Request 944 (accepted)

Overview

Request 944 (accepted)

update version 5178

Created by marguerite over 10 years ago
In state accepted

Submit gpac

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

gpac.changes Changed

gpac.spec Changed

@@ -15,10 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-%define soname		2
+%define soname		3
 
 Name:           gpac
-Version:        0.5.0.svn4668
+Version:        0.5.0.svn5178
 Release:        1.pm.1
 License:        LGPL-2.1+
 Summary:        A multimedia framework covering MPEG-4, VRML/X3D and SVG
@@ -40,17 +40,20 @@
 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 - export functions needed by x264
-Patch7:		gpac-0.5.0-x264-export.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
 BuildRequires:  DirectFB-devel
 BuildRequires:  ImageMagick
 BuildRequires:  Mesa-devel
 BuildRequires:  alsa-devel
 BuildRequires:  dos2unix
 BuildRequires:  doxygen
-BuildRequires:	 fdupes
+BuildRequires:	fdupes
 BuildRequires:  freeglut-devel
 BuildRequires:  freetype2-devel
+BuildRequires:	graphviz
 BuildRequires:  gcc-c++
 %if 0%{?suse_version} >= 1140
 BuildRequires:  libSDL-devel
@@ -195,7 +198,10 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%if 0%{?suse_version} <= 1140
 %patch7 -p1
+%endif
+%patch8 -p1
 
 # Fix encoding warnings
 cp -p Changelog Changelog.origine
@@ -208,6 +214,9 @@
 touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
 rm -rf doc/ipmpx_syntax.bt.origine
 
+# Generate revision.h
+echo '#define GPAC_SVN_REVISION "5178"' > ./include/gpac/revision.h
+
 %build
 # regenerate plugin interface from IDL (see applications/osmozilla/readme.txt)
 %if 0%{?suse_version} > 1140
@@ -370,7 +379,6 @@
 %files -n libgpac-devel
 %defattr(-,root,root)
 %doc doc/CODING_STYLE doc/ipmpx_syntax.bt
-%doc doc/html/*
 %{_includedir}/%{name}/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc

gpac-0.5.0-bufferoverflow.patch Added

gpac-0.5.0-enable_V4Studio.patch Changed

@@ -1,7 +1,8 @@
-diff -urN gpac-0.5.0.svn4192.orig/applications/Makefile gpac-0.5.0.svn4192/applications/Makefile
---- gpac-0.5.0.svn4192.orig/applications/Makefile	2012-11-01 07:44:25.050487961 +0800
-+++ gpac-0.5.0.svn4192/applications/Makefile	2012-11-01 07:45:17.704267823 +0800
-@@ -17,15 +17,15 @@
+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
@@ -22,10 +23,11 @@
  endif
  
  ALLDIRS=$(APPDIRS)
-diff -urN gpac-0.5.0.svn4192.orig/applications/osmo4_wx/Makefile gpac-0.5.0.svn4192/applications/osmo4_wx/Makefile
---- gpac-0.5.0.svn4192.orig/applications/osmo4_wx/Makefile	2012-11-01 07:44:25.011488147 +0800
-+++ gpac-0.5.0.svn4192/applications/osmo4_wx/Makefile	2012-11-01 08:07:33.914532090 +0800
-@@ -46,7 +46,7 @@
+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)
@@ -34,69 +36,20 @@
  
  clean: 
  	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-diff -urN gpac-0.5.0.svn4192.orig/applications/osmozilla/osmo_npapi.cpp gpac-0.5.0.svn4192/applications/osmozilla/osmo_npapi.cpp
---- gpac-0.5.0.svn4192.orig/applications/osmozilla/osmo_npapi.cpp	2012-11-01 07:44:25.049487966 +0800
-+++ gpac-0.5.0.svn4192/applications/osmozilla/osmo_npapi.cpp	2012-11-01 07:46:04.823168413 +0800
-@@ -373,10 +373,10 @@
- 	/* 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)
-diff -urN gpac-0.5.0.svn4192.orig/src/terminal/object_browser.c gpac-0.5.0.svn4192/src/terminal/object_browser.c
---- gpac-0.5.0.svn4192.orig/src/terminal/object_browser.c	2012-11-01 07:44:25.105487684 +0800
-+++ gpac-0.5.0.svn4192/src/terminal/object_browser.c	2012-11-01 07:47:37.788217060 +0800
-@@ -103,6 +103,7 @@
- }
- 
- /*select given object when stream selection is available*/
-+GF_EXPORT
- void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm)
- {
- 	if (!term || !odm) return;
-diff -urN gpac-0.5.0.svn4192.orig/src/terminal/terminal.c gpac-0.5.0.svn4192/src/terminal/terminal.c
---- gpac-0.5.0.svn4192.orig/src/terminal/terminal.c	2012-11-01 07:44:25.105487684 +0800
-+++ gpac-0.5.0.svn4192/src/terminal/terminal.c	2012-11-01 07:47:11.843174648 +0800
-@@ -1868,6 +1868,7 @@
- 	return 0;
- }
- 
-+GF_EXPORT
- const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only)
- {
- 	Bool has_text;
-@@ -1878,7 +1879,7 @@
- 	return gf_sc_get_selected_text(term->compositor);
- }
- 
--
-+GF_EXPORT
- GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only)
- {
- 	if (!term) return GF_BAD_PARAM;
-diff -urN gpac-0.5.0.svn4192.orig/src/utils/os_divers.c gpac-0.5.0.svn4192/src/utils/os_divers.c
---- gpac-0.5.0.svn4192.orig/src/utils/os_divers.c	2012-11-01 07:44:25.063487899 +0800
-+++ gpac-0.5.0.svn4192/src/utils/os_divers.c	2012-11-01 07:49:08.178526744 +0800
-@@ -315,6 +315,7 @@
- #endif
- }
- 
-+GF_EXPORT
- void gf_rand_init(Bool Reset)
- {
- 	if (Reset) {
-@@ -328,6 +329,7 @@
- 	}
- }
- 
-+GF_EXPORT
- u32 gf_rand()
- {
- 	return rand();
+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 Added

gpac-0.5.0-x264-export.patch Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/README.txt Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/REQUIREMENT Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/doc Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/doc/avancement.txt Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/doc/introduction.txt Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/doc/projectmanagement.txt Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/getsources.sh Deleted

@@ -1,44 +0,0 @@
-#!/bin/sh -e
-
-WEBKIT=0
-GPAC=0  
-
-if [ -z $1 ] ; then
-	echo "\nDO NOT USE sudo FOR THIS SCRIPT"
-	echo "\nUsage: You must choose options :"
-	echo "\n\033[31m full - build the whole package (gpac+webkit+hbbtvplayer) Recommended for computer without gpac \033[0m"
-	echo "\n\033[33m webkit - download Webkit sources and install it\033[0m"
-	echo "\n\033[33m gpac - download gpac sources and install it\033[0m"
-	exit 1
-fi
-
-for i in $* ; do
-	if [ "$i" = "full" ] ; then 
-		echo -e "\033[31m Usage: $0 Full Building : Activated \033[0m" 
-		WEBKIT=1
-		GPAC=1  
-	fi
-
-	if [ "$i" = "webkit" ] ; then 
-		echo -e "\033[33m Usage: $0 Webkit Building : Activated \033[0m" 
-		WEBKIT=1 
-	fi
-
-	if [ "$i" = "gpac" ] ; then 
-		echo -e "\033[33m Usage: $0 gpac Building : Activated \033[0m" 
-		WEBKIT=1 
-	fi
-done
-
-if [ $GPAC -eq 1 ] ; then
-	svn checkout https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac gpac
-fi
-
-if [ $WEBKIT -eq 1 ] ; then
-	svn checkout http://svn.webkit.org/repository/webkit/trunk WebKit --depth files -r 97300 # 98458 ?
-	svn checkout http://svn.webkit.org/repository/webkit/trunk/Source WebKit/Source  -r 97300
-	svn checkout http://svn.webkit.org/repository/webkit/trunk/Tools WebKit/Tools  -r 97300
-	svn checkout http://svn.webkit.org/repository/webkit/trunk/WebKitLibraries WebKit/WebKitLibraries  -r 97300
-fi
-
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/README Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/autogen.sh Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/configure.ac Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/doc Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/doc/hbbtvBrowserPlugin-NPAPI-20111108.pptx Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/doc/listeOIPFProfile.xlsx Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/hbbtvbrowserplugin.pc.in Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/hbbtvbrowserplugin.vcproj Deleted

@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="hbbtvbrowserplugin"
-	ProjectGUID="{CBFCB6F1-4877-4CBA-9F59-9B9ADD1D64E5}"
-	RootNamespace="hbbtvbrowserplugin"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories=".\src;&quot;.\src\webkit-plugin-header&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\gtk-2.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\glib-2.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\glib-2.0\include&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\gio-win32-2.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\cairo&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\glib-2.0\gio&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\glib-2.0\glib&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\lib\glib-2.0\include&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\pango-1.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\lib\gtk-2.0\include&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\gdk-pixbuf-2.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\atk-1.0&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32;_WIN32_;HBBTVBROWSERPLUGIN_EXPORTS"
-				GeneratePreprocessedFile="0"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\lib\libhbbtvbrowserplugin.lib"
-				AdditionalLibraryDirectories=""
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=".\src;&quot;.\src\webkit-plugin-header&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\gtk-2.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\glib-2.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\glib-2.0\include&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\gio-win32-2.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\cairo&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\glib-2.0\gio&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\glib-2.0\glib&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\lib\glib-2.0\include&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\pango-1.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\lib\gtk-2.0\include&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\gdk-pixbuf-2.0&quot;;&quot;..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\include\atk-1.0&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_WIN32;_WIN32_;HBBTVBROWSERPLUGIN_EXPORTS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="..\hbbtvterminal\Win32Build\WebKitGTK-Bundle\lib\libhbbtvbrowserplugin.lib"				
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Fichiers sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\src\applicationclass.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\applicationprivatedataclass.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\configurationclass.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\downloadclass.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\downloadcollectionclass.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\drmcontrolinfocollectionclass.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\drmcontrolinformationclass.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtvbrowserplugin.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtvbrowserpluginapi.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\keysetclass.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\oipfapplicationmanager.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\oipfconfiguration.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\oipfdownloadmanager.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\oipfdownloadtrigger.c"
-				>
-			</File>
-			<File
-				RelativePath=".\src\videobroadcast.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Fichiers d&apos;en-tête"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\src\applicationclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\applicationprivatedataclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\configurationclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\downloadclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\downloadcollectionclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\drmcontrolinfocollectionclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\drmcontrolinformationclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtvbrowserplugin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtvbrowserpluginapi.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtvkeyset.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\keysetclass.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\oipfapplicationmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\oipfconfiguration.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\oipfdownloadmanager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\oipfdownloadtrigger.h"
-				>
-			</File>
-			<File
-				RelativePath=".\src\videobroadcast.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Fichiers de ressources"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/makefile.am Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/makefile.old Deleted

@@ -1,110 +0,0 @@
-###############################################################################
-####
-#### MAKEFILE
-####
-#### Copyright Telecom Paristech 2011  
-####
-#### Author : Stanislas Selle
-####
-###############################################################################
-
-###############################################################################
-## Files and Path
-
-PLUGINDIR = /usr/lib/mozilla/plugins
-INSTALL_INCLUDEDIR = /usr/local/include/hbbtvbrowserplugin
-INSTALL_LIBDIR = /usr/local/lib
-INSTALL_PKGDIR = /usr/lib/pkgconfig
-
-PKGFILE = hbbtvbrowserplugin.pc
-
-MAINTARGET = bin/libhbbtvbrowserplugin.so
-
-SRCDIR = src
-HEADERSDIR = src
-
-OBJ = 	obj/hbbtvbrowserplugin.o\
-		obj/oipfapplicationmanager.o\
-		obj/applicationclass.o\
-		obj/applicationprivatedataclass.o\
-		obj/oipfconfiguration.o\
-		obj/configurationclass.o\
-		obj/oipfdownloadmanager.o\
-		obj/oipfdownloadtrigger.o\
-		obj/downloadclass.o\
-		obj/downloadcollectionclass.o\
-		obj/drmcontrolinfocollectionclass.o\
-		obj/drmcontrolinformationclass.o\
-		obj/videobroadcast.o\
-		obj/keysetclass.o
-
-EXPORTHEADERS = hbbtvbrowserpluginapi.h
-
-#TESTURL = file:///home/selle/ressources/HbbTVapps/TPT/app1/index.html
-TESTURL = http://aquila.enst.fr:8080/subwebsite/hbbtvtest/test0003/index.php
-TESTLOG = /tmp/test-err.txt
-###############################################################################
-## Programs
-
-COMPILER	= cc
-DELETER		= rm -f
-BROWSERTEST	= firefox
-
-
-###############################################################################
-## Options, Flags and LinkS
-
-CFLAGS = -Wall -DXP_UNIX=1 -DMOZ_X11=1 -fPIC -g
-
-INCLUDEFLAGS = -Isrc
-LIBRARYFLAGS =
-
-FROMPKG = libxul
-
-PKGFLAGS = `pkg-config --cflags $(FROMPKG) `
-PKGLIBS = `pkg-config --libs $(FROMPKG) `
-
-INCLUDEFLAGS += $(PKGFLAGS)
-LIBRARYFLAGS += $(PKGLIBS)
-
-###############################################################################
-## Rules
-
-all : $(MAINTARGET)
-
-$(MAINTARGET) : $(OBJ)
-	@echo "====> Compiling $(MAINTARGET)"
-	$(COMPILER) $(CFLAGS) $(LIBRARYFLAGS) -shared $(OBJ) -o $(MAINTARGET)
-
-obj/%.o: $(SRCDIR)/%.c $(HEADERSDIR)/%.h
-	@echo "====> Compiling $< "
-	$(COMPILER) $(CFLAGS) -c $< $(INCLUDEFLAGS) -o $@
-
-test : all
-	$(BROWSERTEST) $(TESTURL)  2> $(TESTLOG); cat $(TESTLOG)
-
-install : all
-	@echo "====> Installing"
-	cp $(MAINTARGET) $(PLUGINDIR)
-	@if test -d $(INSTALL_INCLUDEDIR);\
-		then echo " ===> $(INSTALL_INCLUDEDIR) existing already" ; \
-	else mkdir $(INSTALL_INCLUDEDIR); fi;
-	cp $(HEADERSDIR)/$(EXPORTHEADERS) $(INSTALL_INCLUDEDIR)
-	cp $(PKGFILE) $(INSTALL_PKGDIR)
-	@echo "Done."
-
-uninstall :
-	@echo "====> Uninstalling"
-	$(DELETER) $(INSTALL_PKGDIR)/$(PKGFILE) $(INSTALL_INCLUDEDIR)/$(EXPORTHEADERS) $(INSTALL_INCLUDEDIR)/$(MAINTARGET)
-	if test -d $(INSTALL_INCLUDEDIR);\
-		then rmdir $(INSTALL_INCLUDEDIR); fi;
-
-clean :
-	@echo "====> Cleaning"
-	@$(DELETER) $(OBJ)
-	@echo "Deleting objects"
-	@$(DELETER) $(MAINTARGET)
-	@echo "Deleting $(MAINTARGET)"
-
-###############################################################################
-###############################################################################

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/projectmanager Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/projectmanager/codeblocks Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/projectmanager/codeblocks/hbbtvbrowserplugin Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/projectmanager/codeblocks/hbbtvbrowserplugin/hbbtvbrowserplugin.cbp Deleted

@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="hbbtvbrowserplugin" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/hbbtvbrowserplugin" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-		</Compiler>
-		<Unit filename="../../../autogen.sh" />
-		<Unit filename="../../../configure.ac" />
-		<Unit filename="../../../makefile.am" />
-		<Unit filename="../../../makefile.old" />
-		<Unit filename="../../../src/applicationclass.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/applicationclass.h" />
-		<Unit filename="../../../src/applicationprivatedataclass.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/applicationprivatedataclass.h" />
-		<Unit filename="../../../src/configurationclass.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/configurationclass.h" />
-		<Unit filename="../../../src/downloadclass.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/downloadclass.h" />
-		<Unit filename="../../../src/downloadcollectionclass.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/downloadcollectionclass.h" />
-		<Unit filename="../../../src/drmcontrolinfocollectionclass.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/drmcontrolinfocollectionclass.h" />
-		<Unit filename="../../../src/drmcontrolinformationclass.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/drmcontrolinformationclass.h" />
-		<Unit filename="../../../src/hbbtvbrowserplugin.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/hbbtvbrowserplugin.h" />
-		<Unit filename="../../../src/hbbtvbrowserpluginapi.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/hbbtvbrowserpluginapi.h" />
-		<Unit filename="../../../src/keysetclass.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/keysetclass.h" />
-		<Unit filename="../../../src/makefile.am" />
-		<Unit filename="../../../src/oipfapplicationmanager.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/oipfapplicationmanager.h" />
-		<Unit filename="../../../src/oipfconfiguration.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/oipfconfiguration.h" />
-		<Unit filename="../../../src/oipfdownloadmanager.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/oipfdownloadmanager.h" />
-		<Unit filename="../../../src/oipfdownloadtrigger.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/oipfdownloadtrigger.h" />
-		<Unit filename="../../../src/videobroadcast.c">
-			<Option compilerVar="CC" />
-		</Unit>
-		<Unit filename="../../../src/videobroadcast.h" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/projectmanager/codeblocks/hbbtvbrowserplugin/hbbtvbrowserplugin.layout Deleted

@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Debug" />
-	<File name="../../../autogen.sh" open="1" top="0" tabpos="5">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../../configure.ac" open="1" top="0" tabpos="4">
-		<Cursor position="443" topLine="0" />
-	</File>
-	<File name="../../../makefile.am" open="1" top="1" tabpos="1">
-		<Cursor position="116" topLine="0" />
-	</File>
-	<File name="../../../makefile.old" open="1" top="0" tabpos="3">
-		<Cursor position="2670" topLine="56" />
-	</File>
-	<File name="../../../src/applicationclass.c" open="0" top="0" tabpos="4">
-		<Cursor position="5525" topLine="169" />
-	</File>
-	<File name="../../../src/applicationclass.h" open="0" top="0" tabpos="4">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../../src/applicationprivatedataclass.c" open="0" top="0" tabpos="3">
-		<Cursor position="0" topLine="72" />
-	</File>
-	<File name="../../../src/applicationprivatedataclass.h" open="0" top="0" tabpos="8">
-		<Cursor position="1066" topLine="0" />
-	</File>
-	<File name="../../../src/configurationclass.c" open="0" top="0" tabpos="6">
-		<Cursor position="2608" topLine="0" />
-	</File>
-	<File name="../../../src/configurationclass.h" open="0" top="0" tabpos="7">
-		<Cursor position="1064" topLine="0" />
-	</File>
-	<File name="../../../src/downloadclass.c" open="0" top="0" tabpos="13">
-		<Cursor position="904" topLine="12" />
-	</File>
-	<File name="../../../src/downloadclass.h" open="0" top="0" tabpos="10">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../../src/downloadcollectionclass.c" open="0" top="0" tabpos="15">
-		<Cursor position="567" topLine="0" />
-	</File>
-	<File name="../../../src/downloadcollectionclass.h" open="0" top="0" tabpos="9">
-		<Cursor position="68" topLine="0" />
-	</File>
-	<File name="../../../src/drmcontrolinfocollectionclass.c" open="0" top="0" tabpos="1">
-		<Cursor position="44" topLine="0" />
-	</File>
-	<File name="../../../src/drmcontrolinfocollectionclass.h" open="0" top="0" tabpos="38">
-		<Cursor position="78" topLine="0" />
-	</File>
-	<File name="../../../src/drmcontrolinformationclass.c" open="0" top="0" tabpos="2">
-		<Cursor position="44" topLine="0" />
-	</File>
-	<File name="../../../src/drmcontrolinformationclass.h" open="0" top="0" tabpos="39">
-		<Cursor position="72" topLine="0" />
-	</File>
-	<File name="../../../src/hbbtvbrowserplugin.c" open="1" top="0" tabpos="7">
-		<Cursor position="3316" topLine="104" />
-	</File>
-	<File name="../../../src/hbbtvbrowserplugin.h" open="0" top="0" tabpos="1">
-		<Cursor position="117" topLine="0" />
-	</File>
-	<File name="../../../src/hbbtvbrowserpluginapi.c" open="1" top="0" tabpos="6">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../../src/keysetclass.c" open="0" top="0" tabpos="16">
-		<Cursor position="26" topLine="0" />
-	</File>
-	<File name="../../../src/keysetclass.h" open="0" top="0" tabpos="5">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../../src/makefile.am" open="1" top="0" tabpos="2">
-		<Cursor position="1283" topLine="0" />
-	</File>
-	<File name="../../../src/oipfapplicationmanager.c" open="0" top="0" tabpos="3">
-		<Cursor position="3766" topLine="128" />
-	</File>
-	<File name="../../../src/oipfapplicationmanager.h" open="0" top="0" tabpos="12">
-		<Cursor position="374" topLine="0" />
-	</File>
-	<File name="../../../src/oipfconfiguration.c" open="0" top="0" tabpos="5">
-		<Cursor position="3172" topLine="100" />
-	</File>
-	<File name="../../../src/oipfconfiguration.h" open="0" top="0" tabpos="11">
-		<Cursor position="960" topLine="0" />
-	</File>
-	<File name="../../../src/oipfdownloadmanager.c" open="0" top="0" tabpos="5">
-		<Cursor position="5717" topLine="169" />
-	</File>
-	<File name="../../../src/oipfdownloadmanager.h" open="0" top="0" tabpos="11">
-		<Cursor position="840" topLine="0" />
-	</File>
-	<File name="../../../src/oipfdownloadtrigger.c" open="0" top="0" tabpos="4">
-		<Cursor position="158" topLine="0" />
-	</File>
-	<File name="../../../src/oipfdownloadtrigger.h" open="0" top="0" tabpos="9">
-		<Cursor position="103" topLine="0" />
-	</File>
-	<File name="../../../src/videobroadcast.c" open="0" top="0" tabpos="2">
-		<Cursor position="5797" topLine="185" />
-	</File>
-	<File name="../../../src/videobroadcast.h" open="0" top="0" tabpos="13">
-		<Cursor position="274" topLine="0" />
-	</File>
-</CodeBlocks_layout_file>

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/releases Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/releases/hbbtvbrowserplugin-0.01.tar.gz Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/applicationclass.c Deleted

@@ -1,265 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#include "applicationprivatedataclass.h"
-#include "applicationclass.h"
-
-#define kAPPLICATION_ID_PROPERTY_VISIBLE    		            0
-#define kAPPLICATION_ID_PROPERTY_PRIVATEDATA	                1
-#define kAPPLICATION_NUM_PROPERTY_IDENTIFIERS                   2
-
-#define kAPPLICATION_ID_METHOD_CREATEAPPLICATION               0
-#define kAPPLICATION_ID_METHOD_DESTROYAPPLICATION              1
-#define kAPPLICATION_ID_METHOD_SHOW                             2
-#define kAPPLICATION_ID_METHOD_HIDE                             3
-#define kAPPLICATION_NUM_METHOD_IDENTIFIERS              		4
-
-
-static  bool            v_bAPPLICATIONIdentifiersInitialized = false;
-
-static  NPIdentifier    v_APPLICATIONPropertyIdentifiers[kAPPLICATION_NUM_PROPERTY_IDENTIFIERS];
-static  const NPUTF8 *  v_APPLICATIONPropertyNames[kAPPLICATION_NUM_PROPERTY_IDENTIFIERS] = {
-	"visible",
-	"privateData"
-};
-
-static  NPIdentifier    v_APPLICATIONMethodIdentifiers[kAPPLICATION_NUM_METHOD_IDENTIFIERS];
-static  const NPUTF8 *  v_APPLICATIONMethodNames[kAPPLICATION_NUM_METHOD_IDENTIFIERS] = {
-    "createApplication",
-    "destroyApplication",
-    "show",
-    "hide"
-};
-
-
-static  void    APPLICATIONinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_APPLICATIONPropertyNames, kAPPLICATION_NUM_PROPERTY_IDENTIFIERS, v_APPLICATIONPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_APPLICATIONMethodNames,   kAPPLICATION_NUM_METHOD_IDENTIFIERS,   v_APPLICATIONMethodIdentifiers );
-}
-
-NPClass  stAPPLICATIONclass;
-NPClass* pAPPLICATIONclass = NULL;
-
-NPClass* fillAPPLICATIONpclass(void)
-{
-    TRACEINFO;
-    if (pAPPLICATIONclass == NULL)
-    {
-        stAPPLICATIONclass.allocate          = APPLICATION_Allocate;
-        stAPPLICATIONclass.deallocate        = APPLICATION_Deallocate;
-        stAPPLICATIONclass.invalidate        = APPLICATION_Invalidate;
-        stAPPLICATIONclass.hasMethod         = APPLICATION_HasMethod;
-        stAPPLICATIONclass.invoke            = APPLICATION_Invoke;
-        stAPPLICATIONclass.invokeDefault     = APPLICATION_InvokeDefault;
-        stAPPLICATIONclass.hasProperty       = APPLICATION_HasProperty;
-        stAPPLICATIONclass.getProperty       = APPLICATION_GetProperty;
-        stAPPLICATIONclass.setProperty       = APPLICATION_SetProperty;
-        stAPPLICATIONclass.removeProperty    = APPLICATION_RemoveProperty;
-        stAPPLICATIONclass.enumerate         = APPLICATION_Enumerate;
-        pAPPLICATIONclass = &stAPPLICATIONclass;
-    }
-
-    return pAPPLICATIONclass;
-}
-
-
-NPObject *          APPLICATION_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-    if (!v_bAPPLICATIONIdentifiersInitialized)
-    {
-        v_bAPPLICATIONIdentifiersInitialized = true;
-        APPLICATIONinitializeIdentifiers();
-    }
-    
-    NPObj_Application* newapplication = (NPObj_Application*)MEMALLOC(sizeof(NPObj_Application));
-    fprintf(stderr, "\t%s : Allocation at \x1b[%i;3%im%p\n\x1b[0m",__FUNCTION__, 1, 1, newapplication );
-	newapplication->npp = npp;	
-	newapplication->visible = true;
-    newapplication->privateData = sBrowserFuncs->createobject(npp, fillAPPPRIVDATApclass());
-    fprintf(stderr, "\t%s : Create privateData property at \x1b[%i;3%im%p\n\x1b[0m ",__FUNCTION__,  1, 1, newapplication->privateData );
-	newapplication->visible = true;
-    return (NPObject*)newapplication;
-}
-
-  void        APPLICATION_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    NPObj_Application* applicationobj = (NPObj_Application*)obj;
-    sBrowserFuncs->releaseobject(applicationobj->privateData);
-    MEMFREE(applicationobj);
-    return;
-}
-
-  void        APPLICATION_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-  bool        APPLICATION_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-
-    bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kAPPLICATION_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_APPLICATIONMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-	
-    return result;
-}
-
-bool        APPLICATION_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-	bool fctresult = false;
-    if (name == v_APPLICATIONMethodIdentifiers[kAPPLICATION_ID_METHOD_CREATEAPPLICATION])
-    {
-		APPLICATION_Invoke_CreateApplication(obj, args, argCount);
-		fctresult = true;
-    }
-    else if (name == v_APPLICATIONMethodIdentifiers[kAPPLICATION_ID_METHOD_DESTROYAPPLICATION])
-    {
-		APPLICATION_Invoke_DestroyApplication(obj, args, argCount);
-		fctresult = true;
-    }
-    else if (name == v_APPLICATIONMethodIdentifiers[kAPPLICATION_ID_METHOD_HIDE])
-    {
-		APPLICATION_Invoke_Hide(obj, args, argCount);
-		fctresult = true;
-    }
-	else if (name == v_APPLICATIONMethodIdentifiers[kAPPLICATION_ID_METHOD_SHOW])
-    {
-		APPLICATION_Invoke_Show(obj, args, argCount);
-		fctresult = true;
-    }
-    else
-    {       
-        fctresult = false;
-    }
-    return fctresult;
-}
-
- bool        APPLICATION_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        APPLICATION_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kAPPLICATION_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_APPLICATIONPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-  
-    return result;
-}
-
-bool        APPLICATION_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-   
-    bool fctresult = false;
-    NPObj_Application* AppliObj = (NPObj_Application*)obj;
-    
-    if (name == v_APPLICATIONPropertyIdentifiers[kAPPLICATION_ID_PROPERTY_PRIVATEDATA])
-    {    			
-		sBrowserFuncs->retainobject(AppliObj->privateData);
-		OBJECT_TO_NPVARIANT(AppliObj->privateData, *result);	
-    	fctresult = true;
-    }
-    else  if (name == v_APPLICATIONPropertyIdentifiers[kAPPLICATION_ID_PROPERTY_VISIBLE])
-    {    			
-		BOOLEAN_TO_NPVARIANT(AppliObj->visible, *result);
-		fctresult = true;
-    }
-    else
-		
-    return fctresult;
-}
-
-  bool        APPLICATION_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    return true;
-}
-
- bool        APPLICATION_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
- bool        APPLICATION_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-
-/** implementation **/
-
-void APPLICATION_Invoke_CreateApplication(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}
-
-void APPLICATION_Invoke_DestroyApplication(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}
-
-void APPLICATION_Invoke_Show(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;	
-	NPObj_Application* AppliObj = (NPObj_Application*)obj;
-	OnAPPLICATION_Show();
-	AppliObj->visible = true;
-	NOTIMPLEMENTED;
-}
-
-void APPLICATION_Invoke_Hide(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	
-	NPObj_Application* AppliObj = (NPObj_Application*)obj;
-	OnAPPLICATION_Hide();
-	AppliObj->visible = false;
-	NOTIMPLEMENTED; 
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/applicationclass.h Deleted

@@ -1,59 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef __APPLICATIONCLASS_H__
-#define __APPLICATIONCLASS_H__
-
-#include "hbbtvbrowserplugin.h"
-
-typedef struct
-{
-	NPObject header;	
-	NPP npp; 
-	
-	NPBool      visible;
-	NPObject*   privateData;
-	
-} NPObj_Application;
-
-
-NPClass* fillAPPLICATIONpclass(void);
-
-NPObject *  APPLICATION_Allocate(NPP npp, NPClass *aClass);
-void        APPLICATION_Deallocate(NPObject *obj);
-void        APPLICATION_Invalidate(NPObject *obj);
-bool        APPLICATION_HasMethod(NPObject *obj, NPIdentifier name);
-bool        APPLICATION_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        APPLICATION_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        APPLICATION_HasProperty(NPObject *obj, NPIdentifier name);
-bool        APPLICATION_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        APPLICATION_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-
-bool        APPLICATION_RemoveProperty(NPObject *npobj, NPIdentifier name);
-
-bool        APPLICATION_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-
-
-void APPLICATION_Invoke_CreateApplication(NPObject* obj,const NPVariant* args, uint32_t argCount);
-void APPLICATION_Invoke_DestroyApplication(NPObject* obj,const NPVariant* args, uint32_t argCount);
-void APPLICATION_Invoke_Show(NPObject* obj,const NPVariant* args, uint32_t argCount);
-void APPLICATION_Invoke_Hide(NPObject* obj,const NPVariant* args, uint32_t argCount);
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/applicationprivatedataclass.c Deleted

@@ -1,219 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#include "applicationprivatedataclass.h"
-
-#define kAPPPRIVDATA_ID_PROPERTY_KEYSET					       	0
-#define kAPPPRIVDATA_ID_PROPERTY_CURRENTCHANNEL   				1
-#define kAPPPRIVDATA_NUM_PROPERTY_IDENTIFIERS                   2
-
-#define kAPPPRIVDATA_ID_METHOD_GETMEMFREE               	    0
-#define kAPPPRIVDATA_NUM_METHOD_IDENTIFIERS                	    1
-
-
-
-bool            v_bAPPPRIVDATAIdentifiersInitialized = false;
-
-NPIdentifier    v_APPPRIVDATAPropertyIdentifiers[kAPPPRIVDATA_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_APPPRIVDATAPropertyNames[kAPPPRIVDATA_NUM_PROPERTY_IDENTIFIERS] = {
-	"keyset",
-    "currentChannel"
-    };
-
-NPIdentifier    v_APPPRIVDATAMethodIdentifiers[kAPPPRIVDATA_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_APPPRIVDATAMethodNames[kAPPPRIVDATA_NUM_METHOD_IDENTIFIERS] = {
-	"getMEMFREE"
-	};
-
-static  void    APPPRIVDATAinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_APPPRIVDATAPropertyNames, kAPPPRIVDATA_NUM_PROPERTY_IDENTIFIERS, v_APPPRIVDATAPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_APPPRIVDATAMethodNames,   kAPPPRIVDATA_NUM_METHOD_IDENTIFIERS,   v_APPPRIVDATAMethodIdentifiers );
-}
-
-
-NPClass  stAPPPRIVDATAclass;
-NPClass* pAPPPRIVDATAclass = NULL;
-
-NPClass* fillAPPPRIVDATApclass(void)
-{
-    TRACEINFO;
-    if (pAPPPRIVDATAclass == NULL)
-    {
-        stAPPPRIVDATAclass.allocate          = APPPRIVDATA_Allocate;
-        stAPPPRIVDATAclass.deallocate        = APPPRIVDATA_Deallocate;
-        stAPPPRIVDATAclass.invalidate        = APPPRIVDATA_Invalidate;
-        stAPPPRIVDATAclass.hasMethod         = APPPRIVDATA_HasMethod;
-        stAPPPRIVDATAclass.invoke            = APPPRIVDATA_Invoke;
-        stAPPPRIVDATAclass.invokeDefault     = APPPRIVDATA_InvokeDefault;
-        stAPPPRIVDATAclass.hasProperty       = APPPRIVDATA_HasProperty;
-        stAPPPRIVDATAclass.getProperty       = APPPRIVDATA_GetProperty;
-        stAPPPRIVDATAclass.setProperty       = APPPRIVDATA_SetProperty;
-        stAPPPRIVDATAclass.removeProperty    = APPPRIVDATA_RemoveProperty;
-        stAPPPRIVDATAclass.enumerate         = APPPRIVDATA_Enumerate;
-        pAPPPRIVDATAclass = &stAPPPRIVDATAclass;
-    }
-
-    return pAPPPRIVDATAclass;
-}
-
-
-NPObject *          APPPRIVDATA_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-    NPObject* result;
-
-    
-    if (!v_bAPPPRIVDATAIdentifiersInitialized)
-    {
-        v_bAPPPRIVDATAIdentifiersInitialized = true;
-        APPPRIVDATAinitializeIdentifiers();
-    }
-		
-	NPObj_AppPrivData* newappprivdata = (NPObj_AppPrivData*)MEMALLOC(sizeof(NPObj_AppPrivData));    
-	fprintf(stderr, "\t%s : Allocation at \x1b[%i;3%im%p\n\x1b[0m",__FUNCTION__, 1, 1, newappprivdata);    
-    newappprivdata->npp = npp;
-    newappprivdata->keyset = sBrowserFuncs->createobject(npp, fillKEYSETpclass());    
-    fprintf(stderr, "\t%s : Create keyset property at \x1b[%i;3%im%p\n\x1b[0m",__FUNCTION__, 1, 1, newappprivdata->keyset );
-    result = (NPObject*)newappprivdata;
-    return result;
-}
-
-
-void        APPPRIVDATA_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    NPObj_AppPrivData* appprivdataobj = (NPObj_AppPrivData*)obj;
-    sBrowserFuncs->releaseobject(appprivdataobj->keyset);
-    MEMFREE(appprivdataobj);
-    return;
-}
-
-void        APPPRIVDATA_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-bool        APPPRIVDATA_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-	bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kAPPPRIVDATA_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_APPPRIVDATAMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-    
-    return result;
-}
-
-bool        APPPRIVDATA_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-    bool fctresult = false;
-    if (name == v_APPPRIVDATAMethodIdentifiers[kAPPPRIVDATA_ID_METHOD_GETMEMFREE])
-    {
-		APPPRIVDATA_Invoke_GetFreeMen(obj, args, argCount);
-		fctresult = true;
-    }
-    else
-    {    	
-    	fctresult = false;
-    }
-    return fctresult;
-}
-
-bool        APPPRIVDATA_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        APPPRIVDATA_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kAPPPRIVDATA_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_APPPRIVDATAPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-
-   
-    return result;
-}
-
-bool        APPPRIVDATA_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-   
-    bool fctresult = false;
-	NPObj_AppPrivData* AppPrivDataObj = (NPObj_AppPrivData*)obj;
-	if (!strcmp(sBrowserFuncs->utf8fromidentifier(name), v_APPPRIVDATAPropertyNames[kAPPPRIVDATA_ID_PROPERTY_KEYSET]))    
-    {    	
-		sBrowserFuncs->retainobject(AppPrivDataObj->keyset);
-		OBJECT_TO_NPVARIANT(AppPrivDataObj->keyset, *result);
-		
-    	fctresult = true;
-    }
-    else
-		
-    return fctresult;
-}
-
-bool        APPPRIVDATA_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    bool fctresult = false;
-    return fctresult;
-}
-
-bool        APPPRIVDATA_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
-bool        APPPRIVDATA_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-
-
-/** implementation **/
-void APPPRIVDATA_Invoke_GetFreeMen(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/applicationprivatedataclass.h Deleted

@@ -1,54 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef __APPLICATIONPRIVATEDATACLASS_H__
-#define __APPLICATIONPRIVATEDATACLASS_H__
-
-#include "keysetclass.h"
-#include "hbbtvbrowserplugin.h"
-
-typedef struct
-{
-	NPObject header;	
-	NPP npp; 
-
-    NPObject*   keyset;        
-    NPObject*   currentChannel;	
-} NPObj_AppPrivData;
-
-NPClass* fillAPPPRIVDATApclass(void);
-
-NPObject *  APPPRIVDATA_Allocate(NPP npp, NPClass *aClass);
-void        APPPRIVDATA_Deallocate(NPObject *obj);
-void        APPPRIVDATA_Invalidate(NPObject *obj);
-bool        APPPRIVDATA_HasMethod(NPObject *obj, NPIdentifier name);
-bool        APPPRIVDATA_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        APPPRIVDATA_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        APPPRIVDATA_HasProperty(NPObject *obj, NPIdentifier name);
-bool        APPPRIVDATA_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        APPPRIVDATA_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-
-bool        APPPRIVDATA_RemoveProperty(NPObject *npobj, NPIdentifier name);
-
-bool        APPPRIVDATA_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-
-void APPPRIVDATA_Invoke_GetFreeMen(NPObject* obj,const NPVariant* args, uint32_t argCount);
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/configurationclass.c Deleted

@@ -1,182 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors: Stanislas Selle 		
- *				
- */
-#include "configurationclass.h"
-
-
-#define kCONFIGURATION_ID_PROPERTY_PREFERREDAUDIOLANGUAGE		0
-#define kCONFIGURATION_ID_PROPERTY_PREFERREDSUBTITLELANGUAGE 	1
-#define kCONFIGURATION_ID_PROPERTY_COUNTRYID					2
-#define kCONFIGURATION_NUM_PROPERTY_IDENTIFIERS				    3
-
-#define kCONFIGURATION_NUM_METHOD_IDENTIFIERS                	0
-
-
-
-bool            v_bCONFIGURATIONIdentifiersInitialized = false;
-
-NPIdentifier    v_CONFIGURATIONPropertyIdentifiers[kCONFIGURATION_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_CONFIGURATIONPropertyNames[kCONFIGURATION_NUM_PROPERTY_IDENTIFIERS] = {
-	"preferredAudioLanguage",
-    "preferredSubtitleLanguage",
-    "countryId"
-    };
-
-NPIdentifier    v_CONFIGURATIONMethodIdentifiers[kCONFIGURATION_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_CONFIGURATIONMethodNames[kCONFIGURATION_NUM_METHOD_IDENTIFIERS] = {};
-
-static  void    CONFIGURATIONinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_CONFIGURATIONPropertyNames, kCONFIGURATION_NUM_PROPERTY_IDENTIFIERS, v_CONFIGURATIONPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_CONFIGURATIONMethodNames,   kCONFIGURATION_NUM_METHOD_IDENTIFIERS,   v_CONFIGURATIONMethodIdentifiers );
-}
-
-
-NPClass  stCONFIGURATIONclass;
-NPClass* pCONFIGURATIONclass = NULL;
-
-NPClass* fillCONFIGURATIONpclass(void)
-{
-    TRACEINFO;
-    if (pCONFIGURATIONclass == NULL)
-    {
-        stCONFIGURATIONclass.allocate          = CONFIGURATION_Allocate;
-        stCONFIGURATIONclass.deallocate        = CONFIGURATION_Deallocate;
-        stCONFIGURATIONclass.invalidate        = CONFIGURATION_Invalidate;
-        stCONFIGURATIONclass.hasMethod         = CONFIGURATION_HasMethod;
-        stCONFIGURATIONclass.invoke            = CONFIGURATION_Invoke;
-        stCONFIGURATIONclass.invokeDefault     = CONFIGURATION_InvokeDefault;
-        stCONFIGURATIONclass.hasProperty       = CONFIGURATION_HasProperty;
-        stCONFIGURATIONclass.getProperty       = CONFIGURATION_GetProperty;
-        stCONFIGURATIONclass.setProperty       = CONFIGURATION_SetProperty;
-        stCONFIGURATIONclass.removeProperty    = CONFIGURATION_RemoveProperty;
-        stCONFIGURATIONclass.enumerate         = CONFIGURATION_Enumerate;
-        pCONFIGURATIONclass = &stCONFIGURATIONclass;
-    }
-
-    return pCONFIGURATIONclass;
-}
-
-
-NPObject *          CONFIGURATION_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-    
-    if (!v_bCONFIGURATIONIdentifiersInitialized)
-    {
-        v_bCONFIGURATIONIdentifiersInitialized = true;
-        CONFIGURATIONinitializeIdentifiers();
-    }
-	NPObject* newconfiguration = NULL;
-	
-    newconfiguration = (NPObject *)MEMALLOC(sizeof(NPObject));
-
-    return newconfiguration;
-}
-
-
-void        CONFIGURATION_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-     MEMFREE(obj);
-    return;
-}
-
-void        CONFIGURATION_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-bool        CONFIGURATION_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-	bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kCONFIGURATION_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_CONFIGURATIONMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-    
-    return result;
-}
-
-bool        CONFIGURATION_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        CONFIGURATION_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        CONFIGURATION_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kCONFIGURATION_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_CONFIGURATIONPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-
-    
-    return result;
-}
-
-bool        CONFIGURATION_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        CONFIGURATION_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        CONFIGURATION_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
-bool        CONFIGURATION_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/configurationclass.h Deleted

@@ -1,43 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef __CONFIGURATIONCLASS_H__
-#define __CONFIGURATIONCLASS_H__
-
-#include "hbbtvbrowserplugin.h"
-
-
-NPClass* fillCONFIGURATIONpclass(void);
-
-NPObject *  CONFIGURATION_Allocate(NPP npp, NPClass *aClass);
-void        CONFIGURATION_Deallocate(NPObject *obj);
-void        CONFIGURATION_Invalidate(NPObject *obj);
-bool        CONFIGURATION_HasMethod(NPObject *obj, NPIdentifier name);
-bool        CONFIGURATION_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        CONFIGURATION_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        CONFIGURATION_HasProperty(NPObject *obj, NPIdentifier name);
-bool        CONFIGURATION_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        CONFIGURATION_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-
-bool        CONFIGURATION_RemoveProperty(NPObject *npobj, NPIdentifier name);
-
-bool        CONFIGURATION_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/downloadclass.c Deleted

@@ -1,209 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors: Stanislas Selle 		
- *				
- */
-#include "downloadclass.h"
-
-#define kDOWNLOAD_ID_PROPERTY_TOTALIZE			    0
-#define kDOWNLOAD_ID_PROPERTY_STATE					1
-#define kDOWNLOAD_ID_PROPERTY_AMOUNTDOWNLOADED		2
-#define kDOWNLOAD_ID_PROPERTY_NAME					3
-#define kDOWNLOAD_ID_PROPERTY_ID					4
-#define kDOWNLOAD_ID_PROPERTY_CONTENTURL			5
-#define kDOWNLOAD_ID_PROPERTY_DESCRIPTION			6
-#define kDOWNLOAD_ID_PROPERTY_PARENTALRATINGS		7
-#define kDOWNLOAD_ID_PROPERTY_DRMCONTROL			8
-#define kDOWNLOAD_ID_PROPERTY_STARTTIME				9
-#define kDOWNLOAD_ID_PROPERTY_TIMEELAPSED			10
-#define kDOWNLOAD_ID_PROPERTY_TIMEREMAINING			11
-#define kDOWNLOAD_ID_PROPERTY_TRANSFERTYPE			12
-#define kDOWNLOAD_ID_PROPERTY_ORIGINSITE			13
-#define kDOWNLOAD_ID_PROPERTY_ORIGINSITENAME		14
-#define kDOWNLOAD_ID_PROPERTY_CONTENTID				15
-#define kDOWNLOAD_ID_PROPERTY_ICONURL				16
-#define kDOWNLOAD_NUM_PROPERTY_IDENTIFIERS			17
-
-
-#define kDOWNLOAD_NUM_METHOD_IDENTIFIERS    		0
-
-
-bool            v_bDOWNLOADIdentifiersInitialized = false;
-
-NPIdentifier    v_DOWNLOADPropertyIdentifiers[kDOWNLOAD_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_DOWNLOADPropertyNames[kDOWNLOAD_NUM_PROPERTY_IDENTIFIERS] = {
-	"totalize",
-	"state",
-	"amountDownloaded",
-	"name",
-	"id",
-	"contentURL",
-	"description",
-	"parentalRatings",
-	"drmControl",
-	"startTime",
-	"timeElapsed",
-	"timeRemaining",
-	"transferType",
-	"originSite",
-	"originSiteName",
-	"contentID",
-	"iconURL"
-	};
-
-NPIdentifier    v_DOWNLOADMethodIdentifiers[kDOWNLOAD_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_DOWNLOADMethodNames[kDOWNLOAD_NUM_METHOD_IDENTIFIERS] = {
-};
-
-
-static  void    DOWNLOADinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_DOWNLOADPropertyNames, kDOWNLOAD_NUM_PROPERTY_IDENTIFIERS, v_DOWNLOADPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_DOWNLOADMethodNames,   kDOWNLOAD_NUM_METHOD_IDENTIFIERS,   v_DOWNLOADMethodIdentifiers );
-}
-
-NPClass  stDOWNLOADclass;
-NPClass* pDOWNLOADclass = NULL;
-
-NPClass* fillDOWNLOADpclass(void)
-{
-    TRACEINFO;
-    if (pDOWNLOADclass == NULL)
-    {
-        stDOWNLOADclass.allocate          = DOWNLOAD_Allocate;
-        stDOWNLOADclass.deallocate        = DOWNLOAD_Deallocate;
-        stDOWNLOADclass.invalidate        = DOWNLOAD_Invalidate;
-        stDOWNLOADclass.hasMethod         = DOWNLOAD_HasMethod;
-        stDOWNLOADclass.invoke            = DOWNLOAD_Invoke;
-        stDOWNLOADclass.invokeDefault     = DOWNLOAD_InvokeDefault;
-        stDOWNLOADclass.hasProperty       = DOWNLOAD_HasProperty;
-        stDOWNLOADclass.getProperty       = DOWNLOAD_GetProperty;
-        stDOWNLOADclass.setProperty       = DOWNLOAD_SetProperty;
-        stDOWNLOADclass.removeProperty    = DOWNLOAD_RemoveProperty;
-        stDOWNLOADclass.enumerate         = DOWNLOAD_Enumerate;
-        pDOWNLOADclass = &stDOWNLOADclass;
-    }
-
-    return pDOWNLOADclass;
-}
-
-
-NPObject *          DOWNLOAD_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-    
-    if (!v_bDOWNLOADIdentifiersInitialized)
-    {
-        v_bDOWNLOADIdentifiersInitialized = true;
-        DOWNLOADinitializeIdentifiers();
-    }
-
-    NPObject* newdownload = (NPObject *)MEMALLOC(sizeof(NPObject));
-
-    return newdownload;
-}
-
-  void        DOWNLOAD_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    MEMFREE(obj);
-    return;
-}
-
-  void        DOWNLOAD_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-  bool        DOWNLOAD_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-
-    bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kDOWNLOAD_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_DOWNLOADMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-
-    return result;
-}
-
-bool        DOWNLOAD_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
- bool        DOWNLOAD_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        DOWNLOAD_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kDOWNLOAD_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_DOWNLOADPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-
-    return result;
-}
-
-  bool        DOWNLOAD_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        DOWNLOAD_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    return true;
-}
-
- bool        DOWNLOAD_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
- bool        DOWNLOAD_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/downloadclass.h Deleted

@@ -1,42 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef __DOWNLOADCLASS_H__
-#define __DOWNLOADCLASS_H__
-
-#include "hbbtvbrowserplugin.h"
-
-NPClass* fillDOWNLOADpclass(void);
-
-NPObject *  DOWNLOAD_Allocate(NPP npp, NPClass *aClass);
-void        DOWNLOAD_Deallocate(NPObject *obj);
-void        DOWNLOAD_Invalidate(NPObject *obj);
-bool        DOWNLOAD_HasMethod(NPObject *obj, NPIdentifier name);
-bool        DOWNLOAD_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        DOWNLOAD_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        DOWNLOAD_HasProperty(NPObject *obj, NPIdentifier name);
-bool        DOWNLOAD_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        DOWNLOAD_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-
-bool        DOWNLOAD_RemoveProperty(NPObject *npobj, NPIdentifier name);
-
-bool        DOWNLOAD_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/downloadcollectionclass.c Deleted

@@ -1,194 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#include "downloadcollectionclass.h"
-
-
-#define kDWLDCOLLECTION_ID_PROPERTY_LENGH					       	0
-#define kDWLDCOLLECTION_NUM_PROPERTY_IDENTIFIERS                   1
-
-#define kDWLDCOLLECTION_ID_METHOD_ITEM			               	    0
-#define kDWLDCOLLECTION_NUM_METHOD_IDENTIFIERS                	    1
-
-bool            v_bDWLDCOLLECTIONIdentifiersInitialized = false;
-
-NPIdentifier    v_DWLDCOLLECTIONPropertyIdentifiers[kDWLDCOLLECTION_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_DWLDCOLLECTIONPropertyNames[kDWLDCOLLECTION_NUM_PROPERTY_IDENTIFIERS] = {
-	"lengh"
-    };
-
-NPIdentifier    v_DWLDCOLLECTIONMethodIdentifiers[kDWLDCOLLECTION_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_DWLDCOLLECTIONMethodNames[kDWLDCOLLECTION_NUM_METHOD_IDENTIFIERS] = {
-	"item"
-	};
-
-static  void    DWLDCOLLECTIONinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_DWLDCOLLECTIONPropertyNames, kDWLDCOLLECTION_NUM_PROPERTY_IDENTIFIERS, v_DWLDCOLLECTIONPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_DWLDCOLLECTIONMethodNames,   kDWLDCOLLECTION_NUM_METHOD_IDENTIFIERS,   v_DWLDCOLLECTIONMethodIdentifiers );
-}
-
-
-NPClass  stDWLDCOLLECTIONclass;
-NPClass* pDWLDCOLLECTIONclass = NULL;
-
-NPClass* fillDWLDCOLLECTIONpclass(void)
-{
-    TRACEINFO;
-    if (pDWLDCOLLECTIONclass == NULL)
-    {
-        stDWLDCOLLECTIONclass.allocate          = DWLDCOLLECTION_Allocate;
-        stDWLDCOLLECTIONclass.deallocate        = DWLDCOLLECTION_Deallocate;
-        stDWLDCOLLECTIONclass.invalidate        = DWLDCOLLECTION_Invalidate;
-        stDWLDCOLLECTIONclass.hasMethod         = DWLDCOLLECTION_HasMethod;
-        stDWLDCOLLECTIONclass.invoke            = DWLDCOLLECTION_Invoke;
-        stDWLDCOLLECTIONclass.invokeDefault     = DWLDCOLLECTION_InvokeDefault;
-        stDWLDCOLLECTIONclass.hasProperty       = DWLDCOLLECTION_HasProperty;
-        stDWLDCOLLECTIONclass.getProperty       = DWLDCOLLECTION_GetProperty;
-        stDWLDCOLLECTIONclass.setProperty       = DWLDCOLLECTION_SetProperty;
-        stDWLDCOLLECTIONclass.removeProperty    = DWLDCOLLECTION_RemoveProperty;
-        stDWLDCOLLECTIONclass.enumerate         = DWLDCOLLECTION_Enumerate;
-        pDWLDCOLLECTIONclass = &stDWLDCOLLECTIONclass;
-    }
-
-    return pDWLDCOLLECTIONclass;
-}
-
-
-NPObject *          DWLDCOLLECTION_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-    if (!v_bDWLDCOLLECTIONIdentifiersInitialized)
-    {
-        v_bDWLDCOLLECTIONIdentifiersInitialized = true;
-        DWLDCOLLECTIONinitializeIdentifiers();
-    }
-
-    NPObject* newdwldcollection = (NPObject *)MEMALLOC(sizeof(NPObject));
-
-    return newdwldcollection;
-}
-
-
-void        DWLDCOLLECTION_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    MEMFREE(obj);
-    return;
-}
-
-void        DWLDCOLLECTION_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-bool        DWLDCOLLECTION_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-	bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kDWLDCOLLECTION_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_DWLDCOLLECTIONMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-    
-    return result;
-}
-
-bool        DWLDCOLLECTION_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-    bool fctresult = false;
-    if (name == v_DWLDCOLLECTIONMethodIdentifiers[kDWLDCOLLECTION_ID_METHOD_ITEM ])
-    {
-		DWLDCOLLECTION_Invoke_Item(obj, args, argCount);
-		fctresult = true;
-    }
-    else
-    {    	
-    	fctresult = false;
-    }
-    return fctresult;
-
-}
-
-bool        DWLDCOLLECTION_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        DWLDCOLLECTION_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kDWLDCOLLECTION_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_DWLDCOLLECTIONPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-
-    
-    return result;
-}
-
-bool        DWLDCOLLECTION_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        DWLDCOLLECTION_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        DWLDCOLLECTION_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
-bool        DWLDCOLLECTION_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-
-/** implementation **/
-void DWLDCOLLECTION_Invoke_Item(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/downloadcollectionclass.h Deleted

@@ -1,43 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef __DWLDCOLLECTIONCOLLECTIONCLASS_H__
-#define __DWLDCOLLECTIONCOLLECTIONCLASS_H__
-
-#include "hbbtvbrowserplugin.h"
-
-
-NPClass* fillDWLDCOLLECTIONpclass(void);
-
-NPObject *  DWLDCOLLECTION_Allocate(NPP npp, NPClass *aClass);
-void        DWLDCOLLECTION_Deallocate(NPObject *obj);
-void        DWLDCOLLECTION_Invalidate(NPObject *obj);
-bool        DWLDCOLLECTION_HasMethod(NPObject *obj, NPIdentifier name);
-bool        DWLDCOLLECTION_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        DWLDCOLLECTION_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        DWLDCOLLECTION_HasProperty(NPObject *obj, NPIdentifier name);
-bool        DWLDCOLLECTION_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        DWLDCOLLECTION_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-
-bool        DWLDCOLLECTION_RemoveProperty(NPObject *npobj, NPIdentifier name);
-
-bool        DWLDCOLLECTION_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-void DWLDCOLLECTION_Invoke_Item(NPObject* obj,const NPVariant* args, uint32_t argCount);
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/drmcontrolinfocollectionclass.c Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/drmcontrolinfocollectionclass.h Deleted

@@ -1,26 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef __DRMCONTROLINFOCOLLECTIONCLASS_H__
-#define __DRMCONTROLINFOCOLLECTIONCLASS_H__
-
-#include "hbbtvbrowserplugin.h"
-
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/drmcontrolinformationclass.c Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/drmcontrolinformationclass.h Deleted

@@ -1,26 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef __DRMCONTROLINFORMATIONCLASS_H__
-#define __DRMCONTROLINFORMATIONCLASS_H__
-
-#include "hbbtvbrowserplugin.h"
-
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/hbbtvbrowserplugin.c Deleted

@@ -1,335 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-/*
-** HbbTV Plugin PC
-*/
-
-
-#include <gdk/gdk.h>
-#ifdef XP_UNIX
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#endif
-#include <gtk/gtk.h>
-
-#include "hbbtvbrowserplugin.h"
-#include "oipfapplicationmanager.h"
-#include "oipfconfiguration.h"
-#include "videobroadcast.h"
-
-#define MIMETYPEDESCRIPTION "application/hbbtvbrowserplugin::Hbbtv Browser Plugin;" \
-							"video/broadcast::Video Broadcast;"\
-                            "application/oipfapplicationmanager::Oipf Application Manager;"\
-                            "application/oipfconfiguration::Oipf Configuration;"
-
-
-#define PLUGIN_NAME			"hbbtvbrowserplugin"
-#define PLUGIN_DESCRIPTION	"HbbTV browser plugin "
-#define PLUGIN_VERSION		"0.20110704"
-
-
-
-static void
-fillPluginFunctionTable(NPPluginFuncs* pFuncs)
-{
-  TRACEINFO;
-  pFuncs->version = 11;
-  pFuncs->size = sizeof(*pFuncs);
-  pFuncs->newp = OIPF_NPP_New;
-  pFuncs->destroy = OIPF_NPP_Destroy;
-  pFuncs->setwindow = OIPF_NPP_SetWindow;
-  pFuncs->newstream = OIPF_NPP_NewStream;
-//  pFuncs->destroystream = NPP_DestroyStream;
-//  pFuncs->asfile = NPP_StreamAsFile;
-//  pFuncs->writeready = NPP_WriteReady;
-//  pFuncs->write = NPP_Write;
-//  pFuncs->print = NPP_Print;
-  pFuncs->event = OIPF_NPP_HandleEvent;
-//  pFuncs->urlnotify = NPP_URLNotify;
-  pFuncs->getvalue = OIPF_NPP_GetValue;
-  pFuncs->setvalue = OIPF_NPP_SetValue;
-}
-
-char* booltostr(bool data)
-{
-    char *result;
-    if (data)
-        result = "true";
-    else
-        result = "false";
-    return result;
-}
-
-/*
- void drawWindow (HBBTVPluginData* instanceData, GdkDrawable* gdkWindow)
-{
-  TRACEINFO;
-  NPWindow window = *(instanceData->window);
-  int x = window.x;
-  int y = window.y;
-  int width = window.width;
-  int height = window.height;
-  fprintf(stderr,"%p, x = %i  y=%i, width = %i height = %i\n",gdkWindow, x ,y,width,height);
-
-  NPP npp = instanceData->npp;
-  if (!npp)
-    return;
-
-  const char* uaString = "DemoPlug"; // sBrowserFuncs->uagent(npp);
-  if (!uaString)
-    return;
-
-  GdkGC* gdkContext = gdk_gc_new(gdkWindow);
-
-  // draw a grey background for the plugin frame
-  GdkColor grey;
-  grey.red = 24000; grey.blue = 24000; grey.green = 24000;
-  gdk_gc_set_rgb_fg_color(gdkContext, &grey);
-  gdk_draw_rectangle(gdkWindow, gdkContext, TRUE, x, y, width, height);
-
-  // draw a 3-pixel-thick black frame around the plugin
-  GdkColor black;
-  black.red = black.green = black.blue = 0;
-  gdk_gc_set_rgb_fg_color(gdkContext, &black);
-  gdk_gc_set_line_attributes(gdkContext, 3, GDK_LINE_SOLID, GDK_CAP_NOT_LAST, GDK_JOIN_MITER);
-  gdk_draw_rectangle(gdkWindow, gdkContext, FALSE, x + 1, y + 1,
-                     width - 3, height - 3);
-
-  // paint the UA string
-  PangoContext* pangoContext = gdk_pango_context_get();
-  PangoLayout* pangoTextLayout = pango_layout_new(pangoContext);
-  pango_layout_set_width(pangoTextLayout, (width - 10) * PANGO_SCALE);
-  pango_layout_set_text(pangoTextLayout, uaString, -1);
-  gdk_draw_layout(gdkWindow, gdkContext, x + 5, y + 5, pangoTextLayout);
-  g_object_unref(pangoTextLayout);
-
-  g_object_unref(gdkContext);
-}
-*/
-
-
-NPError NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs)
-{
-	TRACEINFO;
-
-    sBrowserFuncs = bFuncs;
-    
-	fillPluginFunctionTable(pFuncs);
-
-	return NPERR_NO_ERROR;
-}
-
-char* NP_GetPluginVersion()
-{
-    TRACEINFO;
-	return PLUGIN_VERSION;
-}
-
-NPError NP_Shutdown()
-{
-    TRACEINFO;
-	return NPERR_NO_ERROR;
-}
-
-char* NP_GetMIMEDescription()
-{
-    TRACEINFO;
-	return MIMETYPEDESCRIPTION;
-}
-
-
-NPError NP_GetValue(void *instance, NPPVariable variable, void *value)
-{
-    TRACEINFO;
-	switch (variable)
-	{
-		case NPPVpluginNameString :
-			*(char**)value = PLUGIN_NAME;
-			break;
-		case NPPVpluginDescriptionString :
-			*(char**)value = PLUGIN_DESCRIPTION;
-			break;
-		default :
-			break;
-	}
-	return NPERR_NO_ERROR;
-}
-
-NPError OIPF_NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char *argn[], char *argv[], NPSavedData *saved)
-{
-	TRACEINFO;
-	int i = 0;
-	
-	NPBool browserSupportsWindowless = false;
-	sBrowserFuncs->getvalue(instance, NPNVSupportsWindowless, &browserSupportsWindowless);
-	if (!browserSupportsWindowless)
-	{		
-		return NPERR_GENERIC_ERROR;
-	}
-	sBrowserFuncs->setvalue(instance, NPPVpluginWindowBool, (void*)false);
-	sBrowserFuncs->setvalue(instance, NPPVpluginTransparentBool, (void*)false);
-	
-
-    NPObject* obj;
-    for(i = 0 ; i<argc ; i++ ){
-		if((strcmp(argn[i],"type")) == 0){
-			instance->pdata = (HBBTVPluginData*)MEMALLOC(sizeof(HBBTVPluginData));
-			HBBTVPluginData* pdata = ((HBBTVPluginData*)instance->pdata);
-			
-			if (strcmp(argv[i], "application/oipfApplicationManager") == 0)
-			{
-				obj = sBrowserFuncs->createobject(instance, fillOAMpclass());				
-			}
-			else if (strcmp(argv[i], "application/oipfConfiguration") == 0)
-			{
-				obj = sBrowserFuncs->createobject(instance, fillOCFGpclass());				
-			}
-			else if (strcmp(argv[i], "video/broadcast") == 0)
-			{
-				obj = sBrowserFuncs->createobject(instance, fillVIDBRCpclass());								
-			}else{
-				
-				obj = NULL;
-			}
-			pdata->type = (char*)MEMALLOC(strlen(argv[i]));
-			strcpy(pdata->type, argv[i] );
-			pdata->obj = obj;
-			pdata->npp = instance;
-			
-		}else{
-			
-			obj = NULL;
-		}
-	}
-
-	return NPERR_NO_ERROR;
-}
-
-NPError OIPF_NPP_Destroy(NPP instance, NPSavedData **save)
-{
-    TRACEINFO;
-    HBBTVPluginData* pdata = (HBBTVPluginData*)instance->pdata;
-    if (pdata)
-    {		
-        sBrowserFuncs->releaseobject(pdata->obj);
-        MEMFREE(pdata->type);
-        MEMFREE(pdata);
-    }
-    return NPERR_NO_ERROR;
-}
-
-
-NPError OIPF_NPP_SetWindow(NPP instance, NPWindow *window)
-{
-	TRACEINFO;
-	
-	
-	
-	HBBTVPluginData* pdata = (HBBTVPluginData*)instance->pdata;
-	if(pdata)
-	{
-		pdata->window = window;
-		if (pdata->type)
-		{
-			if (strcmp(pdata->type, "video/broadcast") == 0)
-			{
-				fprintf(stderr, "%s found \n", pdata->type);
-				if (pdata->obj)
-				{
-					NPObj_VidBrc* vidbrcobj  = (NPObj_VidBrc*)pdata->obj;
-					if (!(vidbrcobj->fullscreen))
-					{
-						OnNoFullscreenSetWindow(pdata->window->x,
-											pdata->window->y,
-											pdata->window->width,
-											pdata->window->height);
-					}
-				}
-			}
-		}
-		/*fprintf(stderr, "\tWindow found : %p\n", window);
-		fprintf(stderr, "\twindow = %p ws_info %p \n\tx = %d, y= %d\n\tclipRect.left = %d clipRect.top= %d\n\twidth=%d,  height= %d\n",
-			pdata->window->window,
-			pdata->window->ws_info,
-			pdata->window->x,
-			pdata->window->y,
-			pdata->window->clipRect.left,
-			pdata->window->clipRect.top,
-			pdata->window->width,
-			pdata->window->height);*/
-	}
-	
-	return NPERR_NO_ERROR;
-}
-
-NPError OIPF_NPP_HandleEvent(NPP instance, void* event)
-{
-	 //TRACEINFO; // frequent event, avoid over log...
-
-	XEvent *nativeEvent = (XEvent*)event;
-	if (nativeEvent->type == GraphicsExpose)
-	{
-		XGraphicsExposeEvent *expose = &nativeEvent->xgraphicsexpose;
-		GC gc = XCreateGC(expose->display, expose->drawable, 0, 0);	
-		XFillRectangle(expose->display, expose->drawable, gc, expose->x, expose->y,expose->width, expose->height);
-		XFreeGC(expose->display, gc);
-		return true;
-	}
-
-	
-	return false;
-}
-
-
-
-NPError OIPF_NPP_GetValue(NPP instance, NPPVariable variable, void *value)
-{
-    TRACEINFO;
-
-    if ( variable == NPPVpluginScriptableNPObject )
-    {			
-        void ** v = (void **)value;        
-        if(instance->pdata)
-        {
-        NPObject* obj = ((HBBTVPluginData*)instance->pdata)->obj;
-		if(obj == NULL){			
-		}else{			
-			sBrowserFuncs->retainobject(obj);
-		}	
-		*v = obj;
-		}
-    }
-	return NPERR_NO_ERROR;
-}
-
-
-NPError OIPF_NPP_SetValue(NPP instance, NPNVariable variable, void *value)
-{
-    TRACEINFO;
-	return NPERR_GENERIC_ERROR;
-}
-
-
-NPError OIPF_NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype)
-{
-    TRACEINFO;
-	return NPERR_GENERIC_ERROR;
-}
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/hbbtvbrowserplugin.h Deleted

@@ -1,82 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef hbbtvbrowserplugin_h
-#define hbbtvbrowserplugin_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <npapi.h>
-#include <npfunctions.h>
-#include <npruntime.h>
-
-#include "hbbtvbrowserpluginapi.h"
-
-#ifndef DEBUG
-	#define DEBUG  true
-	#define PROJECTNAME "HbbTVBrowserPlugin"
-	#define TRACEINFO if (DEBUG) { fprintf(stderr,"\x1b[%i;3%im%s\x1b[0m : call %s\n", 1, 3, PROJECTNAME, __FUNCTION__); }
-	#define NOTIMPLEMENTED if (DEBUG) { printf("%s : %s is \x1b[1;31mNOT IMPLEMENTED\x1b[0m : TODO \n", PROJECTNAME, __FUNCTION__); }
-#endif
-
-typedef struct
-{	
-	NPObject* obj;
-	char* type;
-	NPWindow* window;
-	NPP npp;
-}HBBTVPluginData;
-
-NPNetscapeFuncs* sBrowserFuncs;
-
-#define ALLOCBROWSERMEMORY  true
-
-#ifdef	ALLOCBROWSERMEMORY
-	#define MEMALLOC sBrowserFuncs->memalloc
-	#define MEMFREE  sBrowserFuncs->memfree
-#else 
-	#define MEMALLOC malloc
-	#define MEMFREE  free
-#endif
-
-char* booltostr(bool data);
-
-NPError NP_Initialize(NPNetscapeFuncs* bFuncs, NPPluginFuncs* pFuncs);
-NPError NP_Shutdown();
-NPError NP_GetValue(void *instance, NPPVariable variable, void *value);
-char*	NP_GetPluginVersion();
-char*	NP_GetMIMEDescription();
-
-NPError OIPF_NPP_New(NPMIMEType    pluginType, NPP instance, uint16_t mode, int16_t argc,   char *argn[], char *argv[], NPSavedData *saved);
-NPError OIPF_NPP_Destroy(NPP instance, NPSavedData **save);
-NPError OIPF_NPP_SetWindow(NPP instance, NPWindow *window);
-NPError OIPF_NPP_HandleEvent(NPP instance, void* Event);
-NPError OIPF_NPP_GetValue(NPP instance, NPPVariable variable, void *value);
-NPError OIPF_NPP_SetValue(NPP instance, NPNVariable variable, void *value);
-NPError OIPF_NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/hbbtvbrowserpluginapi.c Deleted

@@ -1,45 +0,0 @@
-
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */#include "hbbtvbrowserpluginapi.h"
-
-
-void OnNoFullscreenSetWindow(int x, int y, int width, int height)
-{
-}
-
-void OnAPPLICATION_Show()
-{
-}
-
-void OnAPPLICATION_Hide()
-{
-}
-
-void OnVIDBRC_SetFullScreen(int fullscreenparam)
-{
-}
-
-void OnKEYSET_SetValue(double param)
-{
-}
-
-void OnKEYSET_Allocate()
-{
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/hbbtvbrowserpluginapi.h Deleted

@@ -1,32 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef hbbtvbrowserpluginapi_h
-#define hbbtvbrowserpluginapi_h
-
-#include <stdlib.h>
-
-///Callbacks
-void OnNoFullscreenSetWindow(int x, int y, int width, int height);
-void OnAPPLICATION_Show();
-void OnAPPLICATION_Hide();
-void OnVIDBRC_SetFullScreen(int fullscreenparam);
-void OnKEYSET_SetValue(double param);
-void OnKEYSET_Allocate();
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/keysetclass.c Deleted

@@ -1,330 +0,0 @@
-
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */#include "keysetclass.h"
-
-#define kKEYSET_ID_PROPERTY_VALUE					       	0
-#define kKEYSET_ID_PROPERTY_MAXIMUMVALUE   					1
-#define kKEYSET_ID_PROPERTY_RED   							2
-#define kKEYSET_ID_PROPERTY_GREEN   						3
-#define kKEYSET_ID_PROPERTY_YELLOW   						4
-#define kKEYSET_ID_PROPERTY_BLUE  							5
-#define kKEYSET_ID_PROPERTY_NAVIGATION   					6
-#define kKEYSET_ID_PROPERTY_VCR   							7
-#define kKEYSET_ID_PROPERTY_SCROLL   						8
-#define kKEYSET_ID_PROPERTY_INFO   							9
-#define kKEYSET_ID_PROPERTY_NUMERIC   						10
-#define kKEYSET_ID_PROPERTY_ALPHA  							11
-#define kKEYSET_ID_PROPERTY_OTHER   						12
-#define kKEYSET_NUM_PROPERTY_IDENTIFIERS                    13
-
-#define kKEYSET_ID_METHOD_SETVALUE               	        0
-#define kKEYSET_NUM_METHOD_IDENTIFIERS                	    1
-
-
-
-bool            v_bKEYSETIdentifiersInitialized = false;
-
-NPIdentifier    v_KEYSETPropertyIdentifiers[kKEYSET_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_KEYSETPropertyNames[kKEYSET_NUM_PROPERTY_IDENTIFIERS] = {
-	"value",
-    "maximumValue",
-    "RED",
-    "GREEN",
-    "YELLOW",
-    "BLUE",
-    "NAVIGATION",
-    "VCR",
-    "SCROLL",
-    "INFO",
-    "NUMERIC",
-    "ALPHA",
-    "OTHER"
-    };
-
-NPIdentifier    v_KEYSETMethodIdentifiers[kKEYSET_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_KEYSETMethodNames[kKEYSET_NUM_METHOD_IDENTIFIERS] = {
-	"setValue"
-	};
-
-static  void    KEYSETinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_KEYSETPropertyNames, kKEYSET_NUM_PROPERTY_IDENTIFIERS, v_KEYSETPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_KEYSETMethodNames,   kKEYSET_NUM_METHOD_IDENTIFIERS,   v_KEYSETMethodIdentifiers );
-}
-
-
-NPClass  stKEYSETclass;
-NPClass* pKEYSETclass = NULL;
-
-NPClass* fillKEYSETpclass(void)
-{
-    TRACEINFO;
-    if (pKEYSETclass == NULL)
-    {
-        stKEYSETclass.allocate          = KEYSET_Allocate;
-        stKEYSETclass.deallocate        = KEYSET_Deallocate;
-        stKEYSETclass.invalidate        = KEYSET_Invalidate;
-        stKEYSETclass.hasMethod         = KEYSET_HasMethod;
-        stKEYSETclass.invoke            = KEYSET_Invoke;
-        stKEYSETclass.invokeDefault     = KEYSET_InvokeDefault;
-        stKEYSETclass.hasProperty       = KEYSET_HasProperty;
-        stKEYSETclass.getProperty       = KEYSET_GetProperty;
-        stKEYSETclass.setProperty       = KEYSET_SetProperty;
-        stKEYSETclass.removeProperty    = KEYSET_RemoveProperty;
-        stKEYSETclass.enumerate         = KEYSET_Enumerate;
-        pKEYSETclass = &stKEYSETclass;
-    }
-
-    return pKEYSETclass;
-}
-
-
-NPObject *          KEYSET_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-    NPObject* result;
-
-    
-    if (!v_bKEYSETIdentifiersInitialized)
-    {
-        v_bKEYSETIdentifiersInitialized = true;
-        KEYSETinitializeIdentifiers();
-    }
-	
-	NPObj_KeySet* newkeyset = (NPObj_KeySet *)MEMALLOC(sizeof(NPObj_KeySet));
-	newkeyset->npp = npp;
-	newkeyset->value = (double*)MEMALLOC(sizeof(double));
-    newkeyset->maximumValue = (double*)MEMALLOC(sizeof(double));
-	result = (NPObject*)newkeyset;
-	OnKEYSET_Allocate();
-    return  result;
-}
-
-
-void        KEYSET_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    NPObj_KeySet* keysetobj = (NPObj_KeySet*)obj;
-    MEMFREE(keysetobj->value);
-    MEMFREE(keysetobj->maximumValue);
-    MEMFREE(keysetobj);
-    return;
-}
-
-void        KEYSET_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-bool        KEYSET_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-	bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kKEYSET_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_KEYSETMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-    
-    return result;
-}
-
-bool        KEYSET_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-    bool fctresult = false;
-    if (name == v_KEYSETMethodIdentifiers[kKEYSET_ID_METHOD_SETVALUE])
-    {
-		KEYSET_Invoke_SetValue(obj, args, argCount, result);
-		fctresult = true;
-    }
-    else
-    {    	
-    	fctresult = false;
-    }
-    return fctresult;
-}
-
-bool        KEYSET_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        KEYSET_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kKEYSET_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_KEYSETPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-
-    
-    return result;
-}
-
-bool        KEYSET_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-    bool fctresult = false;
-    NPObj_KeySet* keysetobj = (NPObj_KeySet*)obj;
-    
-    double 	KEYMASK_RED 		= 0x1;
-	double 	KEYMASK_GREEN 		= 0x2;
-	double 	KEYMASK_YELLOW 		= 0x4;
-	double 	KEYMASK_BLUE 		= 0x8;
-	double 	KEYMASK_NAVIGATION 	= 0x10;
-	double 	KEYMASK_VCR 		= 0x20;
-	double 	KEYMASK_SCROLL 		= 0x40;
-	double 	KEYMASK_INFO 		= 0x80;
-	double 	KEYMASK_NUMERIC 	= 0x100;
-	double 	KEYMASK_ALPHA 		= 0x200;
-	double 	KEYMASK_OTHER 		= 0x400;
-	
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_RED])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_RED, *result);
-    	fctresult = true;
-	}
-	else
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_GREEN])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_GREEN, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_YELLOW])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_YELLOW, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_BLUE])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_BLUE, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_NAVIGATION])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_NAVIGATION, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_VCR])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_VCR, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_SCROLL])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_SCROLL, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_INFO])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_INFO, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_NUMERIC])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_NUMERIC, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_ALPHA])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_ALPHA, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_OTHER])
-	{    			
-		DOUBLE_TO_NPVARIANT(KEYMASK_OTHER, *result);
-    	fctresult = true;
-	}
-	if (name == v_KEYSETPropertyIdentifiers[kKEYSET_ID_PROPERTY_VALUE])
-	{    			
-		double* value = keysetobj->value;
-		DOUBLE_TO_NPVARIANT(*value, *result);
-    	fctresult = true;
-	}
-	
-	if (fctresult)
-	{
-							
-	}
-    
-		
-    
-    return fctresult;    
-}
-
-bool        KEYSET_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    bool fctresult = false;
-    
-    return fctresult;
-}
-
-bool        KEYSET_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
-bool        KEYSET_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-
-
-/** implementation **/
-void KEYSET_Invoke_SetValue(NPObject* obj,const NPVariant* args, uint32_t argCount, NPVariant *result)
-{
-	TRACEINFO;
-	//~ NOTIMPLEMENTED; // in progress
-	double param;
-	NPObj_KeySet* keysetobj = (NPObj_KeySet*)obj;
-	double* value = keysetobj->value;
-	fprintf(stderr,"nb args : %i, %f", argCount,NPVARIANT_TO_DOUBLE(args[0]) );
-	if (!NPVARIANT_IS_DOUBLE(args[0])) {
-		fprintf(stderr,"\t%s : error\n",__FUNCTION__);
-		return;
-    }
-    else {
-		param = NPVARIANT_TO_DOUBLE( args[0] );
-		fprintf(stderr, "\t%s : param to transmit %f \n", __FUNCTION__, param);
-		*value = param;
-		OnKEYSET_SetValue(param);
-	}
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/keysetclass.h Deleted

@@ -1,51 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef    __HBBTVKEYSET_H__
-#define    __HBBTVKEYSET_H__
-
-#include "hbbtvbrowserplugin.h"
-
-typedef struct
-{
-	NPObject header;	
-	NPP npp; 
-	
-	double* value;
-	double* maximumValue;	
-} NPObj_KeySet;
-
-NPClass* fillKEYSETpclass(void);
-
-NPObject *  KEYSET_Allocate(NPP npp, NPClass *aClass);
-void        KEYSET_Deallocate(NPObject *obj);
-void        KEYSET_Invalidate(NPObject *obj);
-bool        KEYSET_HasMethod(NPObject *obj, NPIdentifier name);
-bool        KEYSET_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        KEYSET_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        KEYSET_HasProperty(NPObject *obj, NPIdentifier name);
-bool        KEYSET_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        KEYSET_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-bool        KEYSET_RemoveProperty(NPObject *npobj, NPIdentifier name);
-bool        KEYSET_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-
-void		KEYSET_Invoke_SetValue(NPObject* obj,const NPVariant* args, uint32_t argCount, NPVariant *result);
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/makefile.am Deleted

@@ -1,47 +0,0 @@
-
-lib_LTLIBRARIES = libhbbtvbrowserplugin.la
-
-libhbbtvbrowserplugin_la_SOURCES = hbbtvbrowserplugin.c\
-		hbbtvbrowserpluginapi.c\
-		oipfapplicationmanager.c\
-		applicationclass.c\
-		applicationprivatedataclass.c\
-		oipfconfiguration.c\
-		configurationclass.c\
-		oipfdownloadmanager.c\
-		oipfdownloadtrigger.c\
-		downloadclass.c\
-		downloadcollectionclass.c\
-		drmcontrolinfocollectionclass.c\
-		drmcontrolinformationclass.c\
-		videobroadcast.c\
-		keysetclass.c\
-		hbbtvbrowserplugin.h\
-		hbbtvbrowserpluginapi.h\
-		oipfapplicationmanager.h\
-		applicationclass.h\
-		applicationprivatedataclass.h\
-		oipfconfiguration.h\
-		configurationclass.h\
-		oipfdownloadmanager.h\
-		oipfdownloadtrigger.h\
-		downloadclass.h\
-		downloadcollectionclass.h\
-		drmcontrolinfocollectionclass.h\
-		drmcontrolinformationclass.h\
-		videobroadcast.h\
-		keysetclass.h
-
-library_includedir=$(includedir)/@PACKAGE_NAME@
-library_include_HEADERS = hbbtvbrowserpluginapi.h
-
-SPECIALCFLAGS =  -g -Wall -DXP_UNIX=1 -DMOZ_X11=1 -fPIC
-libhbbtvbrowserplugin_la_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(NPAPI_CFLAGS) $(SPECIALCFLAGS) -I./webkit-plugin-header/ -I./src/webkit-plugin-header/
-libhbbtvbrowserplugin_la_LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(NPAPI_LIBS) $(SPECIALCFLAGS)
-libhbbtvbrowserplugin_la_LIBADD = $(GLIB_LIBS) $(GTK_LIBS) $(NPAPI_LIBS)
-
-install-exec-local :
-	ln -fs $(libdir)/lib@PACKAGE_NAME@.so.0.0.0 $(PLUGINDIR)/lib@PACKAGE_NAME@.so
-
-uninstall-local :
-	rm -f $(PLUGINDIR)/lib@PACKAGE_NAME@.so

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/oipfapplicationmanager.c Deleted

@@ -1,203 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#include "oipfapplicationmanager.h"
-#include "applicationclass.h"
-
-#define kOAM_ID_PROPERTY_ON_LOW_MEMORY                  0
-#define kOAM_NUM_PROPERTY_IDENTIFIERS                   1
-
-#define kOAM_ID_METHOD_GET_OWNER_APPLICATION            0
-#define kOAM_NUM_METHOD_IDENTIFIERS                     1
-
-bool            v_bOAMIdentifiersInitialized = false;
-
-NPIdentifier    v_OAMPropertyIdentifiers[kOAM_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_OAMPropertyNames[kOAM_NUM_PROPERTY_IDENTIFIERS] = {
-    "onLowMemory"
-	};
-
-NPIdentifier    v_OAMMethodIdentifiers[kOAM_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_OAMMethodNames[kOAM_NUM_METHOD_IDENTIFIERS] = {
-    "getOwnerApplication"
-};
-
-
-
-
-static  void    OAMinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_OAMPropertyNames, kOAM_NUM_PROPERTY_IDENTIFIERS, v_OAMPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_OAMMethodNames,   kOAM_NUM_METHOD_IDENTIFIERS,   v_OAMMethodIdentifiers );
-}
-
-NPClass  stOAMclass;
-NPClass* pOAMclass = NULL;
-
-NPClass* fillOAMpclass(void)
-{
-    TRACEINFO;
-    if (pOAMclass == NULL)
-    {
-        stOAMclass.allocate          = OAM_Allocate;
-        stOAMclass.deallocate        = OAM_Deallocate;
-        stOAMclass.invalidate        = OAM_Invalidate;
-        stOAMclass.hasMethod         = OAM_HasMethod;
-        stOAMclass.invoke            = OAM_Invoke;
-        stOAMclass.invokeDefault     = OAM_InvokeDefault;
-        stOAMclass.hasProperty       = OAM_HasProperty;
-        stOAMclass.getProperty       = OAM_GetProperty;
-        stOAMclass.setProperty       = OAM_SetProperty;
-        stOAMclass.removeProperty    = OAM_RemoveProperty;
-        stOAMclass.enumerate         = OAM_Enumerate;
-        pOAMclass = &stOAMclass;
-    }
-
-    return pOAMclass;
-}
-
-
-NPObject *          OAM_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-	
-    if (!v_bOAMIdentifiersInitialized)
-    {
-        v_bOAMIdentifiersInitialized = true;
-        OAMinitializeIdentifiers();
-    }
-    
-    NPObj_OAM* newapplicationmanager = (NPObj_OAM*)MEMALLOC(sizeof(NPObj_OAM));
-	fprintf(stderr, "\t%s : Allocation at \x1b[%i;3%im%p\n\x1b[0m ",__FUNCTION__, 1, 1, newapplicationmanager );
-    newapplicationmanager->npp = npp;
-    newapplicationmanager->ownerApplication = sBrowserFuncs->createobject(npp, fillAPPLICATIONpclass());
-    fprintf(stderr, "\t%s : Create ownerApplication member at \x1b[%i;3%im%p\n\x1b[0m ",__FUNCTION__, 1, 1, newapplicationmanager->ownerApplication );
-    return (NPObject *)newapplicationmanager;
-}
-
-  void        OAM_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    NPObj_OAM* oamobj = (NPObj_OAM*)obj;
-    sBrowserFuncs->releaseobject(oamobj->ownerApplication);    
-    MEMFREE(oamobj);
-    return;
-}
-
-  void        OAM_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-  bool        OAM_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-
-    bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kOAM_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_OAMMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-	
-    return result;
-}
-
-bool        OAM_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-	//OAM_ObjectMain * pMainObj = reinterpret_cast<tWOTVe_OAM_ObjectMain*>(obj);
-	bool fctresult = false;
-    if (name == v_OAMMethodIdentifiers[kOAM_ID_METHOD_GET_OWNER_APPLICATION])
-    {
-		OAM_ObjectMain_Invoke_GetOwnerApplication((NPObj_OAM*)obj, args, argCount, result);
-		fctresult = true;
-    }
-    else
-    {
-        
-        fctresult = false;
-    }
-    return fctresult;
-}
-
- bool        OAM_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        OAM_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kOAM_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_OAMPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-   
-    return result;
-}
-
-bool          OAM_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        OAM_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    return true;
-}
-
- bool        OAM_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
- bool        OAM_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-
-/** implementation **/
-void 		OAM_ObjectMain_Invoke_GetOwnerApplication(NPObj_OAM* obj,const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-	TRACEINFO;
-	sBrowserFuncs->retainobject(obj->ownerApplication);
-	OBJECT_TO_NPVARIANT((NPObject*)(obj->ownerApplication), *result);	
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/oipfapplicationmanager.h Deleted

@@ -1,59 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef    __OIPFAPPLICATIONMANAGER_H__
-#define    __OIPFAPPLICATIONMANAGER_H__
-
-#include "hbbtvbrowserplugin.h"
-
-typedef struct {
-    NPObject    header;
-    NPP         npp;
-    
-    NPObject*   ownerApplication; 
-}  NPObj_OAM;
-
-NPClass* fillOAMpclass(void);
-
-NPObject *  OAM_Allocate(NPP npp, NPClass *aClass);
-void        OAM_Deallocate(NPObject *obj);
-void        OAM_Invalidate(NPObject *obj);
-bool        OAM_HasMethod(NPObject *obj, NPIdentifier name);
-bool        OAM_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        OAM_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        OAM_HasProperty(NPObject *obj, NPIdentifier name);
-bool        OAM_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        OAM_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-bool        OAM_RemoveProperty(NPObject *npobj, NPIdentifier name);
-bool        OAM_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-void 		OAM_ObjectMain_Invoke_GetOwnerApplication(NPObj_OAM* obj,const NPVariant* args, uint32_t argCount, NPVariant* result);
-
-/*
-typedef struct{
-	NPObject	headear;
-	NPP			npp;
-	NPObject*	onLowMemory;
-	NPObject* 	ownerApplication;
-	NPObject* 	newApplication;
-} OAM_ObjectMain;
-*/
-
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/oipfconfiguration.c Deleted

@@ -1,182 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#include "oipfconfiguration.h"
-
-#define kOCFG_ID_PROPERTY_CONFIGURATION				       	0
-#define kOCFG_NUM_PROPERTY_IDENTIFIERS                   	1
-
-#define kOCFG_NUM_METHOD_IDENTIFIERS                	    0
-
-bool            v_bOCFGIdentifiersInitialized = false;
-
-NPIdentifier    v_OCFGPropertyIdentifiers[kOCFG_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_OCFGPropertyNames[kOCFG_NUM_PROPERTY_IDENTIFIERS] = {
-	"configuration"
-    };
-
-NPIdentifier    v_OCFGMethodIdentifiers[kOCFG_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_OCFGMethodNames[kOCFG_NUM_METHOD_IDENTIFIERS] = {};
-
-static  void    OCFGinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_OCFGPropertyNames, kOCFG_NUM_PROPERTY_IDENTIFIERS, v_OCFGPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_OCFGMethodNames,   kOCFG_NUM_METHOD_IDENTIFIERS,   v_OCFGMethodIdentifiers );
-}
-
-
-NPClass  stOCFGclass;
-NPClass* pOCFGclass = NULL;
-
-NPClass* fillOCFGpclass(void)
-{
-    TRACEINFO;
-    if (pOCFGclass == NULL)
-    {
-        stOCFGclass.allocate          = OCFG_Allocate;
-        stOCFGclass.deallocate        = OCFG_Deallocate;
-        stOCFGclass.invalidate        = OCFG_Invalidate;
-        stOCFGclass.hasMethod         = OCFG_HasMethod;
-        stOCFGclass.invoke            = OCFG_Invoke;
-        stOCFGclass.invokeDefault     = OCFG_InvokeDefault;
-        stOCFGclass.hasProperty       = OCFG_HasProperty;
-        stOCFGclass.getProperty       = OCFG_GetProperty;
-        stOCFGclass.setProperty       = OCFG_SetProperty;
-        stOCFGclass.removeProperty    = OCFG_RemoveProperty;
-        stOCFGclass.enumerate         = OCFG_Enumerate;
-        pOCFGclass = &stOCFGclass;
-    }
-
-    return pOCFGclass;
-}
-
-
-NPObject *          OCFG_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-    NPObject* result;
-
-    
-    if (!v_bOCFGIdentifiersInitialized)
-    {
-        v_bOCFGIdentifiersInitialized = true;
-        OCFGinitializeIdentifiers();
-    }
-
-    NPObject* newocfg = (NPObject*)MEMALLOC(sizeof(NPObject));
-    result = newocfg;
-    
-    return result;
-}
-
-
-void        OCFG_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    MEMFREE(obj);
-    return;
-}
-
-void        OCFG_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-bool        OCFG_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-	bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kOCFG_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_OCFGMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-    
-    return result;
-}
-
-bool        OCFG_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-
-    bool fctresult;
-   
-    fctresult = false;
-
-    return fctresult;
-
-}
-
-bool        OCFG_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        OCFG_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kOCFG_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_OCFGPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-   
-    return result;
-}
-
-bool        OCFG_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        OCFG_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    return true;
-}
-
-bool        OCFG_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
-bool        OCFG_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/oipfconfiguration.h Deleted

@@ -1,42 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef    __OIPFCONFIGURATION_H__
-#define    __OIPFCONFIGURATION_H__
-
-#include "hbbtvbrowserplugin.h"
-
-NPClass* fillOCFGpclass(void);
-
-NPObject *  OCFG_Allocate(NPP npp, NPClass *aClass);
-void        OCFG_Deallocate(NPObject *obj);
-void        OCFG_Invalidate(NPObject *obj);
-bool        OCFG_HasMethod(NPObject *obj, NPIdentifier name);
-bool        OCFG_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        OCFG_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        OCFG_HasProperty(NPObject *obj, NPIdentifier name);
-bool        OCFG_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        OCFG_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-
-bool        OCFG_RemoveProperty(NPObject *npobj, NPIdentifier name);
-
-bool        OCFG_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/oipfdownloadmanager.c Deleted

@@ -1,233 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#include "oipfdownloadmanager.h"
-
-#define kODWLDMAN_ID_PROPERTY_ONDOWNLOADSTATECHANGE 0
-#define kODWLDMAN_NUM_PROPERTY_IDENTIFIERS			1
-
-#define kODWLDMAN_ID_METHOD_PAUSE					0
-#define kODWLDMAN_ID_METHOD_RESUME					1
-#define kODWLDMAN_ID_METHOD_REMOVE					2
-#define kODWLDMAN_ID_METHOD_GETDOWNLOADS			3
-#define kODWLDMAN_NUM_METHOD_IDENTIFIERS    		4
-
-bool            v_bODWLDMANIdentifiersInitialized = false;
-
-NPIdentifier    v_ODWLDMANPropertyIdentifiers[kODWLDMAN_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_ODWLDMANPropertyNames[kODWLDMAN_NUM_PROPERTY_IDENTIFIERS] = {
-	"onDownloadStateChange"
-	};
-
-NPIdentifier    v_ODWLDMANMethodIdentifiers[kODWLDMAN_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_ODWLDMANMethodNames[kODWLDMAN_NUM_METHOD_IDENTIFIERS] = {
-    "pause",
-    "resume",
-    "remove",
-    "getDownloads"
-};
-
-
-static  void    ODWLDMANinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_ODWLDMANPropertyNames, kODWLDMAN_NUM_PROPERTY_IDENTIFIERS, v_ODWLDMANPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_ODWLDMANMethodNames,   kODWLDMAN_NUM_METHOD_IDENTIFIERS,   v_ODWLDMANMethodIdentifiers );
-}
-
-NPClass  stODWLDMANclass;
-NPClass* pODWLDMANclass = NULL;
-
-NPClass* fillODWLDMANpclass(void)
-{
-    TRACEINFO;
-    if (pODWLDMANclass == NULL)
-    {
-        stODWLDMANclass.allocate          = ODWLDMAN_Allocate;
-        stODWLDMANclass.deallocate        = ODWLDMAN_Deallocate;
-        stODWLDMANclass.invalidate        = ODWLDMAN_Invalidate;
-        stODWLDMANclass.hasMethod         = ODWLDMAN_HasMethod;
-        stODWLDMANclass.invoke            = ODWLDMAN_Invoke;
-        stODWLDMANclass.invokeDefault     = ODWLDMAN_InvokeDefault;
-        stODWLDMANclass.hasProperty       = ODWLDMAN_HasProperty;
-        stODWLDMANclass.getProperty       = ODWLDMAN_GetProperty;
-        stODWLDMANclass.setProperty       = ODWLDMAN_SetProperty;
-        stODWLDMANclass.removeProperty    = ODWLDMAN_RemoveProperty;
-        stODWLDMANclass.enumerate         = ODWLDMAN_Enumerate;
-        pODWLDMANclass = &stODWLDMANclass;
-    }
-
-    return pODWLDMANclass;
-}
-
-
-NPObject *          ODWLDMAN_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-    NPObject* newdwldman = NULL;
-    if (!v_bODWLDMANIdentifiersInitialized)
-    {
-        v_bODWLDMANIdentifiersInitialized = true;
-        ODWLDMANinitializeIdentifiers();
-    }
-
-    newdwldman = (NPObject*)MEMALLOC(sizeof(NPObject));
-
-    return newdwldman;
-}
-
-  void        ODWLDMAN_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    MEMFREE(obj);
-    return;
-}
-
-  void        ODWLDMAN_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-  bool        ODWLDMAN_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-
-    bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kODWLDMAN_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_ODWLDMANMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }	
-
-    return result;
-}
-
-bool        ODWLDMAN_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-    bool fctresult = false;
-    if (name == v_ODWLDMANMethodIdentifiers[kODWLDMAN_ID_METHOD_GETDOWNLOADS])
-    {
-		ODWLDMAN_Invoke_GetDownloads(obj, args, argCount);
-		fctresult = true;
-    }
-    else if (name == v_ODWLDMANMethodIdentifiers[kODWLDMAN_ID_METHOD_PAUSE])
-    {
-		ODWLDMAN_Invoke_Pause(obj, args, argCount);
-		fctresult = true;
-    }
-    else if (name == v_ODWLDMANMethodIdentifiers[kODWLDMAN_ID_METHOD_REMOVE])
-    {
-		ODWLDMAN_Invoke_Remove(obj, args, argCount);
-		fctresult = true;
-    }
-	else if (name == v_ODWLDMANMethodIdentifiers[kODWLDMAN_ID_METHOD_RESUME])
-    {
-		ODWLDMAN_Invoke_Resume(obj, args, argCount);
-		fctresult = true;
-    }
-    else
-    {        
-        fctresult = false;
-    }
-    return fctresult;
-}
-
- bool        ODWLDMAN_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        ODWLDMAN_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kODWLDMAN_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_ODWLDMANPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-    
-    return result;
-}
-
-  bool        ODWLDMAN_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        ODWLDMAN_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    return true;
-}
-
- bool        ODWLDMAN_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
- bool        ODWLDMAN_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-
-/** implementation */
-
-
-void ODWLDMAN_Invoke_GetDownloads(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}
-
-void ODWLDMAN_Invoke_Pause(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}
-
-void ODWLDMAN_Invoke_Remove(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}
-
-void ODWLDMAN_Invoke_Resume(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/oipfdownloadmanager.h Deleted

@@ -1,48 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef __OIPFDOWNLOADMANAGER_H__
-#define __OIPFDOWNLOADMANAGER_H__
-
-#include "hbbtvbrowserplugin.h"
-
-
-NPClass* fillODWLDMANpclass(void);
-
-NPObject *  ODWLDMAN_Allocate(NPP npp, NPClass *aClass);
-void        ODWLDMAN_Deallocate(NPObject *obj);
-void        ODWLDMAN_Invalidate(NPObject *obj);
-bool        ODWLDMAN_HasMethod(NPObject *obj, NPIdentifier name);
-bool        ODWLDMAN_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        ODWLDMAN_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        ODWLDMAN_HasProperty(NPObject *obj, NPIdentifier name);
-bool        ODWLDMAN_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        ODWLDMAN_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-
-bool        ODWLDMAN_RemoveProperty(NPObject *npobj, NPIdentifier name);
-
-bool        ODWLDMAN_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-
-void ODWLDMAN_Invoke_GetDownloads(NPObject* obj,const NPVariant* args, uint32_t argCount);
-void ODWLDMAN_Invoke_Pause(NPObject* obj,const NPVariant* args, uint32_t argCount);
-void ODWLDMAN_Invoke_Remove(NPObject* obj,const NPVariant* args, uint32_t argCount);
-void ODWLDMAN_Invoke_Resume(NPObject* obj,const NPVariant* args, uint32_t argCount);
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/oipfdownloadtrigger.c Deleted

@@ -1,205 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors: Stanislas Selle 		
- *				
- */
-#include "oipfdownloadtrigger.h"
-
-
-#define kODWLDTRG_NUM_PROPERTY_IDENTIFIERS                   0
-
-#define kODWLDTRG_ID_METHOD_REGISTER_DOWNLOAD	             0
-#define kODWLDTRG_ID_METHOD_REGISTER_DOWNLOADURL            1
-#define kODWLDTRG_NUM_METHOD_IDENTIFIERS                     2
-
-bool            v_bODWLDTRGIdentifiersInitialized = false;
-
-NPIdentifier    v_ODWLDTRGPropertyIdentifiers[kODWLDTRG_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_ODWLDTRGPropertyNames[kODWLDTRG_NUM_PROPERTY_IDENTIFIERS] = {
-};
-
-NPIdentifier    v_ODWLDTRGMethodIdentifiers[kODWLDTRG_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_ODWLDTRGMethodNames[kODWLDTRG_NUM_METHOD_IDENTIFIERS] = {
-    "registerDownload",
-    "registerDownloadURL"
-};
-
-
-
-static  void    ODWLDTRGinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_ODWLDTRGPropertyNames, kODWLDTRG_NUM_PROPERTY_IDENTIFIERS, v_ODWLDTRGPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_ODWLDTRGMethodNames,   kODWLDTRG_NUM_METHOD_IDENTIFIERS,   v_ODWLDTRGMethodIdentifiers );
-}
-
-NPClass  stODWLDTRGclass;
-NPClass* pODWLDTRGclass = NULL;
-
-NPClass* fillODWLDTRGpclass(void)
-{
-    TRACEINFO;
-    if (pODWLDTRGclass == NULL)
-    {
-        stODWLDTRGclass.allocate          = ODWLDTRG_Allocate;
-        stODWLDTRGclass.deallocate        = ODWLDTRG_Deallocate;
-        stODWLDTRGclass.invalidate        = ODWLDTRG_Invalidate;
-        stODWLDTRGclass.hasMethod         = ODWLDTRG_HasMethod;
-        stODWLDTRGclass.invoke            = ODWLDTRG_Invoke;
-        stODWLDTRGclass.invokeDefault     = ODWLDTRG_InvokeDefault;
-        stODWLDTRGclass.hasProperty       = ODWLDTRG_HasProperty;
-        stODWLDTRGclass.getProperty       = ODWLDTRG_GetProperty;
-        stODWLDTRGclass.setProperty       = ODWLDTRG_SetProperty;
-        stODWLDTRGclass.removeProperty    = ODWLDTRG_RemoveProperty;
-        stODWLDTRGclass.enumerate         = ODWLDTRG_Enumerate;
-        pODWLDTRGclass = &stODWLDTRGclass;
-    }
-
-    return pODWLDTRGclass;
-}
-
-
-NPObject *          ODWLDTRG_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-    NPObject* newdwldtrg = NULL;
-    if (!v_bODWLDTRGIdentifiersInitialized)
-    {
-        v_bODWLDTRGIdentifiersInitialized = true;
-        ODWLDTRGinitializeIdentifiers();
-    }
-
-    newdwldtrg = (NPObject*)MEMALLOC(sizeof(NPObject));
-
-    return newdwldtrg;
-}
-
-  void        ODWLDTRG_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    MEMFREE(obj);
-    return;
-}
-
-  void        ODWLDTRG_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-  bool        ODWLDTRG_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-
-    bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kODWLDTRG_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_ODWLDTRGMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-	
-    return result;
-}
-
-bool        ODWLDTRG_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-	bool fctresult = false;
-    if (name == v_ODWLDTRGMethodIdentifiers[kODWLDTRG_ID_METHOD_REGISTER_DOWNLOAD])
-    {
-		ODWLDTRG_Invoke_registerDownload(obj, args, argCount);
-		fctresult = true;
-    }
-    else if (name == v_ODWLDTRGMethodIdentifiers[kODWLDTRG_ID_METHOD_REGISTER_DOWNLOADURL])
-    {
-		ODWLDTRG_Invoke_registerDownloadURL(obj, args, argCount);
-		fctresult = true;
-    }
-	else
-    {        
-        fctresult = false;
-    }
-    return fctresult;
-}
-
- bool        ODWLDTRG_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        ODWLDTRG_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-
-    int i = 0;
-    while ((i < kODWLDTRG_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_ODWLDTRGPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-  
-    return result;
-}
-
-  bool        ODWLDTRG_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        ODWLDTRG_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-    TRACEINFO;
-    return true;
-}
-
- bool        ODWLDTRG_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
- bool        ODWLDTRG_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-
-void ODWLDTRG_Invoke_registerDownload(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}
-
-void ODWLDTRG_Invoke_registerDownloadURL(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/oipfdownloadtrigger.h Deleted

@@ -1,46 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors: Stanislas Selle 		
- *				
- */
-#ifndef __OIPFDOWNLOADTRIGGER_H__
-#define __OIPFDOWNLOADTRIGGER_H__
-
-#include "hbbtvbrowserplugin.h"
-
-
-
-NPClass* fillODWLDTRGpclass(void);
-
-NPObject *  ODWLDTRG_Allocate(NPP npp, NPClass *aClass);
-void        ODWLDTRG_Deallocate(NPObject *obj);
-void        ODWLDTRG_Invalidate(NPObject *obj);
-bool        ODWLDTRG_HasMethod(NPObject *obj, NPIdentifier name);
-bool        ODWLDTRG_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        ODWLDTRG_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        ODWLDTRG_HasProperty(NPObject *obj, NPIdentifier name);
-bool        ODWLDTRG_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        ODWLDTRG_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-
-bool        ODWLDTRG_RemoveProperty(NPObject *npobj, NPIdentifier name);
-
-bool        ODWLDTRG_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-void ODWLDTRG_Invoke_registerDownload(NPObject* obj,const NPVariant* args, uint32_t argCount);
-void ODWLDTRG_Invoke_registerDownloadURL(NPObject* obj,const NPVariant* args, uint32_t argCount);
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/videobroadcast.c Deleted

@@ -1,431 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#include "videobroadcast.h"
-
-#define kVIDBRC_ID_PROPERTY_WIDTH	                   	0
-#define kVIDBRC_ID_PROPERTY_HEIGHT	                  	1
-#define kVIDBRC_ID_PROPERTY_FULLSCREEN					2
-#define kVIDBRC_ID_PROPERTY_ONCHANNELCHANGEERROR		3
-#define kVIDBRC_ID_PROPERTY_PLAYSTATE					4
-#define kVIDBRC_ID_PROPERTY_ONPLAYSTATECHANGE			5
-#define kVIDBRC_ID_PROPERTY_ONCHANNELCHANGESUCCEEDED	6
-#define kVIDBRC_ID_PROPERTY_ONFULLSCREENCHANGE			7
-#define kVIDBRC_ID_PROPERTY_ONFOCUS						8
-#define kVIDBRC_ID_PROPERTY_ONBLUR						9
-#define kVIDBRC_NUM_PROPERTY_IDENTIFIERS                10
-
-#define kVIDBRC_ID_METHOD_GETCHANNELCONFIG              0
-#define kVIDBRC_ID_METHOD_BINDTOCURRENTCHANNEL          1
-#define kVIDBRC_ID_METHOD_CREATECHANNELOBJECT			2
-#define kVIDBRC_ID_METHOD_CREATECHANNELOBJECT2   	    3
-#define kVIDBRC_ID_METHOD_SETCHANNEL              		4
-#define kVIDBRC_ID_METHOD_PREVCHANNEL					5
-#define kVIDBRC_ID_METHOD_NEXTCHANNEL					6
-#define kVIDBRC_ID_METHOD_SETFULLSCREEN					7
-#define kVIDBRC_ID_METHOD_GETVOLUME						8
-#define kVIDBRC_ID_METHOD_RELEASE						9
-#define kVIDBRC_NUM_METHOD_IDENTIFIERS					10
-
-
-bool            v_bVIDBRCIdentifiersInitialized = false;
-
-NPIdentifier    v_VIDBRCPropertyIdentifiers[kVIDBRC_NUM_PROPERTY_IDENTIFIERS];
-const NPUTF8 *  v_VIDBRCPropertyNames[kVIDBRC_NUM_PROPERTY_IDENTIFIERS] = {
-	"width",
-	"height",
-	"fullScreen",
-	"onChannelChangeError",
-	"playState",
-	"onPlayStateChange",
-	"onChannelChangeSucceeded",
-	"onFullScreenChange",
-	"onFocus",
-	"onBlur"
-	};
-
-NPIdentifier    v_VIDBRCMethodIdentifiers[kVIDBRC_NUM_METHOD_IDENTIFIERS];
-const NPUTF8 *  v_VIDBRCMethodNames[kVIDBRC_NUM_METHOD_IDENTIFIERS] = {
-	"getChannelConfig",
-	"bindToCurrentChannel",
-	"createChannelObject",
-	"createChannelObject2",
-	"setChannel",
-	"prevChannel",
-	"nextChannel",
-	"setFullScreen",
-	"getVolume",
-	"release"
-};
-
-static  void    VIDBRCinitializeIdentifiers(void)
-{
-    sBrowserFuncs->getstringidentifiers( v_VIDBRCPropertyNames, kVIDBRC_NUM_PROPERTY_IDENTIFIERS, v_VIDBRCPropertyIdentifiers );
-    sBrowserFuncs->getstringidentifiers( v_VIDBRCMethodNames,   kVIDBRC_NUM_METHOD_IDENTIFIERS,   v_VIDBRCMethodIdentifiers );
-}
-
-NPClass  stVIDBRCclass;
-NPClass* pVIDBRCclass = NULL;
-
-NPClass* fillVIDBRCpclass(void)
-{
-    TRACEINFO;
-    if (pVIDBRCclass == NULL)
-    {
-        stVIDBRCclass.allocate          = VIDBRC_Allocate;
-        stVIDBRCclass.deallocate        = VIDBRC_Deallocate;
-        stVIDBRCclass.invalidate        = VIDBRC_Invalidate;
-        stVIDBRCclass.hasMethod         = VIDBRC_HasMethod;
-        stVIDBRCclass.invoke            = VIDBRC_Invoke;
-        stVIDBRCclass.invokeDefault     = VIDBRC_InvokeDefault;
-        stVIDBRCclass.hasProperty       = VIDBRC_HasProperty;
-        stVIDBRCclass.getProperty       = VIDBRC_GetProperty;
-        stVIDBRCclass.setProperty       = VIDBRC_SetProperty;
-        stVIDBRCclass.removeProperty    = VIDBRC_RemoveProperty;
-        stVIDBRCclass.enumerate         = VIDBRC_Enumerate;
-        pVIDBRCclass = &stVIDBRCclass;
-    }
-
-    return pVIDBRCclass;
-}
-
-
-NPObject *          VIDBRC_Allocate(NPP npp, NPClass *theClass)
-{
-    TRACEINFO;
-
-    
-    if (!v_bVIDBRCIdentifiersInitialized)
-    {
-        v_bVIDBRCIdentifiersInitialized = true;
-        VIDBRCinitializeIdentifiers();
-    }
-	
-	NPObj_VidBrc* newvidbrc = (NPObj_VidBrc*)MEMALLOC(sizeof(NPObj_VidBrc));
-    newvidbrc->npp = npp;
-    
-    return (NPObject*) newvidbrc;
-}
-
-void		VIDBRC_Deallocate(NPObject* obj)
-{
-    TRACEINFO;
-    OnVIDBRC_SetFullScreen(true); 
-    NPObj_VidBrc* vidbrc = (NPObj_VidBrc*)obj;
-    /*
-    if (vidbrc->pcArg_onChannelChangeSucceeded)
-    {
-        MEMFREE(vidbrc->pcArg_onChannelChangeSucceeded);
- //       vidbrc->pcArg_onChannelChangeSucceeded = NULL;        
-    }	
-	if ( vidbrc->onChannelChangeSucceeded )
-	{
-		// sBrowserFuncs->releaseobject(vidbrc->onChannelChangeSucceeded);		
-	//	vidbrc->onChannelChangeSucceeded = NULL;
-	}
- 
-    */
-    MEMFREE(obj);
-    return;
-}
-
-  void        VIDBRC_Invalidate(NPObject* obj)
-{
-    TRACEINFO;
-    return;
-}
-
-  bool        VIDBRC_HasMethod(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;
-
-    bool result = false;
-    int i = 0;
-    NPUTF8* utf8methodname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    while ((i < kVIDBRC_NUM_METHOD_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_VIDBRCMethodIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-	
-    return result;
-}
-
-bool        VIDBRC_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-    TRACEINFO;
-	bool fctresult = false;
-
-	if (name == v_VIDBRCMethodIdentifiers[kVIDBRC_ID_METHOD_GETCHANNELCONFIG])
-    {
-    	VIDBRC_Invoke_getChannelConfig((NPObj_VidBrc*)obj, args, argCount, result);
-    	fctresult = true;
-    }
-    
-    if (name == v_VIDBRCMethodIdentifiers[kVIDBRC_ID_METHOD_SETFULLSCREEN])
-    {
-    	VIDBRC_Invoke_setFullScreen((NPObj_VidBrc*)obj, args, argCount);
-    	fctresult = true;
-    }
-
-    if (name == v_VIDBRCMethodIdentifiers[kVIDBRC_ID_METHOD_BINDTOCURRENTCHANNEL])
-    {
-    	VIDBRC_Invoke_bindToCurrentChannel(obj, args, argCount);
-    	fctresult = true;
-    }
-    
-    
-    return fctresult;
-}
-
- bool        VIDBRC_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-    TRACEINFO;
-    return true;
-}
-
-  bool        VIDBRC_HasProperty(NPObject* obj, NPIdentifier name)
-{
-    TRACEINFO;    bool result = false;
-    NPUTF8* utf8propertyname = (char*)sBrowserFuncs->utf8fromidentifier(name);
-    int i = 0;
-    while ((i < kVIDBRC_NUM_PROPERTY_IDENTIFIERS) && (result == false))
-    {
-        if ( name == v_VIDBRCPropertyIdentifiers[i] )
-        {
-            result= true;
-        }
-        i++;
-    }
-
-    return result;
-}
-
- bool        VIDBRC_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-    TRACEINFO;
-	bool fctresult = false;
-	NPObj_VidBrc* vidbrc = (NPObj_VidBrc*)obj;
-	
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_WIDTH]) {    
-		INT32_TO_NPVARIANT(vidbrc->width,*result);
-    	fctresult = true;
-    } else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_HEIGHT]) {
-		INT32_TO_NPVARIANT(vidbrc->height,*result);
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_FULLSCREEN]) {
-		BOOLEAN_TO_NPVARIANT(vidbrc->fullscreen, *result);
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_PLAYSTATE]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONPLAYSTATECHANGE]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONCHANNELCHANGEERROR]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONCHANNELCHANGESUCCEEDED]) {		
-   /*         if ( vidbrc->pcArg_onChannelChangeSucceeded != NULL )
-            {
-               char*  dup_str = strdup(vidbrc->pcArg_onChannelChangeSucceeded);                              
-               NPString npstr = { dup_str, (uint32_t)(strlen(dup_str)) }; 
-               result->type = NPVariantType_String;
-               result->value.stringValue = npstr;               
-               fctresult = true;
-            }
-            else
-            {
-                OBJECT_TO_NPVARIANT(vidbrc->onPlayStateChange,*result);
-            }*/					
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONFULLSCREENCHANGE]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONFOCUS]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONBLUR]) {
-		fctresult = true;
-	}
-    
-    return fctresult;
-}
-
-  bool        VIDBRC_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-	TRACEINFO;
-	bool fctresult = false;
-	NPObj_VidBrc* vidbrc = (NPObj_VidBrc*)obj;
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_WIDTH]) {    
-		vidbrc->width = NPVARIANT_TO_INT32(*value);
-		VIDBRC_setsize(vidbrc, vidbrc->width, vidbrc->height);
-    	fctresult = true;
-    } else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_HEIGHT]) {
-		vidbrc->height = NPVARIANT_TO_INT32(*value);
-		VIDBRC_setsize(vidbrc, vidbrc->width, vidbrc->height);
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_FULLSCREEN]) {		
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_PLAYSTATE]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONPLAYSTATECHANGE]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONCHANNELCHANGEERROR]) {
-		fctresult = true;
-	} else 
-	if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONCHANNELCHANGESUCCEEDED]) {
-    /*    if ( vidbrc->onChannelChangeSucceeded != NULL )
-        {
-            sBrowserFuncs->releaseobject(vidbrc->onChannelChangeSucceeded);
-            vidbrc->onChannelChangeSucceeded = NULL;
-        }
-        if ( vidbrc->pcArg_onChannelChangeSucceeded )
-        {
-            MEMFREE( vidbrc->pcArg_onChannelChangeSucceeded );
-            vidbrc->pcArg_onChannelChangeSucceeded = NULL;
-        }        
-        vidbrc->onChannelChangeSucceeded = NPVARIANT_TO_OBJECT(*value);
-        sBrowserFuncs->retainobject( vidbrc->onChannelChangeSucceeded);*/
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONFULLSCREENCHANGE]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONFOCUS]) {
-		fctresult = true;
-	} else 
-    if (name == v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_ONBLUR]) {
-		fctresult = true;
-	}
-    return fctresult;
-}
-
- bool        VIDBRC_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-    TRACEINFO;
-    return true;
-}
-
-
- bool        VIDBRC_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-    TRACEINFO;
-    return true;
-}
-
-/** implementation of methods **/
-void		VIDBRC_Invoke_getChannelConfig(NPObj_VidBrc* obj,const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-	NOTIMPLEMENTED;
-	NULL_TO_NPVARIANT(*result);
-	return;
-}
-
-void		VIDBRC_Invoke_setFullScreen(NPObj_VidBrc* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	//NOTIMPLEMENTED; ///inprogress
-	
-	NPP npp = obj->npp;
-	int param;
-	if (argCount != 1 || !NPVARIANT_IS_BOOLEAN(args[0])) {
-		return;
-    }
-    else {
-		param = NPVARIANT_TO_BOOLEAN( args[0] );		
-		if (param != obj->fullscreen)
-		{
-			if (param){
-				obj->fullscreen = true;
-				VIDBRC_setsize(obj, FULLSIZE_WIDTH, FULLSIZE_HEIGHT);
-			}
-			else{
-				obj->fullscreen = false;
-			}
-			
-			HBBTVPluginData* pdata = (HBBTVPluginData*)npp->pdata;
-			if(pdata){
-				if (pdata->window){						
-					OnVIDBRC_SetFullScreen(param);			
-				}
-			}										
-		}	
-}
-    
-}
-
-void		VIDBRC_Invoke_bindToCurrentChannel(NPObject* obj,const NPVariant* args, uint32_t argCount)
-{
-	TRACEINFO;
-	NOTIMPLEMENTED;
-	//OnBindToCurrentChannel();
-}
-
-/** implementation of intermediary function **/
-
-void		VIDBRC_setsize(NPObj_VidBrc* obj,int32_t width, int32_t height)
-{
-		///set the size
-		obj->width = width;
-		obj->height = height;
-		
-		/// get the plugin object and his style object
-		NPIdentifier    npIdent;
-		NPVariant       npVar;		
-		NPObject *      npObjPlugin = NULL;
-		NPObject *      npObjStyle = NULL;
-		
-		if (obj->npp)
-		{
-			sBrowserFuncs->getvalue( obj->npp ,
-                                     NPNVPluginElementNPObject ,
-                                     &npObjPlugin );
-		}
-		if (npObjPlugin)
-		{
-			npIdent = sBrowserFuncs->getstringidentifier( (const NPUTF8 *)"style" );
-			sBrowserFuncs->getproperty( obj->npp ,
-                                                  npObjPlugin,
-                                                  npIdent ,
-                                                  &npVar );
-            npObjStyle = NPVARIANT_TO_OBJECT(npVar);
-	   }
-	   if (npObjStyle)
-	   {
-		   INT32_TO_NPVARIANT(width,npVar);
-		   npIdent = v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_WIDTH];
-		   sBrowserFuncs->setproperty( obj->npp,npObjStyle, npIdent, &npVar);
-		   INT32_TO_NPVARIANT(height,npVar);
-		   npIdent = v_VIDBRCPropertyIdentifiers[kVIDBRC_ID_PROPERTY_HEIGHT];
-		   sBrowserFuncs->setproperty( obj->npp,npObjStyle, npIdent, &npVar);
-	   }
-}
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/videobroadcast.h Deleted

@@ -1,70 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *		Authors:    Stanislas Selle		
- *				
- */
-#ifndef    __VIDEOBROADCAST_H__
-#define    __VIDEOBROADCAST_H__
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <npapi.h>
-#include <nptypes.h>
-#include <npfunctions.h>
-#include <npruntime.h>
-
-#include "hbbtvbrowserplugin.h"
-
-#define FULLSIZE_WIDTH 1280
-#define FULLSIZE_HEIGHT 720
-
-typedef struct
-{
-	NPObject header;	
-	NPP npp; 
-	NPBool      fullscreen;
-	int32_t     width;              
-    int32_t     height; 
-    
-    
-    //~ char*           pcArg_onChannelChangeSucceeded;
-    //~ NPObject*       onChannelChangeSucceeded;
-    //NPObject*   channelConfig;
-    
-} NPObj_VidBrc;
-
-NPClass* fillVIDBRCpclass(void);
-
-NPObject *  VIDBRC_Allocate(NPP npp, NPClass *aClass);
-void        VIDBRC_Deallocate(NPObject *obj);
-void        VIDBRC_Invalidate(NPObject *obj);
-bool        VIDBRC_HasMethod(NPObject *obj, NPIdentifier name);
-bool        VIDBRC_Invoke(NPObject *obj, NPIdentifier name, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        VIDBRC_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool        VIDBRC_HasProperty(NPObject *obj, NPIdentifier name);
-bool        VIDBRC_GetProperty(NPObject *obj, NPIdentifier name, NPVariant *result);
-bool        VIDBRC_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value);
-bool        VIDBRC_RemoveProperty(NPObject *npobj, NPIdentifier name);
-bool        VIDBRC_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count);
-
-void		VIDBRC_Invoke_setFullScreen(NPObj_VidBrc* obj,const NPVariant* args, uint32_t argCount);
-void		VIDBRC_Invoke_bindToCurrentChannel(NPObject* obj,const NPVariant* args, uint32_t argCount);
-void		VIDBRC_Invoke_getChannelConfig(NPObj_VidBrc* obj,const NPVariant* args, uint32_t argCount, NPVariant* result);
-
-void		VIDBRC_setsize(NPObj_VidBrc* obj,int32_t witdh, int32_t height);
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/webkit-plugin-header Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/webkit-plugin-header/npapi.h Deleted

@@ -1,901 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef npapi_h_
-#define npapi_h_
-
-#if defined(__OS2__)
-#pragma pack(1)
-#endif
-
-#include "nptypes.h"
-
-#if defined(__OS2__) || defined(OS2)
-#ifndef XP_OS2
-#define XP_OS2 1
-#endif
-#endif
-
-#ifdef INCLUDE_JAVA
-#include "jri.h"                /* Java Runtime Interface */
-#else
-#define jref    void *
-#define JRIEnv  void
-#endif
-
-#if defined(_WIN32) && !defined(__SYMBIAN32__)
-#include <windows.h>
-#ifndef XP_WIN
-#define XP_WIN 1
-#endif
-#endif
-
-#if defined(__SYMBIAN32__)
-#ifndef XP_SYMBIAN
-#define XP_SYMBIAN 1
-#endif
-#endif
-
-#if defined(__APPLE_CC__) && !defined(XP_UNIX)
-#ifndef XP_MACOSX
-#define XP_MACOSX 1
-#endif
-#endif
-
-#if defined(XP_MACOSX) && defined(__LP64__)
-#define NP_NO_QUICKDRAW
-#define NP_NO_CARBON
-#endif
-
-#if defined(XP_MACOSX)
-#include <ApplicationServices/ApplicationServices.h>
-#include <OpenGL/OpenGL.h>
-#ifndef NP_NO_CARBON
-#include <Carbon/Carbon.h>
-#endif
-#endif
-
-#if defined(XP_UNIX)
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <stdio.h>
-#endif
-
-#if defined(XP_SYMBIAN)
-#include <QEvent>
-#include <QRegion>
-#endif
-
-/*----------------------------------------------------------------------*/
-/*                        Plugin Version Constants                      */
-/*----------------------------------------------------------------------*/
-
-#define NP_VERSION_MAJOR 0
-#define NP_VERSION_MINOR 24
-
-
-/* The OS/2 version of Netscape uses RC_DATA to define the
-   mime types, file extensions, etc that are required.
-   Use a vertical bar to separate types, end types with \0.
-   FileVersion and ProductVersion are 32bit ints, all other
-   entries are strings that MUST be terminated with a \0.
-
-AN EXAMPLE:
-
-RCDATA NP_INFO_ProductVersion { 1,0,0,1,}
-
-RCDATA NP_INFO_MIMEType    { "video/x-video|",
-                             "video/x-flick\0" }
-RCDATA NP_INFO_FileExtents { "avi|",
-                             "flc\0" }
-RCDATA NP_INFO_FileOpenName{ "MMOS2 video player(*.avi)|",
-                             "MMOS2 Flc/Fli player(*.flc)\0" }
-
-RCDATA NP_INFO_FileVersion       { 1,0,0,1 }
-RCDATA NP_INFO_CompanyName       { "Netscape Communications\0" }
-RCDATA NP_INFO_FileDescription   { "NPAVI32 Extension DLL\0"
-RCDATA NP_INFO_InternalName      { "NPAVI32\0" )
-RCDATA NP_INFO_LegalCopyright    { "Copyright Netscape Communications \251 1996\0"
-RCDATA NP_INFO_OriginalFilename  { "NVAPI32.DLL" }
-RCDATA NP_INFO_ProductName       { "NPAVI32 Dynamic Link Library\0" }
-*/
-/* RC_DATA types for version info - required */
-#define NP_INFO_ProductVersion      1
-#define NP_INFO_MIMEType            2
-#define NP_INFO_FileOpenName        3
-#define NP_INFO_FileExtents         4
-/* RC_DATA types for version info - used if found */
-#define NP_INFO_FileDescription     5
-#define NP_INFO_ProductName         6
-/* RC_DATA types for version info - optional */
-#define NP_INFO_CompanyName         7
-#define NP_INFO_FileVersion         8
-#define NP_INFO_InternalName        9
-#define NP_INFO_LegalCopyright      10
-#define NP_INFO_OriginalFilename    11
-
-#ifndef RC_INVOKED
-
-/*----------------------------------------------------------------------*/
-/*                       Definition of Basic Types                      */
-/*----------------------------------------------------------------------*/
-
-#ifndef FALSE
-#define FALSE (0)
-#endif
-#ifndef TRUE
-#define TRUE (1)
-#endif
-#ifndef NULL
-#define NULL (0L)
-#endif
-
-typedef unsigned char NPBool;
-typedef int16_t       NPError;
-typedef int16_t       NPReason;
-typedef char*         NPMIMEType;
-
-/*----------------------------------------------------------------------*/
-/*                       Structures and definitions                     */
-/*----------------------------------------------------------------------*/
-
-#if !defined(__LP64__)
-#if defined(XP_MACOSX)
-#pragma options align=mac68k
-#endif
-#endif /* __LP64__ */
-
-/*
- *  NPP is a plug-in's opaque instance handle
- */
-typedef struct _NPP
-{
-  void* pdata;      /* plug-in private data */
-  void* ndata;      /* netscape private data */
-} NPP_t;
-
-typedef NPP_t*  NPP;
-
-typedef struct _NPStream
-{
-  void*    pdata; /* plug-in private data */
-  void*    ndata; /* netscape private data */
-  const    char* url;
-  uint32_t end;
-  uint32_t lastmodified;
-  void*    notifyData;
-  const    char* headers; /* Response headers from host.
-                           * Exists only for >= NPVERS_HAS_RESPONSE_HEADERS.
-                           * Used for HTTP only; NULL for non-HTTP.
-                           * Available from NPP_NewStream onwards.
-                           * Plugin should copy this data before storing it.
-                           * Includes HTTP status line and all headers,
-                           * preferably verbatim as received from server,
-                           * headers formatted as in HTTP ("Header: Value"),
-                           * and newlines (\n, NOT \r\n) separating lines.
-                           * Terminated by \n\0 (NOT \n\n\0). */
-} NPStream;
-
-typedef struct _NPByteRange
-{
-  int32_t  offset; /* negative offset means from the end */
-  uint32_t length;
-  struct _NPByteRange* next;
-} NPByteRange;
-
-typedef struct _NPSavedData
-{
-  int32_t len;
-  void*   buf;
-} NPSavedData;
-
-typedef struct _NPRect
-{
-  uint16_t top;
-  uint16_t left;
-  uint16_t bottom;
-  uint16_t right;
-} NPRect;
-
-typedef struct _NPSize
-{
-  int32_t width;
-  int32_t height;
-} NPSize;
-
-typedef enum {
-  NPFocusNext = 0,
-  NPFocusPrevious = 1
-} NPFocusDirection;
-
-/* Return values for NPP_HandleEvent */
-#define kNPEventNotHandled 0
-#define kNPEventHandled 1
-/* Exact meaning must be spec'd in event model. */
-#define kNPEventStartIME 2
-
-#if defined(XP_UNIX)
-/*
- * Unix specific structures and definitions
- */
-
-/*
- * Callback Structures.
- *
- * These are used to pass additional platform specific information.
- */
-enum {
-  NP_SETWINDOW = 1,
-  NP_PRINT
-};
-
-typedef struct
-{
-  int32_t type;
-} NPAnyCallbackStruct;
-
-typedef struct
-{
-  int32_t      type;
-  Display*     display;
-  Visual*      visual;
-  Colormap     colormap;
-  unsigned int depth;
-} NPSetWindowCallbackStruct;
-
-typedef struct
-{
-  int32_t type;
-  FILE* fp;
-} NPPrintCallbackStruct;
-
-#endif /* XP_UNIX */
-
-#if defined(XP_MACOSX)
-typedef enum {
-#ifndef NP_NO_QUICKDRAW
-  NPDrawingModelQuickDraw = 0,
-#endif
-  NPDrawingModelCoreGraphics = 1,
-  NPDrawingModelOpenGL = 2,
-  NPDrawingModelCoreAnimation = 3
-} NPDrawingModel;
-
-typedef enum {
-#ifndef NP_NO_CARBON
-  NPEventModelCarbon = 0,
-#endif
-  NPEventModelCocoa = 1
-} NPEventModel;
-#endif
-
-/*
- *   The following masks are applied on certain platforms to NPNV and
- *   NPPV selectors that pass around pointers to COM interfaces. Newer
- *   compilers on some platforms may generate vtables that are not
- *   compatible with older compilers. To prevent older plugins from
- *   not understanding a new browser's ABI, these masks change the
- *   values of those selectors on those platforms. To remain backwards
- *   compatible with different versions of the browser, plugins can
- *   use these masks to dynamically determine and use the correct C++
- *   ABI that the browser is expecting. This does not apply to Windows
- *   as Microsoft's COM ABI will likely not change.
- */
-
-#define NP_ABI_GCC3_MASK  0x10000000
-/*
- *   gcc 3.x generated vtables on UNIX and OSX are incompatible with
- *   previous compilers.
- */
-#if (defined(XP_UNIX) && defined(__GNUC__) && (__GNUC__ >= 3))
-#define _NP_ABI_MIXIN_FOR_GCC3 NP_ABI_GCC3_MASK
-#else
-#define _NP_ABI_MIXIN_FOR_GCC3 0
-#endif
-
-#if defined(XP_MACOSX)
-#define NP_ABI_MACHO_MASK 0x01000000
-#define _NP_ABI_MIXIN_FOR_MACHO NP_ABI_MACHO_MASK
-#else
-#define _NP_ABI_MIXIN_FOR_MACHO 0
-#endif
-
-#define NP_ABI_MASK (_NP_ABI_MIXIN_FOR_GCC3 | _NP_ABI_MIXIN_FOR_MACHO)
-
-/*
- * List of variable names for which NPP_GetValue shall be implemented
- */
-typedef enum {
-  NPPVpluginNameString = 1,
-  NPPVpluginDescriptionString,
-  NPPVpluginWindowBool,
-  NPPVpluginTransparentBool,
-  NPPVjavaClass,                /* Not implemented in WebKit */
-  NPPVpluginWindowSize,         /* Not implemented in WebKit */
-  NPPVpluginTimerInterval,      /* Not implemented in WebKit */
-  NPPVpluginScriptableInstance = (10 | NP_ABI_MASK), /* Not implemented in WebKit */
-  NPPVpluginScriptableIID = 11, /* Not implemented in WebKit */
-  NPPVjavascriptPushCallerBool = 12,  /* Not implemented in WebKit */
-  NPPVpluginKeepLibraryInMemory = 13, /* Not implemented in WebKit */
-  NPPVpluginNeedsXEmbed         = 14, /* Not implemented in WebKit */
-
-  /* Get the NPObject for scripting the plugin. Introduced in NPAPI minor version 14.
-   */
-  NPPVpluginScriptableNPObject  = 15,
-
-  /* Get the plugin value (as \0-terminated UTF-8 string data) for
-   * form submission if the plugin is part of a form. Use
-   * NPN_MemAlloc() to allocate memory for the string data. Introduced
-   * in NPAPI minor version 15.
-   */
-  NPPVformValue = 16,    /* Not implemented in WebKit */
-
-  NPPVpluginUrlRequestsDisplayedBool = 17, /* Not implemented in WebKit */
-
-  /* Checks if the plugin is interested in receiving the http body of
-   * all http requests (including failed ones, http status != 200).
-   */
-  NPPVpluginWantsAllNetworkStreams = 18,
-
-  /* Browsers can retrieve a native ATK accessibility plug ID via this variable. */
-  NPPVpluginNativeAccessibleAtkPlugId = 19,
-
-  /* Checks to see if the plug-in would like the browser to load the "src" attribute. */
-  NPPVpluginCancelSrcStream = 20
-
-#if defined(XP_MACOSX)
-  /* Used for negotiating drawing models */
-  , NPPVpluginDrawingModel = 1000
-  /* Used for negotiating event models */
-  , NPPVpluginEventModel = 1001
-  /* In the NPDrawingModelCoreAnimation drawing model, the browser asks the plug-in for a Core Animation layer. */
-  , NPPVpluginCoreAnimationLayer = 1003
-#endif
-
-#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
-  , NPPVpluginWindowlessLocalBool = 2002
-#endif
-} NPPVariable;
-
-/*
- * List of variable names for which NPN_GetValue should be implemented.
- */
-typedef enum {
-  NPNVxDisplay = 1,
-  NPNVxtAppContext,
-  NPNVnetscapeWindow,
-  NPNVjavascriptEnabledBool,
-  NPNVasdEnabledBool,
-  NPNVisOfflineBool,
-
-  NPNVserviceManager = (10 | NP_ABI_MASK),  /* Not implemented in WebKit */
-  NPNVDOMElement     = (11 | NP_ABI_MASK),  /* Not implemented in WebKit */
-  NPNVDOMWindow      = (12 | NP_ABI_MASK),  /* Not implemented in WebKit */
-  NPNVToolkit        = (13 | NP_ABI_MASK),  /* Not implemented in WebKit */
-  NPNVSupportsXEmbedBool = 14,              /* Not implemented in WebKit */
-
-  /* Get the NPObject wrapper for the browser window. */
-  NPNVWindowNPObject = 15,
-
-  /* Get the NPObject wrapper for the plugins DOM element. */
-  NPNVPluginElementNPObject = 16,
-
-  NPNVSupportsWindowless = 17,
-
-  NPNVprivateModeBool = 18
-
-#if defined(XP_MACOSX)
-  /* Used for negotiating drawing models */
-  , NPNVpluginDrawingModel = 1000
-#ifndef NP_NO_QUICKDRAW
-  , NPNVsupportsQuickDrawBool = 2000
-#endif
-  , NPNVsupportsCoreGraphicsBool = 2001
-  , NPNVsupportsOpenGLBool = 2002
-  , NPNVsupportsCoreAnimationBool = 2003
-#ifndef NP_NO_CARBON
-  , NPNVsupportsCarbonBool = 3000 /* TRUE if the browser supports the Carbon event model */
-#endif
-  , NPNVsupportsCocoaBool = 3001 /* TRUE if the browser supports the Cocoa event model */
-#endif /* XP_MACOSX */
-#if defined(MOZ_PLATFORM_MAEMO) && (MOZ_PLATFORM_MAEMO >= 5)
-  , NPNVSupportsWindowlessLocal = 2002
-#endif
-} NPNVariable;
-
-typedef enum {
-  NPNURLVCookie = 501,
-  NPNURLVProxy
-} NPNURLVariable;
-
-/*
- * The type of Toolkit the widgets use
- */
-typedef enum {
-  NPNVGtk12 = 1,
-  NPNVGtk2
-} NPNToolkitType;
-
-/*
- * The type of a NPWindow - it specifies the type of the data structure
- * returned in the window field.
- */
-typedef enum {
-  NPWindowTypeWindow = 1,
-  NPWindowTypeDrawable
-} NPWindowType;
-
-typedef struct _NPWindow
-{
-  void* window;  /* Platform specific window handle */
-                 /* OS/2: x - Position of bottom left corner */
-                 /* OS/2: y - relative to visible netscape window */
-  int32_t  x;      /* Position of top left corner relative */
-  int32_t  y;      /* to a netscape page. */
-  uint32_t width;  /* Maximum window size */
-  uint32_t height;
-  NPRect   clipRect; /* Clipping rectangle in port coordinates */
-#if defined(XP_UNIX) || defined(XP_SYMBIAN)
-  void * ws_info; /* Platform-dependent additonal data */
-#endif /* XP_UNIX || XP_SYMBIAN */
-  NPWindowType type; /* Is this a window or a drawable? */
-} NPWindow;
-
-typedef struct _NPImageExpose
-{
-  char*    data;       /* image pointer */
-  int32_t  stride;     /* Stride of data image pointer */
-  int32_t  depth;      /* Depth of image pointer */
-  int32_t  x;          /* Expose x */
-  int32_t  y;          /* Expose y */
-  uint32_t width;      /* Expose width */
-  uint32_t height;     /* Expose height */
-  NPSize   dataSize;   /* Data buffer size */
-  float    translateX; /* translate X matrix value */
-  float    translateY; /* translate Y matrix value */
-  float    scaleX;     /* scale X matrix value */
-  float    scaleY;     /* scale Y matrix value */
-} NPImageExpose;
-
-typedef struct _NPFullPrint
-{
-  NPBool pluginPrinted;/* Set TRUE if plugin handled fullscreen printing */
-  NPBool printOne;     /* TRUE if plugin should print one copy to default
-                          printer */
-  void* platformPrint; /* Platform-specific printing info */
-} NPFullPrint;
-
-typedef struct _NPEmbedPrint
-{
-  NPWindow window;
-  void* platformPrint; /* Platform-specific printing info */
-} NPEmbedPrint;
-
-typedef struct _NPPrint
-{
-  uint16_t mode;               /* NP_FULL or NP_EMBED */
-  union
-  {
-    NPFullPrint fullPrint;   /* if mode is NP_FULL */
-    NPEmbedPrint embedPrint; /* if mode is NP_EMBED */
-  } print;
-} NPPrint;
-
-#if defined(XP_MACOSX)
-#ifndef NP_NO_CARBON
-typedef EventRecord NPEvent;
-#else
-typedef void*  NPEvent;
-#endif
-#elif defined(XP_SYMBIAN)
-typedef QEvent NPEvent;
-#elif defined(XP_WIN)
-typedef struct _NPEvent
-{
-  uint16_t event;
-  uintptr_t wParam;
-  uintptr_t lParam;
-} NPEvent;
-#elif defined(XP_OS2)
-typedef struct _NPEvent
-{
-  uint32_t event;
-  uint32_t wParam;
-  uint32_t lParam;
-} NPEvent;
-#elif defined(XP_UNIX)
-typedef XEvent NPEvent;
-#else
-typedef void*  NPEvent;
-#endif
-
-#if defined(XP_MACOSX)
-typedef void* NPRegion;
-#ifndef NP_NO_QUICKDRAW
-typedef RgnHandle NPQDRegion;
-#endif
-typedef CGPathRef NPCGRegion;
-#elif defined(XP_WIN)
-typedef HRGN NPRegion;
-#elif defined(XP_UNIX)
-typedef Region NPRegion;
-#elif defined(XP_SYMBIAN)
-typedef QRegion* NPRegion;
-#else
-typedef void *NPRegion;
-#endif
-
-typedef struct _NPNSString NPNSString;
-typedef struct _NPNSWindow NPNSWindow;
-typedef struct _NPNSMenu   NPNSMenu;
-
-#if defined(XP_MACOSX)
-typedef NPNSMenu NPMenu;
-#else
-typedef void *NPMenu;
-#endif
-
-typedef enum {
-  NPCoordinateSpacePlugin = 1,
-  NPCoordinateSpaceWindow,
-  NPCoordinateSpaceFlippedWindow,
-  NPCoordinateSpaceScreen,
-  NPCoordinateSpaceFlippedScreen
-} NPCoordinateSpace;
-
-#if defined(XP_MACOSX)
-
-#ifndef NP_NO_QUICKDRAW
-typedef struct NP_Port
-{
-  CGrafPtr port;
-  int32_t portx; /* position inside the topmost window */
-  int32_t porty;
-} NP_Port;
-#endif /* NP_NO_QUICKDRAW */
-
-/*
- * NP_CGContext is the type of the NPWindow's 'window' when the plugin specifies NPDrawingModelCoreGraphics
- * as its drawing model.
- */
-
-typedef struct NP_CGContext
-{
-  CGContextRef context;
-#ifdef NP_NO_CARBON
-  NPNSWindow *window;
-#else
-  void *window; /* A WindowRef or NULL for the Cocoa event model. */
-#endif
-} NP_CGContext;
-
-/*
- * NP_GLContext is the type of the NPWindow's 'window' when the plugin specifies NPDrawingModelOpenGL as its
- * drawing model.
- */
-
-typedef struct NP_GLContext
-{
-  CGLContextObj context;
-#ifdef NP_NO_CARBON
-  NPNSWindow *window;
-#else
-  void *window; /* Can be either an NSWindow or a WindowRef depending on the event model */
-#endif
-} NP_GLContext;
-
-typedef enum {
-  NPCocoaEventDrawRect = 1,
-  NPCocoaEventMouseDown,
-  NPCocoaEventMouseUp,
-  NPCocoaEventMouseMoved,
-  NPCocoaEventMouseEntered,
-  NPCocoaEventMouseExited,
-  NPCocoaEventMouseDragged,
-  NPCocoaEventKeyDown,
-  NPCocoaEventKeyUp,
-  NPCocoaEventFlagsChanged,
-  NPCocoaEventFocusChanged,
-  NPCocoaEventWindowFocusChanged,
-  NPCocoaEventScrollWheel,
-  NPCocoaEventTextInput
-} NPCocoaEventType;
-
-typedef struct _NPCocoaEvent {
-  NPCocoaEventType type;
-  uint32_t version;
-  union {
-    struct {
-      uint32_t modifierFlags;
-      double   pluginX;
-      double   pluginY;
-      int32_t  buttonNumber;
-      int32_t  clickCount;
-      double   deltaX;
-      double   deltaY;
-      double   deltaZ;
-    } mouse;
-    struct {
-      uint32_t    modifierFlags;
-      NPNSString *characters;
-      NPNSString *charactersIgnoringModifiers;
-      NPBool      isARepeat;
-      uint16_t    keyCode;
-    } key;
-    struct {
-      CGContextRef context;
-      double x;
-      double y;
-      double width;
-      double height;
-    } draw;
-    struct {
-      NPBool hasFocus;
-    } focus;
-    struct {
-      NPNSString *text;
-    } text;
-  } data;
-} NPCocoaEvent;
-
-#ifndef NP_NO_CARBON
-/* Non-standard event types that can be passed to HandleEvent */
-enum NPEventType {
-  NPEventType_GetFocusEvent = (osEvt + 16),
-  NPEventType_LoseFocusEvent,
-  NPEventType_AdjustCursorEvent,
-  NPEventType_MenuCommandEvent,
-  NPEventType_ClippingChangedEvent,
-  NPEventType_ScrollingBeginsEvent = 1000,
-  NPEventType_ScrollingEndsEvent
-};
-#endif /* NP_NO_CARBON */
-
-#endif /* XP_MACOSX */
-
-/*
- * Values for mode passed to NPP_New:
- */
-#define NP_EMBED 1
-#define NP_FULL  2
-
-/*
- * Values for stream type passed to NPP_NewStream:
- */
-#define NP_NORMAL     1
-#define NP_SEEK       2
-#define NP_ASFILE     3
-#define NP_ASFILEONLY 4
-
-#define NP_MAXREADY (((unsigned)(~0)<<1)>>1)
-
-/*
- * Flags for NPP_ClearSiteData.
- */
-#define NP_CLEAR_ALL   0
-#define NP_CLEAR_CACHE (1 << 0)
-
-#if !defined(__LP64__)
-#if defined(XP_MACOSX)
-#pragma options align=reset
-#endif
-#endif /* __LP64__ */
-
-/*----------------------------------------------------------------------*/
-/*       Error and Reason Code definitions                              */
-/*----------------------------------------------------------------------*/
-
-/*
- * Values of type NPError:
- */
-#define NPERR_BASE                         0
-#define NPERR_NO_ERROR                    (NPERR_BASE + 0)
-#define NPERR_GENERIC_ERROR               (NPERR_BASE + 1)
-#define NPERR_INVALID_INSTANCE_ERROR      (NPERR_BASE + 2)
-#define NPERR_INVALID_FUNCTABLE_ERROR     (NPERR_BASE + 3)
-#define NPERR_MODULE_LOAD_FAILED_ERROR    (NPERR_BASE + 4)
-#define NPERR_OUT_OF_MEMORY_ERROR         (NPERR_BASE + 5)
-#define NPERR_INVALID_PLUGIN_ERROR        (NPERR_BASE + 6)
-#define NPERR_INVALID_PLUGIN_DIR_ERROR    (NPERR_BASE + 7)
-#define NPERR_INCOMPATIBLE_VERSION_ERROR  (NPERR_BASE + 8)
-#define NPERR_INVALID_PARAM               (NPERR_BASE + 9)
-#define NPERR_INVALID_URL                 (NPERR_BASE + 10)
-#define NPERR_FILE_NOT_FOUND              (NPERR_BASE + 11)
-#define NPERR_NO_DATA                     (NPERR_BASE + 12)
-#define NPERR_STREAM_NOT_SEEKABLE         (NPERR_BASE + 13)
-
-/*
- * Values of type NPReason:
- */
-#define NPRES_BASE          0
-#define NPRES_DONE         (NPRES_BASE + 0)
-#define NPRES_NETWORK_ERR  (NPRES_BASE + 1)
-#define NPRES_USER_BREAK   (NPRES_BASE + 2)
-
-/*
- * Don't use these obsolete error codes any more.
- */
-#define NP_NOERR  NP_NOERR_is_obsolete_use_NPERR_NO_ERROR
-#define NP_EINVAL NP_EINVAL_is_obsolete_use_NPERR_GENERIC_ERROR
-#define NP_EABORT NP_EABORT_is_obsolete_use_NPRES_USER_BREAK
-
-/*
- * Version feature information
- */
-#define NPVERS_HAS_STREAMOUTPUT             8
-#define NPVERS_HAS_NOTIFICATION             9
-#define NPVERS_HAS_LIVECONNECT              9
-#define NPVERS_WIN16_HAS_LIVECONNECT        9
-#define NPVERS_68K_HAS_LIVECONNECT          11
-#define NPVERS_HAS_WINDOWLESS               11
-#define NPVERS_HAS_XPCONNECT_SCRIPTING      13  /* Not implemented in WebKit */
-#define NPVERS_HAS_NPRUNTIME_SCRIPTING      14
-#define NPVERS_HAS_FORM_VALUES              15  /* Not implemented in WebKit; see bug 13061 */
-#define NPVERS_HAS_POPUPS_ENABLED_STATE     16  /* Not implemented in WebKit */
-#define NPVERS_HAS_RESPONSE_HEADERS         17
-#define NPVERS_HAS_NPOBJECT_ENUM            18
-#define NPVERS_HAS_PLUGIN_THREAD_ASYNC_CALL 19
-#define NPVERS_HAS_ALL_NETWORK_STREAMS      20
-#define NPVERS_HAS_URL_AND_AUTH_INFO        21
-#define NPVERS_HAS_PRIVATE_MODE             22
-#define NPVERS_MACOSX_HAS_EVENT_MODELS      23
-#define NPVERS_HAS_CANCEL_SRC_STREAM        24
-#define NPVERS_HAS_ADVANCED_KEY_HANDLING    25
-#define NPVERS_HAS_URL_REDIRECT_HANDLING    26
-#define NPVERS_HAS_CLEAR_SITE_DATA          27
-
-/*----------------------------------------------------------------------*/
-/*                        Function Prototypes                           */
-/*----------------------------------------------------------------------*/
-
-#if defined(__OS2__)
-#define NP_LOADDS _System
-#else
-#define NP_LOADDS
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* NPP_* functions are provided by the plugin and called by the navigator. */
-
-#if defined(XP_UNIX)
-char* NPP_GetMIMEDescription(void);
-#endif
-
-NPError NP_LOADDS NPP_Initialize(void);
-void    NP_LOADDS NPP_Shutdown(void);
-NPError NP_LOADDS NPP_New(NPMIMEType pluginType, NPP instance,
-                          uint16_t mode, int16_t argc, char* argn[],
-                          char* argv[], NPSavedData* saved);
-NPError NP_LOADDS NPP_Destroy(NPP instance, NPSavedData** save);
-NPError NP_LOADDS NPP_SetWindow(NPP instance, NPWindow* window);
-NPError NP_LOADDS NPP_NewStream(NPP instance, NPMIMEType type,
-                                NPStream* stream, NPBool seekable,
-                                uint16_t* stype);
-NPError NP_LOADDS NPP_DestroyStream(NPP instance, NPStream* stream,
-                                    NPReason reason);
-int32_t NP_LOADDS NPP_WriteReady(NPP instance, NPStream* stream);
-int32_t NP_LOADDS NPP_Write(NPP instance, NPStream* stream, int32_t offset,
-                            int32_t len, void* buffer);
-void    NP_LOADDS NPP_StreamAsFile(NPP instance, NPStream* stream,
-                                   const char* fname);
-void    NP_LOADDS NPP_Print(NPP instance, NPPrint* platformPrint);
-int16_t NP_LOADDS NPP_HandleEvent(NPP instance, void* event);
-void    NP_LOADDS NPP_URLNotify(NPP instance, const char* url,
-                                NPReason reason, void* notifyData);
-jref    NP_LOADDS NPP_GetJavaClass(void);
-NPError NP_LOADDS NPP_GetValue(NPP instance, NPPVariable variable, void *value);
-NPError NP_LOADDS NPP_SetValue(NPP instance, NPNVariable variable, void *value);
-NPBool  NP_LOADDS NPP_GotFocus(NPP instance, NPFocusDirection direction);
-void    NP_LOADDS NPP_LostFocus(NPP instance);
-void    NP_LOADDS NPP_URLRedirectNotify(NPP instance, const char* url, int32_t status, void* notifyData);
-NPError NP_LOADDS NPP_ClearSiteData(const char* site, uint64_t flags, uint64_t maxAge);
-char**  NP_LOADDS NPP_GetSitesWithData(void);
-
-/* NPN_* functions are provided by the navigator and called by the plugin. */
-void        NP_LOADDS NPN_Version(int* plugin_major, int* plugin_minor,
-                                  int* netscape_major, int* netscape_minor);
-NPError     NP_LOADDS NPN_GetURLNotify(NPP instance, const char* url,
-                                       const char* target, void* notifyData);
-NPError     NP_LOADDS NPN_GetURL(NPP instance, const char* url,
-                                 const char* target);
-NPError     NP_LOADDS NPN_PostURLNotify(NPP instance, const char* url,
-                                        const char* target, uint32_t len,
-                                        const char* buf, NPBool file,
-                                        void* notifyData);
-NPError     NP_LOADDS NPN_PostURL(NPP instance, const char* url,
-                                  const char* target, uint32_t len,
-                                  const char* buf, NPBool file);
-NPError     NP_LOADDS NPN_RequestRead(NPStream* stream, NPByteRange* rangeList);
-NPError     NP_LOADDS NPN_NewStream(NPP instance, NPMIMEType type,
-                                    const char* target, NPStream** stream);
-int32_t     NP_LOADDS NPN_Write(NPP instance, NPStream* stream, int32_t len,
-                                void* buffer);
-NPError     NP_LOADDS NPN_DestroyStream(NPP instance, NPStream* stream,
-                                        NPReason reason);
-void        NP_LOADDS NPN_Status(NPP instance, const char* message);
-const char* NP_LOADDS NPN_UserAgent(NPP instance);
-void*       NP_LOADDS NPN_MemAlloc(uint32_t size);
-void        NP_LOADDS NPN_MemFree(void* ptr);
-uint32_t    NP_LOADDS NPN_MemFlush(uint32_t size);
-void        NP_LOADDS NPN_ReloadPlugins(NPBool reloadPages);
-JRIEnv*     NP_LOADDS NPN_GetJavaEnv(void);
-jref        NP_LOADDS NPN_GetJavaPeer(NPP instance);
-NPError     NP_LOADDS NPN_GetValue(NPP instance, NPNVariable variable,
-                                   void *value);
-NPError     NP_LOADDS NPN_SetValue(NPP instance, NPPVariable variable,
-                                   void *value);
-void        NP_LOADDS NPN_InvalidateRect(NPP instance, NPRect *invalidRect);
-void        NP_LOADDS NPN_InvalidateRegion(NPP instance,
-                                           NPRegion invalidRegion);
-void        NP_LOADDS NPN_ForceRedraw(NPP instance);
-void        NP_LOADDS NPN_PushPopupsEnabledState(NPP instance, NPBool enabled);
-void        NP_LOADDS NPN_PopPopupsEnabledState(NPP instance);
-void        NP_LOADDS NPN_PluginThreadAsyncCall(NPP instance,
-                                                void (*func) (void *),
-                                                void *userData);
-NPError     NP_LOADDS NPN_GetValueForURL(NPP instance, NPNURLVariable variable,
-                                         const char *url, char **value,
-                                         uint32_t *len);
-NPError     NP_LOADDS NPN_SetValueForURL(NPP instance, NPNURLVariable variable,
-                                         const char *url, const char *value,
-                                         uint32_t len);
-NPError     NP_LOADDS NPN_GetAuthenticationInfo(NPP instance,
-                                                const char *protocol,
-                                                const char *host, int32_t port,
-                                                const char *scheme,
-                                                const char *realm,
-                                                char **username, uint32_t *ulen,
-                                                char **password,
-                                                uint32_t *plen);
-uint32_t    NP_LOADDS NPN_ScheduleTimer(NPP instance, uint32_t interval, NPBool repeat, void (*timerFunc)(NPP npp, uint32_t timerID));
-void        NP_LOADDS NPN_UnscheduleTimer(NPP instance, uint32_t timerID);
-NPError     NP_LOADDS NPN_PopUpContextMenu(NPP instance, NPMenu* menu);
-NPBool      NP_LOADDS NPN_ConvertPoint(NPP instance, double sourceX, double sourceY, NPCoordinateSpace sourceSpace, double *destX, double *destY, NPCoordinateSpace destSpace);
-
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
-
-#endif /* RC_INVOKED */
-#if defined(__OS2__)
-#pragma pack()
-#endif
-
-#endif /* npapi_h_ */

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/webkit-plugin-header/npfunctions.h Deleted

@@ -1,223 +0,0 @@
-/*
- * Copyright (C) 2007 Apple Inc.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-#ifndef NPFUNCTIONS_H
-#define NPFUNCTIONS_H
-
-
-#include "npruntime.h"
-#include "npapi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(XP_WIN)
-#define EXPORTED_CALLBACK(_type, _name) _type (__stdcall * _name)
-#else
-#define EXPORTED_CALLBACK(_type, _name) _type (* _name)
-#endif
-
-typedef NPError (*NPN_GetURLNotifyProcPtr)(NPP instance, const char* URL, const char* window, void* notifyData);
-typedef NPError (*NPN_PostURLNotifyProcPtr)(NPP instance, const char* URL, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData);
-typedef NPError (*NPN_RequestReadProcPtr)(NPStream* stream, NPByteRange* rangeList);
-typedef NPError (*NPN_NewStreamProcPtr)(NPP instance, NPMIMEType type, const char* window, NPStream** stream);
-typedef int32_t (*NPN_WriteProcPtr)(NPP instance, NPStream* stream, int32_t len, void* buffer);
-typedef NPError (*NPN_DestroyStreamProcPtr)(NPP instance, NPStream* stream, NPReason reason);
-typedef void (*NPN_StatusProcPtr)(NPP instance, const char* message);
-typedef const char*(*NPN_UserAgentProcPtr)(NPP instance);
-typedef void* (*NPN_MemAllocProcPtr)(uint32_t size);
-typedef void (*NPN_MemFreeProcPtr)(void* ptr);
-typedef uint32_t (*NPN_MemFlushProcPtr)(uint32_t size);
-typedef void (*NPN_ReloadPluginsProcPtr)(NPBool reloadPages);
-typedef NPError (*NPN_GetValueProcPtr)(NPP instance, NPNVariable variable, void *ret_value);
-typedef NPError (*NPN_SetValueProcPtr)(NPP instance, NPPVariable variable, void *value);
-typedef void (*NPN_InvalidateRectProcPtr)(NPP instance, NPRect *rect);
-typedef void (*NPN_InvalidateRegionProcPtr)(NPP instance, NPRegion region);
-typedef void (*NPN_ForceRedrawProcPtr)(NPP instance);
-typedef NPError (*NPN_GetURLProcPtr)(NPP instance, const char* URL, const char* window);
-typedef NPError (*NPN_PostURLProcPtr)(NPP instance, const char* URL, const char* window, uint32_t len, const char* buf, NPBool file);
-typedef void* (*NPN_GetJavaEnvProcPtr)(void);
-typedef void* (*NPN_GetJavaPeerProcPtr)(NPP instance);
-typedef void  (*NPN_PushPopupsEnabledStateProcPtr)(NPP instance, NPBool enabled);
-typedef void  (*NPN_PopPopupsEnabledStateProcPtr)(NPP instance);
-typedef void (*NPN_PluginThreadAsyncCallProcPtr)(NPP npp, void (*func)(void *), void *userData);
-typedef NPError (*NPN_GetValueForURLProcPtr)(NPP npp, NPNURLVariable variable, const char* url, char** value, uint32_t* len);
-typedef NPError (*NPN_SetValueForURLProcPtr)(NPP npp, NPNURLVariable variable, const char* url, const char* value, uint32_t len);
-typedef NPError (*NPN_GetAuthenticationInfoProcPtr)(NPP npp, const char* protocol, const char* host, int32_t port, const char* scheme, const char *realm, char** username, uint32_t* ulen, char** password, uint32_t* plen);
-
-typedef uint32_t (*NPN_ScheduleTimerProcPtr)(NPP npp, uint32_t interval, NPBool repeat, void (*timerFunc)(NPP npp, uint32_t timerID));
-typedef void (*NPN_UnscheduleTimerProcPtr)(NPP npp, uint32_t timerID);
-typedef NPError (*NPN_PopUpContextMenuProcPtr)(NPP instance, NPMenu* menu);
-typedef NPBool (*NPN_ConvertPointProcPtr)(NPP npp, double sourceX, double sourceY, NPCoordinateSpace sourceSpace, double *destX, double *destY, NPCoordinateSpace destSpace);
-
-typedef void (*NPN_ReleaseVariantValueProcPtr) (NPVariant *variant);
-
-typedef NPIdentifier (*NPN_GetStringIdentifierProcPtr) (const NPUTF8 *name);
-typedef void (*NPN_GetStringIdentifiersProcPtr) (const NPUTF8 **names, int32_t nameCount, NPIdentifier *identifiers);
-typedef NPIdentifier (*NPN_GetIntIdentifierProcPtr) (int32_t intid);
-typedef int32_t (*NPN_IntFromIdentifierProcPtr) (NPIdentifier identifier);
-typedef bool (*NPN_IdentifierIsStringProcPtr) (NPIdentifier identifier);
-typedef NPUTF8 *(*NPN_UTF8FromIdentifierProcPtr) (NPIdentifier identifier);
-
-typedef NPObject* (*NPN_CreateObjectProcPtr) (NPP, NPClass *aClass);
-typedef NPObject* (*NPN_RetainObjectProcPtr) (NPObject *obj);
-typedef void (*NPN_ReleaseObjectProcPtr) (NPObject *obj);
-typedef bool (*NPN_InvokeProcPtr) (NPP npp, NPObject *obj, NPIdentifier methodName, const NPVariant *args, unsigned argCount, NPVariant *result);
-typedef bool (*NPN_InvokeDefaultProcPtr) (NPP npp, NPObject *obj, const NPVariant *args, unsigned argCount, NPVariant *result);
-typedef bool (*NPN_EvaluateProcPtr) (NPP npp, NPObject *obj, NPString *script, NPVariant *result);
-typedef bool (*NPN_GetPropertyProcPtr) (NPP npp, NPObject *obj, NPIdentifier  propertyName, NPVariant *result);
-typedef bool (*NPN_SetPropertyProcPtr) (NPP npp, NPObject *obj, NPIdentifier  propertyName, const NPVariant *value);
-typedef bool (*NPN_HasPropertyProcPtr) (NPP, NPObject *npobj, NPIdentifier propertyName);
-typedef bool (*NPN_HasMethodProcPtr) (NPP npp, NPObject *npobj, NPIdentifier methodName);
-typedef bool (*NPN_RemovePropertyProcPtr) (NPP npp, NPObject *obj, NPIdentifier propertyName);
-typedef void (*NPN_SetExceptionProcPtr) (NPObject *obj, const NPUTF8 *message);
-typedef bool (*NPN_EnumerateProcPtr) (NPP npp, NPObject *npobj, NPIdentifier **identifier, uint32_t *count);
-typedef bool (*NPN_ConstructProcPtr)(NPP npp, NPObject* obj, const NPVariant *args, uint32_t argCount, NPVariant *result);    
-
-typedef NPError (*NPP_NewProcPtr)(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
-typedef NPError (*NPP_DestroyProcPtr)(NPP instance, NPSavedData** save);
-typedef NPError (*NPP_SetWindowProcPtr)(NPP instance, NPWindow* window);
-typedef NPError (*NPP_NewStreamProcPtr)(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype);
-typedef NPError (*NPP_DestroyStreamProcPtr)(NPP instance, NPStream* stream, NPReason reason);
-typedef void (*NPP_StreamAsFileProcPtr)(NPP instance, NPStream* stream, const char* fname);
-typedef int32_t (*NPP_WriteReadyProcPtr)(NPP instance, NPStream* stream);
-typedef int32_t (*NPP_WriteProcPtr)(NPP instance, NPStream* stream, int32_t offset, int32_t len, void* buffer);
-typedef void (*NPP_PrintProcPtr)(NPP instance, NPPrint* platformPrint);
-typedef int16_t (*NPP_HandleEventProcPtr)(NPP instance, void* event);
-typedef void (*NPP_URLNotifyProcPtr)(NPP instance, const char* URL, NPReason reason, void* notifyData);
-typedef NPError (*NPP_GetValueProcPtr)(NPP instance, NPPVariable variable, void *ret_value);
-typedef NPError (*NPP_SetValueProcPtr)(NPP instance, NPNVariable variable, void *value);
-typedef NPBool (*NPP_GotFocusPtr)(NPP instance, NPFocusDirection direction);
-typedef void (*NPP_LostFocusPtr)(NPP instance);
-typedef void (*NPP_URLRedirectNotifyPtr)(NPP instance, const char* url, int32_t status, void* notifyData);
-typedef NPError (*NPP_ClearSiteDataPtr)(const char* site, uint64_t flags, uint64_t maxAge);
-typedef char** (*NPP_GetSitesWithDataPtr)(void);
-
-typedef void *(*NPP_GetJavaClassProcPtr)(void);
-typedef void* JRIGlobalRef; //not using this right now
-
-typedef struct _NPNetscapeFuncs {
-    uint16_t size;
-    uint16_t version;
-    
-    NPN_GetURLProcPtr geturl;
-    NPN_PostURLProcPtr posturl;
-    NPN_RequestReadProcPtr requestread;
-    NPN_NewStreamProcPtr newstream;
-    NPN_WriteProcPtr write;
-    NPN_DestroyStreamProcPtr destroystream;
-    NPN_StatusProcPtr status;
-    NPN_UserAgentProcPtr uagent;
-    NPN_MemAllocProcPtr memalloc;
-    NPN_MemFreeProcPtr memfree;
-    NPN_MemFlushProcPtr memflush;
-    NPN_ReloadPluginsProcPtr reloadplugins;
-    NPN_GetJavaEnvProcPtr getJavaEnv;
-    NPN_GetJavaPeerProcPtr getJavaPeer;
-    NPN_GetURLNotifyProcPtr geturlnotify;
-    NPN_PostURLNotifyProcPtr posturlnotify;
-    NPN_GetValueProcPtr getvalue;
-    NPN_SetValueProcPtr setvalue;
-    NPN_InvalidateRectProcPtr invalidaterect;
-    NPN_InvalidateRegionProcPtr invalidateregion;
-    NPN_ForceRedrawProcPtr forceredraw;
-    
-    NPN_GetStringIdentifierProcPtr getstringidentifier;
-    NPN_GetStringIdentifiersProcPtr getstringidentifiers;
-    NPN_GetIntIdentifierProcPtr getintidentifier;
-    NPN_IdentifierIsStringProcPtr identifierisstring;
-    NPN_UTF8FromIdentifierProcPtr utf8fromidentifier;
-    NPN_IntFromIdentifierProcPtr intfromidentifier;
-    NPN_CreateObjectProcPtr createobject;
-    NPN_RetainObjectProcPtr retainobject;
-    NPN_ReleaseObjectProcPtr releaseobject;
-    NPN_InvokeProcPtr invoke;
-    NPN_InvokeDefaultProcPtr invokeDefault;
-    NPN_EvaluateProcPtr evaluate;
-    NPN_GetPropertyProcPtr getproperty;
-    NPN_SetPropertyProcPtr setproperty;
-    NPN_RemovePropertyProcPtr removeproperty;
-    NPN_HasPropertyProcPtr hasproperty;
-    NPN_HasMethodProcPtr hasmethod;
-    NPN_ReleaseVariantValueProcPtr releasevariantvalue;
-    NPN_SetExceptionProcPtr setexception;
-    NPN_PushPopupsEnabledStateProcPtr pushpopupsenabledstate;
-    NPN_PopPopupsEnabledStateProcPtr poppopupsenabledstate;
-    NPN_EnumerateProcPtr enumerate;
-    NPN_PluginThreadAsyncCallProcPtr pluginthreadasynccall;
-    NPN_ConstructProcPtr construct;
-    NPN_GetValueForURLProcPtr getvalueforurl;
-    NPN_SetValueForURLProcPtr setvalueforurl;
-    NPN_GetAuthenticationInfoProcPtr getauthenticationinfo;
-    NPN_ScheduleTimerProcPtr scheduletimer;
-    NPN_UnscheduleTimerProcPtr unscheduletimer;
-    NPN_PopUpContextMenuProcPtr popupcontextmenu;
-    NPN_ConvertPointProcPtr convertpoint;
-} NPNetscapeFuncs;
-
-typedef struct _NPPluginFuncs {
-    uint16_t size;
-    uint16_t version;
-    NPP_NewProcPtr newp;
-    NPP_DestroyProcPtr destroy;
-    NPP_SetWindowProcPtr setwindow;
-    NPP_NewStreamProcPtr newstream;
-    NPP_DestroyStreamProcPtr destroystream;
-    NPP_StreamAsFileProcPtr asfile;
-    NPP_WriteReadyProcPtr writeready;
-    NPP_WriteProcPtr write;
-    NPP_PrintProcPtr print;
-    NPP_HandleEventProcPtr event;
-    NPP_URLNotifyProcPtr urlnotify;
-    JRIGlobalRef javaClass;
-    NPP_GetValueProcPtr getvalue;
-    NPP_SetValueProcPtr setvalue;
-    NPP_GotFocusPtr gotfocus;
-    NPP_LostFocusPtr lostfocus;
-    NPP_URLRedirectNotifyPtr urlredirectnotify;
-    NPP_ClearSiteDataPtr clearsitedata;
-    NPP_GetSitesWithDataPtr getsiteswithdata;
-} NPPluginFuncs;
-
-typedef EXPORTED_CALLBACK(NPError, NP_GetEntryPointsFuncPtr)(NPPluginFuncs*);
-typedef EXPORTED_CALLBACK(void, NPP_ShutdownProcPtr)(void);    
-
-#if defined(XP_MACOSX)
-typedef void (*BP_CreatePluginMIMETypesPreferencesFuncPtr)(void);
-typedef NPError (*MainFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*, NPP_ShutdownProcPtr*);
-#endif
-
-#if defined(XP_UNIX)
-typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*, NPPluginFuncs*);
-typedef EXPORTED_CALLBACK(char*, NP_GetMIMEDescriptionFuncPtr)(void);
-#else
-typedef EXPORTED_CALLBACK(NPError, NP_InitializeFuncPtr)(NPNetscapeFuncs*);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/webkit-plugin-header/npruntime.h Deleted

@@ -1,393 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Copyright (c) 2004, Apple Computer, Inc. and The Mozilla Foundation. 
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * 
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the names of Apple Computer, Inc. ("Apple") or The Mozilla
- * Foundation ("Mozilla") nor the names of their contributors may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY APPLE, MOZILLA AND THEIR CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE, MOZILLA OR
- * THEIR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-#ifndef _NP_RUNTIME_H_
-#define _NP_RUNTIME_H_
-
-#include "npapi.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
-    This API is used to facilitate binding code written in C to script
-    objects.  The API in this header does not assume the presence of a
-    user agent.  That is, it can be used to bind C code to scripting
-    environments outside of the context of a user agent.
-    
-    However, the normal use of the this API is in the context of a
-    scripting environment running in a browser or other user agent.
-    In particular it is used to support the extended Netscape
-    script-ability API for plugins (NP-SAP).  NP-SAP is an extension
-    of the Netscape plugin API.  As such we have adopted the use of
-    the "NP" prefix for this API.
-
-    The following NP{N|P}Variables were added to the Netscape plugin
-    API (in npapi.h):
-
-    NPNVWindowNPObject
-    NPNVPluginElementNPObject
-    NPPVpluginScriptableNPObject
-
-    These variables are exposed through NPN_GetValue() and
-    NPP_GetValue() (respectively) and are used to establish the
-    initial binding between the user agent and native code.  The DOM
-    objects in the user agent can be examined and manipulated using
-    the NPN_ functions that operate on NPObjects described in this
-    header.
-
-    To the extent possible the assumptions about the scripting
-    language used by the scripting environment have been minimized.
-*/
-
-#define NP_BEGIN_MACRO  do {
-#define NP_END_MACRO    } while (0)
-
-/*
-    Objects (non-primitive data) passed between 'C' and script is
-    always wrapped in an NPObject.  The 'interface' of an NPObject is
-    described by an NPClass.
-*/
-typedef struct NPObject NPObject;
-typedef struct NPClass NPClass;
-
-typedef char NPUTF8;
-typedef struct _NPString {
-    const NPUTF8 *UTF8Characters;
-    uint32_t UTF8Length;
-} NPString;
-
-typedef enum {
-    NPVariantType_Void,
-    NPVariantType_Null,
-    NPVariantType_Bool,
-    NPVariantType_Int32,
-    NPVariantType_Double,
-    NPVariantType_String,
-    NPVariantType_Object
-} NPVariantType;
-
-typedef struct _NPVariant {
-    NPVariantType type;
-    union {
-        bool boolValue;
-        int32_t intValue;
-        double doubleValue;
-        NPString stringValue;
-        NPObject *objectValue;
-    } value;
-} NPVariant;
-
-/*
-    NPN_ReleaseVariantValue is called on all 'out' parameters
-    references.  Specifically it is to be called on variants that own
-    their value, as is the case with all non-const NPVariant*
-    arguments after a successful call to any methods (except this one)
-    in this API.
-
-    After calling NPN_ReleaseVariantValue, the type of the variant
-    will be NPVariantType_Void.
-*/
-void NPN_ReleaseVariantValue(NPVariant *variant);
-
-#define NPVARIANT_IS_VOID(_v)    ((_v).type == NPVariantType_Void)
-#define NPVARIANT_IS_NULL(_v)    ((_v).type == NPVariantType_Null)
-#define NPVARIANT_IS_BOOLEAN(_v) ((_v).type == NPVariantType_Bool)
-#define NPVARIANT_IS_INT32(_v)   ((_v).type == NPVariantType_Int32)
-#define NPVARIANT_IS_DOUBLE(_v)  ((_v).type == NPVariantType_Double)
-#define NPVARIANT_IS_STRING(_v)  ((_v).type == NPVariantType_String)
-#define NPVARIANT_IS_OBJECT(_v)  ((_v).type == NPVariantType_Object)
-
-#define NPVARIANT_TO_BOOLEAN(_v) ((_v).value.boolValue)
-#define NPVARIANT_TO_INT32(_v)   ((_v).value.intValue)
-#define NPVARIANT_TO_DOUBLE(_v)  ((_v).value.doubleValue)
-#define NPVARIANT_TO_STRING(_v)  ((_v).value.stringValue)
-#define NPVARIANT_TO_OBJECT(_v)  ((_v).value.objectValue)
-
-#define VOID_TO_NPVARIANT(_v)                                                 \
-NP_BEGIN_MACRO                                                                \
-    (_v).type = NPVariantType_Void;                                           \
-    (_v).value.objectValue = NULL;                                            \
-NP_END_MACRO
-
-#define NULL_TO_NPVARIANT(_v)                                                 \
-NP_BEGIN_MACRO                                                                \
-    (_v).type = NPVariantType_Null;                                           \
-    (_v).value.objectValue = NULL;                                            \
-NP_END_MACRO
-
-#define BOOLEAN_TO_NPVARIANT(_val, _v)                                        \
-NP_BEGIN_MACRO                                                                \
-    (_v).type = NPVariantType_Bool;                                           \
-    (_v).value.boolValue = !!(_val);                                          \
-NP_END_MACRO
-
-#define INT32_TO_NPVARIANT(_val, _v)                                          \
-NP_BEGIN_MACRO                                                                \
-    (_v).type = NPVariantType_Int32;                                          \
-    (_v).value.intValue = _val;                                               \
-NP_END_MACRO
-
-#define DOUBLE_TO_NPVARIANT(_val, _v)                                         \
-NP_BEGIN_MACRO                                                                \
-    (_v).type = NPVariantType_Double;                                         \
-    (_v).value.doubleValue = _val;                                            \
-NP_END_MACRO
-
-#define STRINGZ_TO_NPVARIANT(_val, _v)                                        \
-NP_BEGIN_MACRO                                                                \
-    (_v).type = NPVariantType_String;                                         \
-    NPString str = { _val, uint32_t(strlen(_val)) };                          \
-    (_v).value.stringValue = str;                                             \
-NP_END_MACRO
-
-#define STRINGN_TO_NPVARIANT(_val, _len, _v)                                  \
-NP_BEGIN_MACRO                                                                \
-    (_v).type = NPVariantType_String;                                         \
-    NPString str = { _val, uint32_t(_len) };                                  \
-    (_v).value.stringValue = str;                                             \
-NP_END_MACRO
-
-#define OBJECT_TO_NPVARIANT(_val, _v)                                         \
-NP_BEGIN_MACRO                                                                \
-    (_v).type = NPVariantType_Object;                                         \
-    (_v).value.objectValue = _val;                                            \
-NP_END_MACRO
-
-
-/*
-  Type mappings (JavaScript types have been used for illustration
-    purposes):
-
-  JavaScript       to             C (NPVariant with type:)
-  undefined                       NPVariantType_Void
-  null                            NPVariantType_Null
-  Boolean                         NPVariantType_Bool
-  Number                          NPVariantType_Double or NPVariantType_Int32
-  String                          NPVariantType_String
-  Object                          NPVariantType_Object
-
-  C (NPVariant with type:)   to   JavaScript
-  NPVariantType_Void              undefined
-  NPVariantType_Null              null
-  NPVariantType_Bool              Boolean
-  NPVariantType_Int32             Number
-  NPVariantType_Double            Number
-  NPVariantType_String            String
-  NPVariantType_Object            Object
-*/
-
-typedef void *NPIdentifier;
-
-/*
-    NPObjects have methods and properties.  Methods and properties are
-    identified with NPIdentifiers.  These identifiers may be reflected
-    in script.  NPIdentifiers can be either strings or integers, IOW,
-    methods and properties can be identified by either strings or
-    integers (i.e. foo["bar"] vs foo[1]). NPIdentifiers can be
-    compared using ==.  In case of any errors, the requested
-    NPIdentifier(s) will be NULL. NPIdentifier lifetime is controlled
-    by the browser. Plugins do not need to worry about memory management
-    with regards to NPIdentifiers.
-*/
-NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name);
-void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
-                              NPIdentifier *identifiers);
-NPIdentifier NPN_GetIntIdentifier(int32_t intid);
-bool NPN_IdentifierIsString(NPIdentifier identifier);
-
-/*
-    The NPUTF8 returned from NPN_UTF8FromIdentifier SHOULD be freed.
-*/
-NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier);
-
-/*
-    Get the integer represented by identifier. If identifier is not an
-    integer identifier, the behaviour is undefined.
-*/
-int32_t NPN_IntFromIdentifier(NPIdentifier identifier);
-
-/*
-    NPObject behavior is implemented using the following set of
-    callback functions.
-
-    The NPVariant *result argument of these functions (where
-    applicable) should be released using NPN_ReleaseVariantValue().
-*/
-typedef NPObject *(*NPAllocateFunctionPtr)(NPP npp, NPClass *aClass);
-typedef void (*NPDeallocateFunctionPtr)(NPObject *npobj);
-typedef void (*NPInvalidateFunctionPtr)(NPObject *npobj);
-typedef bool (*NPHasMethodFunctionPtr)(NPObject *npobj, NPIdentifier name);
-typedef bool (*NPInvokeFunctionPtr)(NPObject *npobj, NPIdentifier name,
-                                    const NPVariant *args, uint32_t argCount,
-                                    NPVariant *result);
-typedef bool (*NPInvokeDefaultFunctionPtr)(NPObject *npobj,
-                                           const NPVariant *args,
-                                           uint32_t argCount,
-                                           NPVariant *result);
-typedef bool (*NPHasPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name);
-typedef bool (*NPGetPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name,
-                                         NPVariant *result);
-typedef bool (*NPSetPropertyFunctionPtr)(NPObject *npobj, NPIdentifier name,
-                                         const NPVariant *value);
-typedef bool (*NPRemovePropertyFunctionPtr)(NPObject *npobj,
-                                            NPIdentifier name);
-typedef bool (*NPEnumerationFunctionPtr)(NPObject *npobj, NPIdentifier **value,
-                                         uint32_t *count);
-typedef bool (*NPConstructFunctionPtr)(NPObject *npobj,
-                                       const NPVariant *args,
-                                       uint32_t argCount,
-                                       NPVariant *result);
-
-/*
-    NPObjects returned by create, retain, invoke, and getProperty pass
-    a reference count to the caller.  That is, the callee adds a
-    reference count which passes to the caller.  It is the caller's
-    responsibility to release the returned object.
-
-    NPInvokeFunctionPtr function may return 0 to indicate a void
-    result.
-
-    NPInvalidateFunctionPtr is called by the scripting environment
-    when the native code is shutdown.  Any attempt to message a
-    NPObject instance after the invalidate callback has been
-    called will result in undefined behavior, even if the native code
-    is still retaining those NPObject instances.  (The runtime
-    will typically return immediately, with 0 or NULL, from an attempt
-    to dispatch to a NPObject, but this behavior should not be
-    depended upon.)
-
-    The NPEnumerationFunctionPtr function may pass an array of
-    NPIdentifiers back to the caller. The callee allocs the memory of
-    the array using NPN_MemAlloc(), and it's the caller's responsibility
-    to release it using NPN_MemFree().
-*/
-struct NPClass
-{
-    uint32_t structVersion;
-    NPAllocateFunctionPtr allocate;
-    NPDeallocateFunctionPtr deallocate;
-    NPInvalidateFunctionPtr invalidate;
-    NPHasMethodFunctionPtr hasMethod;
-    NPInvokeFunctionPtr invoke;
-    NPInvokeDefaultFunctionPtr invokeDefault;
-    NPHasPropertyFunctionPtr hasProperty;
-    NPGetPropertyFunctionPtr getProperty;
-    NPSetPropertyFunctionPtr setProperty;
-    NPRemovePropertyFunctionPtr removeProperty;
-    NPEnumerationFunctionPtr enumerate;
-    NPConstructFunctionPtr construct;
-};
-
-#define NP_CLASS_STRUCT_VERSION      3
-
-#define NP_CLASS_STRUCT_VERSION_ENUM 2
-#define NP_CLASS_STRUCT_VERSION_CTOR 3
-
-#define NP_CLASS_STRUCT_VERSION_HAS_ENUM(npclass)   \
-        ((npclass)->structVersion >= NP_CLASS_STRUCT_VERSION_ENUM)
-
-#define NP_CLASS_STRUCT_VERSION_HAS_CTOR(npclass)   \
-        ((npclass)->structVersion >= NP_CLASS_STRUCT_VERSION_CTOR)
-
-struct NPObject {
-    NPClass *_class;
-    uint32_t referenceCount;
-    /*
-     * Additional space may be allocated here by types of NPObjects
-     */
-};
-
-/*
-    If the class has an allocate function, NPN_CreateObject invokes
-    that function, otherwise a NPObject is allocated and
-    returned. This method will initialize the referenceCount member of
-    the NPObject to 1.
-*/
-NPObject *NPN_CreateObject(NPP npp, NPClass *aClass);
-
-/*
-    Increment the NPObject's reference count.
-*/
-NPObject *NPN_RetainObject(NPObject *npobj);
-
-/*
-    Decremented the NPObject's reference count.  If the reference
-    count goes to zero, the class's destroy function is invoke if
-    specified, otherwise the object is freed directly.
-*/
-void NPN_ReleaseObject(NPObject *npobj);
-
-/*
-    Functions to access script objects represented by NPObject.
-
-    Calls to script objects are synchronous.  If a function returns a
-    value, it will be supplied via the result NPVariant
-    argument. Successful calls will return true, false will be
-    returned in case of an error.
-    
-    Calls made from plugin code to script must be made from the thread
-    on which the plugin was initialized.
-*/
-
-bool NPN_Invoke(NPP npp, NPObject *npobj, NPIdentifier methodName,
-                const NPVariant *args, uint32_t argCount, NPVariant *result);
-bool NPN_InvokeDefault(NPP npp, NPObject *npobj, const NPVariant *args,
-                       uint32_t argCount, NPVariant *result);
-bool NPN_Evaluate(NPP npp, NPObject *npobj, NPString *script,
-                  NPVariant *result);
-bool NPN_GetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName,
-                     NPVariant *result);
-bool NPN_SetProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName,
-                     const NPVariant *value);
-bool NPN_RemoveProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName);
-bool NPN_HasProperty(NPP npp, NPObject *npobj, NPIdentifier propertyName);
-bool NPN_HasMethod(NPP npp, NPObject *npobj, NPIdentifier methodName);
-bool NPN_Enumerate(NPP npp, NPObject *npobj, NPIdentifier **identifier,
-                   uint32_t *count);
-bool NPN_Construct(NPP npp, NPObject *npobj, const NPVariant *args,
-                   uint32_t argCount, NPVariant *result);
-
-/*
-    NPN_SetException may be called to trigger a script exception upon
-    return from entry points into NPObjects.  Typical usage:
-
-    NPN_SetException (npobj, message);
-*/
-void NPN_SetException(NPObject *npobj, const NPUTF8 *message);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvbrowserplugin/src/webkit-plugin-header/nptypes.h Deleted

@@ -1,122 +0,0 @@
-/* -*- Mode: C; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * mozilla.org.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Johnny Stenback <jst@mozilla.org> (Original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nptypes_h_
-#define nptypes_h_
-
-/*
- * Header file for ensuring that C99 types ([u]int32_t, [u]int64_t and bool) and
- * true/false macros are available.
- */
-
-#if defined(WIN32) || defined(OS2)
-  /*
-   * Win32 and OS/2 don't know C99, so define [u]int_16/32/64 here. The bool
-   * is predefined tho, both in C and C++.
-   */
-  typedef short int16_t;
-  typedef unsigned short uint16_t;
-  typedef int int32_t;
-  typedef unsigned int uint32_t;
-  typedef long long int64_t;
-  typedef unsigned long long uint64_t;
-
-#elif defined(_AIX) || defined(__sun) || defined(__osf__) || defined(IRIX) || defined(HPUX)
-  /*
-   * AIX and SunOS ship a inttypes.h header that defines [u]int32_t,
-   * but not bool for C.
-   */
-  #include <inttypes.h>
-
-  #ifndef __cplusplus
-    typedef int bool;
-    #define true   1
-    #define false  0
-  #endif
-#elif defined(bsdi) || defined(FREEBSD) || defined(OPENBSD)
-  /*
-   * BSD/OS, FreeBSD, and OpenBSD ship sys/types.h that define int32_t and 
-   * u_int32_t.
-   */
-  #include <sys/types.h>
-
-  /*
-   * BSD/OS ships no header that defines uint32_t, nor bool (for C)
-   */
-  #if defined(bsdi)
-  typedef u_int32_t uint32_t;
-  typedef u_int64_t uint64_t;
-
-  #if !defined(__cplusplus)
-    typedef int bool;
-    #define true   1
-    #define false  0
-  #endif
-  #else
-  /*
-   * FreeBSD and OpenBSD define uint32_t and bool.
-   */
-    #include <inttypes.h>
-    #include <stdbool.h>
-  #endif
-#elif defined(BEOS)
-  #include <inttypes.h>
-#else
-  /*
-   * For those that ship a standard C99 stdint.h header file, include
-   * it. Can't do the same for stdbool.h tho, since some systems ship
-   * with a stdbool.h file that doesn't compile!
-   */
-  #include <stdint.h>
-
-  #ifndef __cplusplus
-    #if !defined(__GNUC__) || (__GNUC__ > 2 || __GNUC_MINOR__ > 95)
-      #include <stdbool.h>
-    #else
-      /*
-       * GCC 2.91 can't deal with a typedef for bool, but a #define
-       * works.
-       */
-      #define bool int
-      #define true   1
-      #define false  0
-    #endif
-  #endif
-#endif
-
-#endif /* nptypes_h_ */

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/autogen.sh Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/configure.ac Deleted

@@ -1,40 +0,0 @@
-###########################################################################################
-##
-## Copyright 2011 Telecom Paristech
-## Author : Stanislas Selle
-##
-###########################################################################################
-
-###  Configure.ac for hbbtvterminal
-
-
-AC_INIT([hbbtvterminal], [0.1.0], [stanislas.selle@telecom-paristech.fr])
-
-AC_CONFIG_AUX_DIR([build-aux])
-
-AC_CONFIG_MACRO_DIR([m4])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-
-#check programs
-AC_PROG_CXX
-
-#check modules
-PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28.0])
-PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.20.1])
-PKG_CHECK_MODULES([WEBKIT], [webkit-1.0 >= 1.5.2])
-PKG_CHECK_MODULES([PIXMAN], [pixman-1 >= 0.16.4])
-PKG_CHECK_MODULES([HBBTVBROWSERPLUGIN], [hbbtvbrowserplugin >= 0.0.3])
-
-# Checks for header files.
-AC_PATH_X
-
-# check header
-AC_HEADER_STDBOOL
-
-# makefiles
-AC_CONFIG_FILES([makefile src/makefile])
-
-
-AC_OUTPUT

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/hbbtv_terminal.vcproj Deleted

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="hbbtv_terminal"
-	ProjectGUID="{247BE3AF-EC92-4892-A7AC-0C51E42A5A44}"
-	RootNamespace="hbbtv_terminal"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\include;&quot;./Win32Build\WebKitGTK-Bundle\include\&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\glib-2.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\atk-1.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\cairo&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\gail-1.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\gdk-pixbuf-2.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\gtk-2.0&quot;;&quot;./Win32Build\\WebKitGTK-Bundle\include\libpng14&quot;;&quot;./Win32Build\\WebKitGTK-Bundle\include\pango-1.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\webkit-1.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\libsoup-2.4&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\glib-2.0\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\gdk-pixbuf-2.0\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\gtk-2.0\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\pango\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\gettext\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\gio\include&quot;;../hbbtvbrowserplugin\src;$(NOINHERIT)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;G_HAVE_ISO_VARARGS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="2"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libasprintf-0.lib libatk-1.0-0.lib libcairo-2.lib libenchant.lib libexpat-1.lib libexslt-0.lib libfontconfig-1.lib libfreetype-6.lib libgailutil-18.lib libgdk-win32-2.0-0.lib libgdk_pixbuf-2.0-0.lib libgettextlib-0-17.lib libgettextpo-0.lib libgettextsrc-0-17.lib libgio-2.0-0.lib libglib-2.0-0.lib libgmodule-2.0-0.lib libgobject-2.0-0.lib libgthread-2.0-0.lib libgtk-win32-2.0-0.lib libintl-8.lib libjpeg-7.lib libpango-1.0-0.lib libpangocairo-1.0-0.lib libpangoft2-1.0-0.lib libpangowin32-1.0-0.lib libpixman-1-0.lib libpng14-14.lib libsoup-2.4-1.lib libwebkitgtk-1.0-0.lib libxslt-1.lib zlib1.lib"
-				OutputFile="../../../bin/win32/debug/$(ProjectName).exe"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories="../../gpac_public/bin/win32/debug;&quot;./Win32Build\WebKitGTK-Bundle\lib&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\..\include;&quot;./Win32Build\WebKitGTK-Bundle\include\&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\glib-2.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\atk-1.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\cairo&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\gail-1.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\gdk-pixbuf-2.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\gtk-2.0&quot;;&quot;./Win32Build\\WebKitGTK-Bundle\include\libpng14&quot;;&quot;./Win32Build\\WebKitGTK-Bundle\include\pango-1.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\webkit-1.0&quot;;&quot;./Win32Build\WebKitGTK-Bundle\include\libsoup-2.4&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\glib-2.0\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\gdk-pixbuf-2.0\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\gtk-2.0\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\pango\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\gettext\include&quot;;&quot;./Win32Build\WebKitGTK-Bundle\lib\gio\include&quot;;../hbbtvbrowserplugin\src;$(NOINHERIT)"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;G_HAVE_ISO_VARARGS"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libasprintf-0.lib libatk-1.0-0.lib libcairo-2.lib libenchant.lib libexpat-1.lib libexslt-0.lib libfontconfig-1.lib libfreetype-6.lib libgailutil-18.lib libgdk-win32-2.0-0.lib libgdk_pixbuf-2.0-0.lib libgettextlib-0-17.lib libgettextpo-0.lib libgettextsrc-0-17.lib libgio-2.0-0.lib libglib-2.0-0.lib libgmodule-2.0-0.lib libgobject-2.0-0.lib libgthread-2.0-0.lib libgtk-win32-2.0-0.lib libintl-8.lib libjpeg-7.lib libpango-1.0-0.lib libpangocairo-1.0-0.lib libpangoft2-1.0-0.lib libpangowin32-1.0-0.lib libpixman-1-0.lib libpng14-14.lib libsoup-2.4-1.lib libwebkitgtk-1.0-0.lib libxslt-1.lib zlib1.lib"
-				OutputFile="../../../bin/win32/release/$(ProjectName).exe"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="../../gpac_public/bin/win32/debug;&quot;./Win32Build\WebKitGTK-Bundle\lib&quot;"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				RandomizedBaseAddress="1"
-				DataExecutionPrevention="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Fichiers sources"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\src\hbbtv_channel.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtv_demux.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtv_keycontrol.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtv_tools.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\src\hbbtvterminal.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Fichiers d&apos;en-tête"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\src\hbbtvterminal.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/makefile.am Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/makefile.old Deleted

@@ -1,81 +0,0 @@
-##
-## Copyright : Telecom Paristech - 2011
-##
-## Author : Stanislas Selle 
-##
-
-###############################################################################
-## Programs
-
-COMPILER	= g++
-DELETER		= rm -f
-
-
-CFLAGS = -g
-
-CFLAGS += -DXP_UNIX
-CFLAGS += -fPIC
-
-###############################################################################
-## Options, Flags and LinkS
-
-INCLUDEFLAGS =	-I/usr/include/xulrunner-lastest/ 						\
-				-I../../gpac_public/include/						\
-				-I../hbbtvbrowserplugin/src/				\
-				-I../../gpac_public/
-
-LIBRARYPATHS = 	-L/usr/lib/xulrunner-devel-lastest/sdk/lib/ 			\
-				-L../../gpac_public/bin/gcc/						\
-				-L../hbbtvbrowserplugin/bin/
-
-LIBRARYNAMES =	-lgpac 													\
-				-lmozjs 												\
-				-lxpcom 												\
-				-lxul 													\
-				../hbbtvbrowserplugin/bin/hbbtvbrowserplugin.so
-
-
-LIBRARYFLAGS = $(LIBRARYPATHS) $(LIBRARYNAMES)
-
-FROMPKG = webkit-1.0 gtk+-2.0 pixman-1
-
-ifneq ($(strip $(FROMPKG)),)
-PKGFLAGS = `pkg-config --cflags $(FROMPKG) `
-PKGLIBS = `pkg-config --libs $(FROMPKG) `
-INCLUDEFLAGS += $(PKGFLAGS)
-LIBRARYFLAGS += $(PKGLIBS)
-endif
-
-
-###############################################################################
-## Files
-
-
-MAINTARGET = bin/hbbtvterminal
-
-OBJ =	obj/hbbtvterminal.o \
-		obj/hbbtv_demux.o \
-		obj/hbbtv_channel.o
-
-#TESTTS = /home/selle/ressources/OpenHbbDemo-3ch2app/OpenHbbDemo-3ch2app.ts
-TESTTS = /home/selle/ressources/mpeg2-ts-hbbtv/TPT/OpenHbb-ch4.ts
-TESTURL = http://aquila.enst.fr:8080/subwebsite/hbbtvtest/oha0005web/index.php
-TESTLOG = /tmp/test-err.txt
-
-###############################################################################
-## Rules
-
-
-all : $(MAINTARGET)
-
-$(MAINTARGET) : $(OBJ)
-	$(COMPILER) $(CFLAGS) $(LIBRARYFLAGS) $(OBJ) -o $(MAINTARGET)
-
-obj/%.o : src/%.cpp
-	$(COMPILER) $(CFLAGS) $(INCLUDEFLAGS) -c $^ -o $@
-
-test : all
-	$(MAINTARGET) -input=$(TESTTS)
-
-clean :
-	rm -f $(OBJ) $(MAINTARGET)

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/projectmanager Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/projectmanager/codeblocks Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/projectmanager/codeblocks/hbbtvterminal Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/projectmanager/codeblocks/hbbtvterminal/HbbtvTerminal.cbp Deleted

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="HbbtvTerminal" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="bin/Debug/HbbtvTerminal" prefix_auto="1" extension_auto="1" />
-				<Option object_output="obj/Debug/" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Compiler>
-					<Add option="-g" />
-				</Compiler>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-Wall" />
-		</Compiler>
-		<Unit filename="../../../autogen.sh" />
-		<Unit filename="../../../configure.ac" />
-		<Unit filename="../../../makefile.am" />
-		<Unit filename="../../../src/hbbtv_channel.cpp" />
-		<Unit filename="../../../src/hbbtv_demux.cpp" />
-		<Unit filename="../../../src/hbbtvterminal.cpp" />
-		<Unit filename="../../../src/hbbtvterminal.h" />
-		<Unit filename="../../../src/makefile.am" />
-		<Extensions>
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/projectmanager/codeblocks/hbbtvterminal/HbbtvTerminal.layout Deleted

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
-	<ActiveTarget name="Debug" />
-	<File name="../../../autogen.sh" open="1" top="0" tabpos="3">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../../configure.ac" open="1" top="0" tabpos="2">
-		<Cursor position="781" topLine="0" />
-	</File>
-	<File name="../../../makefile.am" open="1" top="0" tabpos="7">
-		<Cursor position="40" topLine="0" />
-	</File>
-	<File name="../../../src/hbbtv_channel.cpp" open="1" top="0" tabpos="5">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../../src/hbbtv_demux.cpp" open="0" top="0" tabpos="7">
-		<Cursor position="0" topLine="0" />
-	</File>
-	<File name="../../../src/hbbtvterminal.cpp" open="1" top="0" tabpos="4">
-		<Cursor position="44068" topLine="1111" />
-	</File>
-	<File name="../../../src/hbbtvterminal.h" open="1" top="0" tabpos="1">
-		<Cursor position="354" topLine="0" />
-	</File>
-	<File name="../../../src/makefile.am" open="1" top="0" tabpos="6">
-		<Cursor position="388" topLine="0" />
-	</File>
-</CodeBlocks_layout_file>

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/releases Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/src Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/src/hbbtv_channel.cpp Deleted

@@ -1,253 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors:  Jonathan Sillan		
- *				
- */
-
-#include "hbbtvterminal.h"
-
-static Bool app_priority_test(GF_M2TS_AIT_APPLICATION*,u8 app_priority,u8 app_transport, u8 MaxPriority);
-
-/* Constructor */
-Channel::Channel(u32 TSservice_ID, char* TSchannel_name){  
- 	
-	u8 i;
-	service_ID = TSservice_ID;
-	if(TSchannel_name){
-	  channel_name = gf_strdup(channel_name);
-	}else{
-	  channel_name = NULL;
-	}
-	
-	video_ID = 0;
-	for(i=0 ; i<MAX_audio_index ; i++){
-	  audio_ID[i] = 0;  
-	}
-	ChannelApp = NULL;
-	AIT_PID = 0;
-	PMT_PID = 0;
-	processed = 0;
-	current_audio_index = 0;
-	nb_chan_audio_stream =0;
-}
-
-/* Destructor */
-void Channel::Destroy_Channel(){  
- 	
-	service_ID = 0;
-	if(channel_name){
-	  gf_free(channel_name);
-	}
-	gf_free(this);
-	
-}
-/* Getter */
-u32 Channel::Get_service_id(){  
-	return service_ID; 
-}
-
-char* Channel::Get_channel_name(){
-	return channel_name;
-}
-
-u32 Channel::Get_video_ID(){
-	return video_ID; 
-}
-
-u32 Channel::Get_audio_ID(u32 indice){
-	if(audio_ID[indice] == 0 || indice >= nb_chan_audio_stream){
-		indice = 0;
-	}
-	current_audio_index = indice;
-	return audio_ID[indice];
-}
-
-u32 Channel::Get_ait_pid(){
-	return AIT_PID;
-}
-
-u32 Channel::Get_pmt_pid(){
-	return PMT_PID;
-}
-
-Bool Channel::Get_processed(){
-	return processed;
-}
-
-u32 Channel::Get_audio_index(){
-	return current_audio_index;
-}
-
-u32 Channel::Get_nb_chan_audio_stream(){
-	return nb_chan_audio_stream;
-}
-
-GF_M2TS_CHANNEL_APPLICATION_INFO*Channel::Get_App_info(){
-	return ChannelApp;
-}
-
-GF_M2TS_AIT_APPLICATION* Channel::App_to_play(Bool isConnected,u8 MaxPriority){
-	u32 i;
-	Bool App_selected;
-	u32 app_index;
-	u8 app_priority;
-	u8 app_transport;
-	
-	App_selected = 0;
-	app_priority = 0;
-	app_index = 0;
-	app_transport = 0;
-		
-	for(i = 0 ; i<ChannelApp->nb_application; i++){ 
-		GF_M2TS_AIT_APPLICATION* App_info = (GF_M2TS_AIT_APPLICATION*)gf_list_get(ChannelApp->Application,i);
-		if((isConnected && App_info->broadband) || App_info->broadcast){
-			if(App_info->application_control_code == AUTOSTART){
-				if(app_priority_test(App_info,app_priority,isConnected,MaxPriority)){
-					app_priority = App_info->priority;
-					app_index = i;
-					App_selected = 1;
-					if(!app_transport && App_info->broadband && isConnected){
-						app_transport = BROADBAND;
-					}else{
-						app_transport = BROADCAST;
-					}
-					
-				}				
-			}
-		}		
-	}
-	if(App_selected){
-		GF_M2TS_AIT_APPLICATION* App_info = (GF_M2TS_AIT_APPLICATION*)gf_list_get(ChannelApp->Application,app_index);
-		return App_info;
-	}
-	return NULL;
-}
-
-GF_M2TS_AIT_APPLICATION* Channel::Get_App(u32 application_id){
-	u32 i;
-		
-	for(i = 0 ; i<ChannelApp->nb_application; i++){ 
-		GF_M2TS_AIT_APPLICATION* App_info = (GF_M2TS_AIT_APPLICATION*)gf_list_get(ChannelApp->Application,i);
-		if(App_info->application_id == application_id){
-			return App_info;
-		}		
-	}
-	return NULL;
-}
-
-
-
-/* Class Fonction */
-
-u32 Channel::Add_service_id(u32 service_id){
-  if(service_id){
-	service_ID = service_id;
-	return GF_OK;
-  }
-  return GF_BAD_PARAM;
-}
-
-u32 Channel::Add_channel_name(char* chan_name){
-    if(chan_name != NULL){
-	channel_name = gf_strdup(chan_name);
-	return GF_OK;
-    }
-    return GF_BAD_PARAM;
-}
-u32 Channel::Add_video_ID(u32 video_index){
-    if(video_index){
-	video_ID = video_index;
-	return GF_OK;
-    }
-    return GF_BAD_PARAM;
-}
-
-u32 Channel::Add_audio_ID(u32 audio_index){
-	if(audio_index){
-	u32 i;
-	for(i = 0; i<MAX_audio_index;i++){
-	  if(audio_ID[i]==0){
-		 nb_chan_audio_stream++;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("Add audio ID[%d] %d to channel %d -- total of %d audio stream on this channel\n",i,audio_index,service_ID,nb_chan_audio_stream)); 		
-	    audio_ID[i] = audio_index;
-	    return GF_OK;
-	  }
-	} 	
-    }
-    return GF_BAD_PARAM;
-}
-
-u32 Channel::Add_ait_pid(u32 ait_pid){
-    if(ait_pid){	
-	AIT_PID = ait_pid;
-	return GF_OK;
-    }
-    return GF_BAD_PARAM;
-}
-
-u32 Channel::Add_pmt_pid(u32 pmt_pid){
-    if(pmt_pid){	
-	PMT_PID = pmt_pid;
-	return GF_OK;
-    }
-    return GF_BAD_PARAM;
-}
-
-u32 Channel::Add_App_info(GF_M2TS_CHANNEL_APPLICATION_INFO*chan_app){
-    if(chan_app){	
-		ChannelApp = chan_app;
-		return GF_OK;
-    }
-    return GF_BAD_PARAM;
-}
-
-
-void Channel::Check_Info_Done(){
-	processed = 1;
-}
-
-void Channel::Set_audio_index(u32 index){
-	current_audio_index = index;
-}
-
-/* Incr_audio_index
- * 
- * int mode : 1 ou 0
- * 
- * Increment ou decrement the audio stream index
- */
-void Channel::Incr_audio_index(int mode){
-	if(mode){
-		current_audio_index--;
-	}else{
-		current_audio_index++;
-	}
-}
-	
-/* Global Functions */
-
-static Bool app_priority_test(GF_M2TS_AIT_APPLICATION* App_info,u8 app_priority,u8 isConnected,u8 MaxPriority){
-
-	if(!(App_info->priority >= MaxPriority && (MaxPriority >0)) && 
-	((app_priority < App_info->priority) || (app_priority == App_info->priority))
-	&& ((isConnected && App_info->broadband)||App_info->broadcast)){
-		return 1;
-	}
-	
-	return 0;
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/src/hbbtv_demux.cpp Deleted

@@ -1,388 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors:     Jonathan Sillan		
- *				
- */
-
-#include "hbbtvterminal.h"
-
-static u32 New_ait_received(HbbtvDemuxer* hbbtv_demuxer,GF_M2TS_AIT *ait, char  *data, u32 data_size, u32 table_id);
-static u32 On_hbbtv_ait_section(sPlayerInterface* player_interf, GF_Event *event);
-static u32 On_hbbtv_dsmcc_section(sPlayerInterface* player_interf, GF_Event *event);
-static u32 On_hbbtv_get_tsdemuxer(sPlayerInterface* player_interf, GF_Event *event);
-
-
-
-/* Constructor */
-HbbtvDemuxer::HbbtvDemuxer(char *input_data, char* url, Bool dsmcc, Bool no_url,sPlayerInterface* player_interf)
-{
-
-	Demuxts = NULL;
-
-	Channels = gf_list_new();
- 	Input_data = gf_strdup(input_data);	
-	user = player_interf;
-	player_interf->Demuxer = this;
-	ait_to_process = 0;
-	nb_prog_pmt_received = 0;
-	all_prog_pmt_received =0;
-	No_URL = 0;
-	Ignore_TS_URL = 0;	
-	if(dsmcc){
-		process_dsmcc = 1;
-	}else{
-		process_dsmcc = 0;
-	}
-
-	if(no_url){
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] No URL \n"));
- 		No_URL = 1;
- 	}else if(url){
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Forced URL %s \n",url));
-		Force_URL = gf_strdup(url);
-		Ignore_TS_URL = 1;
-	}
- 	nb_ait = 0;
-	ts_demux_mutex = gf_mx_new("HBBTV_TS_Demux_Mutex");
-
-	ts_demux_thread = gf_th_new("HBBTV_TS_Demux_Thread");
-	
-}
-
-/* Destructor */
-
-/* Getter */
-
-GF_M2TS_Demuxer* HbbtvDemuxer::Get_Ts()
-{
-	return Demuxts;
-}
-
-GF_List* HbbtvDemuxer::Get_AIT_To_Process_list()
-{
-	return Ait_To_Process;
-}
-
-char* HbbtvDemuxer::Get_Input_data()
-{
-	return Input_data;
-}
-
-Bool HbbtvDemuxer::Get_if_dsmcc_process()
-{
-	return process_dsmcc;
-}
-
-GF_Thread * HbbtvDemuxer::Get_Demux_Thread()
-{
-	return ts_demux_thread;
-}
-
-GF_Mutex * HbbtvDemuxer::Get_Demux_Mutex()
-{
-	return ts_demux_mutex;
-}
-
-GF_List * HbbtvDemuxer::Get_ChannelList(){
-	return Channels;
-}
-
-
-Channel* HbbtvDemuxer::Get_Channel(u32 service_id){
-	u32 nb_channel,i;
-
-	nb_channel = gf_list_count(Channels);
-
-	for(i=0;i<nb_channel;i++){
-		Channel* Chan = (Channel*)gf_list_get(Channels,i);
-		if(Chan->Get_service_id() == service_id){
-			return Chan;
-		}
-	}
-	return NULL;
-}
-
-void* HbbtvDemuxer::Get_User(){
-
-	return user;	
-}
-
-
-char* HbbtvDemuxer::Get_Force_URL(){
-	return Force_URL;
-}
-
-Bool HbbtvDemuxer::Get_Ignore_TS_URL(){
-	return Ignore_TS_URL;
-}
-
-Bool HbbtvDemuxer::Get_ait_to_proces(){
-	return ait_to_process;
-}
-
-
-/* Setter */
-void HbbtvDemuxer::Set_Ts(GF_M2TS_Demuxer *on_ts){	
-	Demuxts = on_ts;
-}
-
-void HbbtvDemuxer::Set_ait_to_process(Bool on){
-	ait_to_process = on;
-}
-
-/* Class Fonction */
-GF_Err HbbtvDemuxer::Get_application_info(GF_M2TS_CHANNEL_APPLICATION_INFO*ChannelApp)
-{
-	if(!Ignore_TS_URL && !No_URL){	
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Get application for service %d \n",ChannelApp->service_id));
-		return get_app_url((sPlayerInterface*)user,ChannelApp);	
-      }else{
-      
-	if(!No_URL){
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Forced URL %s \n",Force_URL));
-	}else{
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] URL blocked by the user. No Application to play  \n"));;
-	}
-	return GF_OK;
-	
-      }
-}
-
-Channel* HbbtvDemuxer::Zap_channel(u32 service_id,int zap){
-	  u32 count_list;
-	  u32 i ;
-	  
-	  count_list = gf_list_count(Channels);
-// 	   GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] list: %d\n",count_list));
-	  for(i=0;i<count_list;i++){
-	      Channel* chan = ( Channel*)gf_list_get(Channels,i);
-	      if(chan->Get_service_id() == service_id){
-		if(zap != 0){
-		  /* zap is use for changing channel. It could be +1 or -1 in order to take the next/previous service */
-		  GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] i: %d zap %d\n",i,zap));
-		  		    
-		   i= (i+zap+count_list)%count_list; /* loop on the channels */
-		  
-		  GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] i: %d list %d\n",i,count_list));
-		}
-		Channel* chan = ( Channel*)gf_list_get(Channels,i);		
-		return chan;
-	      }
-	  }
-	  
-	  /* If the prog goes here that means Channels list is empty or 
-	  no object from this current service_id has already been processed */
-// 	  GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] add service_id: %d \n",service_id));
-	  Channel* chan = new Channel(service_id,NULL);
-	  gf_list_add(Channels,chan);
-	  return chan;
-}
-
-void HbbtvDemuxer::Channel_check(){
-	  u32 count_list;
-	  u32 i ;
-	  
-	  count_list = gf_list_count(Channels);
-	  for(i=0;i<count_list;i++){
-	      Channel* chan = ( Channel*)gf_list_get(Channels,i);
-	      chan->Check_Info_Done();
-	  }
-  }
-	      
-
-int HbbtvDemuxer::Check_all_channel_info_received(int Timer){
-	
-	if(!Demuxts){
-	    GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTV]No PAT received \n"));
-	    return 0;
-	}	
-	/* Check if all the PMT have been processed or wait until 5 secondes to starts the program */
-	if(all_prog_pmt_received || Timer == 5){	  
-	    GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] nb_prog_pmt_received %d\n",nb_prog_pmt_received));	  
-	    return 1;
-	}
-	return 0;
-}
-
-void HbbtvDemuxer::Create_Channel(GF_M2TS_Program *prog){  
-
-	Channel* chan = new Channel(prog->number,NULL);
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal]Service number:%d\n",prog->number));
-	chan->Add_pmt_pid(prog->pmt_pid);
-	gf_list_add(Channels,chan);
-	
-}
-
-void HbbtvDemuxer::Check_PMT_Processing(){  	
-	nb_prog_pmt_received++;	
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("Demuxts->programs %d\n",gf_list_count(Demuxts->programs)));	
-	if(nb_prog_pmt_received == gf_list_count(Demuxts->programs)){
-		all_prog_pmt_received = 1;
-	}	
-}
-
-
-/* Global Functions */
-
-u32 DemuxThreadStart(HbbtvDemuxer *hbbtv_demuxer){
-
-	return gf_th_run(hbbtv_demuxer->Get_Demux_Thread(),DemuxStart,(void*)hbbtv_demuxer);
-}
-
-u32 On_hbbtv_received_section(void *ptr, GF_Event *event){
-	u32 e;
-	
-	e = GF_OK;
-	HbbtvDemuxer* hbbtv_demuxer = (HbbtvDemuxer*)ptr;
-	sPlayerInterface* player_interf = (sPlayerInterface*)hbbtv_demuxer->Get_User();	
-	
-
-	if (event->type == GF_EVENT_FORWARDED)
-	{
-		if(event->forwarded_event.service_event_type == GF_M2TS_EVT_PAT_FOUND && hbbtv_demuxer->Get_Ts() == NULL){
-			e = On_hbbtv_get_tsdemuxer(player_interf,event);			
-			if(e != 0){
-				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Error in receiving the TS Demuxer \n"));
-
-			}
-		}
-		if(event->forwarded_event.service_event_type == GF_M2TS_EVT_AIT_FOUND){
-			e = On_hbbtv_ait_section(player_interf,event);
-		}
-		if(event->forwarded_event.service_event_type == GF_M2TS_EVT_DSMCC_FOUND){
-			e = On_hbbtv_dsmcc_section(player_interf,event);
-		}
-		if(event->forwarded_event.service_event_type == GF_M2TS_EVT_PMT_FOUND){	
-			gf_mx_p(hbbtv_demuxer->Get_Demux_Mutex());
-			GF_M2TS_Program * prog = (GF_M2TS_Program*)event->forwarded_event.param;			
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("PMT PID %d \n",prog->pmt_pid));
-			hbbtv_demuxer->Create_Channel(prog);	
-			hbbtv_demuxer->Check_PMT_Processing();
-			gf_mx_v(hbbtv_demuxer->Get_Demux_Mutex());
-		}		
-	}	
-	return e;
-
-  
-}
- 
-static u32 On_hbbtv_ait_section(sPlayerInterface* player_interf, GF_Event *event) 
-{
-	HbbtvDemuxer* hbbtv_demuxer = (HbbtvDemuxer*)player_interf->Demuxer;
-	GF_M2TS_AIT_CARRY* ait_carry;
-	
-	
-	ait_carry = (GF_M2TS_AIT_CARRY*)event->forwarded_event.param;	
-	
-	/* Make sure we are not modifying the AIT List at the same time */
-	gf_mx_p(hbbtv_demuxer->Get_Demux_Mutex());
-	if(player_interf->init){		
-		Get_application_for_channel(hbbtv_demuxer,ait_carry->service_id);			
-	}
-		
-	/* Unlock the mutex */
-	gf_mx_v(hbbtv_demuxer->Get_Demux_Mutex());
-
-	return 0;
-}
-
-u32 Get_application_for_channel(HbbtvDemuxer* hbbtv_demuxer,u32 service_id){
-	u32 nb_channel;
-	Channel* Chan;
-	GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo;
-	GF_Err e;
-
-	Chan = hbbtv_demuxer->Get_Channel(service_id);
-	if(!Chan){
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] service ID %d is not available\n",service_id));
-		return GF_BAD_PARAM;
-	}	
-
-	ChanAppInfo = gf_m2ts_get_channel_application_info(hbbtv_demuxer->Get_Ts()->ChannelAppList,service_id);	
-	
-	if(!ChanAppInfo){
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] service ID %d no application available\n",service_id));
-		return GF_BAD_PARAM;
-	}	
-	
-	Chan->Add_App_info(ChanAppInfo);	
-	e = hbbtv_demuxer->Get_application_info(ChanAppInfo);
-	if(e == GF_OK){
-	  GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Application found for the service ID %d is ON\n",ChanAppInfo->service_id));
-	}else{
-	  GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] This application for this service ID %d does not belong to the current one.\n\n",ChanAppInfo->service_id));
-	}
-	
-	return GF_OK;
-	
-} 
-
-static u32 On_hbbtv_dsmcc_section(sPlayerInterface* player_interf, GF_Event *event) 
-{
-	HbbtvDemuxer* hbbtv_demuxer = (HbbtvDemuxer*)player_interf->Demuxer;
-	GF_M2TS_Demuxer* ts = hbbtv_demuxer->Get_Ts();		
-	GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord;
-
-	GF_M2TS_SL_PCK* pck = (GF_M2TS_SL_PCK*)event->forwarded_event.param;
-	
-	dsmcc_overlord = gf_m2ts_get_dmscc_overlord(ts->dsmcc_controler,pck->stream->service_id);
-
-	if (dsmcc_overlord && dsmcc_overlord->get_index){
-			GF_M2TS_AIT_APPLICATION* Application;
-			Channel* Chan;
-			Chan = (Channel*)hbbtv_demuxer->Get_Channel(dsmcc_overlord->service_id);
-			//if(!Chan)
-			Application = Chan->Get_App(dsmcc_overlord->application_id);	
-			Application->url_received = 1;			
-			put_app_url(player_interf);
-	}
-
-	return 0;
-}
-
-static u32 On_hbbtv_get_tsdemuxer(sPlayerInterface* player_interf, GF_Event *event) 
-{
-	HbbtvDemuxer* hbbtv_demuxer = (HbbtvDemuxer*)player_interf->Demuxer;
-	GF_M2TS_Demuxer *ts = (GF_M2TS_Demuxer*)event->forwarded_event.param;
-	hbbtv_demuxer->Set_Ts(ts);	
-	if(hbbtv_demuxer->Get_Ts() != NULL){
-		if(hbbtv_demuxer->Get_if_dsmcc_process() && !ts->process_dmscc){	
-			gf_m2ts_demux_dmscc_init(ts);
-		}
-		return GF_OK;
-	}
-		
-	return GF_BAD_PARAM;
-}
-
-u32 DemuxStart(void *par){
-
-	GF_Err e;
-	HbbtvDemuxer* hbbtv_demuxer = (HbbtvDemuxer*) par;
-	e = TSDemux_Demux_Setup(hbbtv_demuxer->Get_Ts(), hbbtv_demuxer->Get_Input_data(), 0);
-	if(e)
-	{
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HBBTV] Error during TS demux \n"));
-	}
-	return e;
-
-}
-
-Channel* ZapChannel(HbbtvDemuxer *hbbtv_demuxer,u32 service_id,int zap){  
-	return hbbtv_demuxer->Zap_channel(service_id,zap);
-}

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/src/hbbtv_keycontrol.cpp Deleted

@@ -1,354 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors: Stanislas Selle - Jonathan Sillan		
- *				
- */
-#include "hbbtvterminal.h"
-
-
-
-void gtksendkey(sPlayerInterface* player_interf,int keycode);
-
-void gtksendkey(sPlayerInterface* player_interf,int keycode)
-{
-	TRACEINFO;
-	GdkEvent *KeyEvent;
-	
-	fprintf(stderr, "\x1b[%i;3%imKeyCode\x1b[0m: %d\n",1, 4,keycode);
-	
-	KeyEvent = gdk_event_new (GDK_KEY_PRESS);
-	/* Key Value */
-	KeyEvent->key.keyval = gdk_unicode_to_keyval(keycode);	
-	/* GDK_BUTTON1_MASK refers to left mouse button */
-	KeyEvent->key.state = GDK_BUTTON1_MASK;
-	/* Send the key event to Web Window */
-	
-	KeyEvent->key.window = player_interf->ui->pWebWindow->window;
-	gtk_main_do_event (KeyEvent);
-	//gdk_event_free(KeyEvent);
-}
-
-/* HBBTV Button */
-
-void on_redbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	fprintf(stderr, "\x1b[%i;3%imBOUTON PRESSED\n\x1b[0m", 1, 5);
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;	
-	if (player_interf->keyregistered[RK_RED]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("RED is registered by the application : send HBBTV_VK_RED to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_RED);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("RED is not registered by the application\n"));
-	}
-	
-}
-
-void on_greenbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;
-	if (player_interf->keyregistered[RK_GREEN]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("GREEN is registered by the application : send HBBTV_VK_GREEN to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_GREEN);	
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("GREEN is not registered by the application\n"));
-	}
-}
-
-void on_yellowbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;
-	if (player_interf->keyregistered[RK_YELLOW]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("YELLOW is registered by the application : send HBBTV_VK_YELLOW to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_YELLOW);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("YELLOW is not registered by the application\n"));
-	}	
-}
-
-void on_bluebuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;
-	if (player_interf->keyregistered[RK_BLUE]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("BLUE is registered by the application : send HBBTV_VK_BLUE to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_BLUE);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("BLUE is not registered by the application\n"));
-	}	
-}
-
-/* Navigation */
-
-void on_returnbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;	
-	if (player_interf->keyregistered[RK_NAVIGATION]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is registered by the application : send HBBTV_VK_ENTER to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_ENTER);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is not registered by the application\n"));
-	}	
-}
-
-void on_exitbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	int posx,posy;
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;	
-	//~ gtk_window_set_transient_for(GTK_WINDOW(player_interf->ui->pWebWindow),GTK_WINDOW(player_interf->ui->pTVWindow));
-	get_window_position(player_interf->ui->pWebWindow, &posx, &posy);	
-	resizevideoplayer(player_interf, HBBTV_VIDEO_WIDTH, HBBTV_VIDEO_HEIGHT);	
-	set_window_position(player_interf->ui->pTVWindow, posx, posy);
-	gtk_window_set_position(GTK_WINDOW(player_interf->ui->pTVWindow),GTK_WIN_POS_CENTER_ALWAYS);
-	webkit_web_view_load_uri(player_interf->ui->pWebView, player_interf->url);
-}
-
-void on_upbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;	
-	if (player_interf->keyregistered[RK_NAVIGATION]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is registered by the application : send HBBTV_VK_UP to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_UP);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is not registered by the application\n"));
-	}
-}
-
-void on_downbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;	
-	if (player_interf->keyregistered[RK_NAVIGATION]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is registered by the application : send HBBTV_VK_DOWN to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_DOWN);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is not registered by the application\n"));
-	}	
-}
-
-void on_leftbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;	
-	if (player_interf->keyregistered[RK_NAVIGATION]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is registered by the application : send HBBTV_VK_LEFT to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_LEFT);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE,("NAVIGATION is not registered by the application\n"));
-	}
-}
-
-void on_rightbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;	
-	if (player_interf->keyregistered[RK_NAVIGATION]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is registered by the application : send HBBTV_VK_RIGHT to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_RIGHT);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NAVIGATION is not registered by the application\n"));
-	}	
-}
-
-
-
-/* Control */
-
-void on_playpausebuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
- 	sPlayerInterface* player_interf = (sPlayerInterface*)data; 	
-	set_window_position(player_interf->ui->pTVWindow, 0, 0);
-}
-
-void on_playbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;
-	if (player_interf->keyregistered[RK_VCR]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("VCR is registered by the application : send HBBTV_VK_PLAY to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_PLAY);
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("VCR is not registered by the application\n"));
-	}	
-	
-}
-
-void on_pausebuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;
-	if (player_interf->keyregistered[RK_VCR]){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("VCR is registered by the application : send HBBTV_VK_PAUSE to the Application\n"));
-		gtksendkey(player_interf,HBBTV_VK_PAUSE); 
-	}else{
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("VCR is not registered by the application\n"));
-	}	
-}
-
-void on_onoffbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	sPlayerInterface* player_interf;
-	player_interf = (sPlayerInterface*)data;
-
-	if (player_interf->TVwake == FALSE) {
-		init_gpac(player_interf);
-		player_interf->TVwake = TRUE;
-	}
-	else {
-		stop_gpac(player_interf);
-		player_interf->TVwake = FALSE;
-	}
-	TRACEINFO;
-}
-
-void on_langbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	sPlayerInterface* player_interf;
-	u32 current_service_id;
-	HbbtvDemuxer *hbbtvdemuxer;
-	GF_MediaInfo odi;
-	u32 index_audio,audio_ID;	
-	
-	player_interf = (sPlayerInterface*)data;
-	hbbtvdemuxer = ( HbbtvDemuxer *)player_interf->Demuxer;
-	current_service_id = index_audio = audio_ID = 0;	
-	
-	/* Get the current channel struct */
-	current_service_id = gf_term_get_current_service_id(player_interf->m_term);
-	Channel* chan = (Channel*)ZapChannel(hbbtvdemuxer,current_service_id,0);	
-	if(chan->Get_nb_chan_audio_stream() > 1){
-		GF_ObjectManager *root_odm = gf_term_get_root_object(player_interf->m_term);
-		if (root_odm){
-			if (gf_term_get_object_info(player_interf->m_term, root_odm, &odi) == GF_OK){ 
-				if (odi.od) {
-					/* Increment the audio index to get the next audio stream */
-					chan->Incr_audio_index(0);					
-					gf_term_select_object(player_interf->m_term, gf_term_get_object(player_interf->m_term, root_odm, chan->Get_audio_ID(chan->Get_audio_index())));
-				}
-			}
-		}
-	}
-}
-
-void on_teletextbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	sPlayerInterface* player_interf;
-	player_interf = (sPlayerInterface*)data;
-	gtksendkey(player_interf,HBBTV_VK_TELETEXT);
-
-}
-
-void on_channelbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	sPlayerInterface* player_interf;
-	GtkButton* button;
-	int key_code;
-	char* label;
-	player_interf = (sPlayerInterface*)data;
-	button = (GtkButton*) widget;
-	label = (char*)gtk_button_get_label(button);
-		
-	switch(atoi(label)){
-		case 0:
-			key_code = HBBTV_VK_0;
-			break;
-		case 1:
-			key_code = HBBTV_VK_1;
-			break;
-		case 2:
-			key_code = HBBTV_VK_2;
-			break;
-		case 3:
-			key_code = HBBTV_VK_3;
-			break;
-		case 4:
-			key_code = HBBTV_VK_4;
-			break;
-		case 5:
-			key_code = HBBTV_VK_5;
-			break;
-		case 6:
-			key_code = HBBTV_VK_6;
-			break;
-		case 7:
-			key_code = HBBTV_VK_7;
-			break;
-		case 8:
-			key_code = HBBTV_VK_8;
-			break;
-		case 9:
-			key_code = HBBTV_VK_9;
-			break;
-		default:
-			 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Wrong Key Code %d Defaut channel 1 \n",atoi(label)));
-			key_code = HBBTV_VK_1;
-			break;
-		}
-	if (player_interf->keyregistered[RK_NUMERIC]){
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NUMERIC is registered by the application : send HBBTV_VK_%i to the Application\n",atoi(label)));
-		gtksendkey(player_interf,key_code);
-	}else{
-		hbbtvterm_get_channel_on_air(player_interf,atoi(label),0);
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("NUMERIC is not registered by the application, change channel function\n"));
-	}				
-	
-	
-}
-
-
-void on_chanupbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	sPlayerInterface* player_interf;
-	player_interf = (sPlayerInterface*)data;
-
-	hbbtvterm_channel_zap(player_interf,1);
-
-	TRACEINFO;
-}
-
-
-void on_chandownbuttonclicked(GtkWidget *widget, gpointer data)
-{
-	TRACEINFO;
-	sPlayerInterface* player_interf;
-	player_interf = (sPlayerInterface*)data;
-
-	hbbtvterm_channel_zap(player_interf,-1);
-
-	TRACEINFO;
-}
-
-int playpause(sPlayerInterface* player_interf)
-{
-	int  is_pause = gf_term_get_option( player_interf->m_term, GF_OPT_PLAY_STATE);
-	fprintf(stdout, "[Status: %s]\n", is_pause ? "Playing" : "Paused");
-	gf_term_set_option( player_interf->m_term, GF_OPT_PLAY_STATE, is_pause ? GF_STATE_PLAYING : GF_STATE_PAUSED);
-	return 1;
-}
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/src/hbbtv_tools.cpp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/src/hbbtvterminal.cpp Deleted

@@ -1,1081 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors: Stanislas Selle - Jonathan Sillan		
- *				
- */
-
-#include "hbbtvterminal.h"
-#ifdef XP_UNIX
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#else
-#include <gdk/gdk.h>
-#include <gdk/gdkwin32.h> 
-#endif
-
-#include <JavaScriptCore/JSStringRef.h>
-#include <JavaScriptCore/JSContextRef.h>
-
-//static XID handler;
-static void activate_uri_entry_cb (GtkWidget* entry, gpointer data);
-
-sPlayerInterface* player_interf;
-
-static gboolean on_deleteevent( GtkWidget *widget, GdkEvent  *event, gpointer   data)
-{
-	g_print ("delete event occurred\n");
-	TRACEINFO;
-	return TRUE;
-}
-
-static gboolean on_windowconfigure(GtkWidget *	widget, GdkEvent  *event, gpointer data)
-{
-	TRACEINFO;
-
-	static int oldx = 0;
-	static int oldy = 0;
-	int x, y, olddatax, olddatay;
-	
-	sPlayerInterface* player_interf = (sPlayerInterface*)data;
-
-	gtk_window_get_position(GTK_WINDOW(player_interf->ui->pWebWindow), &olddatax, &olddatay);
-
-	x = event->configure.x;
-	y = event->configure.y;
-
-	int deltax = x - oldx;
-	int deltay = y - oldy;
-
-	gtk_window_move(GTK_WINDOW(player_interf->ui->pTVWindow),olddatax + deltax, olddatay + deltay);
-	gtk_window_move(GTK_WINDOW(player_interf->ui->pBackgroundWindow),olddatax + deltax, olddatay + deltay);
-
-	oldx = x;
-	oldy = y;
-	return TRUE;
-}
-
-
-static void on_destroyevent(GtkWidget *widget, gpointer data)
-{
-	gtk_main_quit();
-	TRACEINFO;
-}
-
-
-int ui_init(sPlayerInterface* player_interf)
-{
-	GtkWidget   *pWindow;
-	GtkWidget   *pTVWindow;
-	GtkWidget   *pWebWindow;
-	GtkWidget   *pMainPositionTable;
-	GtkWidget   *pBrowserPositionTable;
-	GtkWidget   *pRCUPositionTable;
-	GtkWidget   *pColorButtonTable;
-	GtkWidget   *pRedButton;
-	GtkWidget   *pGreenButton;
-	GtkWidget   *pYellowButton;
-	GtkWidget   *pBlueButton;
-	GtkWidget   *pArrowButtonTable;
-	GtkWidget   *pUpButton;
-	GtkWidget   *pDownButton;
-	GtkWidget   *pLeftButton;
-	GtkWidget   *pRightButton;
-	GtkWidget   *pUpArrow;
-	GtkWidget   *pDownArrow;
-	GtkWidget   *pLeftArrow;
-	GtkWidget   *pRightArrow;
-	GtkWidget   *pEnterButton;
-	GtkWidget   *pBackButton;
-	GtkWidget   *pEntry;
-	GtkWidget   *pNumPadTable;
-	GtkWidget   *pNumber[10];
-	GtkWidget   *pPlayButton;
-	GtkWidget   *pStopButton;
-	GtkWidget   *pPauseButton;
-	GtkWidget   *pPlayPauseButton;
-	GtkWidget   *pFastMoveTable;
-	GtkWidget   *pFastForwardButton;
-	GtkWidget   *pFastRewindButton;
-	GtkWidget   *pLangButton;
-	GtkWidget   *pExitButton;
-	GtkWidget   *pOnOffButton;
-	GtkWidget   *pTeletextButton;
-	GtkWidget   *pProgramSelectionTable;
-	GtkWidget   *pPreviousProgramButton;
-	GtkWidget   *pNextProgramButton;
-	GtkWidget   *pQuitButton;
-	GtkWidget   *pTestButton;
-	GtkWidget   *pTest2Button;
-	GtkWidget   *pGoButton;
-	GtkWidget   *pWebScrollWindow;
-	GtkWidget   *pBackgroundWindow;
-
-	GdkColor color;
-	int Error,posx,posy;
-
-	TRACEINFO;
-
-	sGraphicInterface* ui = player_interf->ui;
-
-	/** Main window **/
-	pBackgroundWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	pTVWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	pWebWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-	pWindow = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-
-	ui->pMainWindow = pWindow;
-	ui->pTVWindow = pTVWindow;
-	ui->pWebWindow = pWebWindow;
-	ui->pBackgroundWindow = pBackgroundWindow;
-	 
-	gtk_window_set_title(GTK_WINDOW(pWindow), "RCU");
-	gtk_window_set_title(GTK_WINDOW(pTVWindow), "TV");
-	gtk_window_set_title(GTK_WINDOW(pWebWindow), "WEB");
-	gtk_window_set_title(GTK_WINDOW(pBackgroundWindow), "BACK");
-
-	gtk_window_set_decorated(GTK_WINDOW(pWebWindow), false);
-	gtk_window_set_decorated(GTK_WINDOW(pTVWindow), false);
-	gtk_window_set_decorated(GTK_WINDOW(pBackgroundWindow), false);
-	gtk_window_set_transient_for(GTK_WINDOW(pTVWindow),GTK_WINDOW(pBackgroundWindow));
-	gtk_window_set_transient_for(GTK_WINDOW(pWebWindow),GTK_WINDOW(pTVWindow));
-	
-	gtk_window_set_resizable(GTK_WINDOW(pTVWindow), false);
-	gtk_window_set_resizable(GTK_WINDOW(pWebWindow), false);
-	gtk_window_set_resizable(GTK_WINDOW(pBackgroundWindow), false);
-	
-	/** Quit button **/
-	pQuitButton =  gtk_button_new_with_label("Quit");
-
-	/** Tests button **/
-	pTestButton =  gtk_button_new_with_label("Test");
-	pTest2Button =  gtk_button_new_with_label("Test2");
-
-	/** Entry bar for URL **/
-	pEntry = gtk_entry_new();
-	ui->pEntry = pEntry;
-
-	/** GO Button **/
-	pGoButton =  gtk_button_new_with_label("Go");
-
-	/** Browser Zone **/
-	pWebScrollWindow = gtk_scrolled_window_new(NULL, NULL);
-	//gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(pWebScrollWindow), GTK_POLICY_ALWAYS, GTK_POLICY_ALWAYS);
-
-	ui->pWebView = WEBKIT_WEB_VIEW(webkit_web_view_new());
-	
-	webkit_web_view_set_transparent(ui->pWebView, TRUE);
-
-	if (ui->pWebView)
-		gtk_container_add(GTK_CONTAINER(pWebScrollWindow), GTK_WIDGET(ui->pWebView));
-
-	/** Background Zone **/
-	ui->pBackgroundView = gtk_drawing_area_new();
-	gdk_color_parse("#000044", &color);
- 	gtk_widget_modify_bg ( GTK_WIDGET(ui->pBackgroundView), GTK_STATE_NORMAL, &color);
-
-	/** TV zone **/
-	ui->pTVView = gtk_drawing_area_new();
-
-	/** RCU zone **/
-
-	/* create Red color */
-	gdk_color_parse("#FF0000", &color);
-	pRedButton = gtk_button_new();
- 	gtk_widget_modify_bg ( GTK_WIDGET(pRedButton), GTK_STATE_NORMAL, &color);
-	gtk_button_set_label(GTK_BUTTON(pRedButton)," ");
-	/* create Green color */
-	gdk_color_parse("#00FF00", &color);
-	pGreenButton = gtk_button_new();
- 	gtk_widget_modify_bg ( GTK_WIDGET(pGreenButton), GTK_STATE_NORMAL, &color);
-	gtk_button_set_label(GTK_BUTTON(pGreenButton)," ");
-	/* create Yellow color */
-	gdk_color_parse("#FFFF00", &color);
-	pYellowButton = gtk_button_new();
- 	gtk_widget_modify_bg ( GTK_WIDGET(pYellowButton), GTK_STATE_NORMAL, &color);
-	gtk_button_set_label(GTK_BUTTON(pYellowButton)," ");
-	/* create Blue color */
-	gdk_color_parse("#0000FF", &color);
-	pBlueButton = gtk_button_new();
- 	gtk_widget_modify_bg ( GTK_WIDGET(pBlueButton), GTK_STATE_NORMAL, &color);
-	gtk_button_set_label(GTK_BUTTON(pBlueButton)," ");
-
-	pUpButton       = gtk_button_new();
-	pDownButton     = gtk_button_new();
-	pLeftButton     = gtk_button_new();
-	pRightButton    = gtk_button_new();
-
-	pUpArrow        = gtk_arrow_new(GTK_ARROW_UP,GTK_SHADOW_OUT);
-	pDownArrow      = gtk_arrow_new(GTK_ARROW_DOWN,GTK_SHADOW_OUT);
-	pLeftArrow      = gtk_arrow_new(GTK_ARROW_LEFT,GTK_SHADOW_OUT);
-	pRightArrow     = gtk_arrow_new(GTK_ARROW_RIGHT,GTK_SHADOW_OUT);
-
-	gtk_container_add(GTK_CONTAINER(pUpButton), pUpArrow);
-	gtk_container_add(GTK_CONTAINER(pDownButton), pDownArrow);
-	gtk_container_add(GTK_CONTAINER(pLeftButton), pLeftArrow);
-	gtk_container_add(GTK_CONTAINER(pRightButton), pRightArrow);
-
-	pEnterButton    = gtk_button_new_with_label("Enter");
-	pBackButton     = gtk_button_new_with_label("Back");
-
-	pNumber[0] = gtk_button_new_with_label("0");
-	pNumber[1] = gtk_button_new_with_label("1");
-	pNumber[2] = gtk_button_new_with_label("2");
-	pNumber[3] = gtk_button_new_with_label("3");
-	pNumber[4] = gtk_button_new_with_label("4");
-	pNumber[5] = gtk_button_new_with_label("5");
-	pNumber[6] = gtk_button_new_with_label("6");
-	pNumber[7] = gtk_button_new_with_label("7");
-	pNumber[8] = gtk_button_new_with_label("8");
-	pNumber[9] = gtk_button_new_with_label("9");
-
-	pPreviousProgramButton  = gtk_button_new_with_label("P-");
-	pNextProgramButton      = gtk_button_new_with_label("P+");
-
-	pPlayButton         = gtk_button_new_with_label("Play");
-	pStopButton         = gtk_button_new_with_label("Stop");
-	pPauseButton        = gtk_button_new_with_label("Pause");
-	pPlayPauseButton        = gtk_button_new_with_label("PlayPause");
-
-	pFastForwardButton      = gtk_button_new_with_label(">>");
-	pFastRewindButton       = gtk_button_new_with_label("<<");
-	pTeletextButton         = gtk_button_new_with_label("Teletext");
-	pLangButton          = gtk_button_new_with_label("Language");
-	pExitButton         = gtk_button_new_with_label("Exit");
-	pOnOffButton        = gtk_button_new_with_label("OnOff");
-
-	pColorButtonTable = gtk_table_new(4,1,false);
-	gtk_table_attach(GTK_TABLE(pColorButtonTable),pRedButton,    0,1,0,1, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL),0,0);
-	gtk_table_attach(GTK_TABLE(pColorButtonTable),pGreenButton,  0,1,1,2, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL),0,0);
-	gtk_table_attach(GTK_TABLE(pColorButtonTable),pYellowButton, 0,1,2,3, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL),0,0);
-	gtk_table_attach(GTK_TABLE(pColorButtonTable),pBlueButton,   0,1,3,4, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL),0,0);
-
-	pArrowButtonTable = gtk_table_new(3,3, false);
-	gtk_table_attach(GTK_TABLE(pArrowButtonTable), pUpButton,    1,2,0,1,GtkAttachOptions(GTK_FILL|GTK_EXPAND), GtkAttachOptions(GTK_FILL|GTK_EXPAND), 0,0 );
-	gtk_table_attach(GTK_TABLE(pArrowButtonTable), pDownButton,  1,2,2,3,GtkAttachOptions(GTK_FILL|GTK_EXPAND), GtkAttachOptions(GTK_FILL|GTK_EXPAND), 0,0 );
-	gtk_table_attach(GTK_TABLE(pArrowButtonTable), pLeftButton,  0,1,1,2,GtkAttachOptions(GTK_FILL|GTK_EXPAND), GtkAttachOptions(GTK_FILL|GTK_EXPAND), 0,0 );
-	gtk_table_attach(GTK_TABLE(pArrowButtonTable), pRightButton, 2,3,1,2,GtkAttachOptions(GTK_FILL|GTK_EXPAND), GtkAttachOptions(GTK_FILL|GTK_EXPAND), 0,0 );
-
-	pNumPadTable = gtk_table_new(4,3,false);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[0], 1, 2, 3, 4, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[1], 0, 1, 0, 1, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[2], 1, 2, 0, 1, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[3], 2, 3, 0, 1, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[4], 0, 1, 1, 2, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[5], 1, 2, 1, 2, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[6], 2, 3, 1, 2, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[7], 0, 1, 2, 3, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[8], 1, 2, 2, 3, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pNumPadTable), pNumber[9], 2, 3, 2, 3, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-
-	pFastMoveTable = gtk_table_new(1,2,false);
-	gtk_table_attach(GTK_TABLE(pFastMoveTable), pFastRewindButton,  0,1,0,1, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL),0,0);
-	gtk_table_attach(GTK_TABLE(pFastMoveTable), pFastForwardButton, 1,2,0,1, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL),0,0);
-
-	pProgramSelectionTable = gtk_table_new(1,2, false);
-	gtk_table_attach(GTK_TABLE(pProgramSelectionTable), pPreviousProgramButton, 0,1,0,1, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL),0,0);
-	gtk_table_attach(GTK_TABLE(pProgramSelectionTable), pNextProgramButton,     1,2,0,1, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL),0,0);
-
-	/** create the toplevel tables **/
-	pRCUPositionTable = gtk_table_new(24,1,false);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pColorButtonTable,       0, 1,  0,  4, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pArrowButtonTable,       0, 1,  4,  7, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pEnterButton,            0, 1,  7,  8, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pBackButton,             0, 1,  8,  9, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pNumPadTable,            0, 1,  9, 13, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pPlayButton,             0, 1, 13, 14, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pStopButton,             0, 1, 14, 15, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pPauseButton,            0, 1, 15, 16, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pPlayPauseButton,        0, 1, 16, 17, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pFastMoveTable,          0, 1, 17, 18, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pProgramSelectionTable,  0, 1, 18, 19, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pTeletextButton,         0, 1, 19, 20, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pLangButton,              0, 1, 20, 21, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pExitButton,             0, 1, 21, 22, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pOnOffButton,            0, 1, 22, 23, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-	gtk_table_attach(GTK_TABLE(pRCUPositionTable), pQuitButton,             0, 1, 23, 24, GtkAttachOptions(GTK_FILL|GTK_EXPAND),GtkAttachOptions(GTK_FILL|GTK_EXPAND),0,0);
-
-	pBrowserPositionTable = gtk_table_new(3,3,false);
-	//gtk_table_attach(GTK_TABLE(pBrowserPositionTable), pEntry,          0, 2, 0, 1, GtkAttachOptions(GTK_EXPAND | GTK_FILL), GTK_FILL, 0,0);
-	//gtk_table_attach(GTK_TABLE(pBrowserPositionTable), pGoButton,       2, 3, 0, 1, GtkAttachOptions(GTK_EXPAND | GTK_FILL), GTK_FILL, 0,0);
-	gtk_table_attach(GTK_TABLE(pBrowserPositionTable), pWebScrollWindow, 0, 3, 1, 3, GtkAttachOptions(GTK_EXPAND | GTK_FILL), GtkAttachOptions(GTK_EXPAND | GTK_FILL), 0,0);
-
-	/** Group toplevel tables in the main table **/
-	pMainPositionTable =  gtk_table_new(4,7,false);
-	gtk_table_attach(GTK_TABLE(pMainPositionTable), pRCUPositionTable,      6, 7, 0, 3, GtkAttachOptions(NULL), GtkAttachOptions(NULL), 0,0);
-	//gtk_table_attach(GTK_TABLE(pMainPositionTable), pBottomBarTable,        0, 7, 3, 4, GtkAttachOptions(GTK_EXPAND | GTK_FILL), GtkAttachOptions(GTK_EXPAND | GTK_FILL), 0,0);
-
-	gtk_container_add(GTK_CONTAINER(pWindow), pMainPositionTable);
-	gtk_container_add(GTK_CONTAINER(pTVWindow), ui->pTVView);
-	gtk_container_add(GTK_CONTAINER(pBackgroundWindow), ui->pBackgroundView);
-	//~ gtk_container_add(GTK_CONTAINER(pWebWindow), ui->pWebView);
-	gtk_container_add(GTK_CONTAINER(pWebWindow), pBrowserPositionTable);
-
-	/** SET SIZE **/
-	gtk_widget_set_size_request(GTK_WIDGET(ui->pTVView),  HBBTV_VIDEO_WIDTH,HBBTV_VIDEO_HEIGHT);
-	gtk_widget_set_size_request(GTK_WIDGET(ui->pBackgroundView),  HBBTV_VIDEO_WIDTH,HBBTV_VIDEO_HEIGHT);
-	gtk_widget_set_size_request(GTK_WIDGET(pBrowserPositionTable), HBBTV_VIDEO_WIDTH,HBBTV_VIDEO_HEIGHT);
-	
-	gtk_window_set_position(GTK_WINDOW(pWebWindow), GTK_WIN_POS_CENTER_ALWAYS);	
-	gtk_window_set_position(GTK_WINDOW(pBackgroundWindow), GTK_WIN_POS_CENTER_ALWAYS);
-	gtk_window_set_position(GTK_WINDOW(pTVWindow),  GTK_WIN_POS_CENTER_ALWAYS);
-
-	/** Connect Callback **/
-	//** expose drawable
-
-	// connect to deleteevent function
-	g_signal_connect(G_OBJECT(pWindow), "destroy", G_CALLBACK(on_deleteevent), NULL);
-
-	// connect to destroy function
-	g_signal_connect(G_OBJECT(pWindow), "destroy", G_CALLBACK(on_destroyevent), NULL);
-	g_signal_connect(G_OBJECT(pWebWindow), "destroy", G_CALLBACK(on_destroyevent), NULL);
-	g_signal_connect(G_OBJECT(pQuitButton), "clicked", G_CALLBACK(on_destroyevent), NULL);
-
-	//connect button and entry
-	/* Control */
-	g_signal_connect (G_OBJECT(pEntry), "activate", G_CALLBACK (activate_uri_entry_cb), ui);
-	g_signal_connect (G_OBJECT(pGoButton), "clicked", G_CALLBACK (activate_uri_entry_cb), ui);
-	g_signal_connect (G_OBJECT(pOnOffButton), "clicked", G_CALLBACK (on_onoffbuttonclicked), player_interf );
-	g_signal_connect (G_OBJECT(pPlayPauseButton), "clicked", G_CALLBACK (on_playpausebuttonclicked), player_interf );
-	g_signal_connect (G_OBJECT(pPlayButton), "clicked", G_CALLBACK (on_playbuttonclicked), player_interf );
-	g_signal_connect (G_OBJECT(pPauseButton), "clicked", G_CALLBACK (on_pausebuttonclicked), player_interf );
-	g_signal_connect (G_OBJECT(pLangButton), "clicked", G_CALLBACK (on_langbuttonclicked), player_interf );
-	g_signal_connect (G_OBJECT(pNextProgramButton), "clicked", G_CALLBACK (on_chanupbuttonclicked), player_interf );
-	g_signal_connect (G_OBJECT(pPreviousProgramButton), "clicked", G_CALLBACK (on_chandownbuttonclicked), player_interf );
-	g_signal_connect (G_OBJECT(pNumber[1]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[2]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[3]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[4]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[5]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[6]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[7]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[8]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[9]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pNumber[0]), "clicked", G_CALLBACK (on_channelbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pTeletextButton), "clicked", G_CALLBACK (on_teletextbuttonclicked), player_interf);
-	
-	
-	/* HBBTV Button */
-	g_signal_connect (G_OBJECT(pRedButton), 	"clicked", G_CALLBACK (on_redbuttonclicked), 	player_interf);
-	g_signal_connect (G_OBJECT(pGreenButton), 	"clicked", G_CALLBACK (on_greenbuttonclicked), 	player_interf);
-	g_signal_connect (G_OBJECT(pYellowButton), 	"clicked", G_CALLBACK (on_yellowbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pBlueButton), 	"clicked", G_CALLBACK (on_bluebuttonclicked), 	player_interf);
-	
-	/* Navigation */
-	g_signal_connect (G_OBJECT(pUpButton), 	"clicked", G_CALLBACK (on_upbuttonclicked), 	player_interf);
-	g_signal_connect (G_OBJECT(pDownButton), 	"clicked", G_CALLBACK (on_downbuttonclicked), 	player_interf);
-	g_signal_connect (G_OBJECT(pLeftButton), 	"clicked", G_CALLBACK (on_leftbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pRightButton), 	"clicked", G_CALLBACK (on_rightbuttonclicked), 	player_interf);
-	g_signal_connect (G_OBJECT(pEnterButton), 	"clicked", G_CALLBACK (on_returnbuttonclicked), player_interf);
-	g_signal_connect (G_OBJECT(pExitButton), 	"clicked", G_CALLBACK (on_exitbuttonclicked), 	player_interf);
-	
-
-	//	gtk_widget_add_events(GTK_WIDGET(pWebWindow), GDK_CONFIGURE);
-	// g_signal_connect(G_OBJECT(pTVWindow), "configure-event", G_CALLBACK(on_windowconfigure), pBackgroundWindow);
-	// g_signal_connect(G_OBJECT(pWebWindow), "configure-event", G_CALLBACK(on_windowconfigure), player_interf);
-
-	/** realisation, map  and show **/
-	gtk_widget_realize(ui->pBackgroundView);
-	gtk_widget_realize(ui->pTVView);
-
-	Error = init_gpac(player_interf);
-	if(Error){
-		 GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Error during gpac intialization \n"));
-		 return GF_IO_ERR;
-	}
-
- 	GdkScreen *screen = gtk_widget_get_screen(GTK_WIDGET(ui->pWebView));
-	GdkColormap *rgba = gdk_screen_get_rgba_colormap (screen);
-
-	gtk_widget_set_colormap(GTK_WIDGET(ui->pWebView), rgba);
-	gtk_widget_set_colormap(GTK_WIDGET(pBrowserPositionTable), rgba);
-
-	/** center the windows **/
-	
-	gtk_widget_set_default_colormap(rgba);
-	gtk_widget_show_all(pWindow);
-	gtk_widget_show_all(pBackgroundWindow);
-	gtk_widget_show_all(pTVWindow);
-	gtk_widget_show_all(pWebWindow);
-	gtk_window_present (GTK_WINDOW(pWebWindow));
-
-	return GF_OK;
-}
-
-
-int init_playerinterface(sPlayerInterface* player_interf, char* input_data, char* url, Bool no_url)
-{
-
-	HbbtvDemuxer *hbbtv_demuxer;
-	int Error;
-	int ChannelScanTimer;
-	u32 i,nb_chan;
-
-	hbbtv_demuxer = ( HbbtvDemuxer *)player_interf->Demuxer;
-	ChannelScanTimer = 0;
-
-	player_interf->ui = (sGraphicInterface*) gf_calloc(1,sizeof(sGraphicInterface));
-
-	
-	player_interf->input_data = (char*)gf_calloc(strlen(input_data)+1,sizeof(char));
-	sprintf(player_interf->input_data,"%s",input_data);
-	player_interf->input_data[strlen(input_data)] = 0;
-
-	player_interf->url = url;
-	player_interf->no_url = no_url;
-	player_interf->TVwake = FALSE;
-	player_interf->is_connected = is_connected();
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("player_interf->is_connected %d\n",player_interf->is_connected));
-
-
-	Error = ui_init(player_interf);
-	if(Error){
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Initialization error \n"));
-		return GF_IO_ERR;
-	}
-
-	if(player_interf->url) {
-		init_browser(player_interf);
-	}
-
-	while(!hbbtv_demuxer->Check_all_channel_info_received(ChannelScanTimer)) {
-		ChannelScanTimer++;
-		gf_sleep(1000);
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Wainting for the PMTs \n"));					
-	}
-	
-	hbbtvterm_scan_channel(player_interf);
-
-	/* The check for init is made inside this function. AIT received have to be processed before getting new ones */
-	
-	nb_chan = gf_list_count(hbbtv_demuxer->Get_ChannelList());
-
-	for(i=0;i<nb_chan;i++){		
-	      Channel* chan = ( Channel*)gf_list_get(hbbtv_demuxer->Get_ChannelList(),i);	      
-	      Get_application_for_channel(hbbtv_demuxer,chan->Get_service_id());		
-	}
-	player_interf->init = 1;	
-	
-	put_app_url(player_interf);	  
-	
-	
-
-	return GF_OK;
-
-}
-
-
-int init_gpac(sPlayerInterface* player_interf)
-{
-	TRACEINFO;	
-	char config_path[GF_MAX_PATH];
-	const char *str;
-	const char *gpac_cfg;
-	sGraphicInterface *ui = player_interf->ui;
-	
-
-#ifdef XP_UNIX
-	gpac_cfg = (char *) ".gpacrc";
-	strcpy((char *) config_path, getenv("HOME"));
-#else
-	gpac_cfg = "GPAC.cfg";
-	strcpy((char*)config_path,"D:\\code\\trunk\\gpac_public\\bin\\win32\\debug");
-#endif
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Configuration path : %s/%s \n",config_path,gpac_cfg));
-
-	player_interf->m_user = (GF_User*)gf_malloc(sizeof(GF_User));
-	memset(player_interf->m_user, 0, sizeof(GF_User));
-	//~ player_interf->m_user->config = gf_cfg_new((const char *) config_path, gpac_cfg);
-				
-	/*init config and modules*/
-	player_interf->m_user->config = check_config_file();
-	if(!player_interf->m_user->config){
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Configuration failed. COnfiguration file not found \n"));
-			return GF_BAD_PARAM;
-	}
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Configuration initialized \n"));
-
-	str = gf_cfg_get_key( player_interf->m_user->config, "General", "ModulesDirectory");
-	player_interf->m_user->modules = gf_modules_new(str,  player_interf->m_user->config);
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] %d modules loaded \n",gf_modules_get_count( player_interf->m_user->modules)));
-
-	player_interf->m_user->opaque =  player_interf->Demuxer;
-	player_interf->m_user->EventProc = On_hbbtv_received_section;
-
-#ifdef XP_UNIX
-	player_interf->m_user->os_window_handler = (void*)GDK_WINDOW_XID(gtk_widget_get_window(ui->pTVView));
-	player_interf->m_user->os_display = GDK_WINDOW_XDISPLAY(gtk_widget_get_window(ui->pTVView));
-	XSynchronize((Display *)  player_interf->m_user->os_display, True);
-#else
-	player_interf->m_user->os_window_handler = (void*)GDK_WINDOW_HWND(gtk_widget_get_window(ui->pTVView));
-	player_interf->m_user->os_display = gdk_drawable_get_display (gtk_widget_get_window(ui->pTVView));
-	gdk_display_sync((GdkDisplay *)player_interf->m_user->os_display);
-#endif
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] User initialized \n"));
-
-	if (( player_interf->m_term = gf_term_new(player_interf->m_user))) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Terminal created.\n"));
-	}
-	else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Error when creating terminal\n"));
-		return GF_IO_ERR;
-	}
-
-	gf_term_set_size( player_interf->m_term, HBBTV_VIDEO_WIDTH,HBBTV_VIDEO_HEIGHT);
-
-
-	if (strnicmp(player_interf->input_data, "udp://", 6)
-		&& strnicmp(player_interf->input_data, "mpegts-udp://", 13)
-		&& strnicmp(player_interf->input_data, "mpegts-tcp://", 13)
-		&& strnicmp(player_interf->input_data, "dvb://", 6)
-	&& strnicmp(player_interf->input_data, "http://", 6)) {
-
-		FILE *test = fopen(player_interf->input_data, "rb");
-		if (!test) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] %s  file cannot be oppened \n",player_interf->input_data));
-			return GF_BAD_PARAM;
-		}
-		else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] %s file oppened successfully \n", player_interf->input_data));
-			fclose(test);
-		}
-
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Input URL : %s\n", player_interf->input_data));
-	gf_term_connect( player_interf->m_term, (const char*)player_interf->input_data );
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Terminal connected\n"));
-	
-	return GF_OK;
-}
-
-
-int stop_gpac(sPlayerInterface* player_interf)
-{
-	TRACEINFO;
-	gf_term_disconnect( player_interf->m_term);
-	gf_term_del( player_interf->m_term);
-	gf_modules_del( player_interf->m_user->modules);
-	gf_cfg_del( player_interf->m_user->config);
-
-	return TRUE;
-}
-
-
-static void activate_uri_entry_cb (GtkWidget* entry, gpointer data)
-{
-	TRACEINFO;
-	sGraphicInterface *pUI;
-
-	pUI = (sGraphicInterface*)data;
-	const gchar* uri = gtk_entry_get_text (GTK_ENTRY(pUI->pEntry));
-	g_assert (uri);
-	webkit_web_view_load_uri (pUI->pWebView, uri);
-}
-
-int term_play(sPlayerInterface* player_interf)
-{
-	gf_term_set_option(player_interf->m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-	return 1;
-}
-
-
-int term_pause(sPlayerInterface* player_interf)
-{
-	gf_term_set_option(player_interf->m_term, GF_OPT_PLAY_STATE, GF_STATE_PAUSED);
-	return 1;
-}
-
-
-int init_browser(sPlayerInterface* player_interf)
-{
-	if(!player_interf->no_url) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Initialized the browser with HBBTV Application URL : %s   \n",player_interf->url));
-  		webkit_web_view_load_uri(player_interf->ui->pWebView, player_interf->url);
-		return GF_OK;
-	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] URL blocked by the user. No Application to play  \n"));
-	return GF_OK;
-}
-
-
-int init_player(sPlayerInterface* player_interf)
-{
-	/* Init the player with the fisrt channel of the stream */
-
-	HbbtvDemuxer* hbbtvdemuxer = (HbbtvDemuxer*)player_interf->Demuxer;
-	Channel* chan = (Channel*)gf_list_get(hbbtvdemuxer->Get_ChannelList(),0);
-	hbbtvterm_get_channel_on_air(player_interf,chan->Get_service_id(),0);
-
-	return GF_OK;
-}
-
-GF_Err get_app_url(sPlayerInterface* player_interf, GF_M2TS_CHANNEL_APPLICATION_INFO*ChannelApp)
-{
-	u32 current_service_id;	
-
-	current_service_id = player_interf->m_term->root_scene->selected_service_id;
-	
-	if(!ChannelApp){
-		return GF_IO_ERR;
-	}
-	
-	if((ChannelApp->service_id == current_service_id)) {
-		GF_M2TS_AIT_APPLICATION* app_info;
-		Channel* Chan;	
-		
-		HbbtvDemuxer* hbbtvdemuxer = (HbbtvDemuxer*)player_interf->Demuxer;
-		Chan = (Channel*)ZapChannel(hbbtvdemuxer,current_service_id,0);
-				
-		app_info = Chan->App_to_play(player_interf->is_connected,0);	
-
-		if(!app_info){
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] This service id %d does not have an autostart application. \n",ChannelApp->service_id,current_service_id));
-			return GF_IO_ERR;
-		}		
-	
-		if(player_interf->init){
-			if(app_info->broadband){
-				player_interf->url = app_info->http_url;
-			}else if(app_info->broadcast){
-				player_interf->url = app_info->carousel_url;
-			} 		
-  			webkit_web_view_load_uri(player_interf->ui->pWebView, player_interf->url);  				
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] HBBTV Application URL : %s   \n",player_interf->url));			
-			return GF_OK;
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Cannot start the application until player initialization is finished \n"));
-		return GF_IO_ERR;
-	}	
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("ChannelApp->service_id %d is wrong current_service_id %d !!\n",ChannelApp->service_id,current_service_id));
-	return GF_IO_ERR;
-
-
-}
-
-int put_app_url(sPlayerInterface* player_interf)
-{
-	u32 current_service_id;
-	Bool ignore_TS_url;
-	GF_Err e;
-	HbbtvDemuxer* hbbtvdemux = (HbbtvDemuxer*)player_interf->Demuxer;
-
-	ignore_TS_url = hbbtvdemux->Get_Ignore_TS_URL();
-	e = GF_OK;
-	
-	if(!ignore_TS_url && !player_interf->no_url){
-		
-		current_service_id = player_interf->m_term->root_scene->selected_service_id;
-		Channel* chan = (Channel*)ZapChannel(hbbtvdemux,current_service_id,0);		
-		e = get_app_url(player_interf,chan->Get_App_info());
-		if(e == GF_OK) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Application started\n"));
-				return GF_OK;
-		}		    
-	    player_interf->url = "";
-	    webkit_web_view_load_uri(player_interf->ui->pWebView, player_interf->url);
-	    GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal]No Application found for this service ID %d \n",current_service_id));
-	    return GF_IO_ERR;
-
-	}else{
-
-	    if(!player_interf->no_url){
-		    GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Forced URL %s  Reaload Application \n",player_interf->url));		   
-		     webkit_web_view_load_uri(player_interf->ui->pWebView, player_interf->url);
-	    }else{
-		    GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] URL blocked by the user. \n"));		    
-	    }
-	    return GF_OK;
-	}
-}
-
-
-int hbbtvterm_scan_channel(sPlayerInterface* player_interf)
-{
-
-	GF_MediaInfo odi;
-	u32 i, count;
-	
-	HbbtvDemuxer* HbbtvDemux = (HbbtvDemuxer*)player_interf->Demuxer;
-
-	GF_ObjectManager *root_odm = gf_term_get_root_object(player_interf->m_term);
-	if (!root_odm){		
-		 return GF_IO_ERR;
-	 }
-
-	if (gf_term_get_object_info(player_interf->m_term, root_odm, &odi) != GF_OK) return GF_IO_ERR;
-	if (!odi.od) {	
-		return GF_IO_ERR;
-	}
-	count = gf_term_get_object_count(player_interf->m_term, root_odm);	
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Count: %d \n",count));
-
-	for (i=0; i<count; i++) {		
-		GF_ObjectManager *odm;
-		odm = gf_term_get_object(player_interf->m_term, root_odm, i);
-		if (!odm) break;
-		if (gf_term_get_object_info(player_interf->m_term, odm, &odi) == GF_OK) {
-			u32 service_id = odi.od->ServiceID;
-			Channel* chan = (Channel*)ZapChannel(HbbtvDemux,service_id,0);
-			
-			if (odi.od_type==GF_STREAM_VISUAL && !chan->Get_processed()) {				
-				chan->Add_video_ID(i);
- 				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Service: %d chan->video_index : %d \n",service_id,chan->Get_video_ID()));
-			}else if(odi.od_type==GF_STREAM_AUDIO && !chan->Get_processed()) {				
-				chan->Add_audio_ID(i);
-				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal]Service:%d chan->current_audio_index : %d \n",service_id,chan->Get_audio_ID(0)));;
- 			}
- 			
-		}
-	}
-	HbbtvDemux->Channel_check();
-
-	return GF_OK;
-
-}
-
-
-int hbbtvterm_channel_zap(sPlayerInterface* player_interf,int up_down)
-{
-
-	u32 current_service_id;
-
-	current_service_id = gf_term_get_current_service_id(player_interf->m_term);
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Current_service_id : %d \n",current_service_id));
-	hbbtvterm_get_channel_on_air(player_interf,current_service_id,up_down);
-
-	return GF_OK;
-
-}
-
-
-int hbbtvterm_get_channel_on_air(sPlayerInterface* player_interf, u32 service_id, int zap)
-{
-
-	GF_MediaInfo odi;
-
-	HbbtvDemuxer* hbbtvdemuxer = (HbbtvDemuxer*)player_interf->Demuxer;
-	Channel* chan = (Channel*)ZapChannel(hbbtvdemuxer,service_id,zap);
-	GF_ObjectManager *root_odm = gf_term_get_root_object(player_interf->m_term);
-	if (!root_odm) return GF_IO_ERR;
-
-	if (gf_term_get_object_info(player_interf->m_term, root_odm, &odi) != GF_OK) return GF_IO_ERR;
-	if (!odi.od) {
-		return GF_IO_ERR;
-	}
-
- 	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal]service_id:%d video pid : %d audio pid:%d\n",chan->Get_service_id(),chan->Get_video_ID(),chan->Get_audio_ID(0)));
- 	 	
- 	gf_term_select_object(player_interf->m_term, gf_term_get_object(player_interf->m_term, root_odm, chan->Get_video_ID()));
-	gf_term_select_object(player_interf->m_term, gf_term_get_object(player_interf->m_term, root_odm, chan->Get_audio_ID(0)));	
-		
-	put_app_url(player_interf);
-
-	return GF_OK;
-
-}
-
-/** On Windows Functions **/
-
-void resizevideoplayer(sPlayerInterface* player_interf, int width, int height)
-{
-	TRACEINFO;
-	gf_term_set_size(player_interf->m_term,width,height);
-	gtk_widget_set_size_request(GTK_WIDGET(player_interf->ui->pTVWindow),width,height);
-
-}
-
-void get_window_position(GtkWidget* Widget, int* x, int* y)
-{
-	//TRACEINFO;
-	gtk_window_get_position(GTK_WINDOW(Widget), &(*x), &(*y));
-}
-
-void set_window_position(GtkWidget* Widget, int x, int y)
-{
-	//~ //TRACEINFO;
-	gtk_window_move(GTK_WINDOW(Widget), x, y);
-}
-
-
-void OnAPPLICATION_Show()
-{
-	TRACEINFO;
-	gtk_window_set_opacity(GTK_WINDOW(player_interf->ui->pWebWindow),1);
-}
-
-void OnAPPLICATION_Hide()
-{
-	TRACEINFO;
-	gtk_window_set_opacity(GTK_WINDOW(player_interf->ui->pWebWindow),0);
-}
-
-
-void OnVIBRC_SetChannel(int channel_number){
-	//~ hbbtvterm_get_channel_on_air(player_interf, service_id, 0);
-}
-
-void OnKEYSET_SetValue(double param)
-{
-	TRACEINFO;
-	fprintf(stderr, "\t param transmitted : %i\n", (int)param);
-	
-	int 	KEYMASK_RED 		= 0x1;
-	int 	KEYMASK_GREEN 		= 0x2;
-	int 	KEYMASK_YELLOW 		= 0x4;
-	int 	KEYMASK_BLUE 		= 0x8;
-	int 	KEYMASK_NAVIGATION 	= 0x10;
-	int 	KEYMASK_VCR 		= 0x20;
-	int 	KEYMASK_SCROLL 		= 0x40;
-	int 	KEYMASK_INFO 		= 0x80;
-	int 	KEYMASK_NUMERIC 	= 0x100;
-	int 	KEYMASK_ALPHA 		= 0x200;
-	int 	KEYMASK_OTHER 		= 0x400;
-	
-	player_interf->keyregistered[RK_RED]        = (((int)param & KEYMASK_RED))	      ? true : false;
-	player_interf->keyregistered[RK_GREEN]      = (((int)param & KEYMASK_GREEN))	  ? true : false;
-	player_interf->keyregistered[RK_YELLOW]     = (((int)param & KEYMASK_YELLOW))	  ? true : false;
-	player_interf->keyregistered[RK_BLUE]       = (((int)param & KEYMASK_BLUE))		  ? true : false;
-	player_interf->keyregistered[RK_NAVIGATION] = (((int)param & KEYMASK_NAVIGATION)) ? true : false;
-	player_interf->keyregistered[RK_VCR] 		= (((int)param & KEYMASK_VCR))		  ? true : false;
-	player_interf->keyregistered[RK_SCROLL] 	= (((int)param & KEYMASK_SCROLL))	  ? true : false;
-	player_interf->keyregistered[RK_INFO] 		= (((int)param & KEYMASK_INFO))		  ? true : false;
-	player_interf->keyregistered[RK_NUMERIC] 	= (((int)param & KEYMASK_NUMERIC))	  ? true : false;
-	player_interf->keyregistered[RK_ALPHA] 		= (((int)param & KEYMASK_ALPHA))      ? true : false;
-	player_interf->keyregistered[RK_OTHER] 		= (((int)param & KEYMASK_OTHER))	  ? true : false;	
-}
-
-void OnNoFullscreenSetWindow(int x, int y, int width, int height)
-{
-	TRACEINFO;
-	OnVIDBRC_SetFullScreen(false);
-}
-void OnVIDBRC_SetFullScreen(int fullscreenparam)
-{
-	TRACEINFO;
-	fprintf(stderr,"SET FULLSCREEN OnVIDBRC_SetFullScreen Param : %d\n",fullscreenparam);
-	
-	///Getting the videobroadcast element.
-	WebKitDOMDocument *pDOMdoc  = webkit_web_view_get_dom_document(player_interf->ui->pWebView);
-	WebKitDOMNodeList *objectslist = webkit_dom_document_get_elements_by_tag_name(pDOMdoc,"object");
-	gulong l = webkit_dom_node_list_get_length(objectslist);
-	gulong i = 0;
-	bool videofound = false;
-	WebKitDOMNode* videonode;
-	char *videonodetype;	
-	while ((i < l) && !videofound)
-	{
-			videonode = webkit_dom_node_list_item(objectslist,i);
-			videonodetype = webkit_dom_element_get_attribute(WEBKIT_DOM_ELEMENT(videonode),"type");
-			if (!(strcmp(videonodetype, "video/broadcast")))
-				videofound = true;
-			else
-				i++;
-	}
-	
-	if (!videofound)
-	{
-		fprintf(stderr,"object video broadcast not found \n");
-		return;
-	}
-	else
-	{		
-		fprintf(stderr,"object video broadcast found \n");
-		WebKitDOMElement* videoelt = WEBKIT_DOM_ELEMENT(videonode);
-		
-		///Getting the position of the WebView
-		gint posx, posy;
-		get_window_position(player_interf->ui->pWebWindow, &posx, &posy);
-		fprintf(stderr,"WebWindow Left : %d ,  WebWindow Top : %d \n", posx, posy);
-
-		///Getting the videobroadcast geometry
-		glong left, top;
-		glong eltwidth, eltheight ;
-		///Setting the new size and position of the TVWindow broadcast
-		int newx;
-		int newy;
-
-		if (fullscreenparam){
-			left = 0;
-			top = 0;
-			eltwidth = HBBTV_VIDEO_WIDTH;
-			eltheight = HBBTV_VIDEO_HEIGHT;
-			get_window_position(player_interf->ui->pWebWindow, &newx, &newy);			
-		}else{
-			gtk_window_set_position(GTK_WINDOW(player_interf->ui->pTVWindow), GTK_WIN_POS_NONE);
-			///Getting the top and left values of the video/broadcast element  .
-			left = webkit_dom_element_get_offset_left(videoelt);
-			top = webkit_dom_element_get_offset_top(videoelt);
-			///Getting the width and height values of the video/broadcast element  .
-			eltwidth = webkit_dom_element_get_offset_width(videoelt);
-			eltheight = webkit_dom_element_get_offset_height(videoelt);
-			newx = posx + left;
-			newy = posy + top;		
-		}		
-
-		fprintf(stderr,"Videoelt offset : Left : %d ,  Top : %d, ", left, top);
-		fprintf(stderr,"EltWidth : %d ,  EltHeight : %d \n", eltwidth, eltheight);		
-		set_window_position(player_interf->ui->pTVWindow, newx, newy);
-		fprintf(stderr,"Supposed TVWindow new position : %d x %d \n", newx, newy);				
-		resizevideoplayer(player_interf, eltwidth, eltheight);	
-		if(fullscreenparam){
-			gtk_window_set_position(GTK_WINDOW(player_interf->ui->pTVWindow), GTK_WIN_POS_CENTER_ALWAYS);
-		}
-		fprintf(stderr,"Checking position : \n ");			
-		gint checkx, checky;
-		get_window_position(player_interf->ui->pTVWindow, &checkx, &checky);
-		fprintf(stderr,"CHECK TVWindow Left : %d , CHECK TVWindow Top : %d \n", checkx, checky);
-	}
-		 		
-}
-
-void OnKEYSET_Allocate()
-{
-	webkit_web_view_execute_script(player_interf->ui->pWebView, 
-	"   var KeyEvent = new Object(); \
-		KeyEvent.VK_RED = 403; \
-		KeyEvent.VK_YELLOW = 405;\
-		KeyEvent.VK_GREEN = 404;\
-		KeyEvent.VK_BLUE = 406;\
-		KeyEvent.VK_UP = 38;\
-		KeyEvent.VK_DOWN = 40;\
-		KeyEvent.VK_LEFT = 37;\
-		KeyEvent.VK_RIGHT = 39;\
-		KeyEvent.VK_PLAY = 415;\
-		KeyEvent.VK_STOP	= 413;\
-		KeyEvent.VK_PAUSE = 19;\
-		KeyEvent.VK_FAST_FWD = 417;\
-		KeyEvent.VK_REWIND = 412;\
-		KeyEvent.VK_TELETEXT = 459;\
-		KeyEvent.VK_ESCAPE = 27;\
-		KeyEvent.VK_ENTER = 13;\
-		KeyEvent.VK_0 = 48;\
-		KeyEvent.VK_1 = 49;\
-		KeyEvent.VK_2 = 50;\
-		KeyEvent.VK_3 = 51;\
-		KeyEvent.VK_4 = 52;\
-		KeyEvent.VK_5 = 53;\
-		KeyEvent.VK_6 = 54;\
-		KeyEvent.VK_7 = 55;\
-		KeyEvent.VK_8 = 56;\
-		KeyEvent.VK_9 = 57;		");
-}
-
-
-static void usage()
-{
-	printf("\nUsage: hbbtvterminal -input=input_data [-url=url] [-no_url]\n");
-	printf("-input=input_data : input data to process (dvb://, udp://, or file)\n");
-	printf("-url=url : force the player to connect to an url. Ignore the url(s) found in the input data\n");
-	printf("-no_url : the player will not connect to HBBTV services \n");
-	printf("-dsmcc : enable the DSMCC data carousel processing \n");
-}
-
-
-/****************************************************************************/
-/** getargs																	*/
-/** @author Stanislas Selle													*/
-/** @date 2011/06/15														*/
-/** gets args from agrv and set the options into the arguments				*/
-/****************************************************************************/
-
-static void getargs(int argc, char *argv[], char* &input_data, Bool* dsmcc, char* &url, Bool* no_url)
-{
-	u32 i;
-
-	no_url = 0;
-	i = 0;
-	input_data = NULL;
-	url = NULL;
-
-	for (i=1; i<(u32) argc; i++) {
-		char *arg = argv[i];
-		if (arg[0]=='-') {
-			if (!strnicmp(arg, "-input=", 7)) {
-				input_data = arg+7;
-			}else if (!strnicmp(arg, "-url=", 5)) {
-					url = arg+5;
-			}else if (!strnicmp(arg, "-no_url", 7)) {
-						*no_url = 1;
-			}else if (!strnicmp(arg, "-dsmcc", 6)) {						
-						*dsmcc = 1;
-			}else {
-				usage();
-				exit(0);
-			}			
-		}else {
-			usage();
-			exit(0);
-		}
-	}
-
-	if( !input_data && (!url || *no_url)) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Input data is  needed if no URL is given.\n"));
-		usage();
-		exit(0);
-	}
-	if( !*dsmcc) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Ignoring DSMCC data !! \n"));
-	}
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Starting the processing of the TS file %s \n",input_data));
-
-}
-
-int main (int argc, char* argv[])
-{
-	char* input_data;
-	char* url;
-	Bool dsmcc;
-	Bool no_url;
-	int Error;
-
-	dsmcc = no_url = 0;
-
-	url = input_data = NULL;
-
-	//TRACEINFO;
-	gf_sys_init(1);
-	gf_log_set_tool_level(GF_LOG_MODULE,GF_LOG_INFO);
-	printf("GPAC HBBTV Terminal (c) Telecom ParisTech 2011\n");	
-
-	getargs(argc, argv, input_data , &dsmcc, url, &no_url);
-
-	GF_SAFEALLOC(player_interf, sPlayerInterface);
-
-	HbbtvDemuxer* hbbtv_demuxer = new HbbtvDemuxer(input_data, url,dsmcc, no_url, player_interf);
-
-	gtk_init(&argc, &argv);
-
-	if (!g_thread_supported()) {
-		g_thread_init(NULL);
-	}
-
-	Error = init_playerinterface(player_interf,input_data,url,no_url);
-	if(Error){
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[HBBTVTerminal] Error - Aborting the processing \n"));
-		return 0;
-	}
-	//~ gf_term_set_option(player_interf->m_term, GF_OPT_PLAY_STATE, GF_STATE_PLAYING);
-
-	gtk_main();
-	//free(ui);
-}
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/src/hbbtvterminal.h Deleted

@@ -1,350 +0,0 @@
-/*
- *		Copyright (c) 2010-2011 Telecom-Paristech
- *                 All Rights Reserved
- *	GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- *		Authors: Stanislas Selle - Jonathan Sillan		
- *				
- */
-
-#ifndef __HBBTVTERMINAL__
-#define __HBBTVTERMINAL__
-
-#define _WIN32_WINNT 0x0510 
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-#include <gpac/configuration.h>
-#include <gpac/mpegts.h>
-#include <gpac/tools.h>
-#include <gpac/events.h>
-#include <gpac/options.h>
-#include <gpac/terminal.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/term_info.h>
-#include <hbbtvbrowserpluginapi.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#include <iostream>
-
-#include <webkit/webkit.h>
-#include <webkit/WebKitDOMUIEvent.h>
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define DEBUG  true
-#define PROJECTNAME "HbbTVTerminal"
-#define TRACEINFO if (DEBUG) { fprintf(stderr, " BOB \x1b[%i;3%im%s\x1b[0m : call %s\n", 1, 4, PROJECTNAME, __FUNCTION__); }
-#define NOTIMPLEMENTED if (DEBUG) { printf("SEGAR %s :  %s is NOT IMPLEMENTED : TODO \n", PROJECTNAME, __FUNCTION__); }
-
-#define TRANSPARENCE true
-
-#define HBBTV_VIDEO_WIDTH 1280
-#define HBBTV_VIDEO_HEIGHT 720
-
-typedef struct GraphicInterface
-{
-    WebKitWebView 	*pWebView;
-    GtkWidget       *pTVView;
-    GtkWidget       *pBackgroundView;
-    GtkWidget       *pMainWindow;
-    GtkWidget       *pTVWindow;
-    GtkWidget       *pWebWindow;
-    GtkWidget       *pBackgroundWindow;
-    GtkWidget	  	*pEntry;
-} sGraphicInterface;
-
-
-enum listHBBTVKeys{
-	HBBTV_VK_ENTER	= 13,
-	HBBTV_VK_PAUSE	= 19,
-	HBBTV_VK_ESCAPE	= 27,
-	HBBTV_VK_LEFT		= 37,
-	HBBTV_VK_RIGHT	= 39,
-	HBBTV_VK_UP		= 38,
-	HBBTV_VK_DOWN		= 40,
-	HBBTV_VK_0		= 48,
-	HBBTV_VK_1		= 49,
-	HBBTV_VK_2		= 50,
-	HBBTV_VK_3		= 51,
-	HBBTV_VK_4		= 52,
-	HBBTV_VK_5		= 53,
-	HBBTV_VK_6		= 54,
-	HBBTV_VK_7		= 55,
-	HBBTV_VK_8		= 56,
-	HBBTV_VK_9		= 57,
-	HBBTV_VK_RED		= 403,
-	HBBTV_VK_YELLOW	= 405,
-	HBBTV_VK_GREEN	= 404,
-	HBBTV_VK_BLUE		= 406,
-	HBBTV_VK_REWIND	= 412,
-	HBBTV_VK_STOP		= 413,
-	HBBTV_VK_PLAY		= 415,
-	HBBTV_VK_FAST_FWD	= 417,	
-	HBBTV_VK_TELETEXT = 459
-};
-
-
-enum listRegisteredKeys {
-	RK_OTHER =  	 0,
-	RK_RED = 		 1,
-	RK_GREEN = 		 2,
-	RK_YELLOW =	 	 3,
-	RK_BLUE = 		 4,
-	RK_NAVIGATION =  5,
-	RK_VCR =		 6,	
-	RK_SCROLL =		 7,
-	RK_INFO = 		 8,
-	RK_NUMERIC =	 9,
-	RK_ALPHA = 		10	
-};
-
-typedef struct PlayerInterface
-{
-    sGraphicInterface* ui;
-    Bool no_url;
-    char* input_data;
-    char* url;
-    GF_Terminal *m_term;
-    GF_User *m_user;
-    void* Demuxer;
-    GF_Mutex *Get_demux_info_mutex;
-    int TVwake;
-    Bool keyregistered[11];
-    Bool init;
-    Bool is_connected;
-    Bool app_in_action;
-
-} sPlayerInterface;
-
-int ui_init(sGraphicInterface *ui);
-
-int init_gpac(sPlayerInterface* player_interf);
-int init_browser(sPlayerInterface* player_interf);
-int stop_gpac(sPlayerInterface *player_interf);
-int playpause(sPlayerInterface *player_interf);
-int term_play(sPlayerInterface *player_interf);
-int term_pause(sPlayerInterface *player_interf);
-int init_player(sPlayerInterface* player_interf);
-
-
-typedef struct
-{
-	GF_M2TS_AIT* ait;
-
-	char* data;
-	u32 table_id;
-	u32 data_size;
-} AIT_TO_PROCESS;
-
-
-typedef struct
-{
-	GF_M2TS_DSMCC_SECTION* dsmcc_sections;
-	char* buff;
-
-	/*added not in the spec*/
-	u8 first_section_received;
-}GF_M2TS_GATHER_DSMCC_SECTION;
-
-#define MAX_audio_index 16
-
-class Channel
-{
-public:
-    /* Constructor */
-    Channel(u32 TSservice_ID, char* TSchannel_name);
-    /* Destructor */
-    void Destroy_Channel();
-    /* Fonctions */
-    u32 Add_service_id(u32 service_id);
-    u32 Add_channel_name(char* chan_name);
-    u32 Add_video_ID(u32 video_index);
-    u32 Add_audio_ID(u32 current_audio_index);
-    u32 Add_ait_pid(u32 ait_pid);
-    u32 Add_pmt_pid(u32 pmt_pid);
-    u32 Add_App_info(GF_M2TS_CHANNEL_APPLICATION_INFO*add_ait);
-    void Check_Info_Done();
-    void Incr_audio_index(int index);
-    void Set_audio_index(u32 index);
-    /* Getter */
-    u32 Get_service_id();
-    char* Get_channel_name();
-    u32 Get_video_ID();
-    u32 Get_audio_ID(u32 indice);
-    u32 Get_ait_pid();
-    u32 Get_pmt_pid();
-    Bool Get_processed();
-    u32 Get_audio_index();
-    u32 Get_nb_chan_audio_stream();
-    GF_M2TS_CHANNEL_APPLICATION_INFO* Get_App_info();
-    GF_M2TS_AIT_APPLICATION* App_to_play(Bool isConnected,u8 MaxPriority);
-	GF_M2TS_AIT_APPLICATION* Get_App(u32 application_id);
-
-private:
-    u32 service_ID;
-    u32 number;
-    char* channel_name;
-    u32 video_ID;
-    u32 audio_ID[MAX_audio_index];
-    u32 AIT_PID;
-    u32 PMT_PID;
-    Bool processed;
-    u32 current_audio_index;
-    u32 nb_chan_audio_stream;
-    GF_M2TS_CHANNEL_APPLICATION_INFO* ChannelApp; 
-
-};
-
-class HbbtvDemuxer
-{
-public:
-	/* Constructeur */
-	HbbtvDemuxer(char *input_data, char* url,  Bool dsmcc, Bool no_url,sPlayerInterface* player_interf);
-
-	/* Destructeur */
-
-	/* Fonction */
-	u32 HbbtvDemuxer_DemuxStart();
-	Bool ait_already_received(char *data,u32 pid);
-	void GetAppInfoFromAit(GF_M2TS_AIT* ait);
-	Channel* Zap_channel(u32 service_id,int zap);
-	void Create_Channel(GF_M2TS_Program* pmt);
-	void Check_PMT_Processing();
-	void Channel_check();
-	u32 Check_application_priority(Channel* chan, GF_M2TS_AIT* ait);
-	/* Getter */
-	GF_M2TS_Demuxer* Get_Ts();	
-	GF_List* Get_ChannelList();
-	GF_List* Get_AIT_To_Process_list();
-	char* Get_Input_data();
-	Bool Get_if_dsmcc_process();
-	GF_Thread * Get_Demux_Thread();
-	GF_Mutex * Get_Demux_Mutex();
-	void* Get_User();
-	int Check_all_channel_info_received(int Timer);
-	char* Get_Force_URL();
-	Bool Get_Ignore_TS_URL();
-	Bool Get_ait_to_proces();
-	Channel* Get_Channel(u32 service_id);
-	GF_Err Get_application_info(GF_M2TS_CHANNEL_APPLICATION_INFO*app_info);
-	/* Setter */
-	void Set_Ts(GF_M2TS_Demuxer* ts);
-	void Set_ait_to_process(Bool on);	
-
-private:
-	/* Fonction */
-
-	u32 GetDemuxStartFunction();	
-
-	/* Attribut */
-	GF_M2TS_Demuxer *Demuxts;
-	GF_List* Channels;
-	GF_List* Ait_To_Process;
-
-	/* Thread for Demux */
-	GF_Thread *ts_demux_thread;
-	/* Mutex for Demux */
-	GF_Mutex *ts_demux_mutex;
-
-	/*local file playing*/
-	char *Input_data;
-	char *Service_URL;
-	char *Force_URL;
-	Bool process_dsmcc;
-	Bool Ignore_TS_URL;
-	Bool No_URL;
-	u32 nb_ait;
-	u32 file_size;
-	Bool ait_to_process;
-	u32 nb_prog_pmt_received;
-	Bool all_prog_pmt_received;
-
-	/*callback to push AIT information when a AIT is received*/
-	void (*on_ait_event)(void *player_interf, GF_M2TS_CHANNEL_APPLICATION_INFO*app_info);
-	/*private user data - To the PlayerInterface*/
-	void *user;
-
-};
-
-
-/* Global Functions */
-
-u32 On_hbbtv_received_section(void *ptr, GF_Event *event);
-u32 DemuxThreadStart(HbbtvDemuxer *hbbtv_demuxer);
-u32 DemuxStart(void *par);
-GF_Err get_app_url(sPlayerInterface* player_interf, GF_M2TS_CHANNEL_APPLICATION_INFO*app_info);
-int put_app_url(sPlayerInterface* player_interf);
-u32 Get_application_for_channel(HbbtvDemuxer* hbbtv_demuxer,u32 service_id);
-
-int change_geometry( int width, int height);
-int hbbtvterm_scan_channel(sPlayerInterface* player_interf);
-Channel* ZapChannel(HbbtvDemuxer *hbbtv_demuxer,u32 service_id,int zap);
-int hbbtvterm_channel_zap(sPlayerInterface* player_interf,int up_down);
-int hbbtvterm_get_channel_on_air(sPlayerInterface* player_interf, u32 service_id, int zap);
-void resizevideoplayer(sPlayerInterface* player_interf, int width, int height);
-
-void get_window_position(GtkWidget* Widget, int* x, int* y);
-void set_window_position(GtkWidget* Widget, int x, int y);
-
-GF_Config* check_config_file();
-Bool is_connected();
-
-/* HBBTV Functions */
-
-
-/* HBBTV Button */
-void on_redbuttonclicked(GtkWidget *widget, gpointer data);
-void on_greenbuttonclicked(GtkWidget *widget, gpointer data);
-void on_yellowbuttonclicked(GtkWidget *widget, gpointer data);
-void on_bluebuttonclicked(GtkWidget *widget, gpointer data);
-
-/*Navigation */
-void  on_upbuttonclicked(GtkWidget *widget, gpointer data);
-void on_downbuttonclicked(GtkWidget *widget, gpointer data);
-void on_leftbuttonclicked(GtkWidget *widget, gpointer data);
-void on_rightbuttonclicked(GtkWidget *widget, gpointer data);
-void on_returnbuttonclicked(GtkWidget *widget, gpointer data);
-void on_exitbuttonclicked(GtkWidget *widget, gpointer data);
-void on_2buttonclicked(GtkWidget *widget, gpointer data);
-
-/* Control */
-void on_onoffbuttonclicked(GtkWidget *widget, gpointer data);
-void on_playpausebuttonclicked(GtkWidget *widget, gpointer data);
-void on_playbuttonclicked(GtkWidget *widget, gpointer data);
-void on_pausebuttonclicked(GtkWidget *widget, gpointer data);
-void on_langbuttonclicked(GtkWidget *widget, gpointer data);
-void on_chanupbuttonclicked(GtkWidget *widget, gpointer data);
-void on_chandownbuttonclicked(GtkWidget *widget, gpointer data);
-void on_channelbuttonclicked(GtkWidget *widget, gpointer data);
-void on_teletextbuttonclicked(GtkWidget *widget, gpointer data);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // __HBBTVTERMINAL__

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/src/makefile.am Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/hbbtvterminal/test Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/install.sh Deleted

@@ -1,78 +0,0 @@
-#!/bin/sh -e
-
-PLAYER=0
-DEPENDENCIES=0
-WEBKIT=0
-GPAC=0  
-
-if [ -z $1 ] ; then
-	echo "\nUsage: You must choose options :"
-	echo "\n\033[31m full - build the whole package (gpac+webkit+hbbtvplayer) Recommanded for computer without gpac \033[0m"
-	echo "\n\033[32m player - build the HBBTV player \033[0m"
-	echo "\n\033[33m webkit - download Webkit sources and install it\033[0m"
-	echo "\n\033[33m gpac - download gpac sources and install it\033[0m"
-	echo "\n\033[34m dependencies - get the dependencies needed to build the HBBTVPlayer \033[0m"
-	exit 1
-fi
-
-for i in $* ; do
-	if [ "$i" = "full" ] ; then 
-		echo -e "\033[31m Usage: $0 Full Building : Activated \033[0m" 
-		PLAYER=1
-		DEPENDENCIES=1
-		WEBKIT=1
-		GPAC=1  
-	fi
-
-	if [ "$i" = "player" ] ; then 
-		echo -e "\033[32m Usage: $0 Player Building : Activated \033[0m" 
-		PLAYER=1
-	fi
-
-	if [ "$i" = "dependencies" ] ; then 
-		echo -e "\033[34m Usage: $0 Dependecies Building : Activated \033[0m" 
-		DEPENDENCIES=1
-	fi
-
-	if [ "$i" = "webkit" ] ; then 
-		echo -e "\033[33m Usage: $0 Webkit Building : Activated \033[0m" 
-		WEBKIT=1 
-	fi
-
-	if [ "$i" = "gpac" ] ; then 
-		echo -e "\033[33m Usage: $0 gpac Building : Activated \033[0m" 
-		WEBKIT=1 
-	fi
-done
-
-if [ $DEPENDENCIES -eq 1 ] ; then
-	sudo apt-get install `cat listdependencies`
-fi
-
-if [ $GPAC -eq 1 ] ; then
-	cd gpac
-	./configure --use-js=no
-	make -j2
-	sudo make install
-	sudo make install-lib
-	cd ..
-fi
-
-if [ $WEBKIT -eq 1 ] ; then
-	./WebKit/Tools/Scripts/build-webkit --gtk --with-gtk=2.0 --no-webkit2 --makeargs="-j2 install"
-fi
-
-
-if [ $PLAYER -eq 1 ] ; then
-	cd hbbtvbrowserplugin
-	./autogen.sh
-	sudo make install
-	cd ..
-
-	cd hbbtvterminal
-	./autogen.sh
-	sudo make install
-	cd ..
-fi
-
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/listdependencies Deleted

@@ -1,79 +0,0 @@
-autoconf
-automake
-autotools-dev
-bison
-build-essential
-dvb-apps
-flex
-gail-3.0
-glib-networking
-gperf
-gtk-doc-tools
-liba52-0.7.4-dev
-libasound2-dev
-libatk1.0-0
-libavcodec52
-libavcodec-dev
-libavformat52
-libavformat-dev
-libavutil-dev
-libc6
-libcairo2
-libenchant1c2a
-libenchant-dev
-libfaad2
-libfaad-dev
-libfontconfig1
-libfreetype6
-libfreetype6-dev
-libgail18
-libgail-3-dev
-libgail-dev
-libgcc1
-libgdk-pixbuf2.0-0
-libgl1-mesa-dev
-libglib2.0-0
-libglib2.0-dev
-libgpac0.5.0
-libgstreamer0.10-0
-libgstreamer-plugins-base0.10-0
-libgtk2.0-dev
-libicu44
-libjpeg62-dev
-libmad0-dev
-libogg-dev
-libopenjpeg-dev
-libpango1.0-0
-libpng12-dev
-libpulse-dev
-libsdl1.2debian
-libsdl1.2-dev
-libsoup2.4-dev
-libsqlite3-dev
-libssl-dev
-libstdc++6
-libswscale-dev
-libtheora-dev
-libtool
-libvorbis-dev
-libwxbase2.8-dev
-libwxgtk2.8-dev
-libx11-6
-libxml2
-libxslt-dev
-libxt6
-libxv-dev
-libxvidcore-dev
-linux-sound-base
-subversion
-wx2.8-headers
-x11proto-gl-dev
-x11proto-video-dev
-xulrunner-2.0-dev
-zlib1g-dev
-libgeoclue-dev
-icu-doc
-libicu-dev
-libgstreamer0.10-dev
-libgstreamer-plugins-base0.10-dev
-

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/projectmanager Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/projectmanager/codeblocks Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/hbbtvplayer/projectmanager/codeblocks/hbbtvplayer.workspace Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4CommandPanel.cpp Deleted

@@ -1,601 +0,0 @@
-/*
-  V4CommandPanel.cpp
-
-    Panel allowing to choose an action for a given frame in the time line
-
-*/
-
-#include "safe_include.h"
-
-#include "V4CommandPanel.h"
-#include "V4StudioFrame.h"
-
-#include "V4Node.h"
-
-
-
-// !! order matters !!, index will become the command id
-// when command has no string, it is not available
-// see v4_scenegraph_vrml.h
-wxString cmdNames[] = { wxT(""),                    // GF_SG_SCENE_REPLACE
-                        wxT("Replace Node"),        // GF_SG_NODE_REPLACE
-                        wxT("Replace Field"),       // GF_SG_FIELD_REPLACE
-                        wxT(""),                    // GF_SG_INDEXED_REPLACE
-                        wxT(""),                    // GF_SG_ROUTE_REPLACE
-                        wxT("Delete Node"),         // GF_SG_NODE_DELETE
-                        wxT(""),                    // GF_SG_INDEXED_DELETE
-                        wxT(""),                    // GF_SG_ROUTE_DELETE
-                        wxT("Insert Node"),         // GF_SG_NODE_INSERT
-                        wxT("")                     // GF_SG_INDEXED_INSERT
-                        // TODO : to complete
-                      };
-
-
-// Events table
-BEGIN_EVENT_TABLE(V4CommandPanel, wxPanel)
-  EVT_PAINT(V4CommandPanel::OnPaint)
-  EVT_COMBOBOX(cmbCommandID, V4CommandPanel::OnCommandCombo)
-  EVT_COMBOBOX(cmbFieldID, V4CommandPanel::OnFieldCombo)
-  EVT_BUTTON(CreateID, V4CommandPanel::OnCreateCommand)
-END_EVENT_TABLE()
-
-
-
-// Constructor
-V4CommandPanel::V4CommandPanel(V4StudioFrame * parent_) 
-	: wxPanel(parent_, -1), 
-	// tabs
-	tabs(this, -1), 
-	tabView(&tabs, -1), 
-	tabAdd(&tabs, -1),
-
-	// add Page
-	cmbCommands(&tabAdd, cmbCommandID, ""),
-	lblCommands(&tabAdd, -1, "Action :"),
-	cmbNodes(&tabAdd, -1, ""),
-	lblNodes(&tabAdd, -1, "Node :"), 
-	cmbFields(&tabAdd ,cmbFieldID, ""),
-	lblFields(&tabAdd, -1, "Field :"),
-	txtField(&tabAdd, -1, ""),
-	btnCreate(&tabAdd, CreateID, "Create"),
-
-	// view Page
-	cmbListCommands(&tabView, -1),
-	txtDesc(&tabView, -1),
-	btnDelete(&tabView, -1, "Delete")
-{
-	parent = parent_;
-
-	// disposition
-
-	// global
-	sizerTabs = new wxBoxSizer(wxHORIZONTAL);
-	sizerTabs->Add(&tabs, 1, wxEXPAND);
-
-	tabs.AddPage(&tabView, "View");
-	tabs.AddPage(&tabAdd, "Add");
-
-
-	// Add Page
-	sizerAdd = new wxBoxSizer(wxVERTICAL); // up = combobox, middle = differs with the command, bottom = buttons
-
-	sizerU = new wxBoxSizer(wxHORIZONTAL); // up
-	sizerM = new wxBoxSizer(wxVERTICAL);   // middle
-	sizerD = new wxBoxSizer(wxHORIZONTAL); // bottom
-
-	szSelectNode = new wxBoxSizer(wxHORIZONTAL);
-	szSelectField = new wxBoxSizer(wxHORIZONTAL);
-	szTxtField = new wxBoxSizer(wxHORIZONTAL);
-
-	sizerAdd->Add(sizerU, 1, wxEXPAND);
-	sizerAdd->Add(sizerM, 3, wxEXPAND);
-	sizerAdd->Add(sizerD, 1, wxEXPAND);
-
-	sizerU->Add(&lblCommands, 1, wxEXPAND | wxALL, 5);
-	sizerU->Add(&cmbCommands, 3, wxEXPAND | wxALL, 2);
-
-	szSelectField->Add(&lblFields, 1, wxEXPAND | wxALL, 5);
-	szSelectField->Add(&cmbFields, 2, wxEXPAND | wxALL, 2);
-
-	szSelectNode->Add(&lblNodes, 1, wxEXPAND | wxALL, 5);
-	szSelectNode->Add(&cmbNodes, 2, wxEXPAND | wxALL, 2);
-
-	szTxtField->Add(&txtField, 1, wxEXPAND | wxALL, 5);
-
-	sizerD->Add(&btnCreate, 1, wxEXPAND | wxALL, 3);
-
-	tabAdd.SetSizer(sizerAdd);
-
-
-
-	// View Page
-	sizerView = new wxBoxSizer(wxVERTICAL);
-	sizerUp   = new wxBoxSizer(wxHORIZONTAL);
-	sizerDown = new wxBoxSizer(wxHORIZONTAL);
-
-	sizerView->Add(sizerUp, 0, wxEXPAND);
-	sizerView->Add(sizerDown, 4, wxEXPAND);
-
-	sizerUp->Add(&cmbListCommands, 2, wxEXPAND | wxALL, 2);
-	sizerUp->Add(&btnDelete, 1, wxEXPAND | wxALL, 2);
-
-	sizerDown->Add(&txtDesc, 1, wxEXPAND);
-
-	tabView.SetSizer(sizerView);
-
-
-
-	// global
-	SetSizer(sizerTabs);
-
-	//Layout();
-
-	ShowFieldSizer(false);
-	ShowNodeSizer(false);
-	txtField.Show(false);
-}
-
-// Destructor
-V4CommandPanel::~V4CommandPanel() {
-	delete szSelectNode;
-	delete szSelectField;
-	delete szTxtField;
-};
-
-/************************/
-/*        Events        */
-/************************/
-
-// OnPaint event
-void V4CommandPanel::OnPaint(wxPaintEvent& event) {
-	wxPaintDC dc(this);
-
-	dc.BeginDrawing();
-
-	// draws a seperator line on the left border
-	int w,h;
-	this->GetSize(&w, &h);
-	dc.DrawLine(0, 0, 0, h);
-
-	dc.EndDrawing();
-}
-
-
-// OnCommandCombo -- command combo box selection has changed
-void V4CommandPanel::OnCommandCombo(wxCommandEvent &event) {
-  // retrieves the command id
-  u32 command = (u32) cmbCommands.GetClientData(cmbCommands.GetSelection());
-
-  // retrieves the current node
-  GF_Node * node = GetCurrentNode();
-  
-  if (! IsCommandValidForNode(command, node)) {
-    cmbCommands.SetSelection(-1);
-    command = (u32) -1;
-  }
-
-  // shows or hides components
-  switch (command) {
-    case GF_SG_FIELD_REPLACE: {
-      ShowNodeSizer(false);
-      ShowFieldSizer(true);
-      break;
-    }
-
-    case GF_SG_NODE_REPLACE:
-    case GF_SG_NODE_INSERT: {
-      ShowFieldSizer(false);
-      ShowNodeSizer(true);
-      break;
-    }
-
-    case GF_SG_NODE_DELETE:
-    default : {
-      ShowFieldSizer(false);
-      ShowNodeSizer(false);
-    }
-  }
-}
-
-
-// OnFieldCombo -- field combo box selection has changed
-void V4CommandPanel::OnFieldCombo(wxCommandEvent &event) {
-
-  // if no selection exits
-  u32 sel = cmbFields.GetSelection();
-  if (sel == wxNOT_FOUND) return;
-
-
-  // gets selected node in the timeline
-  GF_Node * node = GetCurrentNode();
-  if (!node) return;
-
-  GF_FieldInfo field;
-  gf_node_get_field(node, sel, &field);
-
-  // show or hides elements depending on the type of the field we will modify
-  if ( (field.fieldType == GF_SG_VRML_SFNODE) || (field.fieldType == GF_SG_VRML_MFNODE) ) {
-    sizerM->Detach(szTxtField);
-    txtField.Show(false);
-    ShowNodeSizer(true);
-  } else {
-    sizerM->Detach(szTxtField);
-    sizerM->Add(szTxtField, 2, wxEXPAND);
-    txtField.Show(true);
-  }
-
-}
-
-
-// OnCreateCommand -- creates a command with the option from the UI
-void V4CommandPanel::OnCreateCommand(wxCommandEvent &event) {
-
-  // verifies that there is a valid command value on cmbCommands
-  u32 sel = cmbCommands.GetSelection();
-  if (sel == wxNOT_FOUND) return;
-
-  // gets data from the UI
-  u32 tag = (u32) cmbCommands.GetClientData(sel);
-  GF_Node * node = GetCurrentNode();
-
-  // Creates the new command - REQUIRES registering the node
-  GF_Command * c = gf_sg_command_new(parent->GetV4SceneManager()->GetSceneGraph(), tag);
-  gf_node_register(node, NULL);
-  c->node = node; // !! the node have to be registered if command is validated
-
-  bool succeed = false;;
-
-  // performs various initialization depending  on the command tag
-  switch (tag) {
-    case GF_SG_NODE_REPLACE: {
-      // TODO : not implemented yet because il would even replace the nodes in the dictionnary
-      break;
-    }
-
-    case GF_SG_FIELD_REPLACE: {
-      // verifies that a valid field is selected
-      u32 selF = cmbFields.GetSelection();
-      if (selF == wxNOT_FOUND) break;
-
-      // gets the field
-      GF_FieldInfo field;
-      gf_node_get_field(node, (u32)cmbFields.GetClientData(selF), &field);
-
-      GF_CommandField * cmdField = gf_sg_command_field_new(c); // if failure, will be freed with freeing the command
-      cmdField->fieldIndex = field.fieldIndex;
-      cmdField->fieldType  = field.fieldType;
-      
-      // fills the GF_CommandField structures with data depending on the field type
-      switch (field.fieldType) {
-        case GF_SG_VRML_SFNODE: {
-          // get the node we will use as a replacement
-          u32 selN = cmbNodes.GetSelection();
-          if (selN == wxNOT_FOUND) break;
-
-          cmdField->new_node = (GF_Node *) cmbNodes.GetClientData(selN);
-          // TODO : why is the 2nd line necessary ?
-          cmdField->field_ptr = &cmdField->new_node;
-
-          succeed = true;
-          break;
-        }
-
-        case GF_SG_VRML_MFNODE: {
-          break;
-        }
-
-        // field is not a node field
-        default: {
-
-          wxString s = txtField.GetValue();
-          if (s.IsEmpty()) break;
-
-          GF_FieldInfo dummy;
-          dummy.far_ptr = gf_sg_vrml_field_pointer_new(field.fieldType);
-          dummy.fieldType = field.fieldType;
-          parent->GetFieldView()->SetFieldValue(dummy, &s, 0); // TODO : check the zero
-
-          cmdField->field_ptr = dummy.far_ptr;
-
-          succeed = true;
-
-          break;
-        }
-
-      }
-      
-      break;
-    }
-
-    case GF_SG_NODE_INSERT: {
-      break;
-    }
-
-    case GF_SG_NODE_DELETE: {
-      break;
-    }
-  }
-
-  if (!succeed) {
-    gf_sg_command_del(c);
-    return;
-  }
-
-
-  V4SceneManager * sm = parent->GetV4SceneManager();
-
-  // The command is created, now searching for an AU to put it in
-  GF_StreamContext * ctx = sm->GetBifsStream();
-  u32 count = gf_list_count (ctx->AUs);
-  GF_AUContext * au = NULL;
-
-  for (u32 i = 0; i < count; i++) {
-     au = (GF_AUContext *) gf_list_get(ctx->AUs, i);
-     // V4Studio only uses timing
-     // TODO : FPS is defined in V4SceneGraph.h, should change and become a property somewhere
-     // TODO : units is a constant
-     if ( au->timing == sm->GetUnits() / sm->GetFrameRate() * frame ) break;
-     au = NULL;
-  }
-
-  // creates new AU at the right time if none found
-  if (!au) au = gf_sm_stream_au_new(ctx, sm->GetUnits() / sm->GetFrameRate() * frame, 0, false);
-
-  // adds command to AU and to the cell
-  gf_list_add(au->commands, (void *) c);
-  parent->GetTimeLine()->AddCommand(c);
-
-  //gf_sg_command_apply(parent->GetV4Scene()->GetSceneGraph(), c, 0);
-
-
-/*
-  // checks whether there is already a command for this object
-  GF_List * chain = parent->timeLine->GetCommands();
-
-  // if we can fuse the two commands together, we do it
-  if (gf_list_count(chain) > 0) {
-    GF_Command * old;
-    old = (GF_Command *) gf_list_get(chain, gf_list_count(chain) - 1);
-    if ( (old->tag = 
-  }
-*/
-
-
-}
-
-
-/************************/
-/*       Refresh        */
-/************************/
-
-// refresh -- refresh the node and the command combo boxes
-void V4CommandPanel::Refresh(u32 frame_) {
-
-  frame = frame_;
-
-  // update the GUI
-  // cmbCommands updates in turns cmbNodes and/or cmbFields
-  RefreshCommands();
-
-  // update the list of the existing command for the cell currently selected
-  RefreshListCommands();
-}
-
-
-//  RefreshListCommands --
-void V4CommandPanel::RefreshListCommands() {
-  // retrieves pointer to the node
-  GF_Node * node = GetCurrentNode();
-  if (!node) return;
-
-  cmbListCommands.Clear();
-
-  GF_Command * c;
-  int i=0;
-
-  while ( c = parent->GetTimeLine()->GetCommand(i) ) {
-    cmbListCommands.Append(wxString(cmdNames[c->tag]), (void *) i);
-    i++;
-  }
-}
-
-
-// RefreshCommands -- lists the available commands for the selected node
-void V4CommandPanel::RefreshCommands() {
-
-  // retrieves pointer to the node
-  GF_Node * node = GetCurrentNode();
-  if (!node) return;
-
-  u32 oldSel = cmbCommands.GetSelection();
-
-  // deletes all items from the combo box
-  cmbCommands.Clear();
-
-  // Prints the different possible commands, associates them with their id
-  for (int i=0; i<sizeof(cmdNames)/sizeof(wxString); i++) {
-    if ( cmdNames[i].CompareTo(wxT("")) ) 
-      if (IsCommandValidForNode(i, node)) cmbCommands.Append(cmdNames[i], (void *)i);
-  }
-
-  // updates other controls by signaling a new selection on the command combo box
-  cmbCommands.SetSelection(oldSel);
-  OnCommandCombo(wxCommandEvent());
-}
-
-
-// RefreshNodes -- lists the available nodes for the given action
-void V4CommandPanel::RefreshNodes() {
-
-  // retrieves pointer to the node
-  GF_Node * node = GetCurrentNode();
-  if (!node) return;
-
-  // refresh the node combo box with the nodePool
-  cmbNodes.Clear();
-
-
-  // Adds nodes selectable for this frame and action (selectable nodes have a NodeID != 0)
-  // associates in the comboBox each element with its pointer
-
-  u32 command = (u32) cmbCommands.GetClientData(cmbCommands.GetSelection());
-
-
-  // according to command type selets a node pool
-  switch (command) {
-
-    case GF_SG_NODE_REPLACE: {
-      // we replace this node, so we need the node from the pool for its type
-      V4NodePool &pool = parent->GetV4SceneManager()->pools.pool(gf_node_get_tag(node));
-
-      // fills the combo box
-      PopulateNodes(pool, node);
-
-      break;
-    }
-
-    case GF_SG_FIELD_REPLACE: {
-      // checks if the field combo box has a valid selection
-      u32 index = cmbFields.GetSelection();
-      if ( index == wxNOT_FOUND ) break;
-
-      // get the field selected
-      GF_FieldInfo field;
-      gf_node_get_field(node, index, &field);
-
-      // if field is not a node field then exits
-      if ( (field.fieldType != GF_SG_VRML_SFNODE) && (field.fieldType != GF_SG_VRML_MFNODE) ) break;
-
-      // get the pool corresponding to that field
-      V4NodePool &pool = parent->GetV4SceneManager()->pools.poolFromFieldName(field.name);
-
-      // fills the combo box
-      PopulateNodes(pool, node);      
-
-      break;
-    }
-
-    case GF_SG_NODE_INSERT: {
-      // we add a child, that is to say we can add any generic node, we use "shape" to find that pool
-      V4NodePool &pool = parent->GetV4SceneManager()->pools.pool(TAG_MPEG4_Shape);
-
-      // fills the combo box
-      PopulateNodes(pool, node);
-
-      break;
-    }
-
-    default: {
-      return;
-    }
-  }
-
-}
-
-
-// RefreshFields -- lists the fields this nodes has
-void V4CommandPanel::RefreshFields() {
-
-  // retrieves pointer to the node
-  GF_Node * node = GetCurrentNode();
-  if (!node) return;
-
-  // clears the combo box
-  cmbFields.Clear();
-
-  int count = gf_node_get_field_count(node);
-  GF_FieldInfo field;
-
-  for (u32 i = 0; i < count; i++) {
-    gf_node_get_field(node, i, &field);
-    cmbFields.Append(field.name, (void *) i);
-  }
-
-  // TODO : are there some nodes with no fields ?
-  cmbFields.SetSelection(0);
-
-  OnFieldCombo(wxCommandEvent());
-
-}
-
-
-// ShowNodeSizer -- shows or hides controls in the szSelectNode sizer
-void V4CommandPanel::ShowNodeSizer(bool show) {
-  cmbNodes.Show(show);
-  lblNodes.Show(show);
-
-  // always detaches to avoid accumulation of objects
-  sizerM->Detach(szSelectNode);
-
-  if (show) {
-    sizerM->Add(szSelectNode, 1, wxEXPAND);
-    RefreshNodes();
-  }
-
-  tabAdd.Layout();
-}
-
-
-
-// ShowFieldSizer -- shows or hides controls in the szSelectField sizer
-void V4CommandPanel::ShowFieldSizer(bool show) {
-  cmbFields.Show(show);
-  lblFields.Show(show);
-  txtField.Show(false); // always hide, RefreshField may bring it back
-
-  // always detaches to avoid accumulation of objects
-  sizerM->Detach(szSelectField);
-  sizerM->Detach(szTxtField);
-
-  if (show) {
-    // here order matters, RefreshFields may add szSelectNode, so we have to had ourselves before that
-    sizerM->Add(szSelectField, 1, wxEXPAND);
-    RefreshFields();
-  }
-
-  tabAdd.Layout();
-}
-
-
-/************************/
-/*        Utils         */
-/************************/
-
-// IsCommandValidForNode -- tells if we can apply this command to that node
-bool V4CommandPanel::IsCommandValidForNode(u32 command, GF_Node * node) {
-  switch (command) {
-    case GF_SG_FIELD_REPLACE:
-    case GF_SG_NODE_DELETE:
-    case GF_SG_NODE_REPLACE: {
-      return true;
-      break;
-    }
-
-    case GF_SG_NODE_INSERT: {
-      // to insert a child, node must have a GF_SG_VRML_MFNODE field, other children are not "inserted"
-      return parent->GetV4SceneManager()->pools.NodeHasField(node, GF_SG_VRML_MFNODE);
-      break;
-    }
-
-  }
-
-  return false;
-}
-
-
-// GetCurrentNode -- returns the node currently selected in the timeline
-GF_Node * V4CommandPanel::GetCurrentNode() {
-  u32 id = parent->GetTimeLine()->GetSelectedID();
-  if (!id) return NULL;
-
-  return gf_sg_find_node(parent->GetV4SceneManager()->GetSceneGraph(), id);
-}
-
-
-
-// PopulateNodes -- fills the cmdNodes with nodes from pool, do not add the specified node if found
-void V4CommandPanel::PopulateNodes(V4NodePool& pool, GF_Node * node) {
-  for (u32 i = 0; i != pool.GetNodesCount(); i++)
-    if (pool.at(i).GetNode() != node)
-      cmbNodes.Append(pool.at(i).GetName(), (void *) pool.at(i).GetNode());
-}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4CommandPanel.h Deleted

@@ -1,103 +0,0 @@
-/*
-  V4CommandPanel.h
-
-    Header file for CommandPanel, the control alloing to create commands from the timeline
-*/
-
-#ifndef _V4CommandPanel_h_
-#define _V4CommandPanel_h_
-
-#include "safe_include.h"
-#include <wx/wx.h>
-#include <wx/notebook.h>
-
-// list of all commands
-#include <gpac/scenegraph_vrml.h>
-
-
-#define cmbCommandID        wxID_HIGHEST+1
-#define cmbFieldID          wxID_HIGHEST+2
-#define CreateID            wxID_HIGHEST+3
-
-
-class V4StudioFrame;
-class V4NodePool;
-
-
-class V4CommandPanel : public wxPanel {
-  public:
-    // Constructor Destructor
-    V4CommandPanel(V4StudioFrame * parent);
-    ~V4CommandPanel();
-
-    // Update
-    void Refresh(u32 frame);
-
-  private:
-
-    u32 frame;
-
-    // controls
-
-    wxNotebook tabs;
-    wxPanel tabView;
-    wxPanel tabAdd;
-
-    // add page
-    wxComboBox cmbCommands;
-    wxStaticText lblCommands;
-
-    wxComboBox cmbNodes;
-    wxStaticText lblNodes;
-
-    wxComboBox cmbFields;
-    wxStaticText lblFields;
-
-    wxButton btnCreate;
-
-    wxTextCtrl txtField;
-
-
-    // view page
-    wxComboBox cmbListCommands;
-    wxTextCtrl txtDesc;
-    wxButton btnDelete;
-
-    //sizers
-    // global
-    wxBoxSizer * sizerTabs;
-    // Add page
-    wxBoxSizer * sizerAdd, * sizerU, * sizerM, * sizerD, * szSelectNode, * szSelectField, * szTxtField;
-    // View page
-    wxBoxSizer * sizerView, * sizerUp, * sizerDown;
-
-
-    // UI -- show or hides part of the control
-    void ShowNodeSizer(bool show);
-    void ShowFieldSizer(bool show);
-
-    // Refreshing of various comboboxes
-    void RefreshCommands();
-    void RefreshNodes();
-    void RefreshFields();
-    void RefreshListCommands();
-
-    // fills the cmdNodes with nodes from pool, do not add the specified node if found
-    void PopulateNodes(V4NodePool& pool, GF_Node * node);
-
-    // events
-    DECLARE_EVENT_TABLE()
-    void OnPaint(wxPaintEvent& event);
-    void OnCommandCombo(wxCommandEvent &event);
-    void OnFieldCombo(wxCommandEvent &event);
-    void OnCreateCommand(wxCommandEvent &event);
-
-    bool IsCommandValidForNode(u32 command, GF_Node * node); // tells if we can apply this command to that node
-    GF_Node * GetCurrentNode(); // returns the node currently selected in the timeline
-
-	// All the component of the V4Studio Main Frame have a pointer to that Main Frame, called parent.
-    V4StudioFrame * parent;
-
-};
-
-#endif
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4FieldList.cpp Deleted

@@ -1,452 +0,0 @@
-#include "safe_include.h" 
-
-// For compilers that supports precompilation , includes "wx/wx.h"
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-	#include "wx/wx.h"
-#endif
-
-#include <wx/colordlg.h>
-#include <wx/fontdlg.h>
-
-#include "V4FieldList.h"
-
-#include "V4StudioFrame.h"
-
-BEGIN_EVENT_TABLE(V4FieldList, wxGrid)
-	EVT_GRID_CELL_CHANGE(V4FieldList::OnCellChanged) 
-	EVT_GRID_CELL_LEFT_CLICK(V4FieldList::OnCellLeftClick) 
-	EVT_GRID_CELL_RIGHT_CLICK(V4FieldList::OnCellRightClick) 
-	EVT_GRID_CELL_LEFT_DCLICK(V4FieldList::OnCellLeftDClick)
-END_EVENT_TABLE()
-
-class Position {
-public :
-	Position(u32 fi, s32 fp) : fieldIndex(fi), fieldPosition(fp) {}
-	u32 fieldIndex;
-	s32 fieldPosition;
-};
-
-V4FieldList::V4FieldList(wxWindow *parent_, wxSize size) : wxGrid(parent_, -1, wxDefaultPosition, size) {
-	positions = gf_list_new();
-	CreateGrid(0,0);
-	SetRowLabelSize(0);
-	SetColLabelSize(20);
-	SetColLabelValue(0, wxString(" "));
-	SetColLabelValue(1, wxString("Field Name"));
-	SetColLabelValue(2, wxString("Field Value"));
-	InsertCols(0,3);
-	AutoSizeColumns(true);
-	EnableGridLines(true);
-
-	parent = (V4StudioFrame *) parent_;
-}
-
-V4FieldList::~V4FieldList() 
-{
-	s32 i;
-	for (i=gf_list_count(positions)-1; i>=0; i--) {
-		Position *p = (Position *)gf_list_get(positions, i);
-		delete p;
-		p = NULL;
-		gf_list_rem(positions, i);
-	}
-	gf_list_del(positions);
-}
-
-void V4FieldList::Create() 
-{
-	GF_Node *node = m_pNode;
-
-	if (!node) return;
-
-	DeleteCols(0,3);
-	u32 nbRows = GetNumberRows();
-	if (nbRows) DeleteRows(0,nbRows);
-	InsertCols(0,3);
-
-	s32 i;
-	for (i=gf_list_count(positions)-1; i>=0; i--) {
-		Position *p = (Position *)gf_list_get(positions, i);
-		delete p;
-		p = NULL;
-		gf_list_rem(positions, i);
-	}
-
-	u32 pos = 0; // counts rows added
-
-  // adds a row to modify DefName
-  InsertRows(pos, 1);
-  SetCellValue(pos, 1, wxString("Name"));
-  const char * defName = gf_node_get_name(node);
-  if (defName) SetCellValue(pos, 2, wxString(defName));
-  gf_list_add(positions, new Position(-1, -1));
-  // enables modifying the DefName
-  for (i=0; i<2; i++) SetReadOnly(pos, i, TRUE);
-  SetReadOnly(pos, 2, FALSE);
-  pos++;
-
-  // adds all fields
-	GF_FieldInfo field;
-	u32 count = gf_node_get_field_count(node);
-	u32 j;
-
-	for (j=0; j<count; j++) {
-		gf_node_get_field(node, j, &field);
-		switch (field.eventType) {
-			case GF_SG_EVENT_FIELD:
-			case GF_SG_EVENT_EXPOSED_FIELD:
-				InsertOneFieldRow(pos, field);
-				pos++;
-				break;
-			default:
-				break;
-		}
-	}
-	AutoSizeColumns(true);
-}
-
-void V4FieldList::InsertOneFieldRow(u32 pos, GF_FieldInfo field) 
-{
-	InsertRows(pos, 1);
-	gf_list_add(positions, new Position(field.fieldIndex, -1));
-	SetReadOnly(pos, 0, TRUE);
-  SetReadOnly(pos, 1, TRUE);
-  SetReadOnly(pos, 2, FALSE);
-	SetCellFieldValue(field, pos);
-}
-
-void V4FieldList::SetFieldValue(GF_FieldInfo f, wxString *value, int pos) 
-{
-	void *ptr = NULL;
-	s32 type = -1;
-	if (gf_sg_vrml_is_sf_field(f.fieldType)) {
-		type = f.fieldType;
-		ptr = f.far_ptr;
-	} else {
-		if (pos < 0) return;
-		gf_sg_vrml_mf_get_item(f.far_ptr, f.fieldType, &ptr, pos);
-		type = gf_sg_vrml_get_sf_type(f.fieldType);
-	}
-	switch (type) {
-		case GF_SG_VRML_SFCOLOR:
-			sscanf(value->c_str(), "%f %f %f", &(((SFColor *)ptr)->red), &(((SFColor *)ptr)->green), &(((SFColor *)ptr)->blue));
-			break;
-		case GF_SG_VRML_SFVEC2F:
-			sscanf(value->c_str(), "%f %f", &(((SFVec2f *)ptr)->x), &(((SFVec2f *)ptr)->y));
-			break;
-		case GF_SG_VRML_SFFLOAT:
-			sscanf(value->c_str(), "%f", (SFFloat *)ptr);
-			break;
-		case GF_SG_VRML_SFINT32:
-			sscanf(value->c_str(), "%d", (SFInt32 *)ptr);
-			break;
-		case GF_SG_VRML_SFBOOL:
-			if (!stricmp(value->c_str(), "true")) *((SFBool *)ptr) = 1;
-			else *((SFBool *)ptr) = 0;
-			break;
-		case GF_SG_VRML_SFSTRING:
-			if (((SFString *)ptr)->buffer) gf_free(((SFString *)ptr)->buffer);
-			((SFString *)ptr)->buffer = gf_strdup(value->c_str());
-			break;
-		default:
-			break;
-	}	
-}
-
-void V4FieldList::GetFieldValue(GF_FieldInfo f, wxString *s, int pos) 
-{
-	void *ptr = NULL;
-	s32 type = -1;
-	if (gf_sg_vrml_is_sf_field(f.fieldType)) {
-		type = f.fieldType;
-		ptr = f.far_ptr;
-	} else {
-		if (pos < 0) return;
-		gf_sg_vrml_mf_get_item(f.far_ptr, f.fieldType, &ptr, pos);
-		type = gf_sg_vrml_get_sf_type(f.fieldType);
-	}
-	switch (type) {
-		case GF_SG_VRML_SFBOOL:
-			if (*(SFBool *)ptr == 0) s->Printf("false");
-			else s->Printf("true");
-			break;
-		case GF_SG_VRML_SFINT32:
-			s->Printf("%d", *(SFInt32 *)ptr);
-			break;
-		case GF_SG_VRML_SFCOLOR:
-			s->Printf("%.2f %.2f %.2f", ((SFColor *)ptr)->red, ((SFColor *)ptr)->green, ((SFColor *)ptr)->blue);
-			break;
-		case GF_SG_VRML_SFVEC2F:
-			s->Printf("%.2f %.2f", ((SFVec2f *)ptr)->x, ((SFVec2f *)ptr)->y);
-			break;
-		case GF_SG_VRML_SFFLOAT:
-			s->Printf("%.2f", *(SFFloat *)ptr);
-			break;
-		case GF_SG_VRML_SFSTRING:
-			s->Printf("%s", ((SFString *)ptr)->buffer);
-			break;
-		case GF_SG_VRML_SFSCRIPT:
-			s->Printf("%s", ((SFScript *)ptr)->script_text);
-			break;
-		default:
-			break;
-	}	
-	gf_node_dirty_set(m_pNode, 0, 1);
-}
-
-// OnCellChanged -- user has validated the changes made to a field, updates the node with the new value
-void V4FieldList::OnCellChanged(wxGridEvent &evt) 
-{
-	u32 row;
-	GF_FieldInfo field;
-	wxString value;
-
-	if (!m_pNode || evt.GetCol() == 0) {
-		evt.Skip();
-		return;
-	}
-
-	row = evt.GetRow();
-	value = GetCellValue(row, 2);
-	Position *pSelected = (Position *)gf_list_get(positions, row);
-	if (!pSelected) {
-		evt.Skip();
-		return;
-	}
-
-  // defName requires special treatment
-  if (pSelected->fieldIndex == (u32) -1) {
-    u32 id = gf_node_get_id(m_pNode);
-    if (!id) id = gf_sg_get_next_available_node_id(parent->GetV4SceneManager()->GetSceneGraph());
-    gf_node_set_id(m_pNode, id, value.c_str());
-    parent->GetV4SceneManager()->pools.Add(m_pNode);
-  } else {
-    // modifies any kind of field
-	  gf_node_get_field(m_pNode, pSelected->fieldIndex, &field);
-	  if (gf_sg_vrml_is_sf_field(field.fieldType)) {
-		  SetFieldValue(field, &value, -1);
-	  } else {
-		  if (pSelected->fieldPosition >= 0) {
-			  SetFieldValue(field, &value, pSelected->fieldPosition);
-		  } else {
-			  GenMFField *mf = (GenMFField *)field.far_ptr;		
-			  void *ptr;
-			  gf_sg_vrml_mf_insert(mf, field.fieldType, &ptr, mf->count);
-			  SetFieldValue(field, &value, mf->count-1);
-			  SetCellValue(row, 2, "");
-			  wxString sign = GetCellValue(row, 0);
-			  switch (sign.GetChar(0)) {
-			  case '-':
-				  {
-					  u32 insertPosition = row+mf->count+1;
-					  InsertRows(insertPosition-1, 1);
-					  gf_list_insert(positions, new Position(pSelected->fieldIndex, mf->count-1), insertPosition);
-					  wxString tmp;
-					  tmp << '['; tmp << (mf->count-1); tmp << ']';
-					  SetCellValue(insertPosition-1, 1, tmp);
-					  wxString buf;
-					  GetFieldValue(field, &buf, mf->count-1);
-					  SetCellValue(insertPosition-1, 2, buf);
-				  }
-				  break;
-			  case '+':
-				  break;
-			  case ' ':
-				  SetCellValue(row, 0, "+");
-				  break;
-			  }
-		  }
-	  }
-  }
-	gf_node_dirty_set(m_pNode, 0, 1);
-	V4StudioFrame *parent = (V4StudioFrame *)this->GetParent();
-	parent->Update();
-}
-
-void V4FieldList::SetLog(wxString s) 
-{
-	V4StudioFrame *parent = (V4StudioFrame *)this->GetParent();
-	parent->GetStatusBar()->SetStatusText(s);
-}
-
-void V4FieldList::SetCellFieldValue(GF_FieldInfo field, u32 pos) 
-{
-	wxString buf;
-	if (gf_sg_vrml_is_sf_field(field.fieldType)) {
-		SetCellValue(pos,1,wxString(field.name));
-		GetFieldValue(field, &buf, -1);
-		SetCellValue(pos,2,buf);
-	} else {
-		GenMFField *mf = (GenMFField *)field.far_ptr;
-		if (mf->count > 0 ) {
-			SetCellValue(pos,0,"+");
-		} else {
-			SetCellValue(pos,0," ");
-		}
-		SetCellValue(pos,1,field.name);
-	}
-}
-
-// OnCellLeftClick -- draws columns for multivalued fields
-void V4FieldList::OnCellLeftClick(wxGridEvent &evt) 
-{
-	u32 col = evt.GetCol();
-	u32 row = evt.GetRow();
-	GF_FieldInfo field;
-	GF_Node *node = m_pNode;
-
-	if (col != 0) {
-		evt.Skip();
-		return;
-	}
-
-	Position *pSelected = (Position *)gf_list_get(positions, row);
-	if (!pSelected) {
-		evt.Skip();
-		return;
-	}
-
-	gf_node_get_field(node, pSelected->fieldIndex, &field);
-	if (gf_sg_vrml_is_sf_field(field.fieldType) || field.fieldType == GF_SG_VRML_MFNODE) {
-		evt.Skip();
-		return;
-	}
-
-	wxString value = GetCellValue(row, col);
-	char c = value.GetChar(0);
-	GenMFField *mf = (GenMFField *)field.far_ptr;
-	if (c == ' ') {
-		evt.Skip();
-		return;
-	} else if (c == '+') {
-		value.SetChar(0, '-');
-		SetCellValue(row,0,value);
-		InsertRows(row+1, mf->count);
-		for (u32 j = 0; j<mf->count; j++) {
-			Position *p = new Position(pSelected->fieldIndex, j);
-			gf_list_insert(positions, p, row+1+j);
-			wxString tmp;
-			tmp << '['; tmp << j; tmp << ']';
-			SetCellValue(row+1+j, 1, tmp);
-			wxString buf;
-			GetFieldValue(field, &buf, j);
-			SetCellValue(row+1+j, 2, buf);
-		}
-	} else if (c == '-') {
-		value.SetChar(0, '+');
-		SetCellValue(row,0,value);
-		DeleteRows(row+1, mf->count);
-		for (s32 j = mf->count-1; j>=0; j--) {
-			Position *p = (Position *)gf_list_get(positions,row+1+j);
-			delete p; 
-			p = NULL;
-			gf_list_rem(positions, row+1+j);
-		}
-	}
-	evt.Skip();
-}
-
-void V4FieldList::OnCellRightClick(wxGridEvent &evt) 
-{
-	int row = evt.GetRow();
-	GF_FieldInfo field;
-	GF_Node *node = m_pNode;
-
-	Position *pSelected = (Position *)gf_list_get(positions,row);
-	if (!pSelected) {
-		evt.Skip();
-		return;
-	}
-
-	gf_node_get_field(node, pSelected->fieldIndex, &field);
-	if (gf_sg_vrml_is_sf_field(field.fieldType)) {
-		evt.Skip();
-		return;
-	}
-
-	GenMFField *mf = (GenMFField *)field.far_ptr;
-	if (pSelected->fieldPosition == -1) {
-		evt.Skip();
-		return;
-	} 
-
-	InsertRows(row, 1);
-	gf_list_insert(positions, new Position(pSelected->fieldIndex, pSelected->fieldPosition), row);
-	void *ptr;
-	gf_sg_vrml_mf_insert(mf, field.fieldType, &ptr, pSelected->fieldPosition);
-	SetCellValue(row, 2, "");
-	for (u32 i=pSelected->fieldPosition; i<mf->count; i++) {
-		wxString tmp;
-		tmp << '['; tmp << i; tmp << ']';
-		SetCellValue(row+i, 1, tmp);
-	}
-}
-
-// OnCellLeftDClick -- Edit a given field
-void V4FieldList::OnCellLeftDClick(wxGridEvent &evt) 
-{
-	int row = evt.GetRow();
-	GF_FieldInfo field;
-	GF_Node *node = m_pNode;
-
-	Position *pSelected = (Position *)gf_list_get(positions,row);
-	if (!pSelected) {
-		evt.Skip();
-		return;
-	}
-
-  // editing the DEF name is NOT modifying a field
-  // we just need to modify the string itself
-  if (pSelected->fieldIndex == (u32) -1) {
-    evt.Skip();
-    return;
-  }
-
-	gf_node_get_field(node, pSelected->fieldIndex, &field);
-	u32 type;
-	void *ptr;
-	if (gf_sg_vrml_is_sf_field(field.fieldType)) {
-		type = field.fieldType;
-		ptr = field.far_ptr;
-	} else {
-		if (pSelected->fieldPosition < 0) {
-			evt.Skip();
-			return;
-		}
-		gf_sg_vrml_mf_get_item(field.far_ptr, field.fieldType, &ptr, pSelected->fieldPosition);
-		type = gf_sg_vrml_get_sf_type(field.fieldType);
-	}
-	
-	if (type== GF_SG_VRML_SFCOLOR) {
-		wxColourDialog cd(this);
-		if (cd.ShowModal() == wxID_OK)
-		{
-			wxColourData retData = cd.GetColourData();
-			wxColour col = retData.GetColour();
-			((SFColor *)ptr)->red = col.Red()/255.0f;					
-			((SFColor *)ptr)->green = col.Green()/255.0f;
-			((SFColor *)ptr)->blue = col.Blue()/255.0f;
-		} else {
-			return;
-		}
-	} else if (!stricmp(field.name,"family")) {
-		wxFontDialog fd(this);
-		if (fd.ShowModal() == wxID_OK) {
-			wxFontData retData = fd.GetFontData();
-			wxFont font = retData.GetChosenFont();
-			wxString name = font.GetFaceName();
-			if (((SFString *)ptr)->buffer) gf_free(((SFString *)ptr)->buffer);
-			((SFString *)ptr)->buffer = gf_strdup(name.c_str());
-		} else {
-			return;
-		}
-
-	} else {
-		evt.Skip();
-		return;
-	}
-	V4StudioFrame *parent = (V4StudioFrame *)this->GetParent();
-	parent->Update();
-}

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4FieldList.h Deleted

@@ -1,47 +0,0 @@
-#ifndef _V4_FIELD_LIST_H
-#define _V4_FIELD_LIST_H
-
-#include "safe_include.h" 
-#include <gpac/scenegraph.h>
-
-#include <wx/grid.h>
-
-
-class V4StudioFrame;
-
-
-class V4FieldList: public wxGrid {
-
-public:
-	V4FieldList(wxWindow *parent, wxSize size);
-	~V4FieldList(); 
-
-	void SetNode(GF_Node *node) { m_pNode = node; }
-	
-	void Create(); 
-	void GetFieldValue(GF_FieldInfo f, wxString *s, int pos);
-	void SetFieldValue(GF_FieldInfo f, wxString *s, int pos);
-
-	void OnCellChanged(wxGridEvent &evt);
-	void OnCellLeftClick(wxGridEvent &evt);
-	void OnCellRightClick(wxGridEvent &evt);
-	void OnCellLeftDClick(wxGridEvent &evt);
-protected:
-    DECLARE_EVENT_TABLE()
-
-private:
-	void SetLog(wxString s);
-
-	void InsertOneFieldRow(u32 position, GF_FieldInfo field);
-
-	void SetCellFieldValue(GF_FieldInfo field, u32 pos);
-
-	GF_Node * m_pNode;
-	GF_List *positions;
-
-	// All the component of the V4Studio Main Frame have a pointer to that Main Frame, called parent.
-	V4StudioFrame * parent;
-
-};
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4Node.cpp Deleted

@@ -1,57 +0,0 @@
-/*
-  V4Node.cpp
- 
-    Implements V4Node class
-*/
-
-#include "V4Node.h"
-#include <crtdbg.h>
-
-
-// Constructor
-V4Node::V4Node(const u32 _NodeID, GF_Node * _node) : NodeID(_NodeID), node(_node) {
-  _ASSERT(_node); // no NULL node
-}
-
-
-// GetID --
-u32 V4Node::GetID() const {
-  return NodeID;  
-}
-
-
-// GetNode --
-GF_Node * V4Node::GetNode() const {
-  return node;
-}
-
-
-// IsAliveAt -- check all aparitions
-bool V4Node::IsAliveAt(const u32 frame) {
-  std::list<segment>::iterator i; 
-
-  for (i = lifeSpan.begin(); i != lifeSpan.end(); i++)
-    if ( ((*i).from >= frame) && ((*i).to <= frame) ) return true;
-
-  return false;
-}
-
-
-// Appear
-void V4Node::Appear(const u32 startFrame, const u32 stopFrame) {
-  // TODO :
-  return;
-}
-
-
-// Disappear
-void V4Node::Disappear(const u32 startFrame, const u32 stopFrame) {
-  // TODO :
-  return;
-}
-
-
-// GetName -- 
-wxString V4Node::GetName() {
-  return wxString(gf_node_get_name(node));
-}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4Node.h Deleted

@@ -1,61 +0,0 @@
-/*
-  V4Node.h
-
-    Represents a node with additionnal attributes for V4Studio, such as lifespan
-*/
-
-#ifndef _V4Node_
-#define _V4Node_
-
-#include "safe_include.h"
-#include <gpac/scenegraph.h> // GF_Node structure
-
-#include <wx/wx.h>
-
-#include <list>
-
-
-struct segment {
-  u32 from, to;
-};
-
-
-class V4Node {
-  public:
-    // constructor destructor
-    V4Node(const u32 NodeID, GF_Node * node=NULL); // node may be modified, don't use const GF_Node *
-
-    // accesses to members
-    u32 GetID() const;
-    GF_Node * GetNode() const;
-
-
-    // computes whether the node is alive at the given frame
-    bool IsAliveAt(const u32 frame);
-
-    // Add an apparition, inclusive
-    void Appear(const u32 startFrame, const u32 stopFrame);
-
-    // Remove frames from lifeSpan, inclusive
-    void Disappear(const u32 startFrame, const u32 stopFrame);
-
-
-    // (to save workspace) tells whether the node should appear on the timeline
-    bool isOnTimeLine;
-
-    // retrieves the node _DEF_ name (node has a Node ID)
-    wxString GetName();
-
-    
-
-  private:
-    // various accesses to the node
-    u32 NodeID;
-    GF_Node * node;
-
-    // timeLine
-    std::list<segment> lifeSpan; // each element of the list is one use of this node, first value is start frame, second is end frame, inclusive
-
-};
-
-#endif
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4NodePool.cpp Deleted

@@ -1,76 +0,0 @@
-/*
-  V4NodePool.cpp
-
-*/
-#include "safe_include.h"
-#include <gpac/scenegraph_vrml.h>
-
-#include "V4NodePool.h"
-
-
-// FindNode -- search for a node with the specified NodeID or pointer
-u32 V4NodePool::FindNode(const u32 NodeID, const GF_Node * node) {
-
-  if ( (NodeID == 0) && (node == NULL) ) return (u32) -1;
-
-  for (int i = 0; i < Nodes.size(); i++)
-    if ( (NodeID == Nodes.at(i).GetID()) || (node == Nodes.at(i).GetNode()) ) return i;
-
-  return (u32) -1;
-}
-
-
-// AddNode --
-V4Node& V4NodePool::AddNode(GF_Node * _node) {
-  // checks that the node is not already in the pool
-  u32 id = gf_node_get_id(_node);
-  u32 i = FindNode(id);
-  if (i != (u32) -1) return Nodes.at(i);
-
-  // add a new entry into the pool
-  V4Node node(id, _node);
-  Nodes.push_back(node);
-  count++;
-  return Nodes.back();
-}
-
-
-// DeleteNode -- Deletes a node from the pool
-void V4NodePool::DeleteNode(const u32 _NodeID, const GF_Node * _node) {
-  u32 i = FindNode(_NodeID, _node);
-  std::vector<V4Node>::iterator iter = Nodes.begin();
-
-  for (u32 j=0; j<i; j++) iter++;
-  Nodes.erase(iter);
-}
-
-
-// GetV4Node -- retrieves a node from the pool
-V4Node&  V4NodePool::GetV4Node(const u32 _NodeID, const GF_Node * _node) {
-  u32 i = FindNode(_NodeID, _node);
-  return Nodes.at(i);
-}
-
-
-// GetNodesCount -- returns the numbre of nodes
-u32 V4NodePool::GetNodesCount() const {
-  return Nodes.size();
-}
-
-
-// FirstNode -- returns the beginning the list
-V4Node& V4NodePool::at(u32 n) {
-  return Nodes.at(n);
-}
-
-
-
-// Clear -- deletes all item
-void V4NodePool::Clear() {
-  Nodes.clear();
-}
-
-// returns count
-u32 V4NodePool::GetCount() const {
-  return count;
-}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4NodePool.h Deleted

@@ -1,57 +0,0 @@
-/*
-  V4NodePool
-
-    Holds every node usable
-
-*/
-
-#ifndef _V4NodePool_
-#define _V4NodePool_
-
-#include "safe_include.h"
-#include <vector>
-#include "V4Node.h"
-
-using namespace std;
-
-class V4NodePool {
-
-  public:
-
-    // Constructor
-    V4NodePool() { count = 0; }
-    
-    // Adds a node to the pool
-    V4Node& AddNode(GF_Node * node=NULL); // node may be modified, don't use const GF_Node *
-
-    // Deletes a node from the pool
-    void DeleteNode(const u32 NodeID, const GF_Node * node=NULL);
-
-    // retrieves a node from the pool
-    V4Node& GetV4Node(const u32 NodeID, const GF_Node * node=NULL);
-
-    // returns the numbre of nodes
-    u32 GetNodesCount() const;
-
-    // returns the nth element in the vector
-    V4Node& at(u32 n);
-
-    // clear the pool
-    void Clear();
-
-    // returns count
-    u32 GetCount() const;
-
-
-  private:
-    vector<V4Node> Nodes;
-
-    // find the V4Node with the specified attributes
-    u32 FindNode(const u32 NodeID, const GF_Node * node=NULL);
-
-    // counts the nodes added to that pool (used in autonaming nodes)
-    u32 count;
-
-};
-
-#endif
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4NodePools.cpp Deleted

@@ -1,121 +0,0 @@
-/*
-  V4NodePools.cpp
-
-    Implements V4NodePools class
-
-*/
-
-#include "V4NodePools.h"
-#include "V4NodePool.h"
-
-V4NodePool dummy;
-
-// Constructor
-V4NodePools::V4NodePools() {
-  pools.resize(DICT_LAST);
-  unPooled = 0;
-}
-
-
-// pool -- returns the pool of object for the given tag 
-V4NodePool& V4NodePools::pool(const u32 tag) 
-{
-	u32 n = poolN(tag);
-  if ((u32) -1 == n) return dummy;
-	return pools.at(n);
-}
-
-
-// pool -- returns the NUMBER of the pool for the given tag
-u32 V4NodePools::poolN(const u32 tag) {
-
-  switch (tag) {
-
-    // objects that can be children of a switch
-    case TAG_MPEG4_OrderedGroup:
-    case TAG_MPEG4_Shape: {
-      return DICT_GEN;
-      break;
-    }
-
-    // objects that can be a geometry
-    case TAG_MPEG4_Rectangle:
-    case TAG_MPEG4_IndexedFaceSet2D:
-    case TAG_MPEG4_Circle: {
-      return DICT_GEOMETRY;
-      break;
-    }
-
-    // objects that can be an appearance
-    case TAG_MPEG4_Appearance: {
-      return DICT_APPEARANCE;
-      break;
-    }
-
-    // objects that can be a texture
-    case TAG_MPEG4_MovieTexture:
-    case TAG_MPEG4_ImageTexture: {
-      return DICT_TEXTURE;
-      break;
-    }
-
-    // objects that can be a material
-    case TAG_MPEG4_Material2D: {
-      return DICT_MATERIAL;
-      break;
-    }
-
-  }
-
-  return (u32) -1;
-}
-
-
-// poolNFromFieldName -- Get the correct pool from a field name
-V4NodePool& V4NodePools::poolFromFieldName(const char * name) {
-
-  if (!strcmp("appearance", name))    return pools.at(DICT_APPEARANCE);
-  if (!strcmp("geometry", name))      return pools.at(DICT_GEOMETRY);
-  if (!strcmp("material", name))      return pools.at(DICT_MATERIAL);
-  if (!strcmp("texture", name))       return pools.at(DICT_TEXTURE);
-
-  // throws an exception if not found
-  return dummy;
-}
-
-
-// Clear -- clears all the pool
-void V4NodePools::Clear() {
-  for (u32 i = 0; i < pools.size(); i++)
-    pools.at(i).Clear();
-}
-
-
-// Add -- Adds a node to the correct pool
-void V4NodePools::Add(GF_Node * node) {
-  u32 tag = gf_node_get_tag(node);
-  if (poolN(tag) == (u32) -1) return;
-  pool(tag).AddNode(node);
-}
-
-
-// NodeHasField -- tells if nodes as field of the given type
-bool V4NodePools::NodeHasField(GF_Node * node, u32 fieldType) {
-  u32 count = gf_node_get_field_count(node);
-  GF_FieldInfo field;
-
-  // cycles through all fields and checks field type
-  for (u32 i = 0; i < count; i++) {
-    gf_node_get_field(node, i, &field);
-    if (field.fieldType == fieldType) return true;
-  }
-
-  return false;
-}
-
-
-// returns the total number of nodes created for that type of node
-u32 V4NodePools::GetCount(const u32 tag) {
-  if (poolN(tag) == (u32) -1) return unPooled++;
-  return pool(tag).GetCount();
-}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4NodePools.h Deleted

@@ -1,59 +0,0 @@
-/*
-  V4NodePools
-
-    List all the Node pools for each possible node tag
-
-*/
-
-#include "safe_include.h"
-#include <gpac/scenegraph.h>
-#include <gpac/nodes_mpeg4.h>
-
-#include <vector>
-
-#include "V4NodePool.h"
-
-
-using namespace std;
-
-
-enum {
-  DICT_GEN = 0,
-  DICT_GEOMETRY,
-  DICT_APPEARANCE,
-  DICT_TEXTURE,
-  DICT_MATERIAL,
-
-  DICT_LAST // last element, gives the actual number of pool
-};
-
-
-class V4NodePools {
-
-  public:
-    // Constructor
-    V4NodePools();
-
-    // gets the correct pool from the given tag
-    V4NodePool& pool(const u32 tag);
-    V4NodePool& poolFromFieldName(const char * name);
-    u32 poolN(const u32 tag);
-
-    // clears all the pools
-    void Clear();
-
-    // Adds a node to the correct pool
-    void Add(GF_Node * node);
-
-    // tells if nodes as field of the given type
-    bool NodeHasField(GF_Node * node, u32 fieldType);
-    
-    // returns the total number of nodes created for that type of node
-    u32 GetCount(const u32 tag);
-
-
-  private:
-    vector<V4NodePool> pools;
-    unsigned int unPooled;
-
-};
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4SceneGraph.cpp Deleted

@@ -1,304 +0,0 @@
-#include "V4SceneGraph.h"
-#include "V4StudioFrame.h"
-
-#include <gpac/scene_manager.h>
-#include <gpac/nodes_mpeg4.h>
-#include <gpac/internal/scenegraph_dev.h>
-
-#include "V4Service.h"
-
-V4SceneGraph::V4SceneGraph(V4StudioFrame *parent) : frame(parent)
-{
-	m_pSm = NULL;
-	m_pSg = NULL;
-	m_pSr = NULL;
-	m_pIs = NULL;
-	m_pOriginal_mp4 = NULL;
-	m_bEncodeNames = 0;
-	m_term = parent->GetGPACPanel()->m_term;
-}
-
-V4SceneGraph::~V4SceneGraph()
-{
-  // TODO : pquoi fallait il commenter cette ligne ?
-	//if (m_pSm) gf_sm_del(m_pSm);
-	if (m_pOriginal_mp4) gf_free(m_pOriginal_mp4);
-	if (m_pService) delete m_pService;
-}
-
-void V4SceneGraph::SetSceneSize(int w, int h)
-{
-	gf_sg_set_scene_size_info(m_pSg, w,h, 1);
-	/*reassign scene graph to update scene size in renderer*/
-	gf_sr_set_scene(m_pSr, m_pSg);
-}
-
-void V4SceneGraph::GetSceneSize(wxSize &size) 
-{
-	gf_sg_get_scene_size_info(m_pSg, (u32 *)&(size.x), (u32 *)&(size.y));	
-}
-
-GF_Node *V4SceneGraph::SetTopNode(u32 tag) 
-{
-	GF_Node * root = NewNode(tag);
-	gf_sg_set_root_node(m_pSg, root);
-	return (GF_Node *)root;
-}
-
-
-GF_Node *V4SceneGraph::NewNode(u32 tag)
-{
-	GF_Node *n = gf_node_new(m_pSg, tag);
-	if (!n) return NULL;
-	gf_node_init(n);
-	return n;
-}
-
-void V4SceneGraph::SaveFile(const char *path) 
-{
-	char rad_name[5000];
-	strcpy(rad_name, "dump");
-	gf_sm_dump(m_pSm, rad_name, 0);
-	GF_ISOFile *mp4 = gf_isom_open(path, GF_ISOM_WRITE_EDIT, NULL);
-	m_pSm->max_node_id = gf_sg_get_max_node_id(m_pSm->scene_graph);
-	gf_sm_encode_to_file(m_pSm, mp4, "c:\\log.txt", NULL, GF_SM_LOAD_MPEG4_STRICT, 0);
-	gf_isom_close(mp4);
-}
-
-void V4SceneGraph::LoadNew() 
-{
-	if (m_pSm) {
-		gf_sr_set_scene(m_pSr, NULL);
-		gf_sm_del(m_pSm);
-		m_pSm = NULL;
-		gf_sg_del(m_pSg);
-		m_pSg = NULL;
-	}
-	if (m_pOriginal_mp4) gf_free(m_pOriginal_mp4);
-	m_pOriginal_mp4 = NULL;
-
-	m_pIs = gf_is_new(NULL);
-	m_pSg = m_pIs->graph;
-	gf_sg_set_init_callback(m_pSg, v4s_node_init, this);
-	gf_sr_set_scene(m_pSr, m_pSg);
-
-	m_pSm = gf_sm_new(m_pSg);
-	/* Create a BIFS stream with one AU with on ReplaceScene */
-	GF_StreamContext *sc = gf_sm_stream_new(m_pSm, 1, GF_STREAM_SCENE, 0);
-	GF_AUContext *au = gf_sm_stream_au_new(sc, 0, 0, 1);
-	GF_Command *command = gf_sg_command_new(m_pSg, GF_SG_SCENE_REPLACE);
-	gf_list_add(au->commands, command);
-
-	// reinitializes the node pool
-	frame->pools.Clear();
-}
-
-void V4SceneGraph::LoadFileOld(const char *path) 
-{
-	m_pService = new V4Service(path);
-	gf_term_attach_service(m_term, m_pService->m_pNetClient);
-	m_pIs = m_term->root_scene;
-	m_pSg = m_pIs->graph;
-	gf_term_play_from_time(m_term, 0);
-	while(!m_pIs->graph_attached) {}
-	// CreateDictionnary crashes because the root node in m_pSg is not set.
-	CreateDictionnary();
-}
-
-void V4SceneGraph::LoadFile(const char *path) 
-{
-	GF_SceneLoader load;
-	if (m_pSm) {
-		gf_sr_set_scene(m_pSr, NULL);
-		gf_sm_del(m_pSm);
-		gf_sg_del(m_pSg);
-	}
-	
-	// initializes a new scene
-	// We need an GF_InlineScene, a SceneManager and an GF_ObjectManager
-	m_pIs = gf_is_new(NULL);
-	m_pSg = m_pIs->graph;
-	m_pSm = gf_sm_new(m_pSg);
-
-	m_pIs->root_od = gf_odm_new();
-
-	m_pIs->root_od->parentscene = NULL;
-	m_pIs->root_od->subscene = m_pIs;
-	m_pIs->root_od->term = m_term;
-
-	m_term->root_scene = m_pIs;
-	
-	// TODO : what's the use of this ?
-	if (m_pOriginal_mp4) gf_free(m_pOriginal_mp4);
-	m_pOriginal_mp4 = NULL;
-
-	/* Loading of a file (BT, MP4 ...) and modification of the SceneManager */
-	memset(&load, 0, sizeof(GF_SceneLoader));
-	load.fileName = path;
-	load.ctx = m_pSm;
-	load.cbk = this;
-	if (strstr(path, ".mp4") || strstr(path, ".MP4") ) load.isom = gf_isom_open(path, GF_ISOM_OPEN_READ, NULL);
-	gf_sm_load_init(&load);
-	gf_sm_load_run(&load);
-	gf_sm_load_done(&load);
-	if (load.isom) gf_isom_delete(load.isom);
-
-	/* SceneManager should be initialized  and filled correctly */
-
-	gf_sg_set_scene_size_info(m_pSg, m_pSm->scene_width, m_pSm->scene_height, m_pSm->is_pixel_metrics);
-
-	// TODO : replace with GetBifsStream
-	GF_StreamContext *sc = (GF_StreamContext *) gf_list_get(m_pSm->streams,0);
-
-	if (sc->streamType == 3) {
-		GF_AUContext *au = (GF_AUContext *) gf_list_get(sc->AUs,0);
-		GF_Command *c = (GF_Command *) gf_list_get(au->commands,0);
-		gf_sg_command_apply(m_pSg, c, 0);
-		/* This is a patch to solve the save pb:
-		    When ApplyCommand is made on a Scene Replace Command
-		    The command node is set to NULL
-		    When we save a BIFS stream whose first command is of this kind,
-		    the file saver thinks the bifs commands should come from an NHNT file 
-		   This is a temporary patch */
-		if (c->tag == GF_SG_SCENE_REPLACE) { c->node = m_pSg->RootNode; }
-	}
-	gf_sr_set_scene(m_pSr, m_pSg);
-
-	// retrieves all the node from the tree and adds them to the node pool
-	GF_Node * root = gf_sg_get_root_node(m_pSg);
-	CreateDictionnary();
-}
-
-GF_Node *V4SceneGraph::CopyNode(GF_Node *node, GF_Node *parent, bool copy) 
-{
-	if (copy) return CloneNodeForEditing(m_pSg, node);
-	u32 nodeID = gf_node_get_id(node);
-	if (!nodeID) {
-		nodeID = gf_sg_get_next_available_node_id(m_pSg);
-		gf_node_set_id(node, nodeID, NULL);
-		gf_node_register(node, parent);
-	}
-	return node;
-}
-
-void V4SceneGraph::LoadCommand(u32 commandNumber)
-{
-	GF_StreamContext *sc = NULL;
-	for (u32 i=0; i<gf_list_count(m_pSm->streams); i++) {
-		sc = (GF_StreamContext *) gf_list_get(m_pSm->streams, i);
-		if (sc->streamType == GF_STREAM_SCENE) break;
-		sc = NULL;
-	}
-	assert(sc);
-	GF_AUContext *au = (GF_AUContext *) gf_list_get(sc->AUs,0);
-	if (commandNumber < gf_list_count(au->commands)) {
-		for (u32 j=0; j<=commandNumber; j++) {
-			GF_Command *c = (GF_Command *) gf_list_get(au->commands, j);
-			gf_sg_command_apply(m_pSg, c, 0);
-		}
-	}
-}
-
-
-
-extern "C" {
-
-GF_Node *CloneNodeForEditing(GF_SceneGraph *inScene, GF_Node *orig) //, GF_Node *cloned_parent)
-{
-	u32 i, j, count;
-	GF_Node *node, *child, *tmp;
-	GF_List *list, *list2;
-	GF_FieldInfo field_orig, field;
-
-	/*this is not a mistake*/
-	if (!orig) return NULL;
-
-	/*check for DEF/USE
-	if (orig->sgprivate->NodeID) {
-		node = gf_sg_find_node(inScene, orig->sgprivate->NodeID);
-		//node already created, USE
-		if (node) {
-			gf_node_register(node, cloned_parent);
-			return node;
-		}
-	}
-	*/
-	/*create a node*/
-/*
-	if (orig->sgprivate->tag == TAG_MPEG4_ProtoNode) {
-		proto_node = ((GF_ProtoInstance *)orig)->proto_interface;
-		//create the instance but don't load the code -c we MUST wait for ISed routes to be cloned before
-		node = gf_sg_proto_create_node(inScene, proto_node, (GF_ProtoInstance *) orig);
-	} else {
-*/
-	node = gf_node_new(inScene, gf_node_get_tag(orig));
-//	}
-
-	count = gf_node_get_field_count(orig);
-
-	/*copy each field*/
-	for (i=0; i<count; i++) {
-		gf_node_get_field(orig, i, &field_orig);
-
-		/*get target ptr*/
-		gf_node_get_field(node, i, &field);
-
-		assert(field.eventType==field_orig.eventType);
-		assert(field.fieldType==field_orig.fieldType);
-
-		/*duplicate it*/
-		switch (field.fieldType) {
-		case GF_SG_VRML_SFNODE:
-			child = CloneNodeForEditing(inScene, (GF_Node *) (* ((GF_Node **) field_orig.far_ptr)));//, node);
-			*((GF_Node **) field.far_ptr) = child;
-			break;
-		case GF_SG_VRML_MFNODE:
-			list = *( (GF_List **) field_orig.far_ptr);
-			list2 = *( (GF_List **) field.far_ptr);
-
-			for (j=0; j<gf_list_count(list); j++) {
-				tmp = (GF_Node *)gf_list_get(list, j);
-				child = CloneNodeForEditing(inScene, tmp);//, node);
-				gf_list_add(list2, child);
-			}
-			break;
-		default:
-			gf_sg_vrml_field_copy(field.far_ptr, field_orig.far_ptr, field.fieldType);
-			break;
-		}
-	}
-	/*register node
-	if (orig->sgprivate->NodeID) {
-		Node_SetID(node, orig->sgprivate->NodeID);
-		gf_node_register(node, cloned_parent);
-	}*/
-
-	/*init node before creating ISed routes so the eventIn handler are in place*/
-	if (gf_node_get_tag(node) != TAG_ProtoNode) gf_node_init(node);
-
-	return node;
-}
-
-}
-
-
-// GetBifsStream -- gets the first stream with id = 3
-GF_StreamContext * V4SceneGraph::GetBifsStream() {
-  GF_StreamContext * ctx = NULL;
-  u32 count = gf_list_count(m_pSm->streams);
-
-  // cycle trough each stream
-  while (count--) {
-    ctx = (GF_StreamContext *) gf_list_get(m_pSm->streams, count);
-    if (ctx->streamType == 3) break;
-  }
-
-  if (ctx == NULL) return NULL;
-
-  // if we went through the loop without finding any BIFS stream return null
-  if (ctx->streamType != 3) return NULL;
-
-  return ctx;
-}
-
-

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4SceneGraph.h Deleted

@@ -1,95 +0,0 @@
-#ifndef _V4SCENEGRAPH_H
-#define _V4SCENEGRAPH_H
-
-#include "safe_include.h" 
-#include <gpac/scene_manager.h>
-#include <gpac/compositor.h>
-#include <gpac/internal/terminal_dev.h> // MPEG4CLIENT
-
-
-#include <wx/gdicmn.h>
-
-
-#define DICTNAME "__V4dictionnary"
-
-
-#define FPS 25
-
-
-class V4StudioFrame;
-class V4Service;
-
-extern "C" {
-  GF_Node *CloneNodeForEditing(GF_SceneGraph *inScene, GF_Node *orig);
-  int GetNextNodeID(GF_SceneGraph *sg);
-}
-
-class V4SceneGraph {
-public:
-	// Constructor / Desctructor
-	V4SceneGraph(V4StudioFrame *parent);
-	~V4SceneGraph();
-
-
-	/* file management functions */
-
-	void SaveFile(const char * path);
-	void LoadNew(); 
-	void LoadFile(const char *path); 
-	void LoadFileOld(const char *path); 
-
-
-	/* Node management functions */
-
-	GF_Node *NewNode(u32 tag);
-	GF_Node *CopyNode(GF_Node *node, GF_Node *parent, bool copy);
-	GF_Node *SetTopNode(u32 tag);  // TODO : will destroy dictionnary
-
-	/* Various */
-
-	void LoadCommand(u32 commandNumber); // ?
-	GF_StreamContext * GetBifsStream();   // Get the first stream with id = 3
-
-
-	/* access to private members */
-
-	// SceneSize
-	void SetSceneSize(int w, int h);
-	void GetSceneSize(wxSize &size);
-
-	// Renderer (owned by the terminal)
-	void SetRenderer(GF_Compositor *sr) { m_pSr = sr; }
-	GF_Compositor *GetSceneCompositor() { return m_pSr; }
-
-	// GF_InlineScene
-	// TODO : Should be modified ?
-	LPINLINESCENE GetInlineScene() { return m_pIs; }
-
-	// SceneManager
-	// TODO : Should be modified ?
-	GF_SceneManager * GetSceneManager() { return m_pSm; }
-
-	// SceneGraph
-	GF_SceneGraph *GetSceneGraph() { return m_pSg; }
-	GF_Node *GetRootNode() { return gf_sg_get_root_node(m_pSg); }
-
-protected:
-
-	// self created
-	LPINLINESCENE m_pIs;
-	GF_SceneGraph * m_pSg;
-	GF_SceneManager *m_pSm;
-	GF_Node * dictionnary;
-
-	// from other objects
-	GF_Compositor *m_pSr;
-	GF_Terminal *m_term;
-	V4StudioFrame * frame;
-	
-	char *m_pOriginal_mp4;
-	Bool m_bEncodeNames;
-	V4Service *m_pService;
-};
-
-#endif
-

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4SceneManager.cpp Deleted

@@ -1,598 +0,0 @@
-#include "V4SceneManager.h"
-#include "V4StudioFrame.h"
-
-#include <gpac/scene_manager.h>
-#include <gpac/nodes_mpeg4.h>
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/constants.h>
-
-
-V4SceneManager::V4SceneManager(V4StudioFrame *parent) : frame(parent)
-{
-	m_pSm = NULL;
-	m_pIs = NULL;
-	units = 1000; // used to calculate AU timings
-}
-
-V4SceneManager::~V4SceneManager()
-{
-	GF_SceneGraph *tmp = m_pIs->graph;
-
-	/* Deletion of the SceneManager 
-	   This is done before deleting the GF_InlineScene in the GF_Terminal in the GPAC Panel
-	   but for that we need to register the root node one more time to avoid the deletion of the scene graph 
-	   But this is temporary, this register of the root node should be done at loading time.
-	*/
-	if (m_pSm) {
-		gf_node_register(m_pSm->scene_graph->RootNode, NULL);
-		gf_sm_del(m_pSm);
-		m_pSm = NULL;
-	}
-
-	/* Destruction of the GPAC panel and of the associated service and terminal */
-	delete m_gpac_panel;
-	m_gpac_panel = NULL;
-	
-}
-
-void V4SceneManager::LoadCommon()
-{
-	/* Creation and initialization of the structure InlineScene, including the SceneGraph */
-	m_pIs = gf_inline_new(NULL);
-
-	/* Creation of the GPAC Panel which includes the creation of the terminal */
-	m_gpac_panel = new wxGPACPanel(this, NULL);
-
-	/* Connection of the InlineScene to the terminal */
-	GF_Terminal *term = m_gpac_panel->GetMPEG4Terminal();
-	term->root_scene = m_pIs;
-
-/*
-	gf_sc_set_scene(term->compositor, m_pIs->graph);
-	m_pIs->graph_attached = 1;
-*/
-
-	/* Creation of a SceneManager to manipulate the scene and streams */
-	m_pSm = gf_sm_new(m_pIs->graph);
-
-	/* Creation of main ObjectManager to manipulate the media */
-	m_pIs->root_od = gf_odm_new();
-	m_pIs->root_od->parentscene = NULL;
-	m_pIs->root_od->subscene = m_pIs;
-	m_pIs->root_od->term = term;
-}
-
-void V4SceneManager::LoadNew() 
-{
-	LoadCommon();
-	
-	/* Create a BIFS stream with one AU with one ReplaceScene */
-	GF_StreamContext *sc = gf_sm_stream_new(m_pSm, 1, GF_STREAM_SCENE, 0);
-	GF_AUContext *au = gf_sm_stream_au_new(sc, 0, 0, 1);
-	GF_Command *command = gf_sg_command_new(m_pIs->graph, GF_SG_SCENE_REPLACE);
-	gf_list_add(au->commands, command);
-
-	SetLength(50);
-	SetFrameRate(25);
-
-	// reinitializes the node pool
-	pools.Clear();
-}
-
-void V4SceneManager::LoadFile(const char *path) 
-{	
-	LoadCommon();
-	GF_Terminal *term = m_gpac_panel->GetMPEG4Terminal();
-
-	/* Loading of a file (BT, MP4 ...) and modification of the SceneManager */
-	GF_SceneLoader load;
-	memset(&load, 0, sizeof(GF_SceneLoader));
-	load.fileName = path;
-	load.ctx = m_pSm;
-	if (strstr(path, ".mp4") || strstr(path, ".MP4") ) load.isom = gf_isom_open(path, GF_ISOM_OPEN_READ, NULL);
-	gf_sm_load_init(&load);
-	gf_sm_load_run(&load);
-	gf_sm_load_done(&load);
-	if (load.isom) gf_isom_delete(load.isom);
-
-	/* SceneManager should be initialized  and filled correctly */
-
-	gf_sg_set_scene_size_info(m_pIs->graph, m_pSm->scene_width, m_pSm->scene_height, m_pSm->is_pixel_metrics);
-
-	// TODO : replace with GetBifsStream
-	GF_StreamContext *sc = (GF_StreamContext *) gf_list_get(m_pSm->streams,0);
-
-	if (sc->streamType == 3) {
-		GF_AUContext *au = (GF_AUContext *) gf_list_get(sc->AUs,0);
-		GF_Command *c = (GF_Command *) gf_list_get(au->commands,0);
-		//gf_sg_command_apply(m_pIs->graph, c, 0);
-		/* This is a patch to solve the save pb:
-		    When ApplyCommand is made on a Scene Replace Command
-		    The command node is set to NULL
-		    When we save a BIFS stream whose first command is of this kind,
-		    the file saver thinks the bifs commands should come from an NHNT file 
-		   This is a temporary patch */
-		if (c->tag == GF_SG_SCENE_REPLACE) { c->node = m_pIs->graph->RootNode; }
-	}
-
-	gf_sc_set_scene(term->compositor, m_pIs->graph);
-	m_pIs->graph_attached = 1;
-
-	// TODO : read actual values from file
-	SetLength(50);
-	SetFrameRate(25);
-
-	// retrieves all the node from the tree and adds them to the node pool
-	GF_Node * root = gf_sg_get_root_node(m_pIs->graph);
-//	CreateDictionnary();
-}
-
-void V4SceneManager::SaveFile(const char *path) 
-{
-	GF_SMEncodeOptions opts;
-	char rad_name[5000];
-
-	/* First dump the scene in a BT file */
-	strcpy(rad_name, "dump");
-	m_pSm->scene_graph->RootNode = NULL;
-	gf_sm_dump(m_pSm, rad_name, 0);
-
-	/* Then reload properly (overriding the current SceneManager)*/
-	GF_SceneLoader load;
-	memset(&load, 0, sizeof(GF_SceneLoader));
-	load.fileName = "dump.bt";
-	load.ctx = m_pSm;
-	gf_sm_load_init(&load);
-	gf_sm_load_run(&load);
-	gf_sm_load_done(&load);
-
-	/* Finally encode the file */
-	GF_ISOFile *mp4 = gf_isom_open(path, GF_ISOM_WRITE_EDIT, NULL);
-	m_pSm->max_node_id = gf_sg_get_max_node_id(m_pSm->scene_graph);
-	memset(&opts, 0, sizeof(opts));
-	opts.flags = GF_SM_LOAD_MPEG4_STRICT;
-	gf_sm_encode_to_file(m_pSm, mp4, &opts);
-	gf_isom_set_brand_info(mp4, GF_ISOM_BRAND_MP42, 1);
-	gf_isom_modify_alternate_brand(mp4, GF_ISOM_BRAND_ISOM, 1);
-	gf_isom_close(mp4);
-}
-
-void V4SceneManager::SetSceneSize(int w, int h)
-{
-	gf_sg_set_scene_size_info(m_pIs->graph, w,h, 1);
-	/*reassign scene graph to update scene size in renderer*/
-	gf_sc_set_scene(m_gpac_panel->GetMPEG4Terminal()->compositor, m_pIs->graph);
-	m_pIs->graph_attached = 1;
-}
-
-void V4SceneManager::GetSceneSize(wxSize &size) 
-{
-	gf_sg_get_scene_size_info(m_pIs->graph, (u32 *)&(size.x), (u32 *)&(size.y));	
-}
-
-GF_Node *V4SceneManager::SetTopNode(u32 tag) 
-{
-	GF_Node *root = NewNode(tag);
-	gf_sg_set_root_node(m_pIs->graph, root);
-	GF_StreamContext *sc = (GF_StreamContext *) gf_list_get(m_pSm->streams,0);
-	if (sc->streamType == 3) {
-		GF_AUContext *au = (GF_AUContext *) gf_list_get(sc->AUs,0);
-		GF_Command *c = (GF_Command *) gf_list_get(au->commands,0);
-		/* This is a patch to solve the save pb:
-		    When ApplyCommand is made on a Scene Replace Command
-		    The command node is set to NULL
-		    When we save a BIFS stream whose first command is of this kind,
-		    the file saver thinks the bifs commands should come from an NHNT file 
-		   This is a temporary patch */
-		if (c->tag == GF_SG_SCENE_REPLACE) { 
-			c->node = m_pIs->graph->RootNode; 
-			gf_node_register(m_pIs->graph->RootNode, NULL);
-		}
-	}
-	return root;
-}
-
-GF_Node *V4SceneManager::NewNode(u32 tag)
-{
-	GF_Node *n = gf_node_new(m_pIs->graph, tag);
-	if (!n) return NULL;
-	gf_node_init(n);
-	return n;
-}
-
-GF_Node *V4SceneManager::CopyNode(GF_Node *node, GF_Node *parent, bool copy) 
-{
-	if (copy) return CloneNodeForEditing(m_pIs->graph, node);
-	u32 nodeID = gf_node_get_id(node);
-	if (!nodeID) {
-		nodeID = gf_sg_get_next_available_node_id(m_pIs->graph);
-		gf_node_set_id(node, nodeID, NULL);
-		gf_node_register(node, parent);
-	}
-	return node;
-}
-
-extern "C" {
-
-GF_Node *CloneNodeForEditing(GF_SceneGraph *inScene, GF_Node *orig) //, GF_Node *cloned_parent)
-{
-	u32 i, j, count;
-	GF_Node *node, *child, *tmp;
-	GF_ChildNodeItem *list, *list2;
-	GF_FieldInfo field_orig, field;
-
-	/*this is not a mistake*/
-	if (!orig) return NULL;
-
-	/*check for DEF/USE
-	if (orig->sgprivate->NodeID) {
-		node = gf_sg_find_node(inScene, orig->sgprivate->NodeID);
-		//node already created, USE
-		if (node) {
-			gf_node_register(node, cloned_parent);
-			return node;
-		}
-	}
-	*/
-	/*create a node*/
-/*
-	if (orig->sgprivate->tag == TAG_MPEG4_ProtoNode) {
-		proto_node = ((GF_ProtoInstance *)orig)->proto_interface;
-		//create the instance but don't load the code -c we MUST wait for ISed routes to be cloned before
-		node = gf_sg_proto_create_node(inScene, proto_node, (GF_ProtoInstance *) orig);
-	} else {
-*/
-	node = gf_node_new(inScene, gf_node_get_tag(orig));
-//	}
-
-	count = gf_node_get_field_count(orig);
-
-	/*copy each field*/
-	for (i=0; i<count; i++) {
-		gf_node_get_field(orig, i, &field_orig);
-
-		/*get target ptr*/
-		gf_node_get_field(node, i, &field);
-
-		assert(field.eventType==field_orig.eventType);
-		assert(field.fieldType==field_orig.fieldType);
-
-		/*duplicate it*/
-		switch (field.fieldType) {
-		case GF_SG_VRML_SFNODE:
-			child = CloneNodeForEditing(inScene, (GF_Node *) (* ((GF_Node **) field_orig.far_ptr)));//, node);
-			*((GF_Node **) field.far_ptr) = child;
-			break;
-		case GF_SG_VRML_MFNODE:
-			list = *( (GF_ChildNodeItem **) field_orig.far_ptr);
-			list2 = *( (GF_ChildNodeItem **) field.far_ptr);
-
-			for (j=0; j<gf_node_list_get_count(list); j++) {
-				tmp = (GF_Node *)gf_node_list_get_child(list, j);
-				child = CloneNodeForEditing(inScene, tmp);//, node);
-				gf_node_list_add_child(&list2, child);
-			}
-			break;
-		default:
-			gf_sg_vrml_field_copy(field.far_ptr, field_orig.far_ptr, field.fieldType);
-			break;
-		}
-	}
-	/*register node
-	if (orig->sgprivate->NodeID) {
-		Node_SetID(node, orig->sgprivate->NodeID);
-		gf_node_register(node, cloned_parent);
-	}*/
-
-	/*init node before creating ISed routes so the eventIn handler are in place*/
-	if (gf_node_get_tag(node) != TAG_ProtoNode) gf_node_init(node);
-
-	return node;
-}
-
-} // extern "C"
-
-
-// GetBifsStream -- gets the first stream with id = 3
-GF_StreamContext * V4SceneManager::GetBifsStream() {
-  GF_StreamContext * ctx = NULL;
-  u32 count = gf_list_count(m_pSm->streams);
-
-  // cycle trough each stream
-  while (count--) {
-    ctx = (GF_StreamContext *) gf_list_get(m_pSm->streams, count);
-    if (ctx->streamType == 3) break;
-  }
-
-  if (ctx == NULL) return NULL;
-
-  // if we went through the loop without finding any BIFS stream return null
-  if (ctx->streamType != 3) return NULL;
-
-  return ctx;
-}
-
-
-// CreateDictionnary -- Create the root node of the dictionnary and populates it
-void V4SceneManager::CreateDictionnary() {
-  GF_Node * root = gf_sg_get_root_node(m_pIs->graph);
-  dictionnary = NewNode(TAG_MPEG4_Switch);
-
-  // Insert the dictionnary in the scene and gives it a name
-  gf_node_insert_child(root, dictionnary, 0);
-  gf_node_register(dictionnary, root);
-  gf_node_set_id(dictionnary, gf_sg_get_next_available_node_id(m_pIs->graph), DICTNAME);
-
-  // makes the dictionnary invisible
-  // the number 1 field is the "whichChoice", setting it to -1 makes it display nothing
-  GF_FieldInfo field;
-  gf_node_get_field(dictionnary, 1, &field);
-  frame->GetFieldView()->SetFieldValue(field, &wxString("-1"), -1);  // TODO : maybe put the method SetFieldValue somewhere more accessible
-
-  // populates dictionnary with the root node of the scene
-  AddToDictionnary(root);
-}
-
-
-// AddToDictionnary -- adds a node to the dictionnary, increases its reference count, the node must already have an ID
-// WARNING : does not add the node to the pool if it has a parent in the dictionnary
-void V4SceneManager::AddToDictionnary(GF_Node * node) {
-
-  // checks if nodes has a parent with an id
-  // if true then there is already a reference to this node 
-  if (HasDefParent(node)) return;
-
-  AddRecursive(node);
-}
-
-
-// AddRecursive -- recursively adds items with an ID to the dictionnary
-void V4SceneManager::AddRecursive(GF_Node * node, bool parentAdded) {
-
-  // skips empty nodes
-  if (!node) return;
-
-  // skips the dictionnary
-  const char * c = gf_node_get_name(node);
-  if ( (c != NULL) && (!strcmp(c, DICTNAME)) ) return;
-
-  // if node as an id adds it to the dictionnary and the node pool
-  u32 id = gf_node_get_id(node);
-  if (id) {
-    pools.Add(node);
-    // children of added node are not added to the dictionnary
-    if (!parentAdded) AddEffective(node);
-    parentAdded = true;
-  }
-  
-  GF_FieldInfo field;
-  GF_ChildNodeItem * list;
-  int count = gf_node_get_field_count(node);
-
-  // tests all fields, if a field is a node then adds it and process its children recursively
-  for (int i=0; i<count; i++) {
-
-    gf_node_get_field(node, i, &field);
-
-    // single value node field
-    if (field.fieldType == GF_SG_VRML_SFNODE)
-      AddRecursive( * ((GF_Node **) field.far_ptr), parentAdded );
-
-    // multiple value node field
-    if (field.fieldType == GF_SG_VRML_MFNODE) {
-      list = *( (GF_ChildNodeItem **) field.far_ptr);
-			for (u32 j=0; j<gf_node_list_get_count(list); j++)
-				AddRecursive( (GF_Node *) gf_node_list_get_child(list, j), parentAdded );
-    }
-  }
-}
-
-
-// AddEffective --
-void V4SceneManager::AddEffective(GF_Node * node) {
-
-  // gets the node type (equals pool number)
-  u32 poolN = pools.poolN(gf_node_get_tag(node));
-
-  // adds the node using a type specific function
-  switch (poolN) {
-    case DICT_GEN: {
-      AddGen(node);
-      break;
-    }
-
-    case DICT_GEOMETRY: {
-      AddGeometry(node);
-      break;
-    }
-
-    case DICT_APPEARANCE: {
-      AddAppearance(node);
-      break;
-    }
-
-    case DICT_TEXTURE: {
-      AddTexture(node);
-      break;
-    }
-
-    case DICT_MATERIAL: {
-      AddMaterial(node);
-      break;
-    }
-
-    // TODO : raise an exception when not found
-  }
-
-}
-
-
-// RemoveFromDictionnary -- Removes _ONE_ item from the dictionnary, if some of the children are also in the dictionnary preserves them
-void V4SceneManager::RemoveFromDictionnary(GF_Node * node) {
-
-}
-
-
-/******* Add element to dictionnary functions *******/
-
-// TODO : can add genericity around here
-// ATTENTION, all these functions thinks the node as already been assigned an ID
-
-// Add gen -- adds any element which can be a children of a switch node
-void V4SceneManager::AddGen(GF_Node * node) {
-
-  // retrieves the chain of children (field number 0 named "choice")
-  GF_FieldInfo field;
-  GF_List * list;
-
-  gf_node_get_field(dictionnary, 0, &field);
-  list = *( (GF_List **) field.far_ptr);
-
-  // adds a reference to that node in the dictionnary
-  gf_list_add(list, node);
-  gf_node_register(node, dictionnary);
-
-}
-
-
-// TODO : check if there is a dummy node with free space in it
-
-
-// AddGeometry -- adds any element which can be a children of a shape as a geometry node
-void V4SceneManager::AddGeometry(GF_Node * node) {
-
-  // creates a dummy node to hold this one
-  GF_Node * parent = CreateDummyNode(TAG_MPEG4_Shape, dictionnary, 0);
-
-  // sets the parentship relation
-  MakeChild(node, parent, 1); // geometry is field one in a shape
-
-}
-
-
-// AddAppearance -- adds any element which can be a children of a shape as an appearance node
-void V4SceneManager::AddAppearance(GF_Node * node) {
-
-  // creates a dummy node to hold this one
-  GF_Node * parent = CreateDummyNode(TAG_MPEG4_Shape, dictionnary, 0);
-
-  // sets the parentship relation
-  MakeChild(node, parent, 0); // appearance is field zero in a shape
-}
-
-
-// AddTexture -- adds any element which can be a children of an appearance as a texture node
-void V4SceneManager::AddTexture(GF_Node * node) {
-
-  // creates dummy nodes to hold this one
-  GF_Node * parent1 = CreateDummyNode(TAG_MPEG4_Shape, dictionnary, 0);
-  GF_Node * parent2 = CreateDummyNode(TAG_MPEG4_Appearance, parent1, 3);
-
-  // sets the parentship relation
-  MakeChild(node, parent2, 1); // texture is field one in a appearance
-
-}
-
-
-// AddMaterial -- adds any element which can be a children of an appearance as a material node
-void V4SceneManager::AddMaterial(GF_Node * node) {
-
-    // creates dummy nodes to hold this one
-  GF_Node * parent1 = CreateDummyNode(TAG_MPEG4_Shape, dictionnary, 0);
-  GF_Node * parent2 = CreateDummyNode(TAG_MPEG4_Appearance, parent1, 3);
-
-  // sets the parentship relation
-  MakeChild(node, parent2, 0); // material is field zero in appearance
-}
-
-
-// CreateDummyNode -- creates a node to hold another one, adds this node to given field of the given parent
-// (designed for use with nodes in the dictionnary)
-GF_Node * V4SceneManager::CreateDummyNode(const u32 tag, GF_Node * parent, const u32 fieldIndex) {
-
-  // creates a new node for this scene
-  GF_Node * newNode = NewNode(tag);
-
-  // sets the parentship relation !! AND registers the node !!
-  MakeChild(newNode, parent, fieldIndex);
-
-  return newNode;
-}
-
-
-// MakeChild -- Sets the first node as a child of the second using the given field
-void V4SceneManager::MakeChild(GF_Node * child, GF_Node * parent, const u32 fieldIndex) {
-  // get the field where we have to add the new child
-  GF_FieldInfo field;
-  gf_node_get_field(parent, fieldIndex, &field);
-
-  // keeps the count of uses up to date
-  gf_node_register(child, parent);
-
-  // if the field is single valued
-  if (field.fieldType == GF_SG_VRML_SFNODE) {
-    *((GF_Node **) field.far_ptr) = child;
-  }
-
-  // if the field is multi valued
-  if (field.fieldType == GF_SG_VRML_MFNODE)
-    gf_node_list_add_child((GF_ChildNodeItem **)field.far_ptr, child );
-
-}
-
-
-// GetDictionnary -- access to the dictionnary
-GF_Node * V4SceneManager::GetDictionnary() const {
-  return dictionnary;  
-}
-
-
-// HasDefParent -- checks if an ancestor of this node has an ID
-GF_Node * V4SceneManager::HasDefParent(GF_Node * node) {
-  
-  assert(node);
-
-  // also checks the node itself
-
-  int count = gf_node_get_parent_count(node);
-  GF_Node * parent;
-
-  // loops through all the parents and recurses
-  for (int i=0; i<count; i++) {
-    parent = gf_node_get_parent(node, i);
-    const char * name = gf_node_get_name(parent);
-    if (name) return parent;
-
-    parent = HasDefParent(parent);
-    if (parent) return parent;
-  }
-
-  return NULL;
-}
-
-void V4SceneManager::CreateIDandAddToPool(GF_Node *node)
-{
-	// gets a node ID
-	u32 id = gf_sg_get_next_available_node_id(GetSceneGraph());
-
-	char d[10]; // supposes no more than 1 000 000 000 objects
-
-	// queries the pool to know which number to use for the name
-	itoa(pools.GetCount(gf_node_get_tag(node)), d, 10); 
-
-	char c[50];
-	strcpy(c, gf_node_get_class_name(node));
-	strncat(c, "_", 1);
-	strncat(c, d, 10);
-
-	gf_node_set_id(node, id, c); // assigns NodeID and name
-	pools.Add(node); // adds to the node pool
-
-}
-
-
-// SetLength -- updates the number of cells in the timeline
-void V4SceneManager::SetLength(const u32 length_) {
-  length = length_;
-  frame->GetTimeLine()->SetLength(length_);
-}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4SceneManager.h Deleted

@@ -1,148 +0,0 @@
-#ifndef _V4SceneManager_H
-#define _V4SceneManager_H
-
-#include "safe_include.h" 
-#include <gpac/scene_manager.h>
-#include <gpac/compositor.h>
-#include <gpac/internal/terminal_dev.h> // MPEG4CLIENT
-#include "wxGPACPanel.h"
-#include "V4NodePools.h"
-
-
-#include <wx/gdicmn.h>
-
-
-#define DICTNAME "__V4dictionnary"
-
-
-class V4StudioFrame;
-
-extern "C" {
-  GF_Node *CloneNodeForEditing(GF_SceneGraph *inScene, GF_Node *orig);
-  int GetNextNodeID(GF_SceneGraph *sg);
-}
-
-class V4SceneManager {
-public:
-	// Constructor / Desctructor
-	V4SceneManager(V4StudioFrame *parent);
-	~V4SceneManager();
-
-	// reusable nodes, sorted by tag
-	V4NodePools pools;
-
-	/* file management functions */
-
-	void SaveFile(const char * path);
-	
-	void LoadCommon(); 
-	void LoadNew(); 
-	void LoadFile(const char *path); 
-
-	/* Node management functions */
-
-	GF_Node *NewNode(u32 tag);
-	GF_Node *CopyNode(GF_Node *node, GF_Node *parent, bool copy);
-	GF_Node *SetTopNode(u32 tag);  // TODO : will destroy dictionnary
-
-	void CreateIDandAddToPool(GF_Node *node);
-
-	/* Dictionnary functions */
-
-	// adds a node to the dictionnary, increases its reference count, the node must already have an ID
-	void AddToDictionnary(GF_Node * node);
-
-	// removes a node from the dictionnary = DELETES it's ID
-	void RemoveFromDictionnary(GF_Node * node);
-
-	GF_Node * GetDictionnary() const;
-
-
-	/* Various */
-
-	void LoadCommand(u32 commandNumber); // ?
-	GF_StreamContext * GetBifsStream();   // Get the first stream with id = 3
-
-
-	/* access to private members */
-
-	// SceneSize
-	void SetSceneSize(int w, int h);
-	void GetSceneSize(wxSize &size);
-
-  // FrameRate
-  void SetFrameRate(const u32 framerate_) { frameRate = framerate_; }
-  u32 GetFrameRate() const { return frameRate; }
-
-  // accesses Length
-  void SetLength(const u32 length_);
-  u32 GetLength() const { return length; }
-
-  // accesses units
-  void SetUnits(u32 units_) { units = units_; }
-  u32 GetUnits() const { return units; }
-
-
-
-	GF_Compositor *GetSceneCompositor() { return m_gpac_panel->GetSceneCompositor(); }
-
-	// GF_InlineScene
-	GF_InlineScene	*GetInlineScene() { return m_pIs; }
-
-	// SceneGraph
-	GF_SceneGraph	*GetSceneGraph() { return m_pIs->graph; }
-	GF_Node			*GetRootNode() { return gf_sg_get_root_node(m_pIs->graph); }
-
-	wxGPACPanel		*GetGPACPanel() { return m_gpac_panel; }
-	V4StudioFrame	*GetV4StudioFrame() { return frame; }
-
-	// TODO : terminal
-	private:
-
-	/* dictionnary function */
-
-	// initializes the dictionnary node
-	void CreateDictionnary();
-
-	// Finds all node with an ID from the given node and adds them to the node pool and the dictionnary
-	void AddRecursive(GF_Node * node, bool parentAdded = false);
-
-	// calls a proper function to add the node according to its type
-	void AddEffective(GF_Node * node);
-
-	// Create a dummy node of type tag and it to the specified field (or reimplace if the field is single valued)
-	GF_Node * CreateDummyNode(const u32 tag, GF_Node * parent, const u32 fieldIndex);
-
-	// Sets the first node as a child of the second using the given field
-	void MakeChild(GF_Node * child, GF_Node * parent, const u32 fieldIndex);
-
-	// Checks is specified node as a parent with an ID
-	GF_Node * V4SceneManager::HasDefParent(GF_Node * node);
-
-	// adds a node to the dictionnary
-	void AddGen(GF_Node * node);
-	void AddGeometry(GF_Node * node);
-	void AddAppearance(GF_Node * node);
-	void AddTexture(GF_Node * node);
-	void AddMaterial(GF_Node * node);
-
-
-protected:
-
-	// self created
-	LPINLINESCENE	m_pIs;
-	GF_SceneManager	*m_pSm;
-	GF_Node			*dictionnary;
-	wxGPACPanel		*m_gpac_panel;
-
-	// from other objects
-	V4StudioFrame	*frame;
-
-  u8  frameRate;
-  u32 length;            // in frames!
-  u32 units;             // = 1000
-	
-};
-
-#endif
-

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4Service.cpp Deleted

@@ -1,205 +0,0 @@
-#include "V4Service.h"
-
-#include <gpac/constants.h>
-
-#define V4_PRIVATE_SCENE_OTI 0xFF
-
-extern "C" {
-
-	
-V4Channel *V4Service::V4_GetChannel(V4Service *v4service, LPNETCHANNEL ch)
-{
-	u32 i;
-	for (i=0; i<gf_list_count(v4service->channels); i++) {
-		V4Channel *v4c = (V4Channel *)gf_list_get(v4service->channels, i);
-		if (v4c->ch && v4c->ch==ch) return v4c;
-	}
-	return NULL;
-}
-
-Bool V4Service::V4_RemoveChannel(V4Service *v4service, LPNETCHANNEL ch)
-{
-	u32 i;
-	for (i=0; i<gf_list_count(v4service->channels); i++) {
-		V4Channel *v4c = (V4Channel *)gf_list_get(v4service->channels, i);
-		if (v4c->ch && v4c->ch==ch) {
-			gf_list_rem(v4service->channels, i);
-			gf_free(v4c);
-			return 1;
-		}
-	}
-	return 0;
-}
-
-static Bool V4_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	return 1;
-}
-
-static GF_Err V4_ConnectService (GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	V4Service *v4serv = (V4Service *)plug->priv;
-	v4serv->SetService(serv);
-	gf_term_on_connect(v4serv->GetService(), NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Err V4_CloseService(GF_InputService *plug)
-{
-	V4Service *v4serv = (V4Service *)plug->priv;
-	gf_term_on_disconnect(v4serv->GetService(), NULL, GF_OK);
-	return GF_OK;
-}
-
-static GF_Descriptor *V4_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	V4Service *v4service= (V4Service *) plug->priv;
-	GF_ESD *esd;
-	GF_InitialObjectDescriptor *iod = (GF_InitialObjectDescriptor *) gf_odf_desc_new(GF_ODF_IOD_TAG);
-	iod->scene_profileAndLevel = 1;
-	iod->graphics_profileAndLevel = 1;
-	iod->OD_profileAndLevel = 1;
-	iod->audio_profileAndLevel = 0xFE;
-	iod->visual_profileAndLevel = 0xFE;
-	iod->objectDescriptorID = 1;
-
-	esd = gf_odf_desc_esd_new(0);
-	esd->slConfig->timestampResolution = 1000;
-	esd->slConfig->useTimestampsFlag = 1;
-	esd->ESID = 0xFFFE;
-	esd->decoderConfig->streamType = GF_STREAM_PRIVATE_SCENE;
-	esd->decoderConfig->objectTypeIndication = 0x01; //V4_PRIVATE_SCENE_OTI; 
-	if (v4service->GetPath()) {
-		esd->decoderConfig->decoderSpecificInfo->dataLength = strlen(v4service->GetPath()) + 1;
-		esd->decoderConfig->decoderSpecificInfo->data = gf_strdup(v4service->GetPath());
-	} 
-	gf_list_add(iod->ESDescriptors, esd);
-	return (GF_Descriptor *)iod;
-}
-
-static GF_Err V4_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	u32 ESID;
-	V4Service *v4serv = (V4Service *)plug->priv;
-	
-	sscanf(url, "ES_ID=%ud", &ESID);
-	if (!ESID) {
-		gf_term_on_connect(v4serv->GetService(), channel, GF_STREAM_NOT_FOUND);
-	} else {
-		V4Channel *v4c = (V4Channel *)gf_malloc(sizeof(V4Channel));
-		memset(v4c, 0, sizeof(V4Channel));
-		v4c->ch = channel;
-		v4c->ESID = ESID;
-		gf_list_add(v4serv->GetChannels(), v4c);
-		gf_term_on_connect(v4serv->GetService(), channel, GF_OK);
-	}
-	return GF_OK;
-}
-
-static GF_Err V4_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	V4Service *v4serv = (V4Service *)plug->priv;
-	Bool had_ch;
-
-	had_ch = v4serv->V4_RemoveChannel(v4serv, channel);
-	gf_term_on_disconnect(v4serv->GetService(), channel, had_ch ? GF_OK : GF_STREAM_NOT_FOUND);
-	return GF_OK;
-}
-
-static GF_Err V4_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	V4Service *v4serv = (V4Service *)plug->priv;
-	V4Channel *v4c;
-
-	if (!com->base.on_channel) return GF_OK;
-
-	v4c = v4serv->V4_GetChannel(v4serv, com->base.on_channel);
-	if (!v4c) 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_PADDING: return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 0;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		/*this is not made for updates, use undefined duration*/
-		com->duration.duration = 0;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-		v4c->start = (u32) (1000 * com->play.start_range);
-		v4c->end = (u32) (1000 * com->play.end_range);
-		return GF_OK;
-	case GF_NET_CHAN_STOP:
-		return GF_OK;
-	case GF_NET_CHAN_CONFIG: return GF_OK;
-	case GF_NET_CHAN_GET_DSI:
-		com->get_dsi.dsi = NULL;
-		com->get_dsi.dsi_len = 0;
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-static GF_Err V4_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)
-{
-	V4Channel *v4c;
-	V4Service *v4serv = (V4Service *)plug->priv;
-	v4c = v4serv->V4_GetChannel(v4serv, channel);
-	if (!v4c) return GF_STREAM_NOT_FOUND;
-
-	memset(out_sl_hdr, 0, sizeof(GF_SLHeader));
-	out_sl_hdr->compositionTimeStampFlag = 1;
-	out_sl_hdr->compositionTimeStamp = v4c->start;
-	out_sl_hdr->accessUnitStartFlag = 1;
-	*sl_compressed = 0;
-	*out_reception_status = GF_OK;
-	*is_new_data = 1;
-	return GF_OK;	return GF_OK;
-}
-
-static GF_Err V4_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	return GF_OK;
-}
-
-static Bool V4_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	return 0;
-}
-
-} // extern "C"
-
-V4Service::V4Service(const char *path) 
-{
-
-	m_pNetClient = (GF_InputService *)gf_malloc(sizeof(GF_InputService));
-	m_pNetClient->priv = this;
-
-	m_pNetClient->CanHandleURL			= V4_CanHandleURL;
-
-	m_pNetClient->ConnectService		= V4_ConnectService;
-	m_pNetClient->CloseService			= V4_CloseService;
-	
-	m_pNetClient->ConnectChannel		= V4_ConnectChannel;
-	m_pNetClient->DisconnectChannel		= V4_DisconnectChannel;
-	
-	m_pNetClient->GetServiceDescriptor = V4_GetServiceDesc;
-	m_pNetClient->ServiceCommand		= V4_ServiceCommand;
-
-	m_pNetClient->ChannelGetSLP			= V4_ChannelGetSLP;
-	m_pNetClient->ChannelReleaseSLP		= V4_ChannelReleaseSLP;
-
-	m_pNetClient->CanHandleURLInService = V4_CanHandleURLInService;
-
-	channels = gf_list_new();
-	if (path) m_path = gf_strdup(path);
-}
-
-V4Service::~V4Service() 
-{
-	if (m_path) gf_free(m_path);
-	gf_list_del(channels);
-	gf_free(m_pNetClient);
-}

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4Service.h Deleted

@@ -1,42 +0,0 @@
-#include "safe_include.h"
-#include <gpac/modules/service.h>
-
-typedef struct
-{
-	u32 ESID;
-	LPNETCHANNEL ch;
-	u32 start, end;
-} V4Channel;
-
-
-class V4Service {
-public:
-
-	V4Service(const char*path);
-	~V4Service();
-
-	void SetService(GF_ClientService *s) { m_pService = s; }
-	GF_ClientService *GetService() { return m_pService; }
-
-	void SetPath(char *path) { m_path = path; }
-	char *GetPath() { return m_path; }
-
-	GF_List* GetChannels() { return channels; }
-	V4Channel *V4_GetChannel(V4Service *v4service, LPNETCHANNEL ch);
-	Bool V4_RemoveChannel(V4Service *v4service, LPNETCHANNEL ch);
-
-	GF_InputService *GetServiceInterface() { return m_pNetClient; }
-
-protected:
-
-	/* the interface given to the GPAC Core */
-	GF_InputService *m_pNetClient;
-
-	/* The actual GPAC Core service returned by the interface */
-	GF_ClientService *m_pService;
-	/* All the channels of the current service */
-	GF_List *channels;
-
-	/* The path to the currently load file */
-	char *m_path;
-};
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4StudioApp.cpp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4StudioApp.h Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4StudioFrame.cpp Deleted

@@ -1,951 +0,0 @@
-#include "safe_include.h" 
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-  #include "wx/wx.h"
-#endif
-
-#include "V4StudioFrame.h"
-#include "wx/xrc/xmlres.h"
-
-
-#include <gpac/internal/scenegraph_dev.h>
-#include <gpac/internal/terminal_dev.h> // GF_Terminal
-#include <gpac/nodes_mpeg4.h>
-
-V4StudioFrame::V4StudioFrame():
-    wxFrame((wxFrame *) NULL, -1, "V4Studio", wxPoint(50, 50), wxSize(800, 700))
-{
-
-	m_pV4sm = NULL;
-
-	m_selection = NULL;
-	m_parentSelection = NULL;
-	m_clipboardNode = NULL;
-
-	m_frame = 0; // we start at frame=0
-	editDict = false;
-
-	// Creates components and places them on the form
-	fieldView = new V4FieldList(this, wxSize(100,250));
-	treeView = new V4StudioTree(this, wxSize(100,250), fieldView);
-	timeLine = new V4TimeLine(this);
-	timeLine->SetSize(500, 100);
-	cmdPanel = new V4CommandPanel(this);
-	cmdPanel->SetSize(100, 100);
-
-	/*new m_pFileMenu bar*/
-	wxMenuBar *b = new wxMenuBar();
-	/*file*/
-	m_pFileMenu = new wxMenu();
-	m_pFileMenu->Append(MENU_FILE_NEW, "&New\tCtrl+N", "Create a new document");
-	m_pFileMenu->Append(MENU_FILE_OPEN, "&Open...\tCtrl+O", "Open an existing document");
-	m_pFileMenu->Append(MENU_FILE_SAVE, "&Save\tCtrl+S", "Save the active document");
-	m_pFileMenu->Append(MENU_FILE_CLOSE, "&Close\tCtrl+X", "Close the active document");
-	m_pFileMenu->AppendSeparator();
-	m_pFileMenu->Append(CHANGE_SIZE_DIALOG, "&Size\tCtrl+Z", "Change scene size");
-	m_pFileMenu->Append(CHANGE_FRAMERATE, "&FrameRate\tCtrl+F", "Change FrameRate");
-	m_pFileMenu->Append(CHANGE_LENGTH, "&Length\tCtrl+L", "Change Length");
-	m_pFileMenu->AppendSeparator();
-	m_pFileMenu->Append(MENU_FILE_QUIT, "E&xit", "Quit the application; prompts to save documents");
-	b->Append(m_pFileMenu, "&File");
-	SetMenuBar(b);
-
-	/*file*/
-	m_pToolsMenu = new wxMenu();
-	m_pToolsMenu->Append(MENU_TOOL_SHOW_LOWLEVEL, "&Low-Level\tCtrl+L", "Shows the low-level toolbar");
-	m_pToolsMenu->Append(MENU_TOOL_SHOW_HIGHLEVEL, "&High-Level\tCtrl+H", "Shows the high-level toolbar");
-	b->Append(m_pToolsMenu, "&Tools");
-	SetMenuBar(b);
-
-	m_pStatusbar = CreateStatusBar();
-
-	// Main Toolbar
-	m_pMainToolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_HORIZONTAL|wxTB_FLAT);
-	m_pMainToolbar->AddTool(TOOL_FILE_NEW, _("New"), wxBitmap (wxT("rc\\new.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Open a new file"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_FILE_OPEN, _("Open"), wxBitmap (wxT("rc\\open.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Open an existing file (BT/XMT/MP4)"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_FILE_SAVE, _("Save"), wxBitmap (wxT("rc\\save.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Save to a file"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_FILE_CLOSE, _("Close"), wxBitmap (wxT("rc\\close.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Close the file"), wxT(""));
-	m_pMainToolbar->AddSeparator();
-	m_pMainToolbar->AddTool(TOOL_FILE_PREVIEW, _("Preview"), wxBitmap (wxT("rc\\preview.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Preview in player"), wxT(""));
-	m_pMainToolbar->AddSeparator();
-	m_pMainToolbar->AddTool(TOOL_EDIT_CUT, _("Cut"), wxBitmap (wxT("rc\\cut.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Cut"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_EDIT_COPY, _("Copy"), wxBitmap (wxT("rc\\copy.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Copy"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_EDIT_PASTE, _("Paste"), wxBitmap (wxT("rc\\paste.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Paste"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_EDIT_PASTE_USE, _("PastePlus"), wxBitmap (wxT("rc\\paste_use.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Paste a USE"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_EDIT_DELETE, _("Delete"), wxBitmap (wxT("rc\\delete.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Delete"), wxT(""));
-	m_pMainToolbar->AddSeparator();
-	m_pMainToolbar->AddTool(TOOL_EDIT_UNDO, _("Undo"), wxBitmap (wxT("rc\\undo.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Undo"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_EDIT_REDO, _("Redo"), wxBitmap (wxT("rc\\redo.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Redo"), wxT(""));
-	m_pMainToolbar->AddSeparator();
-
-	m_pMainToolbar->AddSeparator();
-
-	m_pMainToolbar->AddTool(TOOL_ADD_TO_TL, _("AddToTL"), wxBitmap( wxT("rc\\paste.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Add to timeLine"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_NEXT_FRAME, _("NextFrame"), wxBitmap( wxT("rc\\redo.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Next frame"), wxT(""));
-	m_pMainToolbar->AddTool(TOOL_VIEW_DICT, _("ViewDict"), wxBitmap( wxT("rc\\open.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("View Dictionnary"), wxT(""));
-
-	/* Not Implemented yet */
-	m_pMainToolbar->EnableTool(TOOL_FILE_PREVIEW, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_UNDO, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_REDO, false);
-	m_pMainToolbar->EnableTool(TOOL_NEXT_FRAME, false);
-
-	/* Not available when starting V4Studio */
-	/* Nothing to save */
-	m_pFileMenu->Enable(MENU_FILE_SAVE, false);
-	m_pFileMenu->Enable(MENU_FILE_CLOSE, false);
-	m_pFileMenu->Enable(CHANGE_SIZE_DIALOG, false);
-	m_pFileMenu->Enable(CHANGE_LENGTH, false);
-	m_pFileMenu->Enable(CHANGE_FRAMERATE, false);
-	m_pMainToolbar->EnableTool(TOOL_FILE_SAVE, false);
-	m_pMainToolbar->EnableTool(TOOL_FILE_CLOSE, false);
-
-	/* Nothing to edit */
-	m_pMainToolbar->EnableTool(TOOL_EDIT_CUT, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_COPY, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE_USE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_DELETE, false);
-
-	m_pMainToolbar->EnableTool(TOOL_ADD_TO_TL, false);
-	m_pMainToolbar->EnableTool(TOOL_VIEW_DICT, false);
-	m_pMainToolbar->Realize();
-	SetToolBar(m_pMainToolbar);
-
-	m_uSelectedNodeToolBar = 0;
-	// Node Creation Toolbar
-	m_pLowLevelNodeToolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_VERTICAL|wxTB_FLAT);
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_ORDEREDGROUP, _("OrderedGroup"), wxBitmap (wxT("rc\\orderedgroup.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create an OrderedGroup"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_LAYER2D, _("Layer2D"), wxBitmap (wxT("rc\\layer2d.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Layer2D"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_TRANSFORM2D, _("Transform2D"), wxBitmap (wxT("rc\\t2d.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Tranform2D"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_TRANSFORMMATRIX2D, _("TransformMatrix2D"), wxBitmap (wxT("rc\\tm2d.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a TranformMatrix2D"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_COLOR_TRANSFORM, _("ColorTransform"), wxBitmap (wxT("rc\\colortransform.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a ColorTransform"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_SHAPE, _("Shape"), wxBitmap (wxT("rc\\shape.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Shape"), wxT(""));
-	m_pLowLevelNodeToolbar->AddSeparator();
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_APPEARANCE, _("Appearance"), wxBitmap (wxT("rc\\appearance.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create an Appearance"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_MATERIAL2D, _("Material2D"), wxBitmap (wxT("rc\\material2d.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Material2D"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_LINEPROPS, _("LineProps"), wxBitmap (wxT("rc\\lineproperties.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a LineProperties"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_LINEAR_GRADIENT, _("LinearGradient"), wxBitmap (wxT("rc\\lg.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Linear Gradient"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_RADIAL_GRADIENT, _("RadialGradient"), wxBitmap (wxT("rc\\rg.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Radial Gradient"), wxT(""));
-	m_pLowLevelNodeToolbar->AddSeparator();
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_RECT, _("Rectangle"), wxBitmap (wxT("rc\\rect.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Rectangle"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_CIRCLE, _("Circle"), wxBitmap (wxT("rc\\circle.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Rectangle"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_IFS2D, _("IndexedFaceSet2D"), wxBitmap (wxT("rc\\ifs2d.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create an IndexedFaceSet2D"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_ILS2D, _("IndexedLineSet2D"), wxBitmap (wxT("rc\\ils2d.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create an IndexedLineSet2D"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_XLINEPROPS, _("XLineProps"), wxBitmap (wxT("rc\\xlineproperties.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create an XLineProperties"), wxT(""));
-	m_pLowLevelNodeToolbar->AddSeparator();
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_TEXT, _("Text"), wxBitmap (wxT("rc\\text.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a Text"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_FONTSTYLE, _("FontStyle"), wxBitmap (wxT("rc\\fs.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Create a FontStyle"), wxT(""));
-	m_pLowLevelNodeToolbar->AddSeparator();
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_BACKGROUND2D, _("Background2D"), wxBitmap (wxT("rc\\image.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Add a Background2D"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_MOVIE, _("Movie"), wxBitmap (wxT("rc\\movie.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Add a Movie"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_IMAGE, _("Image"), wxBitmap (wxT("rc\\image.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Add an Image"), wxT(""));
-	m_pLowLevelNodeToolbar->AddTool(TOOL_NEW_SOUND, _("Sound"), wxBitmap (wxT("rc\\sound.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Add a Sound"), wxT(""));
-	m_pLowLevelNodeToolbar->Realize();
-
-/*
-	m_pHighLevelNodeToolbar = new wxToolBar(this, -1, wxDefaultPosition, wxDefaultSize, wxTB_VERTICAL|wxTB_FLAT);
-	m_pHighLevelNodeToolbar->AddTool(TOOL_NEW_2DSCENE, _("OrderedGroup"), wxBitmap (wxT("rc\\orderedgroup.bmp"), wxBITMAP_TYPE_ANY), wxNullBitmap, wxITEM_NORMAL, _("Creates a 2D scene"), wxT(""));
-	m_pHighLevelNodeToolbar->Realize();
-*/
-	set_properties();
-	do_layout();
-	UpdateToolBar();
-}
-
-V4StudioFrame::~V4StudioFrame()
-{
-}
-
-
-/* Functions that changes scene parameters */
-
-void V4StudioFrame::OnChangeFrameRate(wxCommandEvent &event) {
-	if (!m_pV4sm) return;
-
-	u32 l = m_pV4sm->GetFrameRate();
-	wxString sFR;
-	sFR.Printf("%d", l);
-
-	wxTextEntryDialog dialog(this, _T("Enter scene framerate"), _T("one positive integer number"), sFR, wxOK | wxCANCEL);
-
-	if (dialog.ShowModal() != wxID_OK) {
-	dialog.Destroy();
-	return;
-	}
-
-	sscanf(dialog.GetValue(), "%d", &l);
-	m_pV4sm->SetFrameRate(l);
-
-	dialog.Destroy();
-	SceneGraphChanged();
-}
-
-
-void V4StudioFrame::OnChangeLength(wxCommandEvent &event) {
- 	if (!m_pV4sm) return;
-	u32 l = m_pV4sm->GetLength();
-	wxString sLength;
-	sLength.Printf("%d", l);
-
-	wxTextEntryDialog dialog(this, _T("Enter scene length"), _T("one positive integer number"), sLength, wxOK | wxCANCEL);
-
-	if (dialog.ShowModal() != wxID_OK) {
-	dialog.Destroy();
-	return;
-	}
-
-	sscanf(dialog.GetValue(), "%d", &l);
-	m_pV4sm->SetLength(l);
-
-	dialog.Destroy();
-	SceneGraphChanged();
-}
-
-void V4StudioFrame::OnChangeSize(wxCommandEvent &event) 
-{
-	if (!m_pV4sm) return;
-	u32 w, h;
-	wxSize sceneSize;
-	m_pV4sm->GetSceneSize(sceneSize);	
-	w = sceneSize.GetX();
-	h = sceneSize.GetY();
-	wxString sSize;
-	sSize.Printf("%d %d", w, h);
-	wxTextEntryDialog dialog(this,
-						   _T("Enter the scene width and height"),
-						   _T("Please enter two integer numbers"),
-						   sSize,
-						   wxOK | wxCANCEL);
-
-	while (dialog.ShowModal() != wxID_OK && w == 0 && h == 0) {}
-	sscanf(dialog.GetValue(), "%d %d", &w, &h);
-	m_pV4sm->SetSceneSize(w,h);
-	dialog.Destroy();
-	SceneGraphChanged();
-}
-
-// Dispatchs the new scene graph to all the sub components who need it.
-void V4StudioFrame::SceneGraphChanged() 
-{
-	m_parentSelection = NULL;
-	m_selection = (!m_pV4sm ? NULL : m_pV4sm->GetRootNode());
-	Layout();
-	Update();
-}
-
-void V4StudioFrame::set_properties()
-{
-    SetTitle(_("V4Studio"));
-    wxIcon _icon;
-    _icon.CopyFromBitmap(wxBitmap(_("rc\\v4.bmp"), wxBITMAP_TYPE_ANY));
-    SetIcon(_icon);
-    SetSize(wxSize(500, 500));
-}
-
-
-void V4StudioFrame::do_layout()
-{
-	wxBoxSizer * sizer_6 = new wxBoxSizer(wxVERTICAL);   // top = treeview + fieldview; bottom = timeline + command panel
-	wxBoxSizer * sizer_7 = new wxBoxSizer(wxHORIZONTAL); // right = timeline, left = command panel
-	wxBoxSizer * sizer_8 = new wxBoxSizer(wxHORIZONTAL); // right = treeview; left = fieldview
-
-	sizer_6->Add(sizer_8,  2, wxEXPAND, 0); // height of treeview twice bigger thant height of timeline
-	sizer_6->Add(sizer_7,  1, wxEXPAND, 0);
-
-	sizer_7->Add(timeLine, 3, wxEXPAND, 0);
-	sizer_7->Add(cmdPanel, 1, wxEXPAND, 0);
-
-	sizer_8->Add(treeView,  1, wxEXPAND, 0);
-	sizer_8->Add(fieldView, 1, wxEXPAND, 0);
-
-	wxBoxSizer* sizer_9 = new wxBoxSizer(wxHORIZONTAL);
-	
-	sizer_9->Add(m_pLowLevelNodeToolbar, 0, wxEXPAND, 0);
-/*
-	if (m_uSelectedNodeToolBar == 0) sizer_9->Add(m_pLowLevelNodeToolbar, 0, wxEXPAND, 0);
-	else sizer_9->Add(m_pHighLevelNodeToolbar, 0, wxEXPAND, 0);
-*/
-
-	sizer_9->Add(sizer_6, 1, wxEXPAND, 0);
-
-	SetSizer(sizer_9);
-	Layout();
-
-	cmdPanel->Layout();
-}
-
-
-BEGIN_EVENT_TABLE(V4StudioFrame, wxFrame)
-  // m_pFileMenu events
-  EVT_MENU(MENU_FILE_NEW, V4StudioFrame::OnNew)
-  EVT_MENU(MENU_FILE_OPEN, V4StudioFrame::OnFileOpen)
-  EVT_MENU(MENU_FILE_SAVE, V4StudioFrame::OnSave)
-  EVT_MENU(MENU_FILE_CLOSE, V4StudioFrame::OnClose)
-  EVT_MENU(MENU_FILE_QUIT, V4StudioFrame::OnQuit)
-  EVT_MENU(CHANGE_SIZE_DIALOG, V4StudioFrame::OnChangeSize)
-  EVT_MENU(CHANGE_FRAMERATE, V4StudioFrame::OnChangeFrameRate)
-  EVT_MENU(CHANGE_LENGTH, V4StudioFrame::OnChangeLength)
-
-  // m_pToolsMenu events
-  EVT_MENU(MENU_TOOL_SHOW_LOWLEVEL, V4StudioFrame::OnLowLevelTools)
-  EVT_MENU(MENU_TOOL_SHOW_HIGHLEVEL, V4StudioFrame::OnHighLevelTools)
-
-  // edit toolbar events
-  EVT_TOOL(TOOL_FILE_NEW, V4StudioFrame::OnNew)
-  EVT_TOOL(TOOL_FILE_OPEN, V4StudioFrame::OnFileOpen)
-  EVT_TOOL(TOOL_FILE_SAVE, V4StudioFrame::OnSave)
-  EVT_TOOL(TOOL_FILE_CLOSE, V4StudioFrame::OnClose)
-  EVT_TOOL(TOOL_EDIT_CUT, V4StudioFrame::OnEditCut)
-  EVT_TOOL(TOOL_EDIT_COPY, V4StudioFrame::OnEditCopy)
-  EVT_TOOL(TOOL_EDIT_PASTE, V4StudioFrame::OnEditPaste)
-  EVT_TOOL(TOOL_EDIT_PASTE_USE, V4StudioFrame::OnEditPasteUse)
-  EVT_TOOL(TOOL_EDIT_DELETE, V4StudioFrame::OnEditDelete)
-  EVT_TOOL(TOOL_ADD_TO_TL, V4StudioFrame::OnAddToTimeLine)
-  EVT_TOOL(TOOL_NEXT_FRAME, V4StudioFrame::NextFrame)
-  EVT_TOOL(TOOL_VIEW_DICT, V4StudioFrame::SwitchView)
-
-  // new toolbar events
-  EVT_TOOL(TOOL_NEW_ORDEREDGROUP, V4StudioFrame::OnNewOrderedGroup)
-  EVT_TOOL(TOOL_NEW_LAYER2D, V4StudioFrame::OnNewLayer2D)
-  EVT_TOOL(TOOL_NEW_TRANSFORM2D, V4StudioFrame::OnNewTransform2D)
-  EVT_TOOL(TOOL_NEW_TRANSFORMMATRIX2D, V4StudioFrame::OnNewTransformMatrix2D)
-  EVT_TOOL(TOOL_NEW_COLOR_TRANSFORM, V4StudioFrame::OnNewColorTransform)
-  EVT_TOOL(TOOL_NEW_SHAPE, V4StudioFrame::OnNewShape)
-  EVT_TOOL(TOOL_NEW_APPEARANCE, V4StudioFrame::OnNewAppearance)
-  EVT_TOOL(TOOL_NEW_LINEAR_GRADIENT, V4StudioFrame::OnNewLinearGradient)
-  EVT_TOOL(TOOL_NEW_RADIAL_GRADIENT, V4StudioFrame::OnNewRadialGradient)
-  EVT_TOOL(TOOL_NEW_MATERIAL2D, V4StudioFrame::OnNewMaterial2D)
-  EVT_TOOL(TOOL_NEW_LINEPROPS, V4StudioFrame::OnNewLineProps)
-  EVT_TOOL(TOOL_NEW_XLINEPROPS, V4StudioFrame::OnNewXLineProps)
-  EVT_TOOL(TOOL_NEW_RECT, V4StudioFrame::OnNewRect)
-  EVT_TOOL(TOOL_NEW_CIRCLE, V4StudioFrame::OnNewCircle)
-  EVT_TOOL(TOOL_NEW_TEXT, V4StudioFrame::OnNewText)
-  EVT_TOOL(TOOL_NEW_FONTSTYLE, V4StudioFrame::OnNewFontStyle)
-  EVT_TOOL(TOOL_NEW_SOUND, V4StudioFrame::OnNewSound)
-  EVT_TOOL(TOOL_NEW_BACKGROUND2D, V4StudioFrame::OnNewBackground2D)
-  EVT_TOOL(TOOL_NEW_IMAGE, V4StudioFrame::OnNewImageTexture)
-  EVT_TOOL(TOOL_NEW_MOVIE, V4StudioFrame::OnNewMovieTexture)
-END_EVENT_TABLE()
-
-// Creates New Scene
-void V4StudioFrame::OnNew(wxCommandEvent &event)
-{
-	m_pV4sm = new V4SceneManager(this);
-	m_pV4sm->LoadNew();
-
-	m_pMainToolbar->EnableTool(TOOL_ADD_TO_TL, true);
-	m_pMainToolbar->EnableTool(TOOL_VIEW_DICT, true);
-	m_pMainToolbar->EnableTool(TOOL_FILE_SAVE, true);
-	m_pFileMenu->Enable(MENU_FILE_SAVE, true);
-	m_pMainToolbar->EnableTool(TOOL_FILE_CLOSE, true);
-	m_pFileMenu->Enable(MENU_FILE_CLOSE, true);
-	m_pMainToolbar->EnableTool(TOOL_FILE_OPEN, false);
-	m_pFileMenu->Enable(MENU_FILE_OPEN, false);
-	m_pMainToolbar->EnableTool(TOOL_FILE_NEW, false);
-	m_pFileMenu->Enable(MENU_FILE_NEW, false);
-	m_pFileMenu->Enable(CHANGE_SIZE_DIALOG, true);
-	m_pFileMenu->Enable(CHANGE_LENGTH, true);
-	m_pFileMenu->Enable(CHANGE_FRAMERATE, true);
-
-	Layout();
-	SetStatusText("New scene", 0);
-	SceneGraphChanged();
-
-	OnChangeSize(event);
-}
-
-// Opens an existing file
-void V4StudioFrame::OnFileOpen(wxCommandEvent &event)
-{
-	wxFileDialog *dlg = new wxFileDialog(this, "Open a bt scene",
-									   "", "", "BT Files (*.bt)|*.bt|MP4 Files (*.mp4)|*.mp4|XMT Files (*.xmt)|*.xmt|SWF Files (*.swf)|*.swf|All files (*.*)|*.*",
-									   wxOPEN, wxDefaultPosition);
-	if ( dlg->ShowModal() == wxID_OK ) {
-		if (m_pV4sm) delete m_pV4sm;
-		m_pV4sm = new V4SceneManager(this);
-		m_pV4sm->LoadFile(dlg->GetPath().c_str());
-		
-		m_pMainToolbar->EnableTool(TOOL_ADD_TO_TL, true);
-		m_pMainToolbar->EnableTool(TOOL_VIEW_DICT, true);
-		m_pMainToolbar->EnableTool(TOOL_FILE_SAVE, true);
-		m_pFileMenu->Enable(MENU_FILE_SAVE, true);
-		m_pMainToolbar->EnableTool(TOOL_FILE_CLOSE, true);
-		m_pFileMenu->Enable(MENU_FILE_CLOSE, true);
-		m_pMainToolbar->EnableTool(TOOL_FILE_OPEN, false);
-		m_pFileMenu->Enable(MENU_FILE_OPEN, false);
-		m_pMainToolbar->EnableTool(TOOL_FILE_NEW, false);
-		m_pFileMenu->Enable(MENU_FILE_NEW, true);
-		m_pFileMenu->Enable(CHANGE_SIZE_DIALOG, true);
-		m_pFileMenu->Enable(CHANGE_LENGTH, true);
-		m_pFileMenu->Enable(CHANGE_FRAMERATE, true);
-
-		Layout();
-		SetStatusText(dlg->GetFilename(), 0);
-		SceneGraphChanged();
-	}
-	dlg->Destroy();
-}
-
-void V4StudioFrame::OnSave(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	wxFileDialog *dlg = new wxFileDialog(this, "Save the scene to an mp4 file",
-									   "", "", "MPEG-4 Files (*.mp4)|*.mp4|All files (*.*)|*.*",
-									   wxSAVE, wxDefaultPosition);
-	if ( dlg->ShowModal() == wxID_OK )
-	{
-	  m_pV4sm->SaveFile(dlg->GetPath().c_str());
-	  SetStatusText(dlg->GetFilename(), 0);
-	}
-	dlg->Destroy();
-}
-
-void V4StudioFrame::OnClose(wxCommandEvent &event)
-{
-	if (m_pV4sm) delete m_pV4sm;
-	m_pV4sm = NULL;
-
-	m_pMainToolbar->EnableTool(TOOL_ADD_TO_TL, false);
-	m_pMainToolbar->EnableTool(TOOL_VIEW_DICT, false);
-	m_pMainToolbar->EnableTool(TOOL_FILE_SAVE, false);
-	m_pFileMenu->Enable(MENU_FILE_SAVE, false);
-	m_pMainToolbar->EnableTool(TOOL_FILE_CLOSE, false);
-	m_pFileMenu->Enable(MENU_FILE_CLOSE, false);
-	m_pMainToolbar->EnableTool(TOOL_FILE_OPEN, true);
-	m_pFileMenu->Enable(MENU_FILE_OPEN, true);
-	m_pMainToolbar->EnableTool(TOOL_FILE_NEW, true);
-	m_pFileMenu->Enable(MENU_FILE_NEW, true);
-	m_pFileMenu->Enable(CHANGE_SIZE_DIALOG, false);
-	m_pFileMenu->Enable(CHANGE_LENGTH, false);
-	m_pFileMenu->Enable(CHANGE_FRAMERATE, false);
-
-	m_clipboardNode = NULL;
-	m_clipboardParentNode = NULL;
-	m_pMainToolbar->EnableTool(TOOL_EDIT_CUT, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_COPY, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE_USE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_DELETE, false);
-	Layout();
-	SceneGraphChanged();
-}
-
-// Quits application
-// TODO : memory leaks !
-void V4StudioFrame::OnQuit(wxCommandEvent &event)
-{
-	Close(FALSE);
-}
-
-/**********************************************/
-/*  Tools Menu methods						  */
-/**********************************************/
-void V4StudioFrame::OnLowLevelTools(wxCommandEvent &event)
-{
-	m_uSelectedNodeToolBar = 0;
-	do_layout();
-}
-
-void V4StudioFrame::OnHighLevelTools(wxCommandEvent &event)
-{
-	m_uSelectedNodeToolBar = 1;
-	do_layout();
-}
-
-/**********************************************/
-/*  Functions to add components to the scene  */
-/**********************************************/
-void V4StudioFrame::OnNewOrderedGroup(wxCommandEvent &event) 
-{
-	if (!m_pV4sm) return;
-	GF_Node *top = m_pV4sm->GetRootNode();
-	if (!top) {
-		top = m_pV4sm->SetTopNode(TAG_MPEG4_OrderedGroup);
-		m_selection = top;
-		m_parentSelection = NULL;
-	} else {
-		GF_Node *og = m_pV4sm->NewNode(TAG_MPEG4_OrderedGroup);
-		gf_node_insert_child(m_selection, og, -1);
-		gf_node_register(og, m_selection);
-		m_parentSelection = m_selection;
-		m_selection = og;
-	}
-	Update();
-}
-
-void V4StudioFrame::OnNewLayer2D(wxCommandEvent &event) 
-{
-	if (!m_pV4sm) return;
-	GF_Node *top = m_pV4sm->GetRootNode();
-	if (!top) {
-		top = m_pV4sm->SetTopNode(TAG_MPEG4_Layer2D);
-		m_selection = top;
-		m_parentSelection = NULL;
-	} else {
-		GF_Node *l2d = m_pV4sm->NewNode(TAG_MPEG4_Layer2D);
-		gf_node_insert_child(m_selection, l2d, -1);
-    gf_node_register(l2d, m_selection);
-		m_parentSelection = m_selection;
-		m_selection = l2d;
-	}
-	Update();
-}
-
-void V4StudioFrame::OnNewText(wxCommandEvent &event) 
-{
-	if (!m_pV4sm) return;
-	GF_Node *text = m_pV4sm->NewNode(TAG_MPEG4_Text);
-	M_Shape *shape = (M_Shape *)m_selection;
-	shape->geometry = text;
-	gf_node_register(text, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = text;
-	Update();
-}
-
-void V4StudioFrame::OnNewFontStyle(wxCommandEvent &event) 
-{
-	if (!m_pV4sm) return;
-	GF_Node *fs = m_pV4sm->NewNode(TAG_MPEG4_FontStyle);
-	M_Text *text = (M_Text *)m_selection;
-	text->fontStyle = fs;
-	gf_node_register(fs, m_selection);
-	m_selection = fs;
-	m_parentSelection = (GF_Node *)text;
-	Update();
-}
-
-void V4StudioFrame::OnNewRect(wxCommandEvent &event) 
-{
-	if (!m_pV4sm) return;
-	GF_Node *rect = m_pV4sm->NewNode(TAG_MPEG4_Rectangle);
-	M_Shape *shape = (M_Shape *)m_selection;
-	shape->geometry = rect;
-	gf_node_register(rect, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = rect;
-	Update();
-}
-
-void V4StudioFrame::OnNewCircle(wxCommandEvent &event) 
-{
-	if (!m_pV4sm) return;
-	GF_Node *circle = m_pV4sm->NewNode(TAG_MPEG4_Circle);
-	M_Shape *shape = (M_Shape *)m_selection;
-	shape->geometry = circle;
-	gf_node_register(circle, m_selection);
-	((M_Circle *) circle)->radius = 75;
-	m_parentSelection = m_selection;
-	m_selection = circle;
-	Update();
-}
-
-void V4StudioFrame::OnNewTransform2D(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *t2d = m_pV4sm->NewNode(TAG_MPEG4_Transform2D);
-	if (!m_selection) m_selection = m_pV4sm->GetRootNode();
-	gf_node_insert_child(m_selection, t2d, -1);
-	gf_node_register(t2d, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = t2d;
-	Update();
-}
-
-void V4StudioFrame::OnNewColorTransform(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *ct = m_pV4sm->NewNode(TAG_MPEG4_ColorTransform);
-	if (!m_selection) m_selection = m_pV4sm->GetRootNode();
-	gf_node_insert_child(m_selection, ct, -1);
-	gf_node_register(ct, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = ct;
-	Update();
-}
-
-void V4StudioFrame::OnNewTransformMatrix2D(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *tm2d = m_pV4sm->NewNode(TAG_MPEG4_TransformMatrix2D);
-	if (!m_selection) m_selection = m_pV4sm->GetRootNode();
-	gf_node_insert_child(m_selection, tm2d, -1);
-	gf_node_register(tm2d, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = (GF_Node *)tm2d;
-	Update();
-}
-
-void V4StudioFrame::OnNewShape(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *shape = m_pV4sm->NewNode(TAG_MPEG4_Shape);
-	gf_node_insert_child(m_selection, shape, -1);
-	gf_node_register( shape, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = (GF_Node *)shape;
-	Update();
-}
-
-void V4StudioFrame::OnNewAppearance(wxCommandEvent &event) 
-{
-	if (!m_pV4sm) return;
-	GF_Node *app = m_pV4sm->NewNode(TAG_MPEG4_Appearance);
-	M_Shape *shape = (M_Shape *)m_selection;
-	shape->appearance = app;
-	gf_node_register(app, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = app;
-	Update();
-}
-
-void V4StudioFrame::OnNewLinearGradient(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *lg = m_pV4sm->NewNode(TAG_MPEG4_LinearGradient);
-	M_Appearance *app = (M_Appearance *)m_selection;
-	app->texture = lg;
-	gf_node_register(lg, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = (GF_Node *)lg;
-	Update();
-}
-
-void V4StudioFrame::OnNewRadialGradient(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *rg = m_pV4sm->NewNode(TAG_MPEG4_RadialGradient);
-	M_Appearance *app = (M_Appearance *)m_selection;
-	app->texture = rg;
-	gf_node_register(rg, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = rg;
-	Update();
-}
-
-
-void V4StudioFrame::OnNewMaterial2D(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *mat2d = m_pV4sm->NewNode(TAG_MPEG4_Material2D);
-	M_Appearance *app = (M_Appearance *)m_selection;
-	app->material = mat2d;
-	gf_node_register(mat2d, m_selection);
-	m_parentSelection = m_selection;
-
-	m_selection = mat2d;
-	Update();
-}
-
-void V4StudioFrame::OnNewLineProps(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *lp = m_pV4sm->NewNode(TAG_MPEG4_LineProperties);
-	M_Material2D *mat2d= (M_Material2D *)m_selection;
-	mat2d->lineProps = lp;
-	gf_node_register(lp, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = lp;
-	Update();
-}
-
-void V4StudioFrame::OnNewXLineProps(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *lp = m_pV4sm->NewNode(TAG_MPEG4_XLineProperties);
-	M_Material2D *mat2d= (M_Material2D *)m_selection;
-	mat2d->lineProps = lp;
-	gf_node_register(lp, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = lp;
-	Update();
-}
-
-void V4StudioFrame::OnNewSound(wxCommandEvent &event)
-{
-}
-
-void V4StudioFrame::OnNewBackground2D(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *b2d = m_pV4sm->NewNode(TAG_MPEG4_Background2D);
-	gf_node_insert_child(m_selection, b2d, -1);
-	gf_node_register(b2d, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = b2d;
-	Update();
-}
-
-void V4StudioFrame::OnNewImageTexture(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *it = m_pV4sm->NewNode(TAG_MPEG4_ImageTexture);
-	M_Appearance *app = (M_Appearance *) m_selection;
-	app->texture = it;
-	gf_node_register(it, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = it;
-	Update();
-}
-
-void V4StudioFrame::OnNewMovieTexture(wxCommandEvent &event)
-{
-	if (!m_pV4sm) return;
-	GF_Node *mt = m_pV4sm->NewNode(TAG_MPEG4_MovieTexture);
-	M_Appearance *app = (M_Appearance *)m_selection;
-	app->texture = mt;
-	gf_node_register(mt, m_selection);
-	m_parentSelection = m_selection;
-	m_selection = mt;
-	Update();
-}
-
-void V4StudioFrame::UpdateSelection(GF_Node *node, GF_Node *parent) 
-{
-	SetSelection(node);
-	SetParentSelection(parent);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_CUT, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_COPY, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_DELETE, true);
-	UpdateToolBar();
-	fieldView->SetNode(node);
-	fieldView->Create();
-}
-
-
-// Update display
-void V4StudioFrame::Update() 
-{
-	if (m_pV4sm){
-		if (m_pV4sm->GetGPACPanel()) m_pV4sm->GetGPACPanel()->Update();
-		treeView->Refresh(m_pV4sm->GetRootNode());
-	} else {
-		treeView->Refresh(NULL);
-	}
-	UpdateToolBar();
-}
-
-void V4StudioFrame::UpdateToolBar()
-{
-	bool enableGeometry   = false, 
-		 enableAppearance = false, 
-		 enableMaterial   = false, 
-		 enableGroupNode  = false,
-		 enableLineProps  = false, 
-		 enableFontStyle  = false, 
-		 enable2DNode     = false, 
-		 enableTexture    = false, 
-		 enableTopNode    = false,
-		 enableBackground = false;
-
-	// a scene must have been created to enable the controls
-	if (m_pV4sm && m_pV4sm->GetInlineScene()) {
-		if (m_selection != NULL) {
-			u32 tag = gf_node_get_tag(m_selection);
-			GF_Node * node = m_selection;
-			enableBackground = true;
-			switch (tag) {
-				case TAG_MPEG4_Switch:
-				case TAG_MPEG4_OrderedGroup:
-				case TAG_MPEG4_Layer2D:
-				case TAG_MPEG4_Transform2D:
-				case TAG_MPEG4_TransformMatrix2D:
-				case TAG_MPEG4_ColorTransform:
-					enableGroupNode = true;
-					enable2DNode = true;
-					break;
-				case TAG_MPEG4_Shape:
-					if (!((M_Shape *)node)->geometry) enableGeometry = true;
-					if (!((M_Shape *)node)->appearance) enableAppearance = true;
-					break;
-				case TAG_MPEG4_Appearance:
-					if (!((M_Appearance *)node)->material) enableMaterial = true;
-					if (!((M_Appearance *)node)->texture) enableTexture = true;
-					break;
-				case TAG_MPEG4_Material2D:
-					if (!((M_Material2D *)node)->lineProps) enableLineProps = true;
-					break;
-				case TAG_MPEG4_Text:
-					if (!((M_Text *)node)->fontStyle) enableFontStyle = true;
-					break;
-				case TAG_MPEG4_Rectangle:
-				case TAG_MPEG4_Circle:
-				case TAG_MPEG4_ImageTexture:
-				case TAG_MPEG4_MovieTexture:
-				case TAG_MPEG4_Background2D:
-					break;
-			}
-		} else {
-			enableTopNode = true;
-		}
-	} 
-
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_ORDEREDGROUP, enableGroupNode || enable2DNode || enableTopNode);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_LAYER2D, enableGroupNode || enable2DNode || enableTopNode);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_TRANSFORM2D, enableGroupNode || enable2DNode);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_COLOR_TRANSFORM, enableGroupNode || enable2DNode);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_TRANSFORMMATRIX2D, enableGroupNode || enable2DNode);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_SHAPE, enable2DNode);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_RECT, enableGeometry);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_CIRCLE, enableGeometry);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_IFS2D, enableGeometry);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_ILS2D, enableGeometry);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_TEXT, enableGeometry);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_MOVIE, enableTexture);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_IMAGE, enableTexture);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_SOUND, enable2DNode);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_APPEARANCE, enableAppearance);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_MATERIAL2D, enableMaterial);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_LINEAR_GRADIENT, enableTexture);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_RADIAL_GRADIENT, enableTexture);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_LINEPROPS, enableLineProps);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_XLINEPROPS, enableLineProps);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_FONTSTYLE, enableFontStyle);
-	m_pLowLevelNodeToolbar->EnableTool(TOOL_NEW_BACKGROUND2D, enableBackground);
-}
-
-// Cut and paste functions
-void V4StudioFrame::OnEditCut(wxCommandEvent &WXUNUSED(event))
-{
-	if (!m_selection) return;
-
-	m_clipboardNode = m_selection;
-	m_clipboardParentNode = m_parentSelection;
-	gf_node_remove_child(m_parentSelection, m_selection);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_CUT, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_COPY, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE_USE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_DELETE, false);
-
-	Update();
-}
-
-void V4StudioFrame::OnEditDelete(wxCommandEvent &WXUNUSED(event))
-{
-	if (!m_selection) return;
-
-	gf_node_remove_child(m_parentSelection, m_selection);
-	m_clipboardNode = NULL;
-	m_clipboardParentNode = NULL;
-	m_pMainToolbar->EnableTool(TOOL_EDIT_CUT, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_COPY, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE_USE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_DELETE, false);
-
-	Update();
-}
-
-void V4StudioFrame::OnEditCopy(wxCommandEvent &WXUNUSED(event))
-{
-	if (!m_selection) return;
-
-	m_clipboardNode = m_selection;
-	m_clipboardParentNode = m_parentSelection;
-	m_pMainToolbar->EnableTool(TOOL_EDIT_CUT, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_COPY, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE_USE, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_DELETE, false);
-
-	Update();
-}
-
-void V4StudioFrame::OnEditPaste(wxCommandEvent &WXUNUSED(event))
-{
-	if (!m_pV4sm) return;
-	if (m_clipboardNode == NULL) return;
-
-	GF_Node *copy = m_pV4sm->CopyNode(m_clipboardNode, m_parentSelection, true);
-	gf_node_insert_child(m_selection, copy, -1);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_CUT, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_COPY, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE_USE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_DELETE, false);
-
-	Update();
-}
-
-void V4StudioFrame::OnEditPasteUse(wxCommandEvent &WXUNUSED(event))
-{
-	if (!m_pV4sm) return;
-	if (m_clipboardNode == NULL) return;
-
-	GF_Node *copy = m_pV4sm->CopyNode(m_clipboardNode, m_parentSelection, false);
-	gf_node_register(copy, m_selection);
-	gf_node_insert_child(m_selection, copy, -1);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_CUT, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_COPY, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE, true);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_PASTE_USE, false);
-	m_pMainToolbar->EnableTool(TOOL_EDIT_DELETE, false);
-
-	Update();
-}
-
-// OnAddToTimeLine -- adds a node in the timeline (meaning creating a node ID and adding it to the dictionnary and the pool)
-void V4StudioFrame::OnAddToTimeLine(wxCommandEvent &event) {
-	if (!m_pV4sm) return;
-	if (!m_selection) return; // don't add nothing
-
-	// if object has no node id then create one
-	if (! gf_node_get_id(m_selection) )
-		m_pV4sm->CreateIDandAddToPool(m_selection);
-	
-	// Adds the node to the dictionnary
-//	m_pV4sm->AddToDictionnary(m_selection);
-
-	// calls timeline function to add the line
-	char c[50];
-	strcpy(c, gf_node_get_name(m_selection));
-	timeLine->AddLine( gf_node_get_id(m_selection), wxString(c) );
-}
-
-
-// NextFrame -- goto next frame
-void V4StudioFrame::NextFrame(wxCommandEvent &event) {
-	//gf_term_play_from_time(gpacPanel->GetMPEG4Terminal(), 1000);  
-	m_selection = NULL;
-	Update();
-}
-
-
-// SwitchView -- switches between scene editing and dictionnary editing
-void V4StudioFrame::SwitchView(wxCommandEvent &event) {
-	SetEditDict(!editDict);
-}
-
-
-
-/****** Access Functions ******/
-
-// changes time to the frame specified, implies playing the scene up to that point
-void V4StudioFrame::SetFrame(unsigned long _frame) {
-	// TODO : 
-	m_frame = _frame;
-}
-
-
-// SetEditDict -- edit the dictionnary or not
-void V4StudioFrame::SetEditDict(bool _editDict) {
-
-   // does nothing if no scene
-	if (!m_pV4sm) return;
-   if ( ! m_pV4sm->GetSceneGraph() ) return;
-
-   editDict = _editDict;
-
-   if (editDict) treeView->Refresh(m_pV4sm->GetDictionnary());
-   else treeView->Refresh(m_pV4sm->GetRootNode());
-}
-
-
-// GetEditDict -- Access to edit dict
-bool V4StudioFrame::GetEditDict() const {
-	return editDict;
-}

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4StudioFrame.h Deleted

@@ -1,211 +0,0 @@
-#ifndef V4STUDIO_FRAME_H
-#define V4STUDIO_FRAME_H
-
-#include "safe_include.h"  // include m4_tools.h
-
-#include <wx/wx.h>
-#include <wx/image.h>
-#include <wx/listctrl.h>
-
-// UI
-#include "V4StudioTree.h"
-#include "V4FieldList.h"
-#include "V4TimeLine\V4TimeLine.h"
-#include "V4CommandPanel.h"
-
-// Scene data
-#include "V4SceneManager.h" 
-
-enum {
-	// File Menu commands
-	MENU_FILE_NEW,
-	MENU_FILE_OPEN,
-	MENU_FILE_SAVE,
-	MENU_FILE_CLOSE,
-	MENU_FILE_QUIT,
-
-	// Tools Menu commands
-	MENU_TOOL_SHOW_LOWLEVEL,
-	MENU_TOOL_SHOW_HIGHLEVEL,
-
-	// Generic Toolbar commands
-	TOOL_FILE_NEW,
-	TOOL_FILE_OPEN,
-	TOOL_FILE_SAVE,
-	TOOL_FILE_CLOSE,
-	TOOL_FILE_PREVIEW,
-	TOOL_EDIT_CUT,
-	TOOL_EDIT_COPY,
-	TOOL_EDIT_PASTE,
-	TOOL_EDIT_PASTE_USE,
-	TOOL_EDIT_DELETE,
-	TOOL_EDIT_UNDO,
-	TOOL_EDIT_REDO,
-	TOOL_FRAME_COMBO,
-	TOOL_ADD_TO_TL,
-	TOOL_NEXT_FRAME,
-	TOOL_VIEW_DICT,
-
-	CHANGE_SIZE_DIALOG,
-	CHANGE_FRAMERATE,
-	CHANGE_LENGTH,
-
-	/* High level node creation */
-	TOOL_NEW_2DSCENE,
-
-	/* Low level node creations */
-	// 2D node Toolbar commands
-	TOOL_NEW_ORDEREDGROUP,
-	TOOL_NEW_LAYER2D,
-	TOOL_NEW_TRANSFORM2D,
-	TOOL_NEW_TRANSFORMMATRIX2D,
-	TOOL_NEW_COLOR_TRANSFORM,
-	TOOL_NEW_SHAPE,
-
-	// Appearance and sub-appearance Toolbar commands
-	TOOL_NEW_APPEARANCE,
-	TOOL_NEW_MATERIAL2D,
-	TOOL_NEW_LINEPROPS,
-	TOOL_NEW_XLINEPROPS,
-	TOOL_NEW_FONTSTYLE,
-	TOOL_NEW_LINEAR_GRADIENT,
-	TOOL_NEW_RADIAL_GRADIENT,
-
-	// Geometry Toolbar commands
-	TOOL_NEW_RECT,
-	TOOL_NEW_CIRCLE,
-	TOOL_NEW_IFS2D,
-	TOOL_NEW_ILS2D,
-	TOOL_NEW_TEXT,
-
-	// Media Toolbar commands
-	TOOL_NEW_BACKGROUND2D,
-	TOOL_NEW_MOVIE,
-	TOOL_NEW_IMAGE,
-	TOOL_NEW_SOUND
-};
-
-class V4StudioFrame: public wxFrame {
-public:
-
-	// Constructor / Desctructor
-	V4StudioFrame();
-	~V4StudioFrame();
-
-	/* generic UI functions */
-
-	/* File Menu functions */
-	void OnNew(wxCommandEvent &event);
-	void OnFileOpen(wxCommandEvent &event);
-	void OnSave(wxCommandEvent &event);
-	void OnClose(wxCommandEvent &event);
-	void OnQuit(wxCommandEvent &event);
-	void OnChangeSize(wxCommandEvent &event);
-	void OnChangeFrameRate(wxCommandEvent &event);
-	void OnChangeLength(wxCommandEvent &event);
-
-	/* Tools Menu functions */
-	void OnLowLevelTools(wxCommandEvent &event);
-	void OnHighLevelTools(wxCommandEvent &event);
-
-	/* edition toolbar functions */
-	void OnEditCut(wxCommandEvent &event);
-	void OnEditCopy(wxCommandEvent &event);
-	void OnEditPaste(wxCommandEvent &event);
-	void OnEditPasteUse(wxCommandEvent &event);
-	void OnEditDelete(wxCommandEvent &event);
-	void OnAddToTimeLine(wxCommandEvent &event);
-	void OnCombo(wxCommandEvent& event);
-	void NextFrame(wxCommandEvent &event);
-	void SwitchView(wxCommandEvent &event);
-
-	/* new components toolbar functions */
-	void OnNewLayer2D(wxCommandEvent &event);
-	void OnNewOrderedGroup(wxCommandEvent &event);
-	void OnNewTransform2D(wxCommandEvent &event);
-	void OnNewTransformMatrix2D(wxCommandEvent &event);
-	void OnNewColorTransform(wxCommandEvent &event);
-	void OnNewShape(wxCommandEvent &event);
-	void OnNewAppearance(wxCommandEvent &event);
-	void OnNewMaterial2D(wxCommandEvent &event);
-	void OnNewLinearGradient(wxCommandEvent &event);
-	void OnNewRadialGradient(wxCommandEvent &event);
-	void OnNewLineProps(wxCommandEvent &event);
-	void OnNewXLineProps(wxCommandEvent &event);
-	void OnNewText(wxCommandEvent &event);
-	void OnNewFontStyle(wxCommandEvent &event);
-	void OnNewRect(wxCommandEvent &event);
-	void OnNewCircle(wxCommandEvent &event);
-	void OnNewSound(wxCommandEvent &event);
-	void OnNewBackground2D(wxCommandEvent &event);
-	void OnNewImageTexture(wxCommandEvent &event);
-	void OnNewMovieTexture(wxCommandEvent &event);
-
-
-	/* display update functions */
-	void Update();
-	void UpdateSelection(GF_Node *node, GF_Node *parent);
-	void SetSelection(GF_Node *node) { m_selection = node; }
-	void SetParentSelection(GF_Node *node) { m_parentSelection = node; }
-	void UpdateToolBar();
-	void SceneGraphChanged();
-
-
-	/* access to private members */
-
-	// UI objects
-	V4FieldList    * GetFieldView()			{ return fieldView; }
-	V4StudioTree   * GetTreeView()			{ return treeView; }
-	V4CommandPanel * GetCmdPanel()			{ return cmdPanel; }
-	V4TimeLine     * GetTimeLine()			{ return timeLine; }
-	V4SceneManager * GetV4SceneManager()    { return m_pV4sm; }
-
-	// variables
-	void SetFrame(unsigned long _frame);  // changes time to the frame specified, implies playing the scene up to that point
-	void SetEditDict(bool editDict);      // edit the dictionnary or not
-	bool GetEditDict() const;
-
-
-private:
-    void set_properties();
-    void do_layout();
-
-protected:
-
-	DECLARE_EVENT_TABLE()
-
-	// select, cut and paste members
-	GF_Node			*m_selection;
-	GF_Node			*m_parentSelection;
-	GF_Node			*m_clipboardNode;
-	GF_Node			*m_clipboardParentNode;
-
-	// scene data
-	V4SceneManager	*m_pV4sm;
-
-	// UI objects
-	V4StudioTree	*treeView;
-	V4FieldList		*fieldView;
-	V4TimeLine		*timeLine;
-	V4CommandPanel	*cmdPanel;
-
-	wxMenu			*m_pFileMenu;
-	wxMenu			*m_pToolsMenu;
-	wxStatusBar		*m_pStatusbar;
-	// The Main bar that contains the new, load, save, cut, copy ...
-	wxToolBar		*m_pMainToolbar;
-
-	// The tool bar to create all the MPEG-4 nodes
-	wxToolBar		*m_pLowLevelNodeToolbar;
-	wxToolBar		*m_pHighLevelNodeToolbar;
-	u32				m_uSelectedNodeToolBar;
-
-	// editing states machine
-	bool editDict;              // true if we are editing the dictionnary
-	unsigned long m_frame;      // frame currently selected
-
-};
-
-
-#endif 
-

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4StudioTree.cpp Deleted

@@ -1,386 +0,0 @@
-#include "safe_include.h" 
-
-// For compilers that supports precompilation , includes "wx/wx.h"
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-	#include "wx/wx.h"
-#endif
-
-#include "V4StudioTree.h"
-#include "V4StudioFrame.h"
-
-#include "V4SceneManager.h" // DICTNAME constant
-
-#include "wx/image.h"
-#include "wx/imaglist.h"
-#include "wx/treectrl.h"
-
-#include <math.h>
-
-#include "treeIcon1.xpm"
-#include "treeIcon2.xpm"
-#include "treeIcon3.xpm"
-#include "treeIcon4.xpm"
-#include "treeIcon5.xpm"
-
-#include <gpac/nodes_mpeg4.h>
-
-
-BEGIN_EVENT_TABLE(V4StudioTree, wxTreeCtrl)
-    EVT_TREE_SEL_CHANGED(-1, V4StudioTree::OnSelChanged)
-	EVT_TREE_ITEM_RIGHT_CLICK(-1, V4StudioTree::OnItemRightClick)
-    EVT_TREE_BEGIN_DRAG(-1, V4StudioTree::OnBeginDrag)
-    EVT_TREE_END_DRAG(-1, V4StudioTree::OnEndDrag)
-END_EVENT_TABLE()
-
-GF_Err V4StudioTreeItemData::GetField(GF_FieldInfo *f)
-{
-	if (!f || fieldIndex < 0) return GF_BAD_PARAM;
-	return gf_node_get_field(parent, fieldIndex, f);	
-}
-
-V4StudioTree::V4StudioTree(wxWindow *parent_, wxSize size,V4FieldList *fieldView) : 
-	wxTreeCtrl(parent_, -1, wxDefaultPosition, size, wxTR_DEFAULT_STYLE)
-{
-	CreateImageList();
-	AddRoot("Scene", V4StudioTree::TreeCtrlIcon_Folder, V4StudioTree::TreeCtrlIcon_FolderOpened);
-	m_transformNode = NULL;
-	m_selectedNode = NULL;
-
-	parent = (V4StudioFrame *) parent_;
-}
-
-
-// Refresh -- redraws the tree starting at the specified node
-void V4StudioTree::Refresh(GF_Node * node) 
-{
-
-	// check if we have to display the dictionnary or not
-	if (parent->GetEditDict())
-	  node = parent->GetV4SceneManager()->GetDictionnary();
-
-
-	wxTreeItemId rootId = GetRootItem();
-	CollapseAndReset(rootId);
-	if (node) {
-		AddNodesToItem(rootId, node, -1, -1);
-		Expand(rootId);
-	}
-}
-
-void V4StudioTree::AddNodesToItem(wxTreeItemId parentItemId, GF_Node * node, s32 fieldIndex, s32 position) 
-{
-	GF_FieldInfo field;
-	u32 count, i, j;
-	char *name;
-
-	if (!node) return;
-
-	// displays the name and the defname it exists
-  u32 s = strlen(gf_node_get_class_name(node));
-
-  if (gf_node_get_name(node)) {
-    s += strlen(gf_node_get_name(node));
-    name = new char[s+4];
-    strcpy(name, gf_node_get_class_name(node));
-    strcat(name, " - ");
-    strcat(name, gf_node_get_name(node));
-  } else {
-    name = new char[s+1];
-    strcpy(name, gf_node_get_class_name(node));
-  }
-
-	GF_Node * parent = NULL;
-	
-	V4StudioTreeItemData *parentItemData = (V4StudioTreeItemData *)GetItemData(parentItemId);
-	if (parentItemData != NULL) parent = parentItemData->GetNode();
-
-	V4StudioTreeItemData * currentItemData = new V4StudioTreeItemData(node, parent, fieldIndex, position);
-	wxTreeItemId nodeItemId;
-	if (position == -1) nodeItemId = AppendItem(parentItemId, wxString(name), -1, -1, currentItemData);
-	else nodeItemId = InsertItem(parentItemId, position, wxString(name), -1, -1, currentItemData);
-
-  delete [] name;
-  name = NULL;
-
-	count = gf_node_get_field_count(node);
-	for (i=0;i<count; i++) {		
-		gf_node_get_field(node, i, &field);
-		if (field.eventType == GF_SG_EVENT_IN || field.eventType == GF_SG_EVENT_OUT) continue;
-		switch (field.fieldType) {
-		case GF_SG_VRML_SFNODE:
-			if (* (GF_Node **) field.far_ptr) {
-				AddNodesToItem(nodeItemId, * (GF_Node **) field.far_ptr, i, -1);
-			}
-			break;
-		case GF_SG_VRML_MFNODE:
-			{
-				GF_ChildNodeItem *nodes = (* (GF_ChildNodeItem **) field.far_ptr); // list of children
-				u32 nbNodes = gf_node_list_get_count(nodes);
-				u8 skipped = 0; // counts nodes not added
-
-				for (j=0; j< nbNodes; j++) {          
-					// gets a pointer to the current child
-					GF_Node *child = (GF_Node *)gf_node_list_get_child(nodes, j);
-					// prevents the dictionnary from being added to the graph
-					const char * c = gf_node_get_name(child);
-					if ( (c != NULL) && !strcmp(c,DICTNAME) ) {
-						skipped++;
-						continue;
-					}
-					// recursively adds children
-					AddNodesToItem(nodeItemId, child, i, j-skipped);
-				}
-			}
-			break;
-		default:
-			break;
-		}
-	}
-	Expand(nodeItemId);
-}
-
-
-void V4StudioTree::CreateImageList(int size)
-{
-    if ( size == -1 ) {
-        SetImageList(NULL);
-        return;
-    }
-    // Make an image list containing small icons
-    wxImageList *images = new wxImageList(size, size, TRUE);
-
-    // should correspond to TreeCtrlIcon_xxx enum
-    wxBusyCursor wait;
-    wxIcon icons[5];
-    icons[0] = wxIcon(icon1_xpm);
-    icons[1] = wxIcon(icon2_xpm);
-    icons[2] = wxIcon(icon3_xpm);
-    icons[3] = wxIcon(icon4_xpm);
-    icons[4] = wxIcon(icon5_xpm);
-    int sizeOrig = icons[0].GetWidth();
-    for ( size_t i = 0; i < WXSIZEOF(icons); i++ ) {
-		if ( size == sizeOrig ) images->Add(icons[i]);
-		else images->Add(wxBitmap(wxBitmap(icons[i]).ConvertToImage().Rescale(size, size)));
-    }
-    AssignImageList(images);
-}
-
-void V4StudioTree::OnSelChanged(wxTreeEvent& event) 
-{
-	wxKeyEvent kevt = event.GetKeyEvent();
-
-	wxTreeItemId itemId = event.GetItem();
-	m_selectedItem = itemId;
-	if (itemId.IsOk()) {
-		V4StudioTreeItemData *itemData = (V4StudioTreeItemData *)GetItemData(itemId);
-		if (!itemData) {
-			event.Skip();
-			return;
-		}
-		GF_Node *itemNode = itemData->GetNode();
-		GF_Node *itemParentNode = itemData->GetNodeParent();
-		if (!itemNode) {
-			event.Skip();
-			return;
-		}
-		V4StudioFrame *mainFrame = (V4StudioFrame *)GetParent();
-		mainFrame->UpdateSelection(itemNode, itemParentNode);
-	}
-}
-
-void V4StudioTree::SetSelectedItem(GF_Node *node)
-{
-	if (m_selectedNode == node) return;
-	wxTreeItemId rootId = GetRootItem();
-	wxTreeItemId itemId = FindNodeItem(rootId, node);
-	m_transformNode = FindTransformNode(itemId);
-	itemId = GetItemParent(itemId);
-	if (itemId.IsOk()) {
-		V4StudioTreeItemData *data = (V4StudioTreeItemData *)GetItemData(itemId);
-		if (data != NULL) {
-			V4StudioFrame *mainFrame = (V4StudioFrame *)GetParent();
-			GF_Node *itemNode = data->GetNode();
-			m_selectedNode = itemNode;
-			GF_Node *itemParentNode = data->GetNodeParent();
-			mainFrame->UpdateSelection(itemNode, itemParentNode);
-		}
-		SelectItem(itemId);
-	}
-}
-
-wxTreeItemId V4StudioTree::FindNodeItem(wxTreeItemId itemId, GF_Node *node) 
-{
-	void* cookie;
-	V4StudioTreeItemData *data = (V4StudioTreeItemData *)GetItemData(itemId);
-	if (data != NULL) {
-		if (data->GetNode() == node) return itemId;
-	} 
-	wxTreeItemId ret = (wxTreeItemId)0l;
-	wxTreeItemId child = GetFirstChild(itemId, cookie);
-	while (child.IsOk()) {
-		wxTreeItemId ret = FindNodeItem(child, node);
-		if (ret.IsOk()) return ret;
-		child = GetNextChild(itemId, cookie);
-	}
-	return ret;
-}
-
-void V4StudioTree::OnItemRightClick(wxTreeEvent &event) 
-{
-	wxTreeItemId itemId = event.GetItem();
-}
-
-void V4StudioTree::OnBeginDrag(wxTreeEvent& event)
-{
-    // need to explicitly allow drag
-    if ( event.GetItem() != GetRootItem() ){
-        m_draggedItem = event.GetItem();
-		V4StudioTreeItemData *draggedData = (V4StudioTreeItemData *)GetItemData(m_draggedItem);		
-        event.Allow();
-    } else {
-        wxLogMessage(wxT("OnBeginDrag: this item can't be dragged."));
-    }
-}
-
-void V4StudioTree::OnEndDrag(wxTreeEvent& event)
-{
-    wxTreeItemId itemSrc = m_draggedItem, itemDst = event.GetItem(), dstParentItem = GetItemParent(itemDst);
-    m_draggedItem = (wxTreeItemId)0l;
-
-	V4StudioTreeItemData *srcData = (V4StudioTreeItemData *)GetItemData(itemSrc);
-	GF_FieldInfo srcField;
-	srcData->GetField(&srcField);
-	// Removal of the src item from its parent field
-	switch (srcField.fieldType) {
-	case GF_SG_VRML_SFNODE:
-		if (* (GF_Node **) srcField.far_ptr) {}
-		break;
-	case GF_SG_VRML_MFNODE:
-		{
-			GF_ChildNodeItem *nodes = (* (GF_ChildNodeItem **) srcField.far_ptr);
-			gf_node_list_del_child_idx(&nodes, srcData->GetPosition());
-		}
-		break;
-	default:
-		break;
-	}
-
-	GF_Node *srcNode = srcData->GetNode();
-	GF_FieldInfo dstField;
-	V4StudioTreeItemData *dstData = (V4StudioTreeItemData *)GetItemData(itemDst);
-	dstData->GetField(&dstField);
-	// Addition of the src item prior to the dest item
-	switch (dstField.fieldType) {
-	case GF_SG_VRML_SFNODE:
-		if (* (GF_Node **) dstField.far_ptr) {}
-		break;
-	case GF_SG_VRML_MFNODE:
-		{
-			GF_ChildNodeItem *nodes = (* (GF_ChildNodeItem **) dstField.far_ptr);
-			gf_node_list_insert_child(&nodes, srcNode, dstData->GetPosition());
-			gf_node_dirty_set(dstData->GetNode(), 0, 1);
-		}
-		break;
-	default:
-		break;
-	}
-
-	GF_Node *dstParentNode = dstData->GetNodeParent();
-	
-	Delete(itemSrc);
-	AddNodesToItem(dstParentItem, srcNode, dstData->GetFieldIndex(), dstData->GetPosition());
-	V4StudioFrame *mainFrame = (V4StudioFrame *)GetParent();
-	mainFrame->UpdateSelection(srcNode,dstData->GetNodeParent());
-	mainFrame->Update();
-}
-
-GF_Node *V4StudioTree::FindTransformNode(wxTreeItemId itemId) 
-{
-	GF_Node *transformNode = NULL;
-	while (true) {
-		if (itemId.IsOk()) {
-			V4StudioTreeItemData *data = (V4StudioTreeItemData *)GetItemData(itemId);
-			if (data != NULL) {
-				GF_Node *itemNode = data->GetNode();
-				u32 tag = gf_node_get_tag(itemNode);
-				if (tag == TAG_MPEG4_Transform2D || tag == TAG_MPEG4_TransformMatrix2D) {
-					transformNode = itemNode;
-					break;
-				}
-			} else {
-				break;
-			}
-		} else {
-			break;
-		}
-		itemId = GetItemParent(itemId);
-	}
-	return transformNode;
-}
-
-void V4StudioTree::Translate(int dX, int dY) 
-{
-	if (m_transformNode) {
-		GF_FieldInfo field;
-		u32 tag = gf_node_get_tag(m_transformNode);
-		if (tag == TAG_MPEG4_Transform2D){
-			gf_node_get_field(m_transformNode, 7, &field);
-			((SFVec2f *)field.far_ptr)->x += dX;
-			((SFVec2f *)field.far_ptr)->y += dY;
-		} else {
-			gf_node_get_field(m_transformNode, 5, &field);
-			*((SFFloat *)field.far_ptr) += dX;
-			gf_node_get_field(m_transformNode, 8, &field);
-			*((SFFloat *)field.far_ptr) += dY;
-		}
-		V4StudioFrame *mainFrame = (V4StudioFrame *)GetParent();
-		mainFrame->GetFieldView()->SetNode(m_transformNode);
-		mainFrame->GetFieldView()->Create();
-	}
-}
-
-void V4StudioTree::Scale(int dX, int dY) 
-{
-	if (m_transformNode && (dX || dY)) {
-		GF_FieldInfo field;
-		u32 tag = gf_node_get_tag(m_transformNode);
-		if (tag == TAG_MPEG4_Transform2D){
-			gf_node_get_field(m_transformNode, 5, &field);
-			if (dX) ((SFVec2f *)field.far_ptr)->x *= (dX>0?1.01:0.99);
-			if (dY) ((SFVec2f *)field.far_ptr)->y *= (dY>0?1.01:0.99);
-		} else {
-			gf_node_get_field(m_transformNode, 3, &field);
-			if (dX) *((SFFloat *)field.far_ptr) *= (dX>0?1.01:0.99);
-			gf_node_get_field(m_transformNode, 7, &field);
-			if (dY) *((SFFloat *)field.far_ptr) *= (dY>0?1.01:0.99);
-		}
-		V4StudioFrame *mainFrame = (V4StudioFrame *)GetParent();
-		mainFrame->GetFieldView()->SetNode(m_transformNode);
-		mainFrame->GetFieldView()->Create();
-	}
-}
-
-
-void V4StudioTree::Rotate(int dX, int dY) 
-{
-	/*quick and dirty of course...*/
-	dY *= -1;
-	if (m_transformNode && (dX || dY)) {
-		u32 tag = gf_node_get_tag(m_transformNode);
-		if (tag == TAG_MPEG4_Transform2D){
-			Double ang;
-			ang = atan2(dY, dX) / 100;
-			((M_Transform2D *) m_transformNode)->rotationAngle += ang;
-		} else {
-			((M_TransformMatrix2D *) m_transformNode)->mxy += dX;
-			((M_TransformMatrix2D *) m_transformNode)->myx += dY;
-		}
-		V4StudioFrame *mainFrame = (V4StudioFrame *)GetParent();
-		mainFrame->GetFieldView()->SetNode(m_transformNode);
-		mainFrame->GetFieldView()->Create();
-	}
-}
-
-

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4StudioTree.h Deleted

@@ -1,86 +0,0 @@
-#ifndef _V4STUDIO_TREE_H
-#define _V4STUDIO_TREE_H
-
-#include "safe_include.h" 
-#include <gpac/scenegraph.h>
-#include "V4FieldList.h"
-
-#include <wx/treectrl.h>
-
-
-class V4StudioFrame;
-
-
-class V4StudioTreeItemData : public wxTreeItemData {
-public:
-	V4StudioTreeItemData(GF_Node *n, GF_Node *p, s32 fi, s32 pos = -1) : node(n), parent(p), fieldIndex(fi), position(pos) {}
-
-public:
-	GF_Node *GetNode() { return node; }
-	void SetNode(GF_Node *n) { node = n; }
-	GF_Err GetField(GF_FieldInfo *f);
-
-	GF_Node *GetNodeParent() { return parent; }
-	void SetNodeParent(GF_Node *n) { parent = n; }
-	s32 GetPosition() { return position; }
-	void SetPosition(s32 pos) { position = pos; }
-	void SetFieldIndex(s32 i) { fieldIndex = i; }
-	s32 GetFieldIndex() { return fieldIndex; }
-
-private:
-	GF_Node *node;
-	GF_Node *parent;
-	s32 fieldIndex;
-	s32 position;
-
-};
-
-class V4StudioTree: public wxTreeCtrl {
-
-public:
-    enum
-    {
-        TreeCtrlIcon_File,
-        TreeCtrlIcon_FileSelected,
-        TreeCtrlIcon_Folder,
-        TreeCtrlIcon_FolderSelected,
-        TreeCtrlIcon_FolderOpened
-    };
-
-	V4StudioTree(wxWindow *parent, wxSize size, V4FieldList *fieldView);
-
-	void CreateImageList(int size = 16);
-	
-	void Refresh(GF_Node * node); 
-
-	void OnSelChanged(wxTreeEvent& event);
-	void OnItemRightClick(wxTreeEvent &event);
-	void ShowMenu(wxTreeItemId id, const wxPoint& pt);
-	void OnBeginDrag(wxTreeEvent& event);
-	void OnEndDrag(wxTreeEvent& event);
-
-	void SetSelectedItem(GF_Node *node);
-	void Translate(int dX, int dY);
-	void Scale(int dX, int dY);
-	void Rotate(int dX, int dY);
-	wxTreeItemId FindNodeItem(wxTreeItemId itemId, GF_Node *node);
-	GF_Node *FindTransformNode(wxTreeItemId itemId);
-
-protected:
-    DECLARE_EVENT_TABLE()
-
-private:
-	void AddNodesToItem(wxTreeItemId parentItemId, GF_Node * node, s32 fieldIndex, s32 position);
-
-    wxTreeItemId m_selectedItem;             // item being dragged right now
-    wxTreeItemId m_draggedItem;             // item being dragged right now
-
-	GF_Node * m_selectedNode;
-	GF_Node * m_transformNode;
-
-	// All the component of the V4Studio Main Frame have a pointer to that Main Frame, called parent.
-	V4StudioFrame * parent;
-
-};
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLine.cpp Deleted

@@ -1,159 +0,0 @@
-/*
-	V4TimeLine.cpp
-
-	Implémentation de la classe V4TimeLine
-*/
-
-#include "V4TimeLine.h"
-#include "V4TimeLineCase.h"
-#include "..\V4StudioFrame.h"
-
-
-// Constructeur
-V4TimeLine::V4TimeLine(wxWindow * parent_, unsigned int timeLineLength) : wxScrolledWindow(parent_), sizer(NULL) {
-
-  // position en X de la grille
-  Offset = 100;
-  Length = timeLineLength;
-  clicked = NULL;
-
-  parent = (V4StudioFrame *) parent_;
-
-  sizer = new wxBoxSizer(wxVERTICAL);
-
-  // indispensable pour avoir des barres de défilement
-  SetScrollRate( 5, 5 );
-
-  hdr = new V4TimeLineHdr(this);
-  sizer->Add(hdr);
-
-  SetSizer(sizer);
-  FitInside();
-}
-
-
-// Destructeur
-V4TimeLine::~V4TimeLine() {
-}
-
-
-// retourne la position en X du debut de la grille
-int V4TimeLine::GetOffset() {
-  return Offset;
-}
-
-
-// returns Length attribute
-unsigned int V4TimeLine::GetLength() {
-  return Length;
-}
-
-
-// Adds a line to the timeline
-void V4TimeLine::AddLine(u32 NodeID, wxString eltName) {
-  // verifies that we have no line with the same NodeID
-
-  for (int i = 0; i < lines.size(); i++) {
-    if (lines.at(i)->GetNodeID() == NodeID)
-      return;
-  }
-
-  // adds the line at the end of the list, in the next position
-  // note that we already have the hearder line in position 0
-  lines.push_back(
-    new V4TimeLineElt(this, lines.size()+1, NodeID, eltName, hdr->GetFrame())
-   );
-
-  // redraws the component
-  sizer->Add(lines.back());
-  Layout();
-}
-
-
-// called when time changed, update display (background colors)
-void V4TimeLine::SetFrame(u32 _frame, V4TimeLineCell * newClicked) {
-
-  // updates lines display
-  if (_frame != hdr->GetFrame()) {
-    hdr->SetFrame(_frame);
-
-    // TODO : apply all commands from previous frames.
-    // maybe by adding a NextFrame() method
-
-    for (int i = 0; i < lines.size(); i++)
-      lines.at(i)->SetFrame(_frame);
-  }
-
-
-  // updates clicked state on clicked cells
-
-  // removes state from old
-  if (clicked != NULL) {
-    u32 state = clicked->GetState();
-    state &= ~CELL_STATE_CLICKED;
-    clicked->SetState(state);
-  }
-
-  clicked = newClicked;
-
-  // adds state to new
-  if (clicked != NULL) {
-    u32 state = clicked->GetState();
-    state |= CELL_STATE_CLICKED;
-    clicked->SetState(state);
-  }
-
-
-  // updates command panel
-  ((V4StudioFrame *) GetParent())->GetCmdPanel()->Refresh(_frame);
-
-}
-
-
-// GetSelectedID -- returns the ID of the node whose timeline is selected
-u32 V4TimeLine::GetSelectedID() const {
-
-  // if nothing is selected then returns null nodeID
-  if (!clicked) return 0;
-
-  // gets the line from the cell
-  u32 pos = clicked->GetParent()->GetPos();
-
-  // gets the node id (!! the header line is first)
-  if (pos) return lines.at(pos-1)->GetNodeID();
-  else return 0; // if we clicked on a header cell
-}
-
-
-// AddCommand -- 
-void V4TimeLine::AddCommand(GF_Command * c) {
-  clicked->AddCommand(c);
-}
-
-
-// DeleteCommand -- 
-void V4TimeLine::DeleteCommand(u32 n) {
-  clicked->DeleteCommand(n);
-}
-
-
-// GetCommand -- 
-GF_Command * V4TimeLine::GetCommand(u32 n) {
-  return clicked->GetCommand(n);
-}
-
-
-// SetLength -- 
-void V4TimeLine::SetLength(const unsigned int length_) {
-  hdr->SetLength(length_);
-
-  // if the selected frames will be deleted, we select the last cell
-  if (hdr->GetFrame() > length_) SetFrame(length_);
-
-  for (int i = 0; i < lines.size(); i++)
-    lines.at(i)->SetLength(length_);
-
-  Length = length_;
-
-  FitInside();
-}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLine.h Deleted

@@ -1,84 +0,0 @@
-/*
-  V4TimeLine.h
-
-	V4Studio component allowing to edit timings
-	The component draw sub components whose type is V4TimeLineElt
-*/
-
-#ifndef _V4TimeLine_
-#define _V4TimeLine_
-
-#include "../safe_include.h"
-
-// wxWidgets includes
-#include <wx/scrolwin.h>
-#include <wx/sizer.h>
-
-// Own includes
-#include "V4TimeLineElt.h"
-#include "V4TimeLineHdr.h"
-
-// STL includes
-#include <vector>
-
-class V4TimeLineCell;
-class V4StudioFrame;
-
-
-
-class V4TimeLine : public wxScrolledWindow {
-  public:
-	  // Constructeur -- timeLineLength est compté en images
-	  V4TimeLine(wxWindow * parent, unsigned int timeLineLength = 50);
-
-	  // Desctructeur
-	  ~V4TimeLine();
-
-    void AddLine(u32 NodeID, wxString eltName); // Adds a line to the timeline
-                                    // TODO : add an additionnal parameter to specify a pointer to the element represented by the line
-                                    // TODO : use node pointer instead of id ?
-
-    void Clear(); // clears all the line in the timeline
-                  // TODO : check if everything is destroyed correctly
-
-    // retourne la position en X du debut de la grille
-    int GetOffset();
-
-    // access to Length
-    unsigned int GetLength();
-    void SetLength(const unsigned int length_);
-
-    // called when time changed, update display (background colors)
-    void SetFrame(u32 _frame, V4TimeLineCell * newClicked = NULL);
-
-    // returns the ID of the node whose timeline is selected
-    u32 GetSelectedID() const;
-
-    // Deletes a command from the current cell
-    void DeleteCommand(u32 n);
-
-    // Adds a command to the current cell
-    void AddCommand(GF_Command *);
-
-    // Retrieves the list of commands for the current cell
-    GF_Command * GetCommand(u32 n);
-
-    // pointer to the parent
-    V4StudioFrame * parent;
-
-
-  private:
-    // composants graphiques
-    std::vector<V4TimeLineElt *> lines;
-    V4TimeLineHdr * hdr;
-	  wxBoxSizer * sizer;
-
-    // attributs divers
-    int Offset;                   // X position of the grid
-    u32 Length;                   // length (in frames) of the scene
-    V4TimeLineCell * clicked;     // cell currently "clicked"
-
-
-};
-
-#endif
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLineCase.cpp Deleted

@@ -1,186 +0,0 @@
-/*
-  V4TimeLineCase.cpp
-
-*/
-
-#include "V4TimeLineCase.h"
-#include "V4TimeLineLine.h"
-#include "V4TimeLine.h"
-
-#include "..\V4StudioFrame.h"
-#include "..\V4SceneManager.h"
-
-
-BEGIN_EVENT_TABLE(V4TimeLineCell, wxWindow)
-  EVT_PAINT(V4TimeLineCell::OnPaint)
-  EVT_LEFT_UP(V4TimeLineCell::OnLeftUp)
-END_EVENT_TABLE()
-
-
-// Constructor
-V4TimeLineCell::V4TimeLineCell(V4TimeLineLine * parent_, unsigned int _num, unsigned int _type) : wxWindow(parent_, -1), num(_num), state(0), type(_type) {
-
-  parent = parent_;
-  commands = gf_list_new();
-
-  SetSize(parent_->GetOffset() + _num * 20, 0, -1, -1);
-
-  // line, timeline, frame
-  v4sf = (V4StudioFrame *) parent->GetParent()->GetParent();
-
-}
-
-
-// destructor
-V4TimeLineCell::~V4TimeLineCell() {
-  gf_list_del(commands);
-}
-
-
-// OnPaint
-void V4TimeLineCell::OnPaint(wxPaintEvent & event) {
-  wxPaintDC dc(this);
-
-  dc.BeginDrawing();
-
-    int w, h;
-    GetSize(&w, &h);
-
-    // draws the background
-    dc.SetPen(*wxTRANSPARENT_PEN);
-
-    // finds a color according to the parity
-    unsigned char r,g,b;
-    if ( ((V4TimeLineLine *)GetParent())->GetPos() % 2 ) { r = 220; g = 220; b = 255; }
-    else { r = 200; g = 200; b = 255; };
-
-    // if we are selected (ie current frame) adds green
-    if (state & CELL_STATE_SELECTED)
-      g += 35;
-
-    wxColour c(r,g,b);
-
-    wxBrush br(c);
-    dc.SetBrush( br );
-
-    dc.DrawRectangle(0,0,w,h);
-
-    dc.SetBrush(*wxWHITE_BRUSH);
-
-    // draws the vertical borders
-    dc.SetPen(*wxLIGHT_GREY_PEN);
-    dc.DrawLine(0,0,0,h);
-
-    dc.SetPen(*wxBLACK_PEN);
-
-    // draws state specific information
-    if (state & CELL_STATE_CLICKED) dc.DrawCircle(w/2,h/2,10);
-    if (state & CELL_STATE_COMMAND) dc.DrawRectangle(2, 2, w-4, h-4);
-
-    // draws frame number
-    wxString s;
-    if ( (type == CELL_TYPE_HDR) && (! (num % 10)) ) {
-      s = s.Format(wxT("%d"), num);
-      // centers text
-      int wt, ht;
-      dc.GetTextExtent(s, &wt, &ht);
-      dc.DrawText(s, (w-wt)/2, (h-ht)/2);
-    }
-
-  dc.EndDrawing();
-}
-
-
-// OnLeftUp -- tells the application that the user switched frame
-void V4TimeLineCell::OnLeftUp(wxMouseEvent & event) {
-
-  ((V4TimeLine *) GetParent()->GetParent())->SetFrame(num, this);
-
-  V4SceneManager * sg = v4sf->GetV4SceneManager();
-
-  // don't trigger any more reaction if this is a cell in the first row
-  //if (type == CELL_TYPE_HDR) return;
-
-  Refresh();
-  v4sf->Update();
-}
-
-
-// SetState -- Changes cell state
-void V4TimeLineCell::SetState(unsigned int _state) {
-  state = _state;
-
-  // if cell is clicked but not selected, can't be clicked anymore
-  if ( (state & CELL_STATE_CLICKED) && !(state & CELL_STATE_SELECTED) )
-    state &= ~CELL_STATE_CLICKED;
-
-  Refresh();
-}
-
-
-// GetState -- Retrieves cells state
-unsigned int V4TimeLineCell::GetState() const {
-  return state;
-}
-
-
-// AddCommand -- 
-void V4TimeLineCell::AddCommand(GF_Command *c) {
-  gf_list_add(commands, c);
-  SetState( GetState() | CELL_STATE_COMMAND );
-}
-
-// DeleteCommand -- Deletes ONE command
-void V4TimeLineCell::DeleteCommand(const u32 n) {
-  // TODO :
-}
-
-
-// DeleteCommand -- destroys all the commands from this cell (for instance when shortening the scene)
-// ONLY works for NORMAL cells
-void V4TimeLineCell::DeleteCommands() {
-
-  // deletes the commands from the au
-
-  // useful objects
-  V4SceneManager *sm = v4sf->GetV4SceneManager();
-  GF_StreamContext *ctx = sm->GetBifsStream();
-  GF_AUContext * au = NULL;
-  GF_Node * myNode = gf_sg_find_node( sm->GetSceneGraph(), ((V4TimeLineElt *) parent)->GetNodeID() );
-
-  u32 myTiming = sm->GetUnits() / sm->GetFrameRate() * num;
-
-  // first, locates the AU
-  for (int i = 0; i < gf_list_count(ctx->AUs); i++) {
-    au = (GF_AUContext *) gf_list_get(ctx->AUs, i);
-    if (au->timing == myTiming) {
-      // then the commands for this node and deletes it
-      for (int j = 0; j < gf_list_count(au->commands); j++) {
-        GF_Command * c = (GF_Command *)gf_list_get(au->commands, j);
-        if ( c->node == myNode ) {
-          gf_sg_command_del(c);
-          gf_list_rem(au->commands, j);
-          break;
-        }
-      }
-    }
-  }
-
-  // deletes the command in our chain
-  gf_list_reset(commands);
-
-  SetState( GetState() ^ CELL_STATE_COMMAND );
-}
-
-
-// GetCommand -- allow listing of the command for this cell
-GF_Command * V4TimeLineCell::GetCommand(u32 n) {
-  if (gf_list_count(commands) < n) return NULL;
-  else return (GF_Command *) gf_list_get(commands, n);
-}
-
-
-// GetParent -- returns a pointer to parent (used to retrieve line number and node ID)
-V4TimeLineLine * V4TimeLineCell::GetParent() const {
-  return parent;
-}

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLineCase.h Deleted

@@ -1,68 +0,0 @@
-/*
-  V4TimeLineCase.h
-
-    // TODO : description
-*/
-
-#ifndef _V4TimeLineCell_
-#define _V4TimeLineCell_
-
-
-#include <gpac/scenegraph_vrml.h>
-
-#include <wx/window.h>
-
-
-class V4TimeLineLine;
-
-// differents types of a cell -- differs with the line type
-#define CELL_TYPE_HDR       0
-#define CELL_TYPE_NORMAL    1
-
-// different states of a cell
-#define CELL_STATE_CLICKED  1
-#define CELL_STATE_SELECTED 2
-#define CELL_STATE_COMMAND  4
-
-class V4StudioFrame;
-
-class V4TimeLineCell: public wxWindow {
-
-  public:
-    // Constructor
-    V4TimeLineCell(V4TimeLineLine * parent, unsigned int num=0, unsigned int type=CELL_TYPE_NORMAL);
- 
-    // Destructor
-    virtual ~V4TimeLineCell();
-
-    // Changes cell state
-    void SetState(unsigned int _state);
-    unsigned int GetState() const;
-
-    // returns a pointer to parent (used to retrieve line number and node ID)
-    V4TimeLineLine * GetParent() const;
-
-    // manipulates the commands list
-    void AddCommand(GF_Command *);
-    void DeleteCommands();
-    void DeleteCommand(const u32 n);
-    GF_Command * GetCommand(u32 n);
-
-  private:
-    unsigned int state; // possible values not yet defined
-    unsigned int type;  // type of cell
-
-    unsigned int num;
-
-    DECLARE_EVENT_TABLE()
-
-    V4StudioFrame * v4sf;
-    V4TimeLineLine * parent;
-
-    GF_List * commands; // actions to perform for this object (row) when entering the frame (col)
-
-    void OnLeftUp(wxMouseEvent &);
-    void OnPaint(wxPaintEvent &);
-};
-
-#endif
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLineElt.cpp Deleted

@@ -1,74 +0,0 @@
-/*
-  V4TimeLineElt.cpp
-
-	Implements V4TimeLineElt class
-*/
-
-#include "V4TimeLineElt.h"
-#include "V4TimeLine.h"
-#include "V4TimeLineCase.h"
-
-#include "..\V4StudioFrame.h"
-#include "..\V4SceneManager.h"  // FPS constant
-
-
-// Constructor
-V4TimeLineElt::V4TimeLineElt(V4TimeLine * parent, unsigned int pos, unsigned long _NodeID, wxString eltName, unsigned long frame) :
-V4TimeLineLine(parent, pos, frame), txt(NULL), lbl(NULL) {
-  // creates sub-controls
-
-  NodeID = _NodeID;
-
-  sizer = new wxBoxSizer(wxHORIZONTAL);
-  SetSizer(sizer);
-
-  lbl = new wxStaticText(this, -1, eltName);
-  lbl->SetSize(0,0,parent->GetOffset(), 20);
-
-
-  sizer->Add(lbl, 0, wxALL, 0);
-
-  CreateLine(CELL_TYPE_NORMAL);
-
-
-  // locates the existing commands for a node
-  GF_StreamContext * stream = parent->parent->GetV4SceneManager()->GetBifsStream();
-
-  // tries all access units
-  for (i=0; i < gf_list_count(stream->AUs); i++) {
-    GF_AUContext * au = (GF_AUContext *) gf_list_get(stream->AUs, i);
-
-    // and all commands in each au
-    for (u32 j=0; j < gf_list_count(au->commands); j++) {
-      GF_Command * c = (GF_Command *) gf_list_get(au->commands, j);
-
-      // and checks whether they are appled to this node
-      if (gf_node_get_id(c->node) == NodeID) {
-        // TODO : the timing unit might not be 1 ms
-        u32 cellNum = au->timing / 1000 * parent->parent->GetV4SceneManager()->GetFrameRate();
-        cells.at(cellNum)->SetState(CELL_STATE_COMMAND);
-        cells.at(cellNum)->AddCommand(c);
-      }
-    }
-
-  }
-
-}
-
-
-// Destructor
-V4TimeLineElt::~V4TimeLineElt() {
-
-}
-
-
-// returns NodeID
-u32 V4TimeLineElt::GetNodeID() {
-  return NodeID;
-}
-
-
-//
-unsigned char V4TimeLineElt::GetType() {
-  return CELL_TYPE_NORMAL;
-}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLineElt.h Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLineHdr.cpp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLineHdr.h Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLineLine.cpp Deleted

@@ -1,92 +0,0 @@
-/*
-  V4TimeLineLine.cpp
-
-    Implements V4TimeLineLine class
-
-*/
-
-#include "V4TimeLineLine.h"
-#include "V4TimeLine.h"
-
-// Constructor
-V4TimeLineLine::V4TimeLineLine(V4TimeLine * parent, unsigned int _pos, unsigned long frame) : wxWindow((wxWindow *) parent, -1), pos(_pos) {
-}
-
-
-// retrieves X position of the grid
-unsigned int V4TimeLineLine::GetOffset() const {
-  return ( (V4TimeLine *)GetParent() )->GetOffset();
-}
-
-
-// returns the number of frame in the scene
-unsigned int V4TimeLineLine::GetLength() const {
-  return ( (V4TimeLine *)GetParent() )->GetLength();
-}
-
-
-// returns the position of the line in the timeLine
-unsigned int V4TimeLineLine::GetPos() const {
-  return pos;
-}
-
-
-// Update diplay to match new time
-void V4TimeLineLine::SetFrame(unsigned long _frame) {
-  std::vector<V4TimeLineCell *>::iterator iter;
-
-  int i = 0;
-
-  // uptades the needed cells
-
-  for (iter = cells.begin(); iter != cells.end(); iter++) {
-    // newly selected cell, adds selected state
-    if (i == _frame) {
-      unsigned int state = (*iter)->GetState();
-      state |= CELL_STATE_SELECTED;
-      (*iter)->SetState(state);
-    }
-
-    // old selected cell, deletes selected state
-    if ( (i == frame) && (_frame != frame) ) {
-      unsigned int state = (*iter)->GetState();
-      state &= ~CELL_STATE_SELECTED;
-      (*iter)->SetState(state);
-    }
-
-    i++;
-  }
-
-  frame = _frame;
-}
-
-
-// Retrieves frame
-unsigned long V4TimeLineLine::GetFrame() const {
-  return frame;
-}
-
-
-//
-void V4TimeLineLine::SetLength(const unsigned int length_) {
-  int L = GetLength();
-
-  V4TimeLine * line = (V4TimeLine *) GetParent();
-  SetSizeHints(line->GetOffset() + 20 * length_, -1);
-  line->Layout();
-
-  if (L <= length_) {
-
-    for (int i = L; i < length_; i++) {
-      cells.push_back(new V4TimeLineCell(this,i, GetType()));
-      sizer->Add(cells.back(), 1, wxALL, 0);
-    }
-  } else {
-    for (int i = L-1; i >= length_; i--) {
-      if (cells.back()->GetCommand(0)) cells.back()->DeleteCommands();
-      delete cells.back();
-      cells.pop_back();
-    } 
-  }
-
-}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/V4TimeLine/V4TimeLineLine.h Deleted

@@ -1,68 +0,0 @@
-/*
-  V4TimeLineLine.h
-
-    Defines generic behaviour for a line in the timeline
-    There are two child classes: V4TimeLineElt and V4TimeLineHdr
-
-*/
-
-#ifndef _V4TimeLineLine_
-#define _V4TimeLineLine_
-
-#include "../safe_include.h"
-
-#include <wx/wx.h>
-#include <vector>
-#include "V4TimeLineCase.h"
-
-
-#define LINE_TYPE_HDR 0
-#define LINE_TYPE_ELT 1
-
-class V4TimeLine;
-
-
-// macro that creates the sizer and the grid for a line
-#define CreateLine(CELL_TYPE) \
-  SetSizeHints(parent->GetOffset() + 20 * GetLength(), -1); \
-  \
-  for (u32 i=0; i<GetLength(); i++) { \
-    cells.push_back(new V4TimeLineCell(this,i, CELL_TYPE)); \
-    sizer->Add(cells.back(), 1, wxALL, 0); \
-  } \
-  SetFrame(frame);
-
-
-class V4TimeLineLine : public wxWindow {
-  public:
-    // Constructor
-    V4TimeLineLine(V4TimeLine * parent, unsigned int _pos, unsigned long frame=0);
-  
-    // retrieves the X positon of the grid
-    unsigned int GetOffset() const;
-
-    // returns the Y position of the line
-    unsigned int GetPos() const;
-
-    // accesses the length of the grid
-    unsigned int GetLength() const;
-    void SetLength(const unsigned int length_);
-
-    // Update display to match new time
-    void SetFrame(unsigned long _frame);
-    unsigned long GetFrame() const;
-
-    virtual unsigned char GetType() PURE;
-
-
-  protected:
-    std::vector<V4TimeLineCell *> cells; // cases of the grid
-    wxBoxSizer * sizer;
-
-    unsigned int pos; // Y position of the line in the grid
-
-    unsigned long frame; // current frame
-
-};
-
-#endif
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/install.txt Deleted

@@ -1,110 +0,0 @@
-What is V4Studio?
-------------------
-
-This piece of software is an authoring tool to design and encode MPEG-4 content
-at large (audio, video, still picture, vector graphics and text). The current
-version has no support for audio, video or still picture. But if you edit an
-existing mp4 files that contains some media, they will remain in the output mp4.
-
-This tool was design based on the rendering system of the gpac project but the
-GUI is written using wxWindows (www.wxwindows.org).
-
-The current version allows you to open an mp4 file or a bt file, to edit the
-graphical elements (vector graphics, text) of the initial BIFS scene. You can
-then save the result to an mp4 file. Editing is very limited for the moment, you
-can:
-- add nodes within a node depending on the context.
-- delete nodes
-- change some field values (float, int, string, colours, points)
-- move objects.
-
-Problems:
----------
-Since it is in a version early stage, this software has known bugs (fields list
-view, node drag and drop, node deletions) and may have some more unknown ones.
-
-How to install V4Studio?
---------------------------
-I'm using Windows 2000 and I haven't tried it yet on other platforms. Please
-report any problem. Only the Debug version has been tested.
-
-On Windows:
-Get the source from the gpac project http://gpac.sourceforge.net
-
-Compiling:
----------
-Open the GPAC.dsw file. Set the V4Studio project active and build it. It will
-build also libgpac.dll.
-
-The current version uses a hard-coded path to a configuration file GPAC.cfg.
-Before compiling, you should change that path to your path. In the file
-wxGPACPanel.cpp, change:
-	strcpy(config_path, "E:\\MesProjets\\gpac\\gpac\\bin\\Debug");
-into:
-	strcpy(config_path, <gpac_path_with_double_backslash>\\gpac\\bin\\w32_deb");
-
-To link, it needs the js32.lib. Place it under gpac/extra_lib/lib/w32_deb.
-
-To link, you also need some elements from wxWidgets, version 2.5.2. You need to change the path
-to the wxWidgets include and library directories, in tools->options, Directories tab
-Add to include directories:
-<wxWidgets_path>\wxWidgets\include
-<wxWidgets_path>\wxWidgets\contrib\include
-<wxWidgets_path>\wxWidgets\lib\mswd
-
-Add to library directories:
-<wxWidgets_path>\wxWidgets\lib
-<wxWidgets_path>\wxWidgets\contrib\lib
-
-The following libs from wxWidgets are required and should be present in V4Studio project linker settings:
-wxmsw25d_html.lib wxbase25d.lib wxmsw25d_core.lib wxmsw25d_adv.lib wxbase25d_xml.lib wxexpatd.lib wxmsw25d_xrc.lib 
-(remove the 'd' for release versions)
-
-
-Once this is done, you should be able to compile V4Studio.exe.
-
-Running:
---------
-To run the tool, you should have a valid GPAC.cfg file. If you don't have the
-GPAC.CFG file, here a default content, where you should change <gpac_root_path>
-------------------------------------
-[General]
-ModulesDirectory=<gpac_root_path>\gpac\bin\Debug\
-CacheDirectory=<gpac_root_path>\gpac\bin\Debug\cache
-
-[Rendering]
-DriverName=gdip_rend
-AntiAlias=All
-
-[Audio]
-ForceConfig=yes
-NumBuffers=8
-TotalDuration=400
-DriverName=dx_hw
-
-[FontEngine]
-DriverName=gdip_rend
-FontDirectory=C:\WINNT\Fonts
-
-[Video]
-DriverName=dx_hw
-
-[System]
-ThreadingPolicy=Free
-Priority=normal
------------------------------------------
-
-You need also at least the plugin for the Rendering section (here gdip_rend),
-the Video section (here dx_hw), the audio section (here dx_hw). So you should
-also compile the dll for the 2 projects gdip_rend, and dx_hw. Then put the dll
-in the modules Directory.
-
-To run the tool outside VC++, copy the V4Studio.exe file in a PATH and copy the
-rc directory into the same PATH. The program should run without error messages.
-
-If GPAC has been compiled with ECMAScript support, you will
-also have to copy the js32.dll into the execution directory (or any directory in
-the machine PATH)
-
-Other platforms:
-To be tested ...
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/V4Studio.aps Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/V4Studio.rc Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/appearance.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/circle.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/close.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/colortransform.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/copy.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/cut.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/delete.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/fs.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/group.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/ifs2d.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/ils2d.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/image.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/layer2d.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/lg.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/lineproperties.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/material2d.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/movie.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/new.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/open.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/orderedgroup.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/paste.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/paste_use.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/preview.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/print.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/rect.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/redo.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/resource_orig.xrc Deleted

@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resource version="2.3.0.1">
-  <object class="wxMenuBar" name="MB_V4STUDIO">
-    <object class="wxMenu" name="Menu_1">
-      <label>_File</label>
-      <object class="wxMenuItem" name="MENU_FILE_NEW">
-        <label>_New\tCtrl+N</label>
-        <help>Create a new document</help>
-      </object>
-      <object class="wxMenuItem" name="MENU_FILE_OPEN">
-        <label>_Open...\tCtrl+O</label>
-        <help>Open an existing document</help>
-      </object>
-      <object class="wxMenuItem" name="MENU_FILE_SAVE">
-        <label>_Save\tCtrl+S</label>
-        <help>Save the active document</help>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="MENU_FILE_QUIT">
-        <label>E_xit</label>
-        <help>Quit the application; prompts to save documents</help>
-      </object>
-    </object>
-    <object class="wxMenu" name="Menu_2">
-      <label>_Edit</label>
-      <object class="wxMenuItem" name="wxID_UNDO">
-        <label>_Undo\tCtrl+Z</label>
-        <help>Undo the last action</help>
-      </object>
-      <object class="wxMenuItem" name="ID_EDIT_REDO">
-        <label>_Redo\tCtrl+Y</label>
-        <help>Redo the previously undone action</help>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="wxID_CUT">
-        <label>Cu_t\tCtrl+X</label>
-        <help>Cut the selection and put it on the Clipboard</help>
-      </object>
-      <object class="wxMenuItem" name="wxID_COPY">
-        <label>_Copy\tCtrl+C</label>
-        <help>Copy the selection and put it on the Clipboard</help>
-      </object>
-      <object class="wxMenuItem" name="wxID_PASTE">
-        <label>_Paste\tCtrl+V</label>
-        <help>Insert Clipboard contents</help>
-      </object>
-      <object class="wxMenuItem" name="ID_EDIT_DELETE">
-        <label>_Delete\tDel</label>
-        <help>Delete the selection</help>
-      </object>
-    </object>
-    <object class="wxMenu" name="Menu_3">
-      <label>_View</label>
-      <object class="wxMenuItem" name="ID_VIEW_SCENE_TREE">
-        <label>Scene _Tree</label>
-        <help>Show or hide the Scene Tree</help>
-      </object>
-      <object class="wxMenuItem" name="ID_VIEW_SCENE_GRAPH">
-        <label>_Route View</label>
-        <help>Show or hide the GF_Route View</help>
-      </object>
-      <object class="wxMenuItem" name="ID_VIEW_FIELD_VIEW">
-        <label>_Field View</label>
-        <help>Show or hide the Field View</help>
-      </object>
-    </object>
-    <object class="wxMenu" name="Menu_5">
-      <label>_Help</label>
-      <object class="wxMenuItem" name="wxID_ABOUT">
-        <label>_About V4Studio</label>
-        <help>Display program information, version number and copyright</help>
-      </object>
-    </object>
-  </object>
-</resource>

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/rg.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/save.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/shape.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/sound.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/t2d.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/text.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/tm2d.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/undo.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/v4.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/v4.ico Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/rc/xlineproperties.bmp Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/safe_include.h Deleted

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/treeIcon1.xpm Deleted

@@ -1,41 +0,0 @@
-/* XPM */
-static char *icon1_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    32    32        2            1",
-/* colors */
-". c #000000",
-"# c #ffffff",
-/* pixels */
-"################################",
-"################################",
-"####................############",
-"####................############",
-"####..############....##########",
-"####..############....##########",
-"####..##..##..####..##..########",
-"####..##..##..####..##..########",
-"####..############........######",
-"####..############........######",
-"####..##..##..##########..######",
-"####..##..##..##########..######",
-"####..##################..######",
-"###...##################..######",
-"####..##..##..##..##..##..######",
-"####..##..##..##..##..##..######",
-"####..##################..######",
-"####..##################..######",
-"####..##..##..##..##..##..######",
-"####..##..##..##..##..##..######",
-"####..##################..######",
-"####..##################..######",
-"####..##..##..##..##..##..######",
-"####..##..##..##..##..##..######",
-"####..##################..######",
-"####..##################..######",
-"####......................######",
-"####......................######",
-"################################",
-"################################",
-"################################",
-"################################"
-};

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/treeIcon2.xpm Deleted

@@ -1,42 +0,0 @@
-/* XPM */
-static char *icon2_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    32    32        3            1",
-/* colors */
-". c #000000",
-"# c #ff0000",
-"a c None",
-/* pixels */
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaa................aaaaaaaaaaaa",
-"aaaa................aaaaaaaaaaaa",
-"aaaa..############....aaaaaaaaaa",
-"aaaa..############....aaaaaaaaaa",
-"aaaa..##..##..####..aa..aaaaaaaa",
-"aaaa..##..##..####..aa..aaaaaaaa",
-"aaaa..############........aaaaaa",
-"aaaa..############........aaaaaa",
-"aaaa..##..##..##########..aaaaaa",
-"aaaa..##..##..##########..aaaaaa",
-"aaaa..##################..aaaaaa",
-"aaaa..##################..aaaaaa",
-"aaaa..##..##..##..##..##..aaaaaa",
-"aaaa..##..##..##..##..##..aaaaaa",
-"aaaa..##################..aaaaaa",
-"aaaa..##################..aaaaaa",
-"aaaa..##..##..##..##..##..aaaaaa",
-"aaaa..##..##..##..##..##..aaaaaa",
-"aaaa..##################..aaaaaa",
-"aaaa..##################..aaaaaa",
-"aaaa..##..##..##..##..##..aaaaaa",
-"aaaa..##..##..##..##..##..aaaaaa",
-"aaaa..##################..aaaaaa",
-"aaaa..##################..aaaaaa",
-"aaaa......................aaaaaa",
-"aaaa......................aaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-};

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/treeIcon3.xpm Deleted

@@ -1,44 +0,0 @@
-/* XPM */
-static char *icon3_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    32    32        5            1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-"a c #808080",
-"b c #ffff00",
-"c c None",
-/* pixels */
-"cccccccccccccccccccccccccccccccc",
-"cccccccccccccccccccccccccccccccc",
-"ccccccaaaaaaaaaacccccccccccccccc",
-"ccccccaaaaaaaaaacccccccccccccccc",
-"ccccaabb##bb##bbaacccccccccccccc",
-"ccccaabb##bb##bbaacccccccccccccc",
-"ccaabb##bb##bb##bbaaaaaaaaaaaacc",
-"ccaabb##bb##bb##bbaaaaaaaaaaaacc",
-"ccaaccccccccccccccccccccccccaa..",
-"ccaaccccccccccccccccccccccccaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaaaaaaaaaaaaaaaaaaaaaaaaaaa..",
-"ccaaaaaaaaaaaaaaaaaaaaaaaaaaaa..",
-"cccc............................",
-"cccc............................",
-"cccccccccccccccccccccccccccccccc",
-"cccccccccccccccccccccccccccccccc",
-"cccccccccccccccccccccccccccccccc",
-"cccccccccccccccccccccccccccccccc"
-};

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/treeIcon4.xpm Deleted

@@ -1,44 +0,0 @@
-/* XPM */
-static char *icon4_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    32    32        5            1",
-/* colors */
-". c #000000",
-"# c #c0c0c0",
-"a c #808080",
-"b c #ff0000",
-"c c #ffffff",
-/* pixels */
-"cccccccccccccccccccccccccccccccc",
-"cccccccccccccccccccccccccccccccc",
-"ccccccaaaaaaaaaacccccccccccccccc",
-"ccccccaaaaaaaaaacccccccccccccccc",
-"ccccaabb##bb##bbaacccccccccccccc",
-"ccccaabb##bb##bbaacccccccccccccc",
-"ccaabb##bb##bb##bbaaaaaaaaaaaacc",
-"ccaabb##bb##bb##bbaaaaaaaaaaaacc",
-"ccaaccccccccccccccccccccccccaa..",
-"ccaaccccccccccccccccccccccccaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaacc##bb##bb##bb##bb##bb##aa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaccbb##bb##bb##bb##bb##bbaa..",
-"ccaaaaaaaaaaaaaaaaaaaaaaaaaaaa..",
-"ccaaaaaaaaaaaaaaaaaaaaaaaaaaaa..",
-"cccc............................",
-"cccc............................",
-"cccccccccccccccccccccccccccccccc",
-"cccccccccccccccccccccccccccccccc",
-"cccccccccccccccccccccccccccccccc",
-"cccccccccccccccccccccccccccccccc"
-};

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/treeIcon5.xpm Deleted

@@ -1,43 +0,0 @@
-/* XPM */
-static char *icon5_xpm[] = {
-/* width height num_colors chars_per_pixel */
-"    32    32        4            1",
-/* colors */
-". c #000000",
-"# c #808000",
-"a c None",
-"b c #ffff00",
-/* pixels */
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aa..........aaaaaaaaaaaaaaaaaaaa",
-"aa..........aaaaaaaaaaaaaaaaaaaa",
-"aa..bbbbbb................aaaaaa",
-"aa..bbbbbb................aaaaaa",
-"aa..bbbbbbbbbbbbbbbbbbbb..aaaaaa",
-"aa..bbbbbbbbbbbbbbbbbbbb..aaaaaa",
-"aa..bbbbbbbbbbbbbbbbbbbb..aaaaaa",
-"aa..bbbbbbbbbbbbbbbbbbbb..aaaaaa",
-"aa..bbbb......................aa",
-"aa..bbbb......................aa",
-"aa..bbb.####################..aa",
-"aa..bbb.####################..aa",
-"aa..bb..####################.aaa",
-"aa..bb..####################.aaa",
-"aa..b.####################..aaaa",
-"aa..b.####################..aaaa",
-"aa....####################.aaaaa",
-"aa....####################.aaaaa",
-"aa..####################..aaaaaa",
-"aa..####################..aaaaaa",
-"aa......................aaaaaaaa",
-"aa......................aaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-};

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/wxGPACPanel.cpp Deleted

@@ -1,290 +0,0 @@
-#include "safe_include.h" 
-#include <gpac/terminal.h>
-#include <gpac/options.h>
-
-#include "wx/wxprec.h"
-
-#ifndef WX_PRECOMP
-  #include "wx/wx.h"
-#endif
-
-#include "wxGPACPanel.h"
-#include "V4StudioFrame.h"
-#include "V4StudioApp.h"
-#include "V4Service.h"
-
-
-bool GPACInit(void *application, GF_Terminal **term, GF_User *user, bool quiet);
-
-wxGPACPanel::wxGPACPanel(V4SceneManager *parent, const char *path) 
-{
-	this->parent = parent;
-	m_term = NULL;
-	m_pService = NULL;
-
-	// Initializes the MPEG-4 terminal
-	GPACInit(this, &m_term, &m_user, true);			
-	if (!m_term) return;
-
-	// Setting all the variables needed for picking of objects.
-	m_iDragging = 0;
-	m_transformMode = 0;
-	dragX = dragY = 0;
-	picked = NULL;
-
-	if (path) {
-		m_pService = new V4Service(path);
-		gf_term_attach_service(m_term, m_pService->GetServiceInterface());
-	}
-}
-
-wxGPACPanel::~wxGPACPanel()
-{
-	if (m_pService) delete m_pService;
-	if (m_term) gf_term_del(m_term);
-	if (m_user.modules) gf_modules_del(m_user.modules);
-	if (m_user.config) gf_cfg_del(m_user.config);
-}
-
-
-Bool V4S_EventProc(void *par, GF_Event *evt)
-{
-	wxGPACPanel *panel = (wxGPACPanel *)par;
-	if (!panel->GetMPEG4Terminal()) return 0;
-
-	switch (evt->type) {
-	case GF_EVENT_REFRESH:
-		gf_term_set_option(panel->GetMPEG4Terminal(), GF_OPT_REFRESH, 0);
-		break;
-	case GF_EVENT_SCENE_SIZE:
-	case GF_EVENT_SIZE:
-		gf_sc_set_size(panel->GetSceneCompositor(), evt->size.width, evt->size.height);
-		panel->Update();
-		break;
-	case GF_EVENT_MOUSEDOWN:
-		if (evt->mouse.button==GF_MOUSE_LEFT) {
-			panel->picked = gf_sc_pick_node(panel->GetSceneCompositor(), evt->mouse.x, evt->mouse.y);
-			panel->m_iDragging ++;
-			if (panel->picked) {
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->SetSelectedItem(panel->picked);	
-				panel->dragX = evt->mouse.x;
-				panel->dragY = evt->mouse.y;
-				panel->m_transformMode = 0;
-			}
-		}
-		else if (evt->mouse.button==GF_MOUSE_MIDDLE) {
-			panel->m_iDragging ++;
-			panel->picked = gf_sc_pick_node(panel->GetSceneCompositor(), evt->mouse.x, evt->mouse.y);
-			if (panel->picked) {
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->SetSelectedItem(panel->picked);	
-				panel->dragX = evt->mouse.x;
-				panel->dragY = evt->mouse.y;
-				panel->m_transformMode = 2;
-			}
-		}
-		else if (evt->mouse.button==GF_MOUSE_RIGHT) {
-			panel->m_iDragging ++;
-			panel->picked = gf_sc_pick_node(panel->GetSceneCompositor(), evt->mouse.x, evt->mouse.y);
-			if (panel->picked) {
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->SetSelectedItem(panel->picked);	
-				panel->dragX = evt->mouse.x;
-				panel->dragY = evt->mouse.y;
-				panel->m_transformMode = 1;
-			}
-		}
-		break;
-	case GF_EVENT_MOUSEUP:
-		if (evt->mouse.button==GF_MOUSE_LEFT) {
-			panel->m_iDragging --;
-			if (panel->picked) {
-				int dX = evt->mouse.x - panel->dragX;
-				int dY = evt->mouse.y - panel->dragY;
-				panel->dragX = evt->mouse.x;
-				panel->dragY = evt->mouse.y;
-				wxString pos;
-				pos << dX;
-				pos << ',';
-				pos << dY;
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->Translate(dX,dY);
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetStatusBar()->SetStatusText(pos);
-			}
-		}
-		else if (evt->mouse.button==GF_MOUSE_MIDDLE) {
-			panel->m_iDragging --;
-			if (panel->picked) {
-				int dX = evt->mouse.x - panel->dragX;
-				int dY = evt->mouse.y - panel->dragY;
-				panel->dragX = evt->mouse.x;
-				panel->dragY = evt->mouse.y;
-				wxString pos;
-				pos << dX;
-				pos << ',';
-				pos << dY;
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->Rotate(dX,dY);
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetStatusBar()->SetStatusText(pos);
-			}
-		}
-		else if (evt->mouse.button==GF_MOUSE_RIGHT) {
-			panel->m_iDragging --;
-			if (panel->picked) {
-				int dX = evt->mouse.x - panel->dragX;
-				int dY = evt->mouse.y - panel->dragY;
-				panel->dragX = evt->mouse.x;
-				panel->dragY = evt->mouse.y;
-				wxString pos;
-				pos << dX;
-				pos << ',';
-				pos << dY;
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->Scale(dX,dY);
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetStatusBar()->SetStatusText(pos);
-			}
-		}
-		break;
-	case GF_EVENT_MOUSEMOVE:
-	{
-		wxString pos;
-		if (panel->picked && panel->m_iDragging) {
-			int dX = evt->mouse.x - panel->dragX;
-			int dY = evt->mouse.y - panel->dragY;
-			panel->dragX = evt->mouse.x;
-			panel->dragY = evt->mouse.y;
-			pos << dX;
-			pos << ',';
-			pos << dY;
-			switch (panel->m_transformMode) {
-			case 0:
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->Translate(dX,dY);
-				break;
-			case 1:
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->Scale(dX,dY);
-				break;
-			case 2:			
-				panel->GetV4SceneManager()->GetV4StudioFrame()->GetTreeView()->Rotate(dX,dY);
-				break;
-			}
-		} else {
-			pos << evt->mouse.x;
-			pos << ',';
-			pos << evt->mouse.y;
-		}
-		panel->GetV4SceneManager()->GetV4StudioFrame()->GetStatusBar()->SetStatusText(pos);
-	}
-		break;
-	case GF_EVENT_QUIT:
-		panel->GetV4SceneManager()->GetV4StudioFrame()->Close(TRUE);
-		break;
-	}
-	return 0;
-}
-
-void wxGPACPanel::Update() 
-{
-	if (m_term) {
-		//gf_term_set_option(m_term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
-		gf_sc_invalidate(m_term->compositor, NULL);
-		gf_sc_draw_frame(m_term->compositor);
-	}
-}
-
-bool GPACInit(void *application, GF_Terminal **term, GF_User *user, bool quiet) 
-{
-	memset(user, 0, sizeof(GF_User));
-
-	/*locate exec dir for cfg file*/
-    wxPathList pathList;
-	wxString currentDir(wxGetCwd());
-    wxString abs_gpac_path = "";
-	const char *gpac_cfg;
-
-	if (!quiet) ::wxLogMessage("Looking for GPAC configuration file");
-
-#if defined(__WXMAC__) && !defined(__DARWIN__)
-    // On Mac, the current directory is the relevant one when the application starts.
-    abs_gpac_path = wxGetCwd();
-	gpac_cfg = "GPAC.cfg";
-#else
-
-#ifdef WIN32
-	V4StudioApp &app = wxGetApp();
-	gpac_cfg = "GPAC.cfg";
-	/*locate exe*/
-    if (wxIsAbsolutePath(app.argv[0])) {
-        abs_gpac_path = wxPathOnly(app.argv[0]);
-	} else {
-		if (currentDir.Last() != wxFILE_SEP_PATH) currentDir += wxFILE_SEP_PATH;
-		abs_gpac_path = currentDir + app.argv[0];
-		if (wxFileExists(abs_gpac_path)) {
-			abs_gpac_path = wxPathOnly(abs_gpac_path);
-		} else {
-			abs_gpac_path = "";
-			pathList.AddEnvList(wxT("PATH"));
-			abs_gpac_path = pathList.FindAbsoluteValidPath(app.argv[0]);
-			if (!abs_gpac_path.IsEmpty()) {
-				abs_gpac_path = wxPathOnly(abs_gpac_path);
-			} else {
-				/*ask user*/
-				wxDirDialog dlg(NULL, "Locate GPAC config file directory");
-				if ( dlg.ShowModal() != wxID_OK ) return 0;
-				abs_gpac_path = dlg.GetPath();
-			}
-		}
-	}
-#else
-	gpac_cfg = ".gpacrc";
-	char *cfg_dir = getenv("HOME");
-	if (cfg_dir) {
-		abs_gpac_path = cfg_dir;
-	} else {
-		/*ask user*/
-		wxDirDialog dlg(NULL, "Locate GPAC config file directory");
-		if ( dlg.ShowModal() != wxID_OK ) return 0;
-		abs_gpac_path = dlg.GetPath();
-	}
-
-#endif
-
-#endif
-
-	/*load config*/
-	Bool first_launch = 0;
-	user->config = gf_cfg_init(NULL, &first_launch);
-
-	if (!user->config) {
-		wxMessageDialog(NULL, "Cannot create GPAC config file", "Init error", wxOK).ShowModal();
-	}
-	if (!quiet) ::wxLogMessage("GPAC configuration file opened - looking for modules");
-	const char *str = gf_cfg_get_key(user->config, "General", "ModulesDirectory");
-	user->modules = gf_modules_new(str, user->config);
-
-	if (! gf_modules_get_count(user->modules) ) {
-		wxMessageDialog(NULL, "No modules available - system cannot work", "Fatal Error", wxOK).ShowModal();
-		gf_modules_del(user->modules);
-		gf_cfg_del(user->config);
-		return 0;
-	}
-
-	if (!quiet) ::wxLogMessage("%d modules found:", gf_modules_get_count(user->modules));
-	for (u32 i=0; i<gf_modules_get_count(user->modules); i++) {
-		if (!quiet) ::wxLogMessage("\t%s", gf_modules_get_file_name(user->modules, i));
-	}
-
-	if (!quiet) ::wxLogMessage("Starting GPAC Terminal");
-	/*now load terminal*/
-	user->opaque = application;
-	user->EventProc = V4S_EventProc;
-//	user->os_window_handler = ((wxGPACPanel *)application)->GetV4SceneManager()->GetV4StudioFrame()->GetHandle();
-
-	// Forces the renderer to not use a thread and do the rendering by itfe
-	gf_cfg_set_key(user->config, "Systems", "NoVisualThread", "No");
-
-	*term = gf_term_new(user);
-	if (!*term) {
-		wxMessageDialog(NULL, "Fatal Error", "Cannot load GPAC Terminal", wxOK).ShowModal();
-		return 0;
-	} else {
-		if (!quiet) ::wxLogMessage("GPAC Terminal started");
-	}
-
-	return 1;
-}
-

gpac-0.5.0.svn4668.tar.bz2/applications/v4studio/wxGPACPanel.h Deleted

@@ -1,46 +0,0 @@
-#ifndef _GPACPANEL_H
-#define _GPACPANEL_H
-
-
-#include "safe_include.h" 
-#include <gpac/scenegraph.h>
-#include <gpac/compositor.h>
-/*for service connection...*/
-#include <gpac/internal/terminal_dev.h>
-
-class V4SceneManager;
-class V4Service;
-
-class wxGPACPanel 
-{
-
-public :
-	//  Constructor / Desctructor
-	wxGPACPanel(V4SceneManager *parent, const char *path);
-	~wxGPACPanel();
-
-	 // Access to private members
-	GF_Terminal *GetMPEG4Terminal() { return m_term; }	
-	GF_Compositor *GetSceneCompositor() { return m_term->compositor; }	
-	V4SceneManager *GetV4SceneManager() { return parent; }
-	// 
-	void Update();
-
-	// Variables used for drag, drop, move, ... picking ...
-	s32 m_iDragging;
-	u32 m_transformMode; // 0 Move, 1 Scale, 2 Rotate
-	GF_Node *picked;
-	u32 dragX, dragY;
-
-private:
-	void TranslateCoordinates(long x, long y, int &sceneX, int &sceneY);
-
-	V4SceneManager *parent;
-
-	GF_Terminal *m_term;
-	GF_User m_user;
-
-	V4Service *m_pService;
-};
-
-#endif

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/mediasegments-mp4-audio-only.js Deleted

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/mediasegments-mp4-video-audio-multiplexed.js Deleted

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/mediasegments-mp4-video-only-local.js Deleted

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/mediasegments-mp4-video-only.js Deleted

@@ -1,28 +0,0 @@
-/* Array representing the different files to download per quality */
-var segmentFiles = 
-	[ 
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
-		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
-		  segmentPrefix: "mp4-main-multi-h264bl_low-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
-		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
-		  segmentPrefix: "mp4-main-multi-h264bl_mid-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		},
-		{ 
-		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
-		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
-		  segmentPrefix: "mp4-main-multi-h264bl_hd-",
-		  segmentSuffix: ".m4s",
-		  segStartIndex: 1,
-		  segEndIndex: 60
-		}
-	];

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/video_html5_mse.js Deleted

@@ -1,228 +0,0 @@
-'use strict';
-/*****************************************************************************************
- *
- * Example code using the Media Source Extension API with GPAC
- *
- *****************************************************************************************/
-alert("Media Source Script loaded");
-
-var v;
-var r;
-var t;
-var qe;
-var dte;
-var vte;
-var be;
-var ue;
-
-var use_regulation = true;
-
-/* difference in seconds between the latest media time downloaded and the media time being played
-used to trigger a new download when the regulation mode is on */
-var TIME_THRESOLD = 2;
-
-/* Current file being downloaded */
-var fileIndex = -1;
-
-/* Current quality being downloaded */
-var qualityIndex = 0;
-
-/* using multiple XHR objects (1 per file, because of GPAC bug in the allocation of arraybuffer) */
-var xhrs = new Array();
-var xhr = new XMLHttpRequest();
-
-/* Using only one SourceBuffer in this example */
-var sb = null;
-
-/* URL of the segment being downloaded */
-var url = null;
-
-/* maximum number of segments to download */
-var maxSeg = Infinity;
-
-/* Array representing the download pattern */
-/* download order of each segments (for out-of-order append), segments not listed are downloaded in the right order */
-//var appendOrder = null;
-var appendOrder = [0, 5, 4, 3, 2, 1];
-var fileIndexReordered;
-var prevFileIndex = 0;
-
-function createInfoStructure(g) {
-    var ta;
-    ta = document.createElement("textArea");
-    ta.setAttribute("width", "800");
-    g.appendChild(ta);
-
-    qe = document.createElement("tspan");
-    ta.appendChild(qe);
-    ta.appendChild(document.createElement("tbreak"));
-    dte = document.createElement("tspan");
-    ta.appendChild(dte);
-    ta.appendChild(document.createElement("tbreak"));
-    vte = document.createElement("tspan");
-    ta.appendChild(vte);
-    ta.appendChild(document.createElement("tbreak"));
-    be = document.createElement("tspan");
-    ta.appendChild(be);
-    ta.appendChild(document.createElement("tbreak"));
-    ue = document.createElement("tspan");
-    ta.appendChild(ue);
-}
-
-function updateInfo() {
-    dte.textContent = "Document time        :" + document.documentElement.getCurrentTime();
-    vte.textContent = "Video time           :" + v.currentTime;
-    qe.textContent = "Quality Requested:" + qualityIndex;
-    if (sb != null && sb.buffered.length > 0) {
-     be.textContent = "Media Data Buffered: (" + sb.buffered.start(0) + "," + sb.buffered.end(0) + ")";
-    } else {
-        be.textContent = "empty buffer";
-    }
-}
-
-function updateDownloadInfo(s) {
-    ue.textContent = s;
-}
-
-function switchQuality() {
-    alert('Switching quality');
-    qualityIndex = (qualityIndex + 1) % segmentFiles.length;
-    updateInfo();
-}
-
-function getNextSegment() {
-
-    /* apply the limit (if any) to the number of segments to download */
-    if (maxSeg > 0 && fileIndex >= maxSeg) return;
-
-    fileIndex++;
-
-    /* apply the segment reordering pattern (if any) */
-    if (appendOrder != null && fileIndex < appendOrder.length) {
-        fileIndexReordered = appendOrder[fileIndex];
-        alert("Changing file index from: " + fileIndex + "to : " + fileIndexReordered);
-    } else {
-        fileIndexReordered = fileIndex;
-        alert("Using file index: " + fileIndex);
-    }
-
-    /* determine the url to use */
-    if (fileIndexReordered < segmentFiles[qualityIndex].segStartIndex) {
-        /* Setting the url with the initialization segment */
-        url = segmentFiles[qualityIndex].baseURL + segmentFiles[qualityIndex].initName;
-    }
-    else if (fileIndexReordered >= segmentFiles[qualityIndex].segStartIndex && fileIndexReordered < segmentFiles[qualityIndex].segEndIndex) {
-        /* Setting the url with a regular media segment */
-        url = segmentFiles[qualityIndex].baseURL + segmentFiles[qualityIndex].segmentPrefix + fileIndexReordered + segmentFiles[qualityIndex].segmentSuffix;
-    }
-
-    alert("url: " + url);
-    /* starting the download */
-    if (url) {
-        updateDownloadInfo("Downloading segment #" + fileIndexReordered + " " + url);
-        xhrs[fileIndex] = xhr;
-        xhrs[fileIndex].url = url;
-        xhrs[fileIndex].open("GET", url);
-        xhrs[fileIndex].responseType = "arraybuffer";
-        xhrs[fileIndex].onreadystatechange = onDone;
-        xhrs[fileIndex].send();
-    }
-
-    updateInfo();
-}
-
-function onDone(e) {
-    if (this.readyState == this.DONE) {
-        updateDownloadInfo("Downloading segment #" + fileIndexReordered + " " + this.url + " - done");
-        var arraybuffer = this.response;
-        alert("Received ArrayBuffer (size: " + arraybuffer.byteLength + ")");
-
-        /* Appending the downloaded segment to the SourceBuffer */
-        if (sb) {
-            /* if there is a discontinuity in the file index, we need to inform the SourceBuffer */
-            if (prevFileIndex != 0 && fileIndexReordered != prevFileIndex + 1) {
-                sb.abort("continuation");
-            }
-            prevFileIndex = fileIndexReordered;
-            /* we assume everything will be fine with this append */
-            sb.appendBuffer(arraybuffer);
-        }
-        url = null;
-
-        if (!use_regulation) {
-            getNextSegment();
-        }
-    }
-}
-
-function onSourceOpen(event) {
-    alert("MediaSource opened");
-    /* GPAC Hack: since the event is not targeted to the MediaSource, we need to get the MediaSource back */
-    var ms = event.target.ms;
-
-    alert("Adding Source Buffer of type video/mp4 to the MediaSource");
-    sb = ms.addSourceBuffer("video/mp4");
-
-    getNextSegment();
-}
-
-/* Function called repeatedly to monitor the playback time versus download time difference 
-and to trigger a new download if needed */
-function repeatFunc() {
-    updateInfo();
-
-    /* don't download a new segment if:
-    - the SourceBuffer is not created
-    - there is already a download going on */
-    if (sb != null && url == null) {
-        if (sb.buffered.length > 0) {
-            alert("Source buffered range: (" + sb.buffered.start(0) + "," + sb.buffered.end(0) + ")");
-            if (sb.updating == false && sb.buffered.end(0) - v.currentTime < TIME_THRESOLD) {
-                alert("buffered attribute has too few data, downloading new segment");
-                getNextSegment();
-            }
-        }
-        else {
-            if (!sb.updating) {
-                alert("buffered attribute has no data, downloading new segment");
-                getNextSegment();
-            }
-        }
-    }
-}
-
-function init() {
-
-    v = document.getElementById("v");
-    /* GPAC Hack: the event should be dispatched to the MediaSource object not to the video */
-    v.addEventListener("sourceopen", onSourceOpen);
-
-    if (use_regulation) {
-        /* GPAC workaround: adding the event listener on the repeatEvent of a dummy animation to simulate window.setInterval */
-        var a = document.getElementById("a");
-        a.addEventListener("repeatEvent", repeatFunc);
-        alert("Using regulation - downloading segments as fast as possible");
-    } else {
-        alert("Not using any regulation - downloading segments as fast as possible");
-    }
-
-    /* adding listener to toggle video quality */
-    r = document.getElementById("r");
-    r.addEventListener("click", switchQuality);
-
-    t = document.getElementById("t");
-    createInfoStructure(t);
-
-    alert("Creating new MediaSource");
-    var ms = new MediaSource();
-
-    var bloburl = URL.createObjectURL(ms);
-    alert("Attaching Media Source " + bloburl + " to Video");
-    v.src = bloburl;
-
-    /* GPAC hack to retrieve the MediaSource from the video when the sourceopen event is dispatched to the video */
-    v.ms = ms;
-
-    alert("Starting video playback");
-    v.play();
-}

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/xhr_reuse.js Deleted

@@ -1,36 +0,0 @@
-/*****************************************************************************************
- * Testing reuse of the same XHR object for multiple downloads with ArrayBuffer
- *****************************************************************************************/
-
-alert("Script loaded");
-
-var count = 0;
-
-function getFile(xhr, url)
-{
-  xhr.url = url;
-  xhr.open("GET", xhr.url);
-  xhr.responseType = "arraybuffer";
-  xhr.onreadystatechange = onDone;
-  alert("Downloading: "+xhr.url +" waiting for ArrayBuffer response");
-  xhr.send();
-}
-
-function onDone(e)
-{ 
-  if (this.readyState == this.DONE)
-  {
-	alert("Download done: "+this.url);
-	alert("Response: "+this.response+", of size: "+this.response.byteLength);
-	if (count == 0) {
-	  count++;
-	  getFile(this, "http://perso.telecom-paristech.fr/~concolat/html5_tests/video1.ogv");
-	}
-  }
-}
-
-function init()
-{
-  var xhr = new XMLHttpRequest();
-  getFile(xhr, "http://perso.telecom-paristech.fr/~concolat/html5_tests/video1.mp4");
-}

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/generic_subtitle.c Deleted

@@ -1,322 +0,0 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2012 
- *					All rights reserved
- *
- *  This file is part of GPAC / ISO Media File Format sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <gpac/internal/isomedia_dev.h>
-#include <gpac/constants.h>
-
-#ifndef GPAC_DISABLE_ISOM
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err gf_isom_update_generic_subtitle_description( GF_ISOFile                          *movie, 
-                                                    u32                                 trackNumber, 
-                                                    u32                                 descriptionIndex, 
-                                                    GF_GenericSubtitleSampleDescriptor  *desc)
-{
-	GF_TrackBox *trak;
-	GF_Err      e;
-
-	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;
-
-	switch (trak->Media->handler->handlerType) {
-	case GF_ISOM_MEDIA_SUBM:
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-
-	//GF_GenericSubtitleSampleEntryBox *gsub;
-	//gsub = (GF_GenericSubtitleSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->boxList, descriptionIndex - 1);
-	//if (!gsub) return GF_BAD_PARAM;
-	//switch (txt->type) {
-	//case GF_ISOM_BOX_TYPE_METX:
-	//case GF_ISOM_BOX_TYPE_METT:
-	//	break;
-	//default:
-	//	return GF_BAD_PARAM;
-	//}
-
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-	return e;
-}
-
-GF_Err gf_isom_new_generic_subtitle_description(GF_ISOFile  *movie, 
-                                                u32         trackNumber, 
-                                                char        *content_encoding, 
-                                                char        *xml_schema_loc, 
-                                                char        *mime_type_or_namespace, 
-                                                Bool        is_xml, 
-                                                char        *URLname,
-                                                char        *URNname,
-                                                u32         *outDescriptionIndex)
-{
-	GF_TrackBox                 *trak;
-	GF_Err                      e;
-	u32                         dataRefIndex;
-	GF_MetaDataSampleEntryBox   *metasd;
-
-	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_SUBM:
-		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;
-	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
-
-	metasd = (GF_MetaDataSampleEntryBox *) gf_isom_box_new((is_xml ? GF_ISOM_BOX_TYPE_METX : GF_ISOM_BOX_TYPE_METT));
-	metasd->dataReferenceIndex = dataRefIndex;
-	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, metasd);
-	if (outDescriptionIndex) *outDescriptionIndex = gf_list_count(trak->Media->information->sampleTable->SampleDescription->other_boxes);
-
-    metasd->content_encoding = gf_strdup(content_encoding);
-    metasd->xml_schema_loc = gf_strdup(xml_schema_loc);
-    metasd->mime_type_or_namespace = gf_strdup(mime_type_or_namespace);
-	return e;
-}
-
-
-/* blindly adds text to a sample following 3GPP Timed Text style */
-GF_Err gf_isom_generic_subtitle_sample_add_text(GF_GenericSubtitleSample *samp, char *text_data, u32 text_len)
-{
-	if (!samp) return GF_BAD_PARAM;
-	if (!text_len) return GF_OK;
-	samp->text = (char*)gf_realloc(samp->text, sizeof(char) * (samp->len + text_len) );
-	memcpy(samp->text + samp->len, text_data, sizeof(char) * text_len);
-	samp->len += text_len;
-	return GF_OK;
-}
-
-/* 
- * Writing the generic sample structure into a sample buffer 
- * 2 options: 
- * - putting the text or XML in the sample directly
- * - or using a meta box to structure the sample data
-*/
-GF_ISOSample *gf_isom_generic_subtitle_to_sample(GF_GenericSubtitleSample *samp)
-{
-	GF_ISOSample *res;
-	GF_BitStream *bs;
-	if (!samp) return NULL;
-
-	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	//gf_bs_write_u16(bs, samp->len);
-
-	if (samp->len) gf_bs_write_data(bs, samp->text, samp->len);
-    else     gf_bs_write_data(bs, "", 1);
-
-	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 gf_isom_generic_subtitle_has_similar_description(GF_ISOFile                          *movie, 
-//                                                        u32                                 trackNumber, 
-//                                                        GF_GenericSubtitleSampleDescriptor  *desc, 
-//                                                        u32                                 *outDescIdx, 
-//                                                        Bool                                *same_box)
-//{
-//	GF_TrackBox             *trak;
-//	GF_Err                  e;
-//	u32                     i;
-//    u32                     j;
-//    u32                     count;
-//	GF_Tx3gSampleEntryBox   *txt;
-//
-//	*same_box   = 0;
-//	*outDescIdx = 0;
-//
-//	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) return GF_BAD_PARAM;
-//
-//	switch (trak->Media->handler->handlerType) {
-//	case GF_ISOM_MEDIA_SUBT:
-//		break;
-//	default:
-//		return GF_BAD_PARAM;
-//	}
-//
-//	return GF_OK;
-//}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-GF_GenericSubtitleSample *gf_isom_new_generic_subtitle_sample()
-{
-	GF_GenericSubtitleSample *res;
-	GF_SAFEALLOC(res, GF_GenericSubtitleSample);
-	if (!res) return NULL;
-	return res;
-}
-
-GF_Err gf_isom_generic_subtitle_reset(GF_GenericSubtitleSample *samp)
-{
-	if (!samp) return GF_BAD_PARAM;
-	if (samp->text) gf_free(samp->text);
-	samp->text = NULL;
-	samp->len = 0;
-	return GF_OK;
-}
-
-GF_EXPORT
-void gf_isom_delete_generic_subtitle_sample(GF_GenericSubtitleSample * samp)
-{
-	gf_isom_generic_subtitle_reset(samp);
-	gf_free(samp);
-}
-
-GF_EXPORT
-GF_GenericSubtitleSample *gf_isom_parse_generic_subtitle_sample(GF_BitStream *bs)
-{
-	GF_GenericSubtitleSample *s = gf_isom_new_generic_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 
-		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;
-		gf_bs_read_data(bs, s->text, s->len);
-	}
-	return s;
-}
-
-GF_GenericSubtitleSample *gf_isom_parse_generic_subtitle_sample_from_data(char *data, u32 dataLength)
-{
-	GF_GenericSubtitleSample *s;
-	GF_BitStream *bs;
-	/*empty text sample*/
-	if (!data || !dataLength) {
-		return gf_isom_new_generic_subtitle_sample();
-	}
-	
-	bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
-	s = gf_isom_parse_generic_subtitle_sample(bs);
-	gf_bs_del(bs);
-	return s;
-}
-
-
-/*out-of-band sample desc (128 and 255 reserved in RFC)*/
-#define SAMPLE_INDEX_OFFSET		129
-
-GF_Err gf_isom_rewrite_generic_subtitle_sample(GF_ISOSample *samp, u32 sampleDescriptionIndex, u32 sample_dur)
-{
-	//GF_BitStream *bs;
-	//u32 pay_start, txt_size;
-	//Bool is_utf_16 = 0;
-	//if (!samp || !samp->data || !samp->dataLength) return GF_OK;
-
-	//bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
-	//txt_size = gf_bs_read_u16(bs);
-	//gf_bs_del(bs);
-
-	///*remove BOM*/
-	//pay_start = 2;
-	//if (txt_size>2) {
-	//	/*seems 3GP only accepts BE UTF-16 (no LE, no UTF32)*/
-	//	if (((u8) samp->data[2]==(u8) 0xFE) && ((u8)samp->data[3]==(u8) 0xFF)) {
-	//		is_utf_16 = 1;
-	//		pay_start = 4;
-	//		txt_size -= 2;
-	//	}
-	//}
-
-	///*rewrite as TTU(1)*/
-	//bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	//gf_bs_write_int(bs, is_utf_16, 1);
-	//gf_bs_write_int(bs, 0, 4);
-	//gf_bs_write_int(bs, 1, 3);
-	//gf_bs_write_u16(bs, 8 + samp->dataLength - pay_start);
-	//gf_bs_write_u8(bs, sampleDescriptionIndex + SAMPLE_INDEX_OFFSET);
-	//gf_bs_write_u24(bs, sample_dur);
-	///*write text size*/
-	//gf_bs_write_u16(bs, txt_size);
-	//if (txt_size) gf_bs_write_data(bs, samp->data + pay_start, samp->dataLength - pay_start);
-
-	//gf_free(samp->data);
-	//samp->data = NULL;
-	//gf_bs_get_content(bs, &samp->data, &samp->dataLength);
-	//gf_bs_del(bs);
-	return GF_OK;
-}
-
-
-//GF_Err gf_isom_text_get_encoded_tx3g(GF_ISOFile *file, u32 track, u32 sidx, u32 sidx_offset, char **tx3g, u32 *tx3g_size)
-//{
-//	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->boxList, 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;
-//	*tx3g_size = 0;
-//	gf_bs_get_content(bs, tx3g, tx3g_size);
-//	gf_bs_del(bs);
-//	return GF_OK;
-//}
-
-#endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4668.tar.bz2/Makefile -> gpac-0.5.0.svn5178.tar.bz2/Makefile Changed

@@ -10,8 +10,19 @@
 	$(MAKE) -C applications all
 	$(MAKE) -C modules all
 
+SVNREV_PATH:=$(SRC_PATH)/include/gpac/revision.h
+
 version:
-	@if [ -d ".svn" ]; then if which svnversion >/dev/null; then echo "#define GPAC_SVN_REVISION	\"$(shell svnversion $(SRC_PATH) )\"" > $(SRC_PATH)/include/gpac/revision.h ; else  echo "No SVN Version found"; fi; fi
+	@if [ -d $(SRC_PATH)/".svn" ]; then \
+		if which svnversion >/dev/null; then \
+			echo "#define GPAC_SVN_REVISION	\"$(shell svnversion $(SRC_PATH) )\"" > $(SVNREV_PATH).new ; \
+			if ! diff -q $(SVNREV_PATH) $(SVNREV_PATH).new >/dev/null ; then \
+				mv $(SVNREV_PATH).new  $(SVNREV_PATH) ;  \
+			fi ; \
+		fi \
+	else \
+		echo "No SVN Version found" ; \
+	fi \
 
 lib:	version
 	$(MAKE) -C src all
@@ -59,7 +70,7 @@
 	$(INSTALL) -d "$(DESTDIR)$(prefix)/bin"
 ifeq ($(DISABLE_ISOFF), no) 
 ifeq ($(CONFIG_LINUX), yes)
-ifeq ($(CONFIG_FFMPEG), system)
+ifneq ($(CONFIG_FFMPEG), no)
 	$(INSTALL) $(INSTFLAGS) -m 755 bin/gcc/DashCast "$(DESTDIR)$(prefix)/bin"
 endif
 endif
@@ -201,6 +212,4 @@
 	@echo
 	@echo "to build libgpac documentation, go to gpac/doc and type 'doxygen'"
 
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend

gpac-0.5.0.svn4668.tar.bz2/applications/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/Makefile Changed

@@ -2,7 +2,7 @@
 
 vpath %.c $(SRC_PATH)/applications/dashcast
 
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include" -I../../
+CFLAGS= $(OPTFLAGS) -D_GNU_SOURCE -I"$(SRC_PATH)/include" -I../../ $(ffmpeg_cflags)
 
 LINKLIBS=$(GPAC_SH_FLAGS)
 
@@ -20,6 +20,10 @@
 CFLAGS+=-DGPAC_READ_ONLY
 endif
 
+ifeq ($(CONFIG_LIBAV),yes)
+CFLAGS+=-DGPAC_USE_LIBAV
+endif
+
 #common obj
 OBJS= dashcast.o audio_data.o audio_decoder.o audio_encoder.o audio_muxer.o circular_buffer.o cmd_data.o controler.o message_queue.o register.o video_data.o video_decoder.o video_encoder.o video_muxer.o video_scaler.o task.o
 
@@ -31,7 +35,7 @@
 PROG=DashCast
 endif
 
-LINKLIBS+=-lz -lpthread -lavcodec -lavformat -lswscale -lavutil -lavdevice 
+LINKLIBS+= $(ffmpeg_lflags)
 
 ifeq ($(CONFIG_DARWIN), yes)
 #fixme - use proper detection of libavdevice dependencies
@@ -64,10 +68,4 @@
 distclean: clean
 	rm -f Makefile.bak .depend
 
-
-
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_data.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_data.c Changed

@@ -25,80 +25,73 @@
 
 #include "audio_data.h"
 
-void dc_audio_data_set_default(AudioData * adata) {
-
-	strcpy(adata->psz_name, "");
-	strcpy(adata->psz_format, "");
-	strcpy(adata->psz_codec, "");
-	adata->i_bitrate = -1;
-	adata->i_channels= -1;
-	adata->i_samplerate = -1;
 
+void dc_audio_data_set_default(AudioDataConf *audio_data_conf)
+{
+	strcpy(audio_data_conf->filename, "");
+	strcpy(audio_data_conf->format, "");
+	strcpy(audio_data_conf->codec, "");
+	audio_data_conf->bitrate = -1;
+	audio_data_conf->channels= -1;
+	audio_data_conf->samplerate = -1;
 }
 
-void dc_audio_data_init(AudioData * adata, char * psz_name, char * psz_format) {
-
-	if(psz_name != NULL && strlen(psz_name) > 0)
-		strcpy(adata->psz_name, psz_name);
+void dc_audio_data_init(AudioDataConf *audio_data_conf, char *filename, char *format)
+{
+	if (filename != NULL && strlen(filename) > 0)
+		strcpy(audio_data_conf->filename, filename);
 	else
-		strcpy(adata->psz_name, "");
+		strcpy(audio_data_conf->filename, "");
 
-	if(psz_format != NULL && strlen(psz_format) > 0)
-		strcpy(adata->psz_format, psz_format);
+	if (format != NULL && strlen(format) > 0)
+		strcpy(audio_data_conf->format, format);
 	else
-		strcpy(adata->psz_format, "");
+		strcpy(audio_data_conf->format, "");
 }
 
-int dc_audio_input_data_init(AudioInputData * p_aid, int i_channels, int i_samplerate,
-		int i_maxcon, int mode) {
-
+int dc_audio_input_data_init(AudioInputData *audio_input_data, int channels, int samplerate, int num_consumers, int mode)
+{
 	int i;
 
-	dc_producer_init(&p_aid->pro, AUDIO_CB_SIZE, "audio decoder");
-
-
-	dc_circular_buffer_create(&p_aid->p_cb, AUDIO_CB_SIZE, mode,
-			i_maxcon);
+	dc_producer_init(&audio_input_data->producer, AUDIO_CB_SIZE, "audio decoder");
+	dc_circular_buffer_create(&audio_input_data->circular_buf, AUDIO_CB_SIZE, mode, num_consumers);
 
 	for (i = 0; i < AUDIO_CB_SIZE; i++) {
-		AudioDataNode * p_adn = gf_malloc(sizeof(AudioDataNode));
-		p_aid->p_cb.p_list[i].p_data = (void *) p_adn;
-
-		p_adn->i_abuf_size = MAX_AUDIO_PACKET_SIZE;
-		p_adn->p_abuf = gf_malloc(p_adn->i_abuf_size * sizeof(uint8_t));
+		AudioDataNode *audio_data_node = gf_malloc(sizeof(AudioDataNode));
+		audio_input_data->circular_buf.list[i].data = (void *) audio_data_node;
 
+		audio_data_node->abuf_size = MAX_AUDIO_PACKET_SIZE;
+		audio_data_node->abuf = gf_malloc(audio_data_node->abuf_size * sizeof(uint8_t));
 	}
 
-	p_aid->p_aframe = avcodec_alloc_frame();
-
-	if(p_aid->p_aframe == NULL) {
-		fprintf(stderr, "Cannot initialize AudioInputData");
+	audio_input_data->aframe = FF_ALLOC_FRAME();
+	if (audio_input_data->aframe == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot initialize AudioInputData"));
 		return -1;
 	}
 
-	p_aid->i_channels = i_channels;
-	p_aid->i_samplerate = i_samplerate;
+	audio_input_data->channels = channels;
+	audio_input_data->samplerate = samplerate;
 
 	return 0;
 }
 
-void dc_audio_input_data_destroy(AudioInputData * p_aid) {
-
+void dc_audio_input_data_destroy(AudioInputData *audio_input_data)
+{
 	int i;
-
-	for (i = 0; i < AUDIO_CB_SIZE; i++) {
-		AudioDataNode * p_adn = p_aid->p_cb.p_list[i].p_data;
-		gf_free(p_adn->p_abuf);
-		gf_free(p_adn);
+	if (audio_input_data->circular_buf.list) {
+		for (i = 0; i < AUDIO_CB_SIZE; i++) {
+			AudioDataNode *audio_data_node = audio_input_data->circular_buf.list[i].data;
+			gf_free(audio_data_node->abuf);
+			gf_free(audio_data_node);
+		}
 	}
 
-	dc_circular_buffer_destroy(&p_aid->p_cb);
-
+	dc_circular_buffer_destroy(&audio_input_data->circular_buf);
 }
 
-void dc_audio_inout_data_end_signal(AudioInputData * p_aid) {
-
-	dc_producer_end_signal(&p_aid->pro, &p_aid->p_cb);
-	dc_producer_end_signal_previous(&p_aid->pro, &p_aid->p_cb);
-
+void dc_audio_inout_data_end_signal(AudioInputData *audio_input_data)
+{
+	dc_producer_end_signal(&audio_input_data->producer, &audio_input_data->circular_buf);
+	dc_producer_end_signal_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
 }

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_data.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_data.h Changed

@@ -23,7 +23,6 @@
  *
  */
 
-
 #ifndef AUDIO_DATA_H_
 #define AUDIO_DATA_H_
 
@@ -32,69 +31,59 @@
 #define LIVE_FRAME_SIZE 1024
 #define MAX_AUDIO_PACKET_SIZE (128 * 1024)
 
+
 #include "../../modules/ffmpeg_in/ffmpeg_in.h"
 #include "libavcodec/avcodec.h"
 #include "libavutil/mem.h"
+#include "libav_compat.h"
 #include "circular_buffer.h"
 
 #include <time.h>
 
 
 /*
- * AudioInputData is designed to keep the data
- * of input audio in a circular buffer.
+ * AudioInputData is designed to keep the data of input audio in a circular buffer.
  * The circular buffer has its own mechanism for synchronization.
  */
 typedef struct {
+	/* The circular buffer of input audio. Input audio is the audio frames after decoding. */
+	CircularBuffer circular_buf;
 
-	/*
-	 * The circular buffer of input audio.
-	 * Input audio is the audio frames after decoding.
-	 */
-	CircularBuffer p_cb;
-
-	/*
-	 * The user of circular buffer has an index to it,
-	 * which is in this variable.
-	 */
-	Producer pro;
+	/* The user of circular buffer has an index to it, which is in this variable. */
+	Producer producer;
 
-	AVFrame * p_aframe;
+	AVFrame *aframe;
 
 	int64_t next_pts;
 
-	int i_channels;
-	int i_samplerate;
-
+	int channels;
+	int samplerate;
 } AudioInputData;
 
 /*
- * This structure corresponds to an
- * entry of audio configuration in the
- * configuration file
+ * This structure corresponds to an entry of audio configuration in the configuration file
  */
 typedef struct {
 	/* audio file name */
-	char psz_name[256];
+	char filename[GF_MAX_PATH];
 	/* audio format */
-	char psz_format[256];
+	char format[GF_MAX_PATH];
 	/* audio bitrate */
-	int i_bitrate;
+	int bitrate;
 	/* audio samplerate */
-	int i_samplerate;
+	int samplerate;
 	/* audio channel number */
-	int i_channels;
+	int channels;
 	/* audio codec */
-	char psz_codec[256];
+	char codec[GF_MAX_PATH];
+	/* custom parameter to be passed directly to the encoder - free it once you're done */
+	char *custom;
 
 	/* used for source switching */
-	char psz_source_id[256];
+	char source_id[GF_MAX_PATH];
 	time_t start_time;
 	time_t end_time;
-
-} AudioData;
-
-
+} AudioDataConf;
 
 /*
  * Each node in a circular buffer is a pointer.
@@ -103,19 +92,21 @@
  * an AVFrame.
  */
 typedef struct {
-
-	uint8_t * p_abuf;
-	int i_abuf_size;
-
+	uint8_t *abuf;
+	int abuf_size;
+	uint64_t channel_layout;
+	int sample_rate;
+	int format;
+	int channels;
 } AudioDataNode;
 
-void dc_audio_data_set_default(AudioData * adata);
+void dc_audio_data_set_default(AudioDataConf *audio_data_conf);
 
 /*
  * Initialize an AudioInputData.
  *
- * @param ain [out] is the structure to be initialize.
- * @param maxcon [in] contains information on the number of users of circular buffer;
+ * @param audio_input_data [out] is the structure to be initialize.
+ * @param num_consumers [in] contains information on the number of users of circular buffer;
  * which means the number of audio encoders.
  * @param live [in] indicates the system is live
  *
@@ -123,21 +114,21 @@
  *
  * @note Must use dc_audio_data_destroy to free memory.
  */
-int dc_audio_input_data_init(AudioInputData * ain, int channels, int samplerate,  int maxcon, int mode);
+int dc_audio_input_data_init(AudioInputData *audio_input_data, int channels, int samplerate, int num_consumers, int mode);
 
 /*
  * Destroy an AudioInputData
  *
- * @param ain [in] the structure to be destroyed.
+ * @param audio_input_data [in] the structure to be destroyed.
  */
-void dc_audio_input_data_destroy(AudioInputData * ain);
+void dc_audio_input_data_destroy(AudioInputData *audio_input_data);
 
 /*
  * Signal to all the users of the circular buffer in the AudioInputData
  * which the current node is the last node to consume.
  *
- * @param ain [in] the structure to be signaled on.
+ * @param audio_input_data [in] the structure to be signaled on.
  */
-void dc_audio_inout_data_end_signal(AudioInputData * ain);
+void dc_audio_inout_data_end_signal(AudioInputData *audio_input_data);
 
 #endif /* AUDIO_DATA_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_decoder.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_decoder.c Changed

@@ -25,217 +25,229 @@
 
 #include "audio_decoder.h"
 
-int dc_audio_decoder_open(AudioInputFile * p_ain, AudioData * p_adata, int i_mode, int i_no_loop) {
-
+int dc_audio_decoder_open(AudioInputFile *audio_input_file, AudioDataConf *audio_data_conf, int mode, int no_loop)
+{
 	u32 i;
-	AVInputFormat * p_in_fmt = NULL;
-	AVCodecContext * p_codec_ctx;
-	AVCodec * p_codec;
-
-	if (p_adata->psz_format && strcmp(p_adata->psz_format,"") != 0) {
-
-		p_in_fmt = av_find_input_format(p_adata->psz_format);
-		if (p_in_fmt == NULL) {
-			fprintf(stderr, "Cannot find the format %s.\n", p_adata->psz_format);
+	AVCodecContext *codec_ctx;
+	AVCodec *codec;
+	AVInputFormat *in_fmt = NULL;
+
+	if (audio_data_conf->format && strcmp(audio_data_conf->format,"") != 0) {
+		in_fmt = av_find_input_format(audio_data_conf->format);
+		if (in_fmt == NULL) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find the format %s.\n", audio_data_conf->format));
 			return -1;
 		}
-
 	}
 
-	p_ain->p_fmt = NULL;
-
 	/*
-	 * Open audio
+	 * Open audio (may already be opened when shared with the video input).
 	 */
-	if (avformat_open_input(&p_ain->p_fmt, p_adata->psz_name, p_in_fmt, NULL) != 0) {
-		fprintf(stderr, "Cannot open file: %s\n", p_adata->psz_name);
-		return -1;
-	}
+	if (!audio_input_file->av_fmt_ctx) {
+		if (avformat_open_input(&audio_input_file->av_fmt_ctx, audio_data_conf->filename, in_fmt, NULL) != 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open file: %s\n", audio_data_conf->filename));
+			return -1;
+		}
 
-	/*
-	 * Retrieve stream information
-	 */
-	if (avformat_find_stream_info(p_ain->p_fmt, NULL) < 0) {
-		fprintf(stderr, "Cannot find stream information\n");
-		return -1;
-	}
+		/*
+		* Retrieve stream information
+		*/
+		if (avformat_find_stream_info(audio_input_file->av_fmt_ctx, NULL) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find stream information\n"));
+			return -1;
+		}
 
-	av_dump_format(p_ain->p_fmt, 0, p_adata->psz_name, 0);
+		av_dump_format(audio_input_file->av_fmt_ctx, 0, audio_data_conf->filename, 0);
+	}
 
 	/*
 	 * Find the first audio stream
 	 */
-	p_ain->i_astream_idx = -1;
-	for (i = 0; i < p_ain->p_fmt->nb_streams; i++) {
-		if (p_ain->p_fmt->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
-			p_ain->i_astream_idx = i;
+	audio_input_file->astream_idx = -1;
+	for (i=0; i<audio_input_file->av_fmt_ctx->nb_streams; i++) {
+		if (audio_input_file->av_fmt_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+			audio_input_file->astream_idx = i;
 			break;
 		}
 	}
-	if (p_ain->i_astream_idx == -1) {
-		fprintf(stderr, "Cannot find a audio stream\n");
+	if (audio_input_file->astream_idx == -1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find a audio stream\n"));
 		return -1;
 	}
 
 	/*
 	 * Get a pointer to the codec context for the audio stream
 	 */
-	p_codec_ctx = p_ain->p_fmt->streams[p_ain->i_astream_idx]->codec;
+	codec_ctx = audio_input_file->av_fmt_ctx->streams[audio_input_file->astream_idx]->codec;
 
 	/*
 	 * Find the decoder for the audio stream
 	 */
-	p_codec = avcodec_find_decoder(p_codec_ctx->codec_id);
-	if (p_codec == NULL) {
-		fprintf(stderr, "Input audio codec is not supported.\n");
-		avformat_close_input(&p_ain->p_fmt);
+	codec = avcodec_find_decoder(codec_ctx->codec_id);
+	if (codec == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Input audio codec is not supported.\n"));
+		avformat_close_input(&audio_input_file->av_fmt_ctx);
 		return -1;
 	}
 
 	/*
 	 * Open codec
 	 */
-	if (avcodec_open2(p_codec_ctx, p_codec, NULL) < 0) {
-		fprintf(stderr, "Cannot open input audio codec.\n");
-		avformat_close_input(&p_ain->p_fmt);
+	if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input audio codec.\n"));
+		avformat_close_input(&audio_input_file->av_fmt_ctx);
 		return -1;
 	}
 
-	p_ain->p_fifo = av_fifo_alloc(2 * MAX_AUDIO_PACKET_SIZE);
+	audio_input_file->fifo = av_fifo_alloc(2 * MAX_AUDIO_PACKET_SIZE);
 
-	p_adata->i_channels = p_codec_ctx->channels;
-	p_adata->i_samplerate = p_codec_ctx->sample_rate;
+	audio_data_conf->channels = codec_ctx->channels;
+	audio_data_conf->samplerate = codec_ctx->sample_rate;
 
-	p_ain->i_mode = i_mode;
-	p_ain->i_no_loop = i_no_loop;
+	audio_input_file->mode = mode;
+	audio_input_file->no_loop = no_loop;
 
 	return 0;
 }
 
-int dc_audio_decoder_read(AudioInputFile * p_ain, AudioInputData * p_ad) {
-
+int dc_audio_decoder_read(AudioInputFile *audio_input_file, AudioInputData *audio_input_data)
+{
 	int ret;
 	AVPacket packet;
-	int i_got_frame = 0;
+	int got_frame = 0;
 	//int locked_already = 0;
-	AVCodecContext * p_codec_ctx;
-	AudioDataNode * p_adn;
+	AVCodecContext *codec_ctx;
+	AudioDataNode *audio_data_node;
 
 	/* Get a pointer to the codec context for the audio stream */
-	p_codec_ctx = p_ain->p_fmt->streams[p_ain->i_astream_idx]->codec;
+	codec_ctx = audio_input_file->av_fmt_ctx->streams[audio_input_file->astream_idx]->codec;
 
 	/* Read frames */
 	while (1) {
-
-		ret = av_read_frame(p_ain->p_fmt, &packet);
-
+		if (audio_input_file->av_pkt_list) {
+			if (gf_list_count(audio_input_file->av_pkt_list)) {
+				AVPacket *packet_copy;
+				assert(audio_input_file->av_pkt_list);
+				gf_mx_p(audio_input_file->av_pkt_list_mutex);
+				packet_copy = gf_list_pop_front(audio_input_file->av_pkt_list);
+				gf_mx_v(audio_input_file->av_pkt_list_mutex);
+
+				if (packet_copy == NULL) {
+					ret = AVERROR_EOF;
+				} else {
+					memcpy(&packet, packet_copy, sizeof(AVPacket));
+					gf_free(packet_copy);
+					ret = 0;
+				}
+			} else {
+				gf_sleep(1);
+				continue;
+			}
+		} else {
+			ret = av_read_frame(audio_input_file->av_fmt_ctx, &packet);
+		}
 		if (ret == AVERROR_EOF) {
-
-			if(p_ain->i_mode == LIVE_MEDIA && p_ain->i_no_loop == 0) {
-				av_seek_frame(p_ain->p_fmt, p_ain->i_astream_idx, 0, 0);
+			if (audio_input_file->mode == LIVE_MEDIA && audio_input_file->no_loop == 0) {
+				av_seek_frame(audio_input_file->av_fmt_ctx, audio_input_file->astream_idx, 0, 0);
 				continue;
 			}
 
 			/* Flush decoder */
 			packet.data = NULL;
 			packet.size = 0;
-			avcodec_get_frame_defaults(p_ad->p_aframe);
-			avcodec_decode_audio4(p_codec_ctx, p_ad->p_aframe, &i_got_frame, &packet);
-
-			if (i_got_frame) {
+			avcodec_get_frame_defaults(audio_input_data->aframe);
+			avcodec_decode_audio4(codec_ctx, audio_input_data->aframe, &got_frame, &packet);
 
-				dc_producer_lock(&p_ad->pro, &p_ad->p_cb);
-				dc_producer_unlock_previous(&p_ad->pro, &p_ad->p_cb);
-				p_adn = (AudioDataNode *) dc_producer_produce(&p_ad->pro, &p_ad->p_cb);
+			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);
 				
-				p_adn->i_abuf_size = p_ad->p_aframe->linesize[0];
-				memcpy(p_adn->p_abuf, p_ad->p_aframe->data[0], p_adn->i_abuf_size);
+				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);
 
-				dc_producer_advance(&p_ad->pro);
+				dc_producer_advance(&audio_input_data->producer, &audio_input_data->circular_buf);
 				return 0;
 			}
 
-			dc_producer_end_signal(&p_ad->pro, &p_ad->p_cb);
-			dc_producer_unlock_previous(&p_ad->pro, &p_ad->p_cb);
+			dc_producer_end_signal(&audio_input_data->producer, &audio_input_data->circular_buf);
+			dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
+
 			return -2;
 		}
-
-		else if (ret < 0) {
-			fprintf(stderr, "Cannot read audio frame.\n");
+		else if (ret < 0)
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot read audio frame.\n"));
 			continue;
 		}
 
 		/* Is this a packet from the audio stream? */
-		if (packet.stream_index == p_ain->i_astream_idx) {
-
+		if (packet.stream_index == audio_input_file->astream_idx) {
 			/* Set audio frame to default */
-			avcodec_get_frame_defaults(p_ad->p_aframe);
+			avcodec_get_frame_defaults(audio_input_data->aframe);
 
 			/* Decode audio frame */
-			if (avcodec_decode_audio4(p_codec_ctx, p_ad->p_aframe, &i_got_frame, &packet) < 0) {
+			if (avcodec_decode_audio4(codec_ctx, audio_input_data->aframe, &got_frame, &packet) < 0) {
 				av_free_packet(&packet);
-				fprintf(stderr, "Error while decoding audio.\n");
-				dc_producer_end_signal(&p_ad->pro, &p_ad->p_cb);
-				dc_producer_unlock_previous(&p_ad->pro, &p_ad->p_cb);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while decoding audio.\n"));
+				dc_producer_end_signal(&audio_input_data->producer, &audio_input_data->circular_buf);
+				dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
 				return -1;
 			}
 
-			if (p_ad->p_aframe->pts != AV_NOPTS_VALUE)
-				p_ad->next_pts = p_ad->p_aframe->pts;
+			if (audio_input_data->aframe->pts != AV_NOPTS_VALUE)
+				audio_input_data->next_pts = audio_input_data->aframe->pts;
 
-			p_ad->next_pts += ((int64_t) AV_TIME_BASE
-					* p_ad->p_aframe->nb_samples) / p_codec_ctx->sample_rate;
+			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? */
-			if (i_got_frame) {
-
-				av_fifo_generic_write(p_ain->p_fifo, p_ad->p_aframe->data[0],
-						p_ad->p_aframe->linesize[0], NULL);
+			if (got_frame) {
+				av_fifo_generic_write(audio_input_file->fifo, audio_input_data->aframe->data[0], audio_input_data->aframe->linesize[0], NULL);
 
-				if (/*p_ad->p_cb.mode == OFFLINE*/
-						p_ain->i_mode == ON_DEMAND || p_ain->i_mode == LIVE_MEDIA) {
-
-					dc_producer_lock(&p_ad->pro, &p_ad->p_cb);
+				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);
 
 					/* Unlock the previous node in the circular buffer. */
-					dc_producer_unlock_previous(&p_ad->pro, &p_ad->p_cb);
+					dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
 
 					/* Get the pointer of the current node in circular buffer. */
-					p_adn = (AudioDataNode *) dc_producer_produce(&p_ad->pro,
-							&p_ad->p_cb);
-
-					p_adn->i_abuf_size = p_ad->p_aframe->linesize[0];
-					av_fifo_generic_read(p_ain->p_fifo, p_adn->p_abuf, p_adn->i_abuf_size , NULL);
-
-					dc_producer_advance(&p_ad->pro);
+					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);
+
+					dc_producer_advance(&audio_input_data->producer, &audio_input_data->circular_buf);
 				} else {
-
-					while (av_fifo_size(p_ain->p_fifo) >= LIVE_FRAME_SIZE) {
-
+					while (av_fifo_size(audio_input_file->fifo) >= LIVE_FRAME_SIZE) {
 						/* Lock the current node in the circular buffer. */
-						if (dc_producer_lock(&p_ad->pro, &p_ad->p_cb) < 0) {
-							printf(
-									"[dashcast] Live system dropped an audio frame\n");
+						if (dc_producer_lock(&audio_input_data->producer, &audio_input_data->circular_buf) < 0) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[dashcast] Live system dropped an audio frame\n"));
 							continue;
 						}
 
 						/* Unlock the previous node in the circular buffer. */
-						dc_producer_unlock_previous(&p_ad->pro, &p_ad->p_cb);
+						dc_producer_unlock_previous(&audio_input_data->producer, &audio_input_data->circular_buf);
 
 						/* Get the pointer of the current node in circular buffer. */
-						p_adn = (AudioDataNode *) dc_producer_produce(
-								&p_ad->pro, &p_ad->p_cb);
+						audio_data_node = (AudioDataNode *) dc_producer_produce( &audio_input_data->producer, &audio_input_data->circular_buf);
 
-						p_adn->i_abuf_size = LIVE_FRAME_SIZE;
-						av_fifo_generic_read(p_ain->p_fifo, p_adn->p_abuf, p_adn->i_abuf_size, NULL);
+						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);
 
-						dc_producer_advance(&p_ad->pro);
+						dc_producer_advance(&audio_input_data->producer, &audio_input_data->circular_buf);
 					}
-
 				}
 
 				return 0;
-
 			}
 		}
 
@@ -243,21 +255,29 @@
 		 * Free the packet that was allocated by av_read_frame
 		 */
 		av_free_packet(&packet);
-
 	}
 
-	fprintf(stderr, "Unknown error while reading audio frame.\n");
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Unknown error while reading audio frame.\n"));
 	return -1;
-
 }
 
-void dc_audio_decoder_close(AudioInputFile * p_ain) {
-
+void dc_audio_decoder_close(AudioInputFile *audio_input_file)
+{
 	/*
 	 * Close the audio format context
 	 */
-	avformat_close_input(&p_ain->p_fmt);
-
-	av_fifo_free(p_ain->p_fifo);
+	avformat_close_input(&audio_input_file->av_fmt_ctx);
+
+	if (audio_input_file->av_pkt_list_mutex) {
+		gf_mx_p(audio_input_file->av_pkt_list_mutex);
+		while (gf_list_count(audio_input_file->av_pkt_list)) {
+			AVPacket *pkt = gf_list_last(audio_input_file->av_pkt_list);
+			av_free_packet(pkt);
+			gf_list_rem_last(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);
 }

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_decoder.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_decoder.h Changed

@@ -31,64 +31,60 @@
 #include "libavformat/avformat.h"
 #include "libavutil/fifo.h"
 
+
 /*
  * The structure which keeps the data of
  * input audio file.
  */
 typedef struct {
+	/* Format context structure provided by avlib to open and read from a media file. */
+	AVFormatContext *av_fmt_ctx;
 
-	/*
-	 * Format context structure provided by avlib
-	 * to open and read from a media file
-	 */
-	AVFormatContext * p_fmt;
-
-	/*
-	 * The index of the audio stream
-	 * in the file
-	 */
-	int i_astream_idx;
+	/* A list of AVPackets and return value to be processed: when this parameter is non-null,
+	 * the video thread makes the demux and pushes the packets. */
+	GF_List  *av_pkt_list;
+	GF_Mutex *av_pkt_list_mutex;
 
-	AVFifoBuffer * p_fifo;
+	/* The index of the audio stream in the file. */
+	int astream_idx;
 
-	int i_mode;
-	int i_no_loop;
+	AVFifoBuffer *fifo;
 
+	int mode;
+	int no_loop;
 } AudioInputFile;
 
 /*
  * Open the input audio
  *
- * @param cmdd [in] contains information about the file name
+ * @param cmd_data [in] contains information about the file name
  * and the audio format.
  *
- * @param ainf [out] pointer to the structure which we want to
+ * @param audio_input_file [out] pointer to the structure which we want to
  * open the file
  *
  * @return 0 on success -1 on failure.
  */
-int dc_audio_decoder_open(AudioInputFile * ainf, AudioData * adata, int mode, int no_loop);
+int dc_audio_decoder_open(AudioInputFile *audio_input_file, AudioDataConf *audio_data_conf, int mode, int no_loop);
 
 /*
  * Read and decode audio and put samples on circular buffer
  *
- * @param ainf [in] contains info on input audio. This parameter
+ * @param audio_input_file [in] contains info on input audio. This parameter
  * must have been opened with open_audio_input
  *
- * @param aind [out] the samples will be saved on the circular buffer
+ * @param audio_input_data [out] the samples will be saved on the circular buffer
  * of this parameter.
  *
  * @return 0 on success, -1 on failure, -2 on EOF (end of the file)
- *
  */
-int dc_audio_decoder_read(AudioInputFile * ainf, AudioInputData * aind);
+int dc_audio_decoder_read(AudioInputFile *audio_input_file, AudioInputData *audio_input_data);
 
 /*
  * Close the input audio
  *
- * @param ainf [in] the audio file to be closed
- *
+ * @param audio_input_file [in] the audio file to be closed
  */
-void dc_audio_decoder_close(AudioInputFile * ainf);
+void dc_audio_decoder_close(AudioInputFile *audio_input_file);
 
 #endif /* AUDIO_DECODER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_encoder.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_encoder.c Changed

@@ -25,187 +25,165 @@
 
 #include "audio_encoder.h"
 
-int dc_audio_encoder_open(AudioOutputFile * p_aout, AudioData * p_adata) {
 
-	int i_osize;
+extern void build_dict(void *priv_data, const char *options);
 
-	//AVCodec * p_audio_codec;
-	//AVStream * p_audio_stream;
 
-	p_aout->p_fifo = av_fifo_alloc(2 * MAX_AUDIO_PACKET_SIZE);
-	p_aout->p_aframe = avcodec_alloc_frame();
-	p_aout->p_adata_buf = (uint8_t*) av_malloc(2 * MAX_AUDIO_PACKET_SIZE);
+int dc_audio_encoder_open(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf)
+{
+	int osize;
 
-	p_aout->p_codec = avcodec_find_encoder_by_name("mp2"/*FIXME: p_adata->psz_codec - Note: windows build doesn't seem to have AAC*/);
-	if (p_aout->p_codec == NULL) {
-		fprintf(stderr, "Output audio codec not found\n");
+	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->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);
+	if (audio_output_file->codec == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Output audio codec not found\n"));
 		return -1;
 	}
 
-	p_aout->p_codec_ctx = avcodec_alloc_context3(p_aout->p_codec);
-
-//	/* Create new audio stream */
-//	p_audio_stream = avformat_new_stream(p_aout->p_fmt, p_audio_codec);
-//	if (!p_audio_stream) {
-//		fprintf(stderr, "Cannot create output video stream\n");
-//		return -1;
-//	}
-
-
-	p_aout->p_codec_ctx->codec_id = p_aout->p_codec->id;
-	p_aout->p_codec_ctx->codec_type = AVMEDIA_TYPE_AUDIO;
-	p_aout->p_codec_ctx->bit_rate = p_adata->i_bitrate;
-	p_aout->p_codec_ctx->sample_rate = p_adata->i_samplerate;
+	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;
+	audio_output_file->codec_ctx->sample_rate = audio_data_conf->samplerate;
 	{
 		AVRational time_base;
 		time_base.num = 1;
-		time_base.den = p_adata->i_samplerate;
-		p_aout->p_codec_ctx->time_base = time_base;
+		time_base.den = audio_data_conf->samplerate;
+		audio_output_file->codec_ctx->time_base = time_base;
 	}
-	p_aout->p_codec_ctx->channels = p_adata->i_channels;
-	p_aout->p_codec_ctx->channel_layout = AV_CH_LAYOUT_STEREO; /*FIXME: depends on channels -> http://ffmpeg.org/doxygen/trunk/channel__layout_8c_source.html#l00074*/
-	p_aout->p_codec_ctx->sample_fmt = AV_SAMPLE_FMT_S16;
-
-//	if (p_aout->p_fmt->oformat->flags & AVFMT_GLOBALHEADER)
-//		p_aout->p_codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
-
-//	p_audio_stream->codec->codec_id = p_audio_codec->id;
-//	p_audio_stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-//	p_audio_stream->codec->bit_rate = p_aout->p_adata->i_bitrate;
-//	p_audio_stream->codec->sample_rate = p_aout->p_adata->i_samplerate;
-//	p_audio_stream->codec->channels = p_aout->p_adata->i_channels;
-//	p_audio_stream->codec->sample_fmt = AV_SAMPLE_FMT_S16;
-//
-//	/*
-//	 p_audio_stream->codec->delay = 0;
-//	 p_audio_stream->codec->thread_count = 1;
-//	 p_audio_stream->codec->max_b_frames = 0;
-//	 */
-//
-//	if (p_aout->p_fmt->oformat->flags & AVFMT_GLOBALHEADER)
-//		p_audio_stream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
-	p_aout->i_astream_idx = 0;
+	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;
+#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(p_aout->p_codec_ctx, p_aout->p_codec, NULL) < 0) {
+	if (avcodec_open2(audio_output_file->codec_ctx, audio_output_file->codec, NULL) < 0) {
 		/*FIXME: if we enter here (set "mp2" as a codec and "200000" as a bitrate -> deadlock*/
-		fprintf(stderr, "Cannot open output audio codec\n");
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output audio codec\n"));
 		return -1;
 	}
 
-	i_osize = av_get_bytes_per_sample(p_aout->p_codec_ctx->sample_fmt);
-
-	p_aout->i_frame_bytes = p_aout->p_codec_ctx->frame_size * i_osize
-			* p_aout->p_codec_ctx->channels;
-
-	avcodec_get_frame_defaults(p_aout->p_aframe);
-
-	p_aout->p_aframe->nb_samples =
-			p_aout->i_frame_bytes
-					/ (p_aout->p_codec_ctx->channels
-							* av_get_bytes_per_sample(
-									p_aout->p_codec_ctx->sample_fmt));
+	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;
+	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));
 
-	if (avcodec_fill_audio_frame(p_aout->p_aframe,
-			p_aout->p_codec_ctx->channels, p_aout->p_codec_ctx->sample_fmt,
-			p_aout->p_adata_buf, p_aout->i_frame_bytes, 1) < 0) {
-		fprintf(stderr, "Fill audio frame failed\n");
+	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) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Fill audio frame failed\n"));
 		return -1;
 	}
 
-	//p_aout->acc_samples = 0;
-	p_aout->i_frame_size = p_aout->p_codec_ctx->frame_size;
+	//audio_output_file->acc_samples = 0;
+	audio_output_file->frame_size = audio_output_file->codec_ctx->frame_size;
 
 	return 0;
 }
 
-int dc_audio_encoder_read(AudioOutputFile * p_aout, AudioInputData * p_aind) {
-
+int dc_audio_encoder_read(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data)
+{
 	int ret;
-	AudioDataNode * p_adn;
-
-	ret = dc_consumer_lock(&p_aout->acon, &p_aind->p_cb);
+	AudioDataNode *audio_data_node;
 
+	ret = dc_consumer_lock(&audio_output_file->consumer, &audio_input_data->circular_buf);
 	if (ret < 0) {
-#ifdef DEBUG
-		printf("Audio encoder got to end of buffer!\n");
-#endif
-
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Audio encoder got an end of buffer!\n"));
 		return -2;
 	}
 
-	dc_consumer_unlock_previous(&p_aout->acon, &p_aind->p_cb);
+	dc_consumer_unlock_previous(&audio_output_file->consumer, &audio_input_data->circular_buf);
 
-	p_adn = (AudioDataNode *) dc_consumer_consume(&p_aout->acon, &p_aind->p_cb);
+	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;
+#endif
+	audio_output_file->aframe->format = audio_data_node->format;
 
 	/* Write audio sample on fifo */
-//	av_fifo_generic_write(p_aout->p_fifo, p_adn->p_aframe->data[0],
-//			p_adn->p_aframe->linesize[0], NULL);
-	av_fifo_generic_write(p_aout->p_fifo, p_adn->p_abuf, p_adn->i_abuf_size, NULL);
+//	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(&p_aout->acon);
+	dc_consumer_advance(&audio_output_file->consumer);
 
 	return 0;
 }
 
-int dc_audio_encoder_flush(AudioOutputFile * p_aout, AudioInputData * p_aind) {
+#if 0
+int dc_audio_encoder_flush(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data)
+{
+	int got_pkt;
+	//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;
 
-	int i_got_pkt;
-
-	//AVStream * p_audio_stream = p_aout->p_fmt->streams[p_aout->i_astream_idx];
-	//AVCodecContext * p_audio_codec_ctx = p_audio_stream->codec;
-
-	AVCodecContext * p_audio_codec_ctx = p_aout->p_codec_ctx;
-
-	av_init_packet(&p_aout->packet);
-	p_aout->packet.data = NULL;
-	p_aout->packet.size = 0;
+	av_init_packet(&audio_output_file->packet);
+	audio_output_file->packet.data = NULL;
+	audio_output_file->packet.size = 0;
 
 	/* Set PTS (method 1) */
-	p_aout->p_aframe->pts = p_aind->next_pts;
+	audio_output_file->aframe->pts = audio_input_data->next_pts;
 	/* Encode audio */
-	if (avcodec_encode_audio2(p_audio_codec_ctx, &p_aout->packet, NULL,
-			&i_got_pkt) != 0) {
-		fprintf(stderr, "Error while encoding audio.\n");
+#ifdef DC_AUDIO_RESAMPLER
+#error resampling is not done here
+#endif
+	if (avcodec_encode_audio2(audio_codec_ctx, &audio_output_file->packet, NULL, &got_pkt) != 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while encoding audio.\n"));
 		return -1;
 	}
-	if (i_got_pkt) {
-		//p_aout->acc_samples += p_aout->p_aframe->nb_samples;
+	if (got_pkt) {
+		//audio_output_file->acc_samples += audio_output_file->aframe->nb_samples;
 		return 0;
 	}
-	av_free_packet(&p_aout->packet);
+	av_free_packet(&audio_output_file->packet);
 	return 1;
 }
+#endif
 
-int dc_audio_encoder_encode(AudioOutputFile * p_aout, AudioInputData * p_aind) {
-
-	int i_got_pkt;
-
-	//AVStream * p_audio_stream = p_aout->p_fmt->streams[p_aout->i_astream_idx];
-	//AVCodecContext * p_audio_codec_ctx = p_audio_stream->codec;
-
-	AVCodecContext * p_audio_codec_ctx = p_aout->p_codec_ctx;
-
-	while (av_fifo_size(p_aout->p_fifo) >= p_aout->i_frame_bytes) {
-
-		av_fifo_generic_read(p_aout->p_fifo, p_aout->p_adata_buf,
-				p_aout->i_frame_bytes, NULL);
+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) {
+		av_fifo_generic_read(audio_output_file->fifo, audio_output_file->adata_buf, audio_output_file->frame_bytes, NULL);
 
-		p_aout->p_aframe->data[0] = p_aout->p_adata_buf;
-		p_aout->p_aframe->linesize[0] = p_aout->i_frame_bytes;
+		audio_output_file->aframe->data[0] = audio_output_file->adata_buf;
+		audio_output_file->aframe->linesize[0] = audio_output_file->frame_bytes;
 
-		av_init_packet(&p_aout->packet);
-		p_aout->packet.data = NULL;
-		p_aout->packet.size = 0;
+		av_init_packet(&audio_output_file->packet);
+		audio_output_file->packet.data = NULL;
+		audio_output_file->packet.size = 0;
 
 		/* 
 		 * Set PTS (method 1)
 		 */
-
-		//p_aout->p_aframe->pts = p_aind->next_pts;
+		//audio_output_file->aframe->pts = audio_input_data->next_pts;
 
 		/*
 		 * Set PTS (method 2)
@@ -214,48 +192,99 @@
 		//	int64_t now = av_gettime();
 		//	AVRational avr;
 		//	avr.num = 1;
-		//	avr.den =  AV_TIME_BASE;
-		//	p_aout->p_aframe->pts = av_rescale_q(now, avr, p_audio_codec_ctx->time_base);
+		//	avr.den = AV_TIME_BASE;
+		//	audio_output_file->aframe->pts = av_rescale_q(now, avr, audio_codec_ctx->time_base);
 		//}
 
+		/* 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"));
+			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;
+				}
+			}
+
+			//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;
+			}
+#endif
+		}
 
 		/* Encode audio */
-		if (avcodec_encode_audio2(p_audio_codec_ctx, &p_aout->packet, p_aout->p_aframe, &i_got_pkt) != 0) {
-
-			fprintf(stderr, "Error while encoding audio.\n");
+		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"));
 			return -1;
 		}
 
-		if (i_got_pkt) {
-
-			//p_aout->acc_samples += p_aout->p_aframe->nb_samples;
+		if (got_pkt) {
+			//audio_output_file->acc_samples += audio_output_file->aframe->nb_samples;
 			return 0;
-
 		}
 
-		av_free_packet(&p_aout->packet);
+		av_free_packet(&audio_output_file->packet);
 	}
 
 	return 1;
 }
 
-void dc_audio_encoder_close(AudioOutputFile * p_aoutf) {
-
+void dc_audio_encoder_close(AudioOutputFile *audio_output_file)
+{
 //	int i;
 //
 //	/* free the streams */
-//	for (i = 0; i < p_aout->p_fmt->nb_streams; i++) {
-//		avcodec_close(p_aout->p_fmt->streams[i]->codec);
-//		av_freep(&p_aout->p_fmt->streams[i]->info);
+//	for (i = 0; i < audio_output_file->av_fmt_ctx->nb_streams; i++) {
+//		avcodec_close(audio_output_file->av_fmt_ctx->streams[i]->codec);
+//		av_freep(&audio_output_file->av_fmt_ctx->streams[i]->info);
 //	}
 
-	av_fifo_free(p_aoutf->p_fifo);
+	av_fifo_free(audio_output_file->fifo);
 
-	av_free(p_aoutf->p_adata_buf);
-	av_free(p_aoutf->p_aframe);
-
-	avcodec_close(p_aoutf->p_codec_ctx);
-	av_free(p_aoutf->p_codec_ctx);
+	av_free(audio_output_file->adata_buf);
+	av_free(audio_output_file->aframe);
 
+	avcodec_close(audio_output_file->codec_ctx);
+	av_free(audio_output_file->codec_ctx);
 }
-

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_encoder.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_encoder.h Changed

@@ -28,40 +28,37 @@
 
 #include "audio_muxer.h"
 
-int dc_audio_encoder_open(AudioOutputFile * p_aout, AudioData * p_adata);
 /*
  * Open an audio stream
  *
- * @param aoutf [in] add an audio stream to the file
+ * @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 
  */
+int dc_audio_encoder_open(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf);
 
-int dc_audio_encoder_read(AudioOutputFile * p_aout, AudioInputData * p_aind);
+int dc_audio_encoder_read(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data);
 
-
-int dc_audio_encoder_flush(AudioOutputFile * p_aout, AudioInputData * p_aind);
+//int dc_audio_encoder_flush(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data);
 
 /*
- * Read the decoded audio sample from circular buffer (which is in aind) 
+ * Read the decoded audio sample from circular buffer (which is in audio_input_data) 
  * and encode and write them on the output file
  * 
- * @param aoutf [in] audio output file
- * @param aind [in] audio input data structure which contains a circular buffer with audio samples
+ * @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 
  */ 
-int dc_audio_encoder_encode(AudioOutputFile * aoutf, AudioInputData * aind);
-
+int dc_audio_encoder_encode(AudioOutputFile *audio_output_file, AudioInputData *audio_input_data);
 
 /*
  * Close the output audio file
  * 
- * @param aoutf [in] audio output file
+ * @param audio_output_file [in] audio output file
  */
-void dc_audio_encoder_close(AudioOutputFile * aoutf);
-
+void dc_audio_encoder_close(AudioOutputFile *audio_output_file);
 
 #endif /* AUDIO_ENCODER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_muxer.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_muxer.c Changed

@@ -26,448 +26,398 @@
 #include "audio_muxer.h"
 #include "libavformat/avio.h"
 
-int dc_gpac_audio_moov_create(AudioOutputFile * p_aoutf, char * psz_name) {
 
+int dc_gpac_audio_moov_create(AudioOutputFile *audio_output_file, char *filename)
+{
 	GF_Err ret;
-
-	AVCodecContext * p_audio_codec_ctx = p_aoutf->p_codec_ctx;
-	u32 di;
-	u32 track;
+	u32 di, track;
 	u8 bpsample;
-	GF_ESD * p_esd;
+	GF_ESD *esd;
+#ifndef GPAC_DISABLE_AV_PARSERS
 	GF_M4ADecSpecInfo acfg;
+#endif
+	AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
 
-	p_aoutf->p_isof = gf_isom_open(psz_name,
-			GF_ISOM_OPEN_WRITE, NULL);
+	audio_output_file->isof = gf_isom_open(filename, GF_ISOM_OPEN_WRITE, NULL);
+	if (!audio_output_file->isof) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open iso file %s\n", filename));
+		return -1;
+	}
 
-	if (!p_aoutf->p_isof) {
-		fprintf(stderr, "Cannot open iso file %s\n",
-				psz_name);
+	esd = gf_odf_desc_esd_new(2);
+	if (!esd) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create GF_ESD\n"));
 		return -1;
 	}
 
+	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;
+
+#ifndef GPAC_DISABLE_AV_PARSERS
 	memset(&acfg, 0, sizeof(GF_M4ADecSpecInfo));
 	acfg.base_object_type = GF_M4A_LAYER2;
-	acfg.base_sr = p_audio_codec_ctx->sample_rate;
-	acfg.nb_chan = p_audio_codec_ctx->channels;
+	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);
 
-	p_esd = gf_odf_desc_esd_new(2);
-
-	if (!p_esd) {
-		fprintf(stderr, "Cannot create GF_ESD\n");
-		return -1;
-	}
-
-	p_esd->decoderConfig = (GF_DecoderConfig *) gf_odf_desc_new(GF_ODF_DCD_TAG);
-	p_esd->slConfig = (GF_SLConfig *) gf_odf_desc_new(GF_ODF_SLC_TAG);
-	p_esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	p_esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
-	p_esd->decoderConfig->bufferSizeDB = 20;
-	p_esd->slConfig->timestampResolution = p_audio_codec_ctx->sample_rate;
-	p_esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
-	p_esd->ESID = 1;
-
-	ret = gf_m4a_write_config(&acfg, &p_esd->decoderConfig->decoderSpecificInfo->data, &p_esd->decoderConfig->decoderSpecificInfo->dataLength);
-
-	//gf_isom_store_movie_config(p_voutf->p_isof, 0);
-	track = gf_isom_new_track(p_aoutf->p_isof, p_esd->ESID,
-			GF_ISOM_MEDIA_AUDIO, p_audio_codec_ctx->sample_rate);
-
-	//printf("TimeScale: %d \n", p_video_codec_ctx->time_base.den);
+	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));
 	if (!track) {
-		fprintf(stderr, "Cannot create new track\n");
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create new track\n"));
 		return -1;
 	}
 
-	ret = gf_isom_set_track_enabled(p_aoutf->p_isof, track, 1);
+	ret = gf_isom_set_track_enabled(audio_output_file->isof, track, 1);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_set_track_enabled\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_track_enabled\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-//	if (!p_esd->ESID) p_esd->ESID = gf_isom_get_track_id(p_aoutf->p_isof, track);
+//	if (!esd->ESID) esd->ESID = gf_isom_get_track_id(audio_output_file->isof, track);
 
-	ret = gf_isom_new_mpeg4_description(p_aoutf->p_isof, track, p_esd, NULL,
-			NULL, &di);
+	ret = gf_isom_new_mpeg4_description(audio_output_file->isof, track, esd, NULL, NULL, &di);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_new_mpeg4_description\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_new_mpeg4_description\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	gf_odf_desc_del((GF_Descriptor *) p_esd);
-	p_esd = NULL;
+	gf_odf_desc_del((GF_Descriptor *) esd);
+	esd = NULL;
 
-	bpsample = av_get_bytes_per_sample(p_aoutf->p_codec_ctx->sample_fmt) * 8;
-
-	ret = gf_isom_set_audio_info(p_aoutf->p_isof, track, di,
-			p_audio_codec_ctx->sample_rate, p_aoutf->p_codec_ctx->channels,
-			bpsample);
+	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);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_set_audio_info\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_audio_info\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	ret = gf_isom_set_pl_indication(p_aoutf->p_isof, GF_ISOM_PL_AUDIO, acfg.audioPL);
-
+#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) {
-		fprintf(stderr, "%s: gf_isom_set_pl_indication\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_pl_indication\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	//printf("time scale: %d  sample dur: %d \n",
-	//		p_video_codec_ctx->time_base.den, p_aoutf->p_codec_ctx->frame_size);
+	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(p_aoutf->p_isof, track, 1,
-			p_aoutf->p_codec_ctx->frame_size, 0, 0, 0, 0);
+	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) {
-		fprintf(stderr, "%s: gf_isom_setup_track_fragment\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_setutrack_fragment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	//gf_isom_add_track_to_root_od(p_voutf->p_isof,1);
+	//gf_isom_add_track_to_root_od(video_output_file->isof,1);
 
-	ret = gf_isom_finalize_for_fragment(p_aoutf->p_isof, 1);
+	ret = gf_isom_finalize_for_fragment(audio_output_file->isof, 1);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_finalize_for_fragment\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_finalize_for_fragment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
 	return 0;
 }
 
-int dc_gpac_audio_isom_open_seg(AudioOutputFile * p_aoutf, char * psz_name) {
-
+int dc_gpac_audio_isom_open_seg(AudioOutputFile *audio_output_file, char *filename)
+{
 	GF_Err ret;
-
-	ret = gf_isom_start_segment(p_aoutf->p_isof, psz_name, 1);
+	ret = gf_isom_start_segment(audio_output_file->isof, filename, GF_TRUE);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_start_segment\n", gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_start_segment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-//	ret = gf_isom_start_fragment(p_aoutf->p_isof, 1);
-//	if (ret != GF_OK) {
-//		fprintf(stderr, "%s: gf_isom_start_fragment\n",
-//				gf_error_to_string(ret));
-//		return -1;
-//	}
-
-	p_aoutf->dts = 0;
+	audio_output_file->dts = 0;
 
 	return 0;
 }
 
-int dc_gpac_audio_isom_write(AudioOutputFile * p_aoutf) {
-
+int dc_gpac_audio_isom_write(AudioOutputFile *audio_output_file)
+{
 	GF_Err ret;
-	//AVStream * p_video_stream =
-	//		p_voutf->p_fmt->streams[p_voutf->i_vstream_idx];
-	//AVCodecContext * p_video_codec_ctx = p_video_stream->codec;
-	//AVCodecContext * p_audio_codec_ctx = p_aoutf->p_codec_ctx;
+	//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;
 
-	p_aoutf->p_sample->data = (char *) p_aoutf->packet.data;
-	p_aoutf->p_sample->dataLength = p_aoutf->packet.size;
+	audio_output_file->sample->data = (char *) audio_output_file->packet.data;
+	audio_output_file->sample->dataLength = audio_output_file->packet.size;
 
-	p_aoutf->p_sample->DTS = p_aoutf->dts; //p_aoutf->p_aframe->pts;
-	p_aoutf->p_sample->IsRAP = 1; //p_aoutf->p_aframe->key_frame;//p_audio_codec_ctx->coded_frame->key_frame;
-	//printf("RAP %d , DTS %ld \n", p_aoutf->p_sample->IsRAP, p_aoutf->p_sample->DTS);
+	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;
+	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(p_aoutf->p_isof, 1, p_aoutf->p_sample, 1,
-			p_aoutf->p_codec_ctx->frame_size, 0, 0, 0);
-
-	p_aoutf->dts += p_aoutf->p_codec_ctx->frame_size;
+	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);
+	audio_output_file->dts += audio_output_file->codec_ctx->frame_size;
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_fragment_add_sample\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_fragment_add_sample\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-//	ret = gf_isom_flush_fragments(p_voutf->p_isof, 1);
+//	ret = gf_isom_flush_fragments(video_output_file->isof, 1);
 //	if (ret != GF_OK) {
-//		fprintf(stderr, "%s: gf_isom_flush_fragments\n",
-//				gf_error_to_string(ret));
+//		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_flush_fragments\n", gf_error_to_string(ret)));
 //		return -1;
 //	}
 
 	return 0;
 }
 
-int dc_gpac_audio_isom_close_seg(AudioOutputFile * p_aoutf) {
-
+int dc_gpac_audio_isom_close_seg(AudioOutputFile *audio_output_file)
+{
 	GF_Err ret;
-
-	ret = gf_isom_close_segment(p_aoutf->p_isof, 0, 0, 0, 0, 0, 1, p_aoutf->i_seg_marker, NULL,
-			NULL);
+	ret = gf_isom_close_segment(audio_output_file->isof, 0, 0,0, 0, 0, 0, 1, audio_output_file->seg_marker, NULL, NULL);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_close_segment\n", gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_close_segment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	//p_aoutf->acc_samples = 0;
+	//audio_output_file->acc_samples = 0;
 
 	return 0;
 }
 
-int dc_gpac_audio_isom_close(AudioOutputFile * p_aoutf) {
-
+int dc_gpac_audio_isom_close(AudioOutputFile *audio_output_file)
+{
 	GF_Err ret;
-
-	ret = gf_isom_close(p_aoutf->p_isof);
+	ret = gf_isom_close(audio_output_file->isof);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_close\n", gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_close\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	//p_aoutf->acc_samples = 0;
+	//audio_output_file->acc_samples = 0;
 
 	return 0;
 }
 
-int dc_ffmpeg_audio_muxer_open(AudioOutputFile * p_aoutf, char * psz_name) {
+int dc_ffmpeg_audio_muxer_open(AudioOutputFile *audio_output_file, char *filename)
+{
+	AVStream *audio_stream;
+	AVOutputFormat *output_fmt;
 
-	AVStream * p_audio_stream;
-	AVOutputFormat * p_output_fmt;
+	AVCodecContext *audio_codec_ctx = audio_output_file->codec_ctx;
+	audio_output_file->av_fmt_ctx = NULL;
 
-	AVCodecContext * p_audio_codec_ctx = p_aoutf->p_codec_ctx;
-	p_aoutf->p_fmt = NULL;
+//	strcpy(audio_output_file->filename, audio_data_conf->filename);
+//	audio_output_file->abr = audio_data_conf->bitrate;
+//	audio_output_file->asr = audio_data_conf->samplerate;
+//	audio_output_file->ach = audio_data_conf->channels;
+//	strcpy(audio_output_file->codec, audio_data_conf->codec);
 
-//	strcpy(p_aoutf->psz_name, p_aconf->psz_name);
-//	p_aoutf->i_abr = p_aconf->i_bitrate;
-//	p_aoutf->i_asr = p_aconf->i_samplerate;
-//	p_aoutf->i_ach = p_aconf->i_channels;
-//	strcpy(p_aoutf->psz_codec, p_aconf->psz_codec);
-
-	/*  Find output format  */
-	p_output_fmt = av_guess_format(NULL, psz_name, NULL);
-	if (!p_output_fmt) {
-		fprintf(stderr, "Cannot find suitable output format\n");
+	/* Find output format */
+	output_fmt = av_guess_format(NULL, filename, NULL);
+	if (!output_fmt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find suitable output format\n"));
 		return -1;
 	}
 
-	p_aoutf->p_fmt = avformat_alloc_context();
-	if (!p_aoutf->p_fmt) {
-		fprintf(stderr, "Cannot allocate memory for pOutVideoFormatCtx\n");
+	audio_output_file->av_fmt_ctx = avformat_alloc_context();
+	if (!audio_output_file->av_fmt_ctx) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate memory for pOutVideoFormatCtx\n"));
 		return -1;
 	}
 
-	p_aoutf->p_fmt->oformat = p_output_fmt;
-	strcpy(p_aoutf->p_fmt->filename, psz_name);
+	audio_output_file->av_fmt_ctx->oformat = output_fmt;
+	strcpy(audio_output_file->av_fmt_ctx->filename, filename);
 
-	/*  Open the output file  */
-	if (!(p_output_fmt->flags & AVFMT_NOFILE)) {
-		if (avio_open(&p_aoutf->p_fmt->pb, psz_name,
-				URL_WRONLY) < 0) {
-			fprintf(stderr, "Cannot not open '%s'\n",
-					psz_name);
+	/* Open the output file */
+	if (!(output_fmt->flags & AVFMT_NOFILE)) {
+		if (avio_open(&audio_output_file->av_fmt_ctx->pb, filename, URL_WRONLY) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot not open '%s'\n", filename));
 			return -1;
 		}
 	}
 
-	p_audio_stream = avformat_new_stream(p_aoutf->p_fmt,
-			p_aoutf->p_codec);
-	if (!p_audio_stream) {
-		fprintf(stderr, "Cannot create output video stream\n");
+	audio_stream = avformat_new_stream(audio_output_file->av_fmt_ctx, audio_output_file->codec);
+	if (!audio_stream) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create output video stream\n"));
 		return -1;
 	}
 
-	p_audio_stream->codec->codec_id = p_aoutf->p_codec->id;
-	p_audio_stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-	p_audio_stream->codec->bit_rate = p_audio_codec_ctx->bit_rate;//p_aoutf->p_adata->i_bitrate;
-	p_audio_stream->codec->sample_rate = p_audio_codec_ctx->sample_rate;//p_aoutf->p_adata->i_samplerate;
-	p_audio_stream->codec->channels = p_audio_codec_ctx->channels;//p_aoutf->p_adata->i_channels;
-	p_audio_stream->codec->sample_fmt = AV_SAMPLE_FMT_S16;
+	audio_stream->codec->codec_id = audio_output_file->codec->id;
+	audio_stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+	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;
 
-//	if (p_aoutf->p_fmt->oformat->flags & AVFMT_GLOBALHEADER)
-//		p_aoutf->p_codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+//	if (audio_output_file->av_fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
+//		audio_output_file->codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
 
-	//p_video_stream->codec = p_voutf->p_codec_ctx;
+	//video_stream->codec = video_output_file->codec_ctx;
 
 	/* open the video codec */
-	if (avcodec_open2(p_audio_stream->codec, p_aoutf->p_codec, NULL) < 0) {
-		fprintf(stderr, "Cannot open output video codec\n");
+	if (avcodec_open2(audio_stream->codec, audio_output_file->codec, NULL) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video codec\n"));
 		return -1;
 	}
 
-	avformat_write_header(p_aoutf->p_fmt, NULL);
+	avformat_write_header(audio_output_file->av_fmt_ctx, NULL);
 
 	return 0;
 }
 
-int dc_ffmpeg_audio_muxer_write(AudioOutputFile * p_aout) {
-
-	AVStream * p_audio_stream = p_aout->p_fmt->streams[p_aout->i_astream_idx];
-	AVCodecContext * p_audio_codec_ctx = p_audio_stream->codec;
+int dc_ffmpeg_audio_muxer_write(AudioOutputFile *audio_output_file)
+{
+	AVStream *audio_stream = audio_output_file->av_fmt_ctx->streams[audio_output_file->astream_idx];
+	AVCodecContext *audio_codec_ctx = audio_stream->codec;
 
-	p_aout->packet.stream_index = p_audio_stream->index;
+	audio_output_file->packet.stream_index = audio_stream->index;
 
-	if (p_aout->packet.pts != AV_NOPTS_VALUE)
-		p_aout->packet.pts = av_rescale_q(p_aout->packet.pts,
-				p_audio_codec_ctx->time_base, p_audio_stream->time_base);
+	if (audio_output_file->packet.pts != AV_NOPTS_VALUE)
+		audio_output_file->packet.pts = av_rescale_q(audio_output_file->packet.pts, audio_codec_ctx->time_base, audio_stream->time_base);
 
-	if (p_aout->packet.duration > 0)
-		p_aout->packet.duration = (int)av_rescale_q(p_aout->packet.duration,
-				p_audio_codec_ctx->time_base, p_audio_stream->time_base);
+	if (audio_output_file->packet.duration > 0)
+		audio_output_file->packet.duration = (int)av_rescale_q(audio_output_file->packet.duration, audio_codec_ctx->time_base, audio_stream->time_base);
 	/*
 	 * if (pkt.pts != AV_NOPTS_VALUE)
-	 * pkt.pts = av_rescale_q(pkt.pts, audioEncCtx->time_base,
-	 * audioStream->time_base);
+	 * pkt.pts = av_rescale_q(pkt.pts, audioEncCtx->time_base, audioStream->time_base);
 	 */
 
-	p_aout->packet.flags |= AV_PKT_FLAG_KEY;
-
-	if (av_interleaved_write_frame(p_aout->p_fmt, &p_aout->packet) != 0) {
+	audio_output_file->packet.flags |= AV_PKT_FLAG_KEY;
 
-		fprintf(stderr, "Writing frame is not successful\n");
-		av_free_packet(&p_aout->packet);
+	if (av_interleaved_write_frame(audio_output_file->av_fmt_ctx, &audio_output_file->packet) != 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Writing frame is not successful\n"));
+		av_free_packet(&audio_output_file->packet);
 		return -1;
 	}
 
-	av_free_packet(&p_aout->packet);
+	av_free_packet(&audio_output_file->packet);
 
 	return 0;
 }
 
-int dc_ffmpeg_audio_muxer_close(AudioOutputFile * p_aoutf) {
-
+int dc_ffmpeg_audio_muxer_close(AudioOutputFile *audio_output_file)
+{
 	u32 i;
 
-	av_write_trailer(p_aoutf->p_fmt);
-
-	avio_close(p_aoutf->p_fmt->pb);
+	av_write_trailer(audio_output_file->av_fmt_ctx);
+	avio_close(audio_output_file->av_fmt_ctx->pb);
 
 	// free the streams
-	for (i = 0; i < p_aoutf->p_fmt->nb_streams; i++) {
-		avcodec_close(p_aoutf->p_fmt->streams[i]->codec);
-		av_freep(&p_aoutf->p_fmt->streams[i]->info);
+	for (i = 0; i < audio_output_file->av_fmt_ctx->nb_streams; i++) {
+		avcodec_close(audio_output_file->av_fmt_ctx->streams[i]->codec);
+		av_freep(&audio_output_file->av_fmt_ctx->streams[i]->info);
 	}
 
-	//p_voutf->p_fmt->streams[p_voutf->i_vstream_idx]->codec = NULL;
-	avformat_free_context(p_aoutf->p_fmt);
+	//video_output_file->av_fmt_ctx->streams[video_output_file->vstream_idx]->codec = NULL;
+	avformat_free_context(audio_output_file->av_fmt_ctx);
 
-	//p_aoutf->acc_samples = 0;
+	//audio_output_file->acc_samples = 0;
 
 	return 0;
 
 }
 
-int dc_audio_muxer_init(AudioOutputFile * p_aoutf, AudioData * p_adata,
-		AudioMuxerType muxer_type, int frame_per_seg, int frame_per_frag, u32 seg_marker) {
-
-	char name[256];
-	sprintf(name, "audio encoder %s", p_adata->psz_name);
-	dc_consumer_init(&p_aoutf->acon, AUDIO_CB_SIZE, name);
+int dc_audio_muxer_init(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf, AudioMuxerType muxer_type, int frame_per_seg, int frame_per_frag, u32 seg_marker)
+{
+	char name[GF_MAX_PATH];
+	snprintf(name, sizeof(name), "audio encoder %s", audio_data_conf->filename);
+	dc_consumer_init(&audio_output_file->consumer, AUDIO_CB_SIZE, name);
 
-	p_aoutf->p_sample = gf_isom_sample_new();
-	p_aoutf->p_isof = NULL;
-	p_aoutf->muxer_type = muxer_type;
+	audio_output_file->sample = gf_isom_sample_new();
+	audio_output_file->isof = NULL;
+	audio_output_file->muxer_type = muxer_type;
 
-	p_aoutf->i_frame_per_seg = frame_per_seg;
-	p_aoutf->i_frame_per_frag = frame_per_frag;
+	audio_output_file->frame_per_seg = frame_per_seg;
+	audio_output_file->frame_per_frag = frame_per_frag;
 
-	p_aoutf->i_seg_marker = seg_marker;
+	audio_output_file->seg_marker = seg_marker;
 
 	return 0;
 }
 
-void dc_audio_muxer_free(AudioOutputFile * p_aoutf) {
-
-	if (p_aoutf->p_isof != NULL) {
-		gf_isom_close(p_aoutf->p_isof);
+void dc_audio_muxer_free(AudioOutputFile *audio_output_file)
+{
+	if (audio_output_file->isof != NULL) {
+		gf_isom_close(audio_output_file->isof);
 	}
 
-	gf_isom_sample_del(&p_aoutf->p_sample);
+	//gf_isom_sample_del(&audio_output_file->sample);
 }
 
-GF_Err dc_audio_muxer_open(AudioOutputFile * p_aoutf, char * psz_directory, char * psz_id, int i_seg) {
-
+GF_Err dc_audio_muxer_open(AudioOutputFile *audio_output_file, char *directory, char *id_name, int seg)
+{
 	GF_Err ret;
-	char psz_name[256];
-
-	switch (p_aoutf->muxer_type) {
+	char name[GF_MAX_PATH];
 
+	switch (audio_output_file->muxer_type) {
 	case FFMPEG_AUDIO_MUXER:
-		sprintf(psz_name, "%s/%s_%d_ffmpeg.mp4",
-				psz_directory, psz_id, i_seg);
-		return dc_ffmpeg_audio_muxer_open(p_aoutf, psz_name);
+		snprintf(name, sizeof(name), "%s/%s_%d_ffmpeg.mp4", directory, id_name, seg);
+		return dc_ffmpeg_audio_muxer_open(audio_output_file, name);
 	case GPAC_AUDIO_MUXER:
-		sprintf(psz_name, "%s/%s_%d_gpac.mp4",
-				psz_directory, psz_id, i_seg);
-		dc_gpac_audio_moov_create(p_aoutf, psz_name);
-		return dc_gpac_audio_isom_open_seg(p_aoutf, NULL);
+		snprintf(name, sizeof(name), "%s/%s_%d_gpac.mp4", directory, id_name, seg);
+		dc_gpac_audio_moov_create(audio_output_file, name);
+		return dc_gpac_audio_isom_open_seg(audio_output_file, NULL);
 	case GPAC_INIT_AUDIO_MUXER:
-		if(i_seg == 0) {
-			sprintf(psz_name, "%s/%s_init_gpac.mp4",
-								psz_directory, psz_id);
-			dc_gpac_audio_moov_create(p_aoutf, psz_name);
-			p_aoutf->i_first_dts = 0;
+		if (seg == 0) {
+			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
+			dc_gpac_audio_moov_create(audio_output_file, name);
+			audio_output_file->first_dts = 0;
 		}
-		sprintf(psz_name, "%s/%s_%d_gpac.m4s",
-							psz_directory, psz_id, i_seg);
-
-		ret = dc_gpac_audio_isom_open_seg(p_aoutf, psz_name);
+		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
+		ret = dc_gpac_audio_isom_open_seg(audio_output_file, name);
 		return ret;
 	default:
 		return GF_BAD_PARAM;
-	};
+	}
 
 	return GF_BAD_PARAM;
 }
 
-int dc_audio_muxer_write(AudioOutputFile * p_aoutf, int i_frame_nb) {
-
-	//GF_Err ret;
-	switch (p_aoutf->muxer_type) {
-
+int dc_audio_muxer_write(AudioOutputFile *audio_output_file, int frame_nb)
+{
+	switch (audio_output_file->muxer_type) {
 	case FFMPEG_AUDIO_MUXER:
-		return dc_ffmpeg_audio_muxer_write(p_aoutf);
+		return dc_ffmpeg_audio_muxer_write(audio_output_file);
 	case GPAC_AUDIO_MUXER:
 	case GPAC_INIT_AUDIO_MUXER:
-		if (i_frame_nb % p_aoutf->i_frame_per_frag == 0) {
-			gf_isom_start_fragment(p_aoutf->p_isof, 1);
-
-			gf_isom_set_traf_base_media_decode_time(p_aoutf->p_isof, 1,
-					p_aoutf->i_first_dts * p_aoutf->i_frame_size);
-			p_aoutf->i_first_dts += p_aoutf->i_frame_per_frag;
+		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);
+			audio_output_file->first_dts += audio_output_file->frame_per_frag;
 		}
-		dc_gpac_audio_isom_write(p_aoutf);
-		if (i_frame_nb % p_aoutf->i_frame_per_frag
-				== p_aoutf->i_frame_per_frag - 1) {
-			gf_isom_flush_fragments(p_aoutf->p_isof, 1);
+		dc_gpac_audio_isom_write(audio_output_file);
+		if (frame_nb % audio_output_file->frame_per_frag == audio_output_file->frame_per_frag - 1) {
+			gf_isom_flush_fragments(audio_output_file->isof, 1);
 		}
-		if(i_frame_nb + 1 == p_aoutf->i_frame_per_seg)
+		if (frame_nb + 1 == audio_output_file->frame_per_seg) {
 			return 1;
+		}
 		return 0;
 	default:
 		return GF_BAD_PARAM;
-	};
+	}
 
 	return GF_BAD_PARAM;
 }
 
-int dc_audio_muxer_close(AudioOutputFile * p_aoutf) {
-
-	switch (p_aoutf->muxer_type) {
-
+int dc_audio_muxer_close(AudioOutputFile *audio_output_file)
+{
+	switch (audio_output_file->muxer_type) {
 	case FFMPEG_AUDIO_MUXER:
-		return dc_ffmpeg_audio_muxer_close(p_aoutf);
+		return dc_ffmpeg_audio_muxer_close(audio_output_file);
 	case GPAC_AUDIO_MUXER:
-		dc_gpac_audio_isom_close_seg(p_aoutf);
-		return dc_gpac_audio_isom_close(p_aoutf);
+		dc_gpac_audio_isom_close_seg(audio_output_file);
+		return dc_gpac_audio_isom_close(audio_output_file);
 	case GPAC_INIT_AUDIO_MUXER:
-		return dc_gpac_audio_isom_close_seg(p_aoutf);
+		return dc_gpac_audio_isom_close_seg(audio_output_file);
 	default:
 		return GF_BAD_PARAM;
-	};
+	}
 
 	return GF_BAD_PARAM;
 }

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/audio_muxer.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/audio_muxer.h Changed

@@ -30,23 +30,22 @@
 #include "../../modules/ffmpeg_in/ffmpeg_in.h"
 #include "libavutil/fifo.h"
 #include "libavformat/avformat.h"
-#ifndef WIN32
 #include "libavdevice/avdevice.h"
+#ifdef DC_AUDIO_RESAMPLER
+#include "libavresample/avresample.h"
 #endif
 #include "libavutil/mathematics.h"
+#include "libavutil/opt.h"
 #include <gpac/isomedia.h>
 #include <gpac/internal/media_dev.h>
 #include <gpac/constants.h>
 #include "audio_data.h"
-#include "libav_compat.h"
 
 
 typedef enum {
-
 	FFMPEG_AUDIO_MUXER,
 	GPAC_AUDIO_MUXER,
 	GPAC_INIT_AUDIO_MUXER
-
 } AudioMuxerType;
 
 /*
@@ -58,28 +57,32 @@
  *
  */
 typedef struct {
-
-	//AudioData * p_adata;
+	//AudioDataConf *audio_data_conf;
 
 	/* File format context structure */
-	AVFormatContext * p_fmt;
-	AVCodec * p_codec;
-	AVCodecContext * p_codec_ctx;
+	AVFormatContext *av_fmt_ctx;
+	AVCodec *codec;
+	AVCodecContext *codec_ctx;
 
-	GF_ISOFile * p_isof;
-	GF_ISOSample * p_sample;
+	GF_ISOFile *isof;
+	GF_ISOSample *sample;
 	int dts;
 
 	/* The index to the audio stream in the file */
-	int i_astream_idx;
+	int astream_idx;
 
 	/* It keeps the index with which encoder access to the circular buffer (as a consumer) */
-	Consumer acon;
+	Consumer consumer;
+
+#ifdef DC_AUDIO_RESAMPLER
+	/* Optional audio resampling between the decoder and the encoder */
+	AVAudioResampleContext *aresampler;
+#endif
 
 	/* Variables that encoder needs to encode data */
-	AVFrame * p_aframe;
-	uint8_t * p_adata_buf;
-	int i_frame_bytes;
+	AVFrame *aframe;
+	uint8_t *adata_buf;
+	int frame_bytes;
 	AVPacket packet;
 
 	/*
@@ -89,40 +92,40 @@
 	 * to store audio samples in the fifo and once an access unit
 	 * is complete we can encode it.
 	 */
-	AVFifoBuffer * p_fifo;
+	AVFifoBuffer *fifo;
 
 	AudioMuxerType muxer_type;
 
 	/* Accumulated sample */
 	//int acc_samples;
 
-	int i_frame_per_seg;
-	int i_frame_per_frag;
-	int i_first_dts;
+	int frame_per_seg;
+	int frame_per_frag;
+	int first_dts;
 
-	u32 i_seg_marker;
+	u32 seg_marker;
 
-	int i_frame_size;
+	int frame_size;
 
 } AudioOutputFile;
 
-int dc_audio_muxer_init(AudioOutputFile * aoutf, AudioData * aconf, AudioMuxerType muxer_type,
-		int frame_per_seg, int frame_per_frag, u32 seg_marker);
-void dc_audio_muxer_free(AudioOutputFile * aoutf);
+int dc_audio_muxer_init(AudioOutputFile *audio_output_file, AudioDataConf *audio_data_conf, AudioMuxerType muxer_type, int frame_per_seg, int frame_per_frag, u32 seg_marker);
+void dc_audio_muxer_free(AudioOutputFile *audio_output_file);
 
 /*
  * Open the output audio
  *
- * @param aoutf [out] open the audio output on this file
+ * @param audio_output_file [out] open the audio output on this file
  *
- * @param aconf [in] the structure containing the
+ * @param audio_data_conf [in] the structure containing the
  * configuration of the output file (bitrate, samplerate, name, channels)
  *
  * @return 0 on success, -1 on failure
  */
-GF_Err dc_audio_muxer_open(AudioOutputFile * aoutf, char * psz_directory, char * psz_id, int i_seg);
-GF_Err dc_audio_muxer_write(AudioOutputFile * aout, int i_frame_nb);
-GF_Err dc_audio_muxer_close(AudioOutputFile * aoutf);
+GF_Err dc_audio_muxer_open(AudioOutputFile *audio_output_file, char *directory, char *id_name, int seg);
+
+GF_Err dc_audio_muxer_write(AudioOutputFile *audio_output_file, int frame_nb);
 
+GF_Err dc_audio_muxer_close(AudioOutputFile *audio_output_file);
 
 #endif /* AUDIO_MUXER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/circular_buffer.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/circular_buffer.c Changed

@@ -25,310 +25,239 @@
 
 #include "circular_buffer.h"
 
-//#define DEBUG
-
-void dc_circular_buffer_create(CircularBuffer * p_cb, int i_size, LockMode mode,
-		int i_max_con_nb) {
-
-	int i;
-	p_cb->i_size = i_size;
-	p_cb->p_list = gf_malloc(i_size * sizeof(Node));
-	p_cb->mode = mode;
-	p_cb->i_max_con_nb = i_max_con_nb;
 
-	for (i = 0; i < i_size; i++) {
-		p_cb->p_list[i].i_pro_nb = 0;
-		p_cb->p_list[i].i_con_nb = 0;
-		p_cb->p_list[i].i_con_access = 0;
-		p_cb->p_list[i].i_marked = 0;
-		p_cb->p_list[i].i_con_waiting = 0;
-
-#ifdef SEM
-		p_cb->p_list[i].con_sem = gf_sema_new(1000, 0);
-		p_cb->p_list[i].pro_sem = gf_sema_new(1000, 0);
-#else
-		p_cb->p_list[i].con_cond = gf_cond_new();
-		p_cb->p_list[i].pro_cond = gf_cond_new();
-#endif
+//#define DEBUG
 
-		p_cb->p_list[i].mux = gf_mx_new("Circular Buffer Mutex");
 
+void dc_circular_buffer_create(CircularBuffer *circular_buf, u32 size, LockMode mode, int max_num_consumers)
+{
+	u32 i;
+	circular_buf->size = size;
+	circular_buf->list = gf_malloc(size * sizeof(Node));
+	circular_buf->mode = mode;
+	circular_buf->max_num_consumers = max_num_consumers;
+
+	for (i=0; i<size; i++) {
+		circular_buf->list[i].num_producers = 0;
+		circular_buf->list[i].num_consumers = 0;
+		circular_buf->list[i].num_consumers_accessed = 0;
+		circular_buf->list[i].marked = 0;
+		circular_buf->list[i].num_consumers_waiting = 0;
+		circular_buf->list[i].consumers_semaphore = gf_sema_new(1000, 0);
+		circular_buf->list[i].producers_semaphore = gf_sema_new(1000, 0);
+		circular_buf->list[i].mutex = gf_mx_new("Circular Buffer Mutex");
 	}
-
 }
 
-void dc_circular_buffer_destroy(CircularBuffer * p_cb) {
-
-	int i;
-	for (i = 0; i < p_cb->i_size; i++) {
-
-#ifdef SEM
-		gf_sema_del(p_cb->p_list[i].con_sem);
-		gf_sema_del(p_cb->p_list[i].pro_sem);
-#else
-		gf_cond_del(p_cb->p_list[i].con_cond);
-		gf_cond_del(p_cb->p_list[i].pro_cond);
-#endif
-
-		gf_mx_del(p_cb->p_list[i].mux);
-
+void dc_circular_buffer_destroy(CircularBuffer *circular_buf)
+{
+	u32 i;
+	for (i = 0; i < circular_buf->size; i++) {
+		gf_sema_del(circular_buf->list[i].consumers_semaphore);
+		gf_sema_del(circular_buf->list[i].producers_semaphore);
+		gf_mx_del(circular_buf->list[i].mutex);
 	}
 
-	gf_free(p_cb->p_list);
+	gf_free(circular_buf->list);
 }
 
-void dc_consumer_init(Consumer * p_con, int i_max_idx, char * name) {
-	p_con->i_idx = 0;
-	p_con->i_max_idx = i_max_idx;
-	strcpy(p_con->psz_name, name);
+void dc_consumer_init(Consumer *consumer, int max_idx, char *name)
+{
+	consumer->idx = 0;
+	consumer->max_idx = max_idx;
+	strcpy(consumer->name, name);
 }
 
-void * dc_consumer_consume(Consumer * p_con, CircularBuffer * p_cb) {
-	return p_cb->p_list[p_con->i_idx].p_data;
+void * dc_consumer_consume(Consumer *consumer, CircularBuffer *circular_buf)
+{
+	return circular_buf->list[consumer->idx].data;
 }
 
-int dc_consumer_lock(Consumer * p_con, CircularBuffer * p_cb) {
+int dc_consumer_lock(Consumer *consumer, CircularBuffer *circular_buf)
+{
+	Node *node = &circular_buf->list[consumer->idx];
 
-	Node * p_node = &p_cb->p_list[p_con->i_idx];
-
-	gf_mx_p(p_node->mux);
-#ifdef DEBUG
-	printf("consumer %s enters lock %d\n", p_con->psz_name, p_con->i_idx);
-#endif
-	if (p_node->i_marked == 2) {
-		gf_mx_v(p_node->mux);
+	gf_mx_p(node->mutex);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("consumer %s enters lock %d\n", consumer->name, consumer->idx));
+	if (node->marked == 2) {
+		gf_mx_v(node->mutex);
 		return -1;
 	}
 
-	p_node->i_con_waiting++;
-	while (p_node->i_pro_nb || !p_node->i_marked) {
-
-#ifdef SEM
-		gf_mx_v(p_node->mux);
-		gf_sema_wait(p_node->con_sem);
-		gf_mx_p(p_node->mux);
-#else
-		gf_cond_wait(p_node->con_cond, p_node->mux);
-#endif
+	node->num_consumers_waiting++;
+	while (node->num_producers || !node->marked) {
+		gf_mx_v(node->mutex);
+		gf_sema_wait(node->consumers_semaphore);
+		gf_mx_p(node->mutex);
 
-		if (p_node->i_marked == 2) {
-			gf_mx_v(p_node->mux);
+		if (node->marked == 2) {
+			gf_mx_v(node->mutex);
 			return -1;
 		}
 	}
-	p_node->i_con_waiting--;
+	node->num_consumers_waiting--;
 
-	if (p_node->i_marked == 2) {
-		gf_mx_v(p_node->mux);
+	if (node->marked == 2) {
+		gf_mx_v(node->mutex);
 		return -1;
 	}
-	p_node->i_con_nb++;
-	p_node->i_con_access++;
-#ifdef DEBUG
-	printf("consumer %s exits lock %d \n", p_con->psz_name, p_con->i_idx);
-#endif
-	gf_mx_v(p_node->mux);
+	node->num_consumers++;
+	node->num_consumers_accessed++;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("consumer %s exits lock %d \n", consumer->name, consumer->idx));
+	gf_mx_v(node->mutex);
 
 	return 0;
 }
 
-int dc_consumer_unlock(Consumer * p_con, CircularBuffer * p_cb) {
-
-	int i_last_con = 0;
-	Node * p_node = &p_cb->p_list[p_con->i_idx];
+int dc_consumer_unlock(Consumer *consumer, CircularBuffer *circular_buf)
+{
+	int last_consumer = 0;
+	Node *node = &circular_buf->list[consumer->idx];
 
-	gf_mx_p(p_node->mux);
-	p_node->i_con_nb--;
+	gf_mx_p(node->mutex);
+	node->num_consumers--;
 
-	if (p_node->i_con_access == p_cb->i_max_con_nb) {
-		p_node->i_marked = 0;
-		p_node->i_con_access = 0;
-		i_last_con = 1;
+	if (node->num_consumers_accessed == circular_buf->max_num_consumers) {
+		node->marked = 0;
+		node->num_consumers_accessed = 0;
+		last_consumer = 1;
 	}
 
-#ifdef SEM
-	gf_sema_notify(p_node->pro_sem, 1);
-#else
-	gf_cond_signal(p_node->pro_cond);
-#endif
+	gf_sema_notify(node->producers_semaphore, 1);
 
-#ifdef DEBUG
-	printf("consumer %s unlock %d \n", p_con->psz_name, p_con->i_idx);
-#endif
-	gf_mx_v(p_node->mux);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("consumer %s unlock %d \n", consumer->name, consumer->idx));
+	gf_mx_v(node->mutex);
 
-	return i_last_con;
+	return last_consumer;
 }
 
-int dc_consumer_unlock_previous(Consumer * p_con, CircularBuffer * p_cb) {
+int dc_consumer_unlock_previous(Consumer *consumer, CircularBuffer *circular_buf)
+{
+	int node_idx = (consumer->idx - 1 + consumer->max_idx) % consumer->max_idx;
+	int last_consumer = 0;
+	Node *node = &circular_buf->list[node_idx];
 
-	int node_idx = (p_con->i_idx - 1 + p_con->i_max_idx) % p_con->i_max_idx;
-	int i_last_con = 0;
-	Node * p_node = &p_cb->p_list[node_idx];
+	gf_mx_p(node->mutex);
 
-	gf_mx_p(p_node->mux);
+	node->num_consumers--;
+	if (node->num_consumers < 0)
+		node->num_consumers = 0;
 
-	p_node->i_con_nb--;
-	if (p_node->i_con_nb < 0)
-		p_node->i_con_nb = 0;
-
-	if (p_node->i_con_access == p_cb->i_max_con_nb) {
-		if (p_node->i_marked != 2)
-			p_node->i_marked = 0;
-		p_node->i_con_access = 0;
-		i_last_con = 1;
+	if (node->num_consumers_accessed == circular_buf->max_num_consumers) {
+		if (node->marked != 2)
+			node->marked = 0;
+		node->num_consumers_accessed = 0;
+		last_consumer = 1;
 	}
 
-#ifdef SEM
-	gf_sema_notify(p_node->pro_sem, 1);
-#else
-	gf_cond_signal(p_node->pro_cond);
-#endif
+	gf_sema_notify(node->producers_semaphore, 1);
 
-#ifdef DEBUG
-	printf("consumer %s unlock %d \n", p_con->psz_name, node_idx);
-#endif
-	gf_mx_v(p_node->mux);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("consumer %s unlock %d \n", consumer->name, node_idx));
+	gf_mx_v(node->mutex);
 
-	return i_last_con;
+	return last_consumer;
 }
 
-void dc_consumer_advance(Consumer * p_con) {
-	p_con->i_idx = (p_con->i_idx + 1) % p_con->i_max_idx;
+void dc_consumer_advance(Consumer *consumer)
+{
+	consumer->idx = (consumer->idx + 1) % consumer->max_idx;
 }
 
-void dc_producer_init(Producer * p_pro, int i_max_idx, char * name) {
-	p_pro->i_idx = 0;
-	p_pro->i_max_idx = i_max_idx;
-	strcpy(p_pro->psz_name, name);
+void dc_producer_init(Producer *producer, int max_idx, char *name)
+{
+	producer->idx = 0;
+	producer->max_idx = max_idx;
+	strcpy(producer->name, name);
 }
 
-void * dc_producer_produce(Producer * p_pro, CircularBuffer * p_cb) {
-	return p_cb->p_list[p_pro->i_idx].p_data;
-
+void * dc_producer_produce(Producer *producer, CircularBuffer *circular_buf)
+{
+	return circular_buf->list[producer->idx].data;
 }
 
-int dc_producer_lock(Producer * p_pro, CircularBuffer * p_cb) {
+int dc_producer_lock(Producer *producer, CircularBuffer *circular_buf)
+{
+	Node *node = &circular_buf->list[producer->idx];
 
-	Node * p_node = &p_cb->p_list[p_pro->i_idx];
+	gf_mx_p(node->mutex);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("producer %s enters lock %d \n", producer->name, producer->idx));
 
-	gf_mx_p(p_node->mux);
-#ifdef DEBUG
-	printf("producer %s enters lock %d \n", p_pro->psz_name, p_pro->i_idx);
-#endif
-
-	if ( (p_cb->mode == LIVE_CAMERA || p_cb->mode == LIVE_MEDIA)  && (p_node->i_con_nb || p_node->i_marked)) {
-		gf_mx_v(p_node->mux);
+	if ( (circular_buf->mode == LIVE_CAMERA || circular_buf->mode == LIVE_MEDIA) && (node->num_consumers || node->marked)) {
+		gf_mx_v(node->mutex);
 		return -1;
 	}
 
-	while (p_node->i_con_nb || p_node->i_marked) {
-
-#ifdef SEM
-		gf_mx_v(p_node->mux);
-		gf_sema_wait(p_node->pro_sem);
-		gf_mx_p(p_node->mux);
-#else
-		gf_cond_wait(p_node->pro_cond, p_node->mux);
-#endif
-
+	while (node->num_consumers || node->marked) {
+		gf_mx_v(node->mutex);
+		gf_sema_wait(node->producers_semaphore);
+		gf_mx_p(node->mutex);
 	}
 
-	p_node->i_pro_nb++;
-	p_node->i_marked = 1;
-
-#ifdef DEBUG
-	printf("producer %s exits lock %d \n", p_pro->psz_name, p_pro->i_idx);
-#endif
-	gf_mx_v(p_node->mux);
+	node->num_producers++;
+	if (circular_buf->size>1) {
+		node->marked = 1;
+	}
 
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("producer %s exits lock %d \n", producer->name, producer->idx));
+	gf_mx_v(node->mutex);
+	
 	return 0;
 }
 
-void dc_producer_unlock(Producer * p_pro, CircularBuffer * p_cb) {
-
-	Node * p_node = &p_cb->p_list[p_pro->i_idx];
-
-	gf_mx_p(p_node->mux);
-
-	p_node->i_pro_nb--;
-
-#ifdef SEM
-	gf_sema_notify(p_node->con_sem, p_node->i_con_waiting);
-#else
-	gf_cond_broadcast(p_node->con_cond);
-#endif
-
-#ifdef DEBUG
-	printf("producer %s unlock %d \n", p_pro->psz_name, p_pro->i_idx);
-#endif
-	gf_mx_v(p_node->mux);
+void dc_producer_unlock(Producer *producer, CircularBuffer *circular_buf)
+{
+	Node *node = &circular_buf->list[producer->idx];
 
+	gf_mx_p(node->mutex);
+	node->num_producers--;
+	gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("producer %s unlock %d \n", producer->name, producer->idx));
+	gf_mx_v(node->mutex);
 }
 
-void dc_producer_unlock_previous(Producer * p_pro, CircularBuffer * p_cb) {
-
-	int node_idx = (p_pro->i_idx - 1 + p_pro->i_max_idx) % p_pro->i_max_idx;
-	Node * p_node = &p_cb->p_list[node_idx];
-
-	gf_mx_p(p_node->mux);
-
-	p_node->i_pro_nb = 0;
-
-#ifdef SEM
-	gf_sema_notify(p_node->con_sem, p_node->i_con_waiting);
-#else
-	gf_cond_broadcast(p_node->con_cond);
-#endif
-
-#ifdef DEBUG
-	printf("producer %s unlock %d \n", p_pro->psz_name, node_idx);
-#endif
-	gf_mx_v(p_node->mux);
+void dc_producer_unlock_previous(Producer *producer, CircularBuffer *circular_buf)
+{
+	int node_idx = (producer->idx - 1 + producer->max_idx) % producer->max_idx;
+	Node *node = &circular_buf->list[node_idx];
 
+	gf_mx_p(node->mutex);
+	node->num_producers = 0;
+	gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("producer %s unlock %d \n", producer->name, node_idx));
+	gf_mx_v(node->mutex);
 }
 
-void dc_producer_advance(Producer * p_pro) {
-	p_pro->i_idx = (p_pro->i_idx + 1) % p_pro->i_max_idx;
+void dc_producer_advance(Producer *producer, CircularBuffer *circular_buf)
+{
+	if (circular_buf->size == 1) {
+		Node *node = &circular_buf->list[producer->idx];
+		gf_mx_p(node->mutex);
+		node->marked = 1;
+		gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
+		gf_mx_v(node->mutex);
+	}
+	producer->idx = (producer->idx + 1) % producer->max_idx;
 }
 
-void dc_producer_end_signal(Producer * p_pro, CircularBuffer * p_cb) {
-
-	Node * p_node = &p_cb->p_list[p_pro->i_idx];
-	gf_mx_p(p_node->mux);
-
-	p_node->i_marked = 2;
+void dc_producer_end_signal(Producer *producer, CircularBuffer *circular_buf)
+{
+	Node *node = &circular_buf->list[producer->idx];
 
-#ifdef SEM
-	gf_sema_notify(p_node->con_sem, p_node->i_con_waiting);
-#else
-	gf_cond_broadcast(p_node->con_cond);
-#endif
-
-#ifdef DEBUG
-	printf("producer %s sends end signal %d \n", p_pro->psz_name, p_pro->i_idx);
-#endif
-	gf_mx_v(p_node->mux);
+	gf_mx_p(node->mutex);
+	node->marked = 2;
+	gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("producer %s sends end signal %d \n", producer->name, producer->idx));
+	gf_mx_v(node->mutex);
 }
 
-void dc_producer_end_signal_previous(Producer * p_pro, CircularBuffer * p_cb) {
-
-	int i_node = (p_pro->i_max_idx + p_pro->i_idx - 1) % p_pro->i_max_idx;
+void dc_producer_end_signal_previous(Producer *producer, CircularBuffer *circular_buf)
+{
+	int i_node = (producer->max_idx + producer->idx - 1) % producer->max_idx;
+	Node *node = &circular_buf->list[i_node];
 
-	Node * p_node = &p_cb->p_list[i_node];
-	gf_mx_p(p_node->mux);
-
-	p_node->i_marked = 2;
-
-#ifdef SEM
-	gf_sema_notify(p_node->con_sem, p_node->i_con_waiting);
-#else
-	gf_cond_broadcast(p_node->con_cond);
-#endif
-
-#ifdef DEBUG
-	printf("producer %s sends end signal %d \n", p_pro->psz_name, i_node);
-#endif
-	gf_mx_v(p_node->mux);
+	gf_mx_p(node->mutex);
+	node->marked = 2;
+	gf_sema_notify(node->consumers_semaphore, node->num_consumers_waiting);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("producer %s sends end signal %d \n", producer->name, node));
+	gf_mx_v(node->mutex);
 }
-

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/circular_buffer.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/circular_buffer.h Changed

@@ -30,16 +30,12 @@
 #include <stdio.h>
 #include <gpac/thread.h>
 
-#ifdef WIN32
-#define SEM
-#endif
-
 
 /*
  * The method (mode) of multithread management.
  * It can be LIVE or OFFLINE.
  * LIVE means that the system is real time. The producer does not wait
- * for anyone and it always produce and find a place on the circular buffer.
+ * for anyone and it always produces and finds a place on the circular buffer.
  * OFFLINE means that the system is working offline, so the producer can
  * wait for the consumers to finish their job.
  */
@@ -54,46 +50,27 @@
  * all the variables needed for multithread management. 
  */
 typedef struct {
-
 	/* Pointer to the data on the node */
-	void * p_data;
-
+	void *data;
 	/* The number of the producer currently using this node */
-	int i_pro_nb;
-
+	int num_producers;
 	/* The number of consumer currently using this node */
-	int i_con_nb;
-
-	int i_con_waiting;
-
+	int num_consumers;
+	/* The number of consumer currently waiting for this node */
+	int num_consumers_waiting;
 	/* Mutex used for synchronizing the users of this node. */
-	GF_Mutex * mux;
-
-#ifdef SEM
+	GF_Mutex *mutex;
 	/* Semaphore for producer */
-	GF_Semaphore * pro_sem;
-
+	GF_Semaphore *producers_semaphore;
 	/* Semaphore for consumers */
-	GF_Semaphore * con_sem;
-#else
-	/* Condition variable aimed for signaling the producers waiting on this condition. */
-	GF_Condition * pro_cond;
-
-	/* condition variable aimed for signaling the consumers waiting on this condition. */
-	GF_Condition * con_cond;
-#endif
-
+	GF_Semaphore *consumers_semaphore;
 	/* If marked is 0 it means the data on this node is not valid.
 	 * If marked is 1 it means that the data on this node is valid.
-	 *  If marked is 2 it means this node is the last node.
-	 */
-	int i_marked;
-	/*
-	 * Indicates the number of consumer already accessed to this node.
-	 * It is used for the case where the last consumer has to to something.
-	 */
-	int i_con_access;
-
+	 * If marked is 2 it means this node is the last node. */
+	int marked;
+	/* Indicates the number of consumers which already accessed this node.
+	 * It is used for the case where the last consumer has to do something. */
+	int num_consumers_accessed;
 } Node;
 
 /*
@@ -102,19 +79,14 @@
  * locking mechanism it needs to use. (LIVE or OFFLINE)
  */
 typedef struct {
-
 	/* The size of circular buffer */
-	int i_size;
-	
+	u32 size;	
 	/* A list of all the nodes */
-	Node * p_list;
-	
+	Node *list;	
 	/* The mode for multithread management. */
-	LockMode mode;
-	
+	LockMode mode;	
 	/* The maximum number of the consumers using the circular buffer */
-	int i_max_con_nb;
-
+	u32 max_num_consumers;
 } CircularBuffer;
 
 /*
@@ -122,11 +94,11 @@
  */ 
 typedef struct {
 	/* The index where the producer is using */
-	int i_idx;
+	int idx;
 	/* The maximum of the index. (Which means the size of circular buffer) */
-	int i_max_idx;
+	int max_idx;
 
-	char psz_name[256];
+	char name[GF_MAX_PATH];
 } Producer;
 
 /*
@@ -134,152 +106,141 @@
  */
 typedef struct {
 	/* The index where the consumer is using */
-	int i_idx;
+	int idx;
 	/* The maximum of the index. (Which means the size of circular buffer) */
-	int i_max_idx;
+	int max_idx;
 
-	char psz_name[256];
+	char name[GF_MAX_PATH];
 } Consumer;
 
 /*
  * Create a circular buffer
  * 
- * @param cb [out] circular buffer to be created
+ * @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)
- * @param maxcon [in] maximum number of the consumers of the circular buffer
- *
+ * @param num_consumers [in] maximum number of the consumers of the circular buffer
  */
-void dc_circular_buffer_create(CircularBuffer * cb, int size, LockMode mode,int maxcon);
+void dc_circular_buffer_create(CircularBuffer *circular_buf, u32 size, LockMode mode, int num_consumers);
 
 /*
  * Destroy the circular buffer
  *
- * @param cb [in] circular buffer to be destroyed
- *
+ * @param circular_buf [in] circular buffer to be destroyed
  */
-void dc_circular_buffer_destroy(CircularBuffer * cb);
+void dc_circular_buffer_destroy(CircularBuffer *circular_buf);
 
 /* 
  * Initialize a consumer
  * 
- * @param con [out] the consumer to be initialize
- * @param maxcon [in] maximum number of the consumers
- *
+ * @param consumer [out] the consumer to be initialize
+ * @param num_consumers [in] maximum number of the consumers
  */
-void dc_consumer_init(Consumer * con, int maxcon, char * name);
+void dc_consumer_init(Consumer *consumer, int num_consumers, char *name);
 
 /*
- * Return the data in the node in question. (cb[con index])
- * @param con [in] consumer
- * @param cb [in] circular buffer
- *  
+ * Return the data in the node in question. (circular_buf[consumer index])
+ *
+ * @param consumer [in] consumer
+ * @param circular_buf [in] circular buffer
  */
-void * dc_consumer_consume(Consumer * con, CircularBuffer * cb);
+void * dc_consumer_consume(Consumer *consumer, CircularBuffer *circular_buf);
 
 /*
  * Consumer lock on circular buffer
  * 
- * @param con [in] consumer
- * @param cb [in] 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 * con, CircularBuffer * cb);
+int dc_consumer_lock(Consumer *consumer, CircularBuffer *circular_buf);
 
 /*
  * Consumer unlock on circular buffer
  *
- * @param con [in] consumer
- * @param cb [in] circular buffer
+ * @param consumer [in] consumer
+ * @param circular_buf [in] circular buffer
  *
- * @return 0 on normal exit, 1 if the consumer unlocking this node
- * is the last consumer.
+ * @return 0 on normal exit, 1 if the consumer unlocking this node is the last consumer.
  */
-int dc_consumer_unlock(Consumer * con, CircularBuffer * cb);
+int dc_consumer_unlock(Consumer *consumer, CircularBuffer *circular_buf);
 
 /*
  * Consumer unlock on previous node of the circular buffer
  *
- * @param con [in] consumer
- * @param cb [in] circular buffer
+ * @param consumer [in] consumer
+ * @param circular_buf [in] circular buffer
  *
- * @return 0 on normal exit, 1 if the consumer unlocking this node
- * is the last consumer.
+ * @return 0 on normal exit, 1 if the consumer unlocking this node is the last consumer.
  */
-int dc_consumer_unlock_previous(Consumer * con, CircularBuffer * cb);
+int dc_consumer_unlock_previous(Consumer *consumer, CircularBuffer *circular_buf);
 
 /*
  * Consumer leads its index
  * 
- * @param con [in] consumer
+ * @param consumer [in] consumer
  */
-void dc_consumer_advance(Consumer * con);
+void dc_consumer_advance(Consumer *consumer);
 
 /* 
  * Initialize a producer
  * 
- * @param pro [out] the producer to be initialize
+ * @param producer [out] the producer to be initialize
  * @param maxpro [in] maximum number of the producers
- *
  */
-void dc_producer_init(Producer * pro, int maxpro, char * name);
+void dc_producer_init(Producer *producer, int maxpro, char *name);
 
 /*
- * Return the data in the node in question. (cb[con index])
- * @param pro [in] producer
- * @param cb [in] circular buffer
- *  
+ * Return the data in the node in question. (circular_buf[consumer index])
+ *
+ * @param producer [in] producer
+ * @param circular_buf [in] circular buffer
  */
-void * dc_producer_produce(Producer * pro, CircularBuffer * cb);
+void * dc_producer_produce(Producer *producer, CircularBuffer *circular_buf);
 
 /*
  * Producer lock on circular buffer
  * 
- * @param pro [in] producer
- * @param cb [in] 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 * pro, CircularBuffer * cb);
+int dc_producer_lock(Producer *producer, CircularBuffer *circular_buf);
 
 /*
  * Producer unlock on circular buffer
  *
- * @param pro [in] producer
- * @param cb [in] circular buffer
- *
+ * @param producer [in] producer
+ * @param circular_buf [in] circular buffer
  */
-void dc_producer_unlock(Producer * pro, CircularBuffer * cb);
+void dc_producer_unlock(Producer *producer, CircularBuffer *circular_buf);
 
 /*
  * Producer unlock on the previous node of the circular buffer
  *
- * @param pro [in] producer
- * @param cb [in] circular buffer
- *
+ * @param producer [in] producer
+ * @param circular_buf [in] circular buffer
  */
 void dc_producer_unlock_previous(Producer *, CircularBuffer *);
 
 /*
  * Producer leads its index
  * 
- * @param pro [in] producer
- *
+ * @param producer [in] producer
+ * @param circular_buf [in] circular buffer
  */
-void dc_producer_advance(Producer * pro);
+void dc_producer_advance(Producer *producer, CircularBuffer *);
 
 /*
  * Producer signal that the current node is the last node
  * 
- * @param pro [in] producer
- * @param cb [in] circular buffer
+ * @param producer [in] producer
+ * @param circular_buf [in] circular buffer
  */
-void dc_producer_end_signal(Producer * pro, CircularBuffer * cb);
-
-void dc_producer_end_signal_previous(Producer * p_pro, CircularBuffer * p_cb);
+void dc_producer_end_signal(Producer *producer, CircularBuffer *circular_buf);
 
+void dc_producer_end_signal_previous(Producer *producer, CircularBuffer *circular_buf);
 
 #endif /* CIRCULAR_BUFFER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/cmd_data.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/cmd_data.c Changed

@@ -1,794 +1,888 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include "cmd_data.h"
-
-int dc_str_to_resolution(char * psz_str, int * p_width, int * p_height) {
-
-	char * token = strtok(psz_str, "x");
-
-	if (!token) {
-		fprintf(stderr, "Cannot parse resolution string.\n");
-		return -1;
-	}
-	*p_width = atoi(token);
-
-	token = strtok(NULL, " ");
-
-	if (!token) {
-		fprintf(stderr, "Cannot parse resolution string.\n");
-		return -1;
-	}
-	*p_height = atoi(token);
-
-	return 0;
-}
-
-int dc_read_configuration(CmdData * p_cmdd) {
-
-	u32 i;
-
-	GF_Config * p_conf = p_cmdd->p_conf;
-
-	u32 i_sec_count = gf_cfg_get_section_count(p_conf);
-
-	if (i_sec_count == 0) {
-
-		gf_cfg_set_key(p_conf, "v1", "type", "video");
-		gf_cfg_set_key(p_conf, "v1", "bitrate", "400000");
-//		gf_cfg_set_key(p_conf, "v1", "framerate", "25");
-		gf_cfg_set_key(p_conf, "v1", "width", "640");
-		gf_cfg_set_key(p_conf, "v1", "height", "480");
-//		gf_cfg_set_key(p_conf, "v1", "codec", "libx264");
-
-		gf_cfg_set_key(p_conf, "a1", "type", "audio");
-		gf_cfg_set_key(p_conf, "a1", "bitrate", "192000");
-//		gf_cfg_set_key(p_conf, "a1", "samplerate", "48000");
-//		gf_cfg_set_key(p_conf, "a1", "channels", "2");
-//		gf_cfg_set_key(p_conf, "a1", "codec", "mp2");
-
-		i_sec_count = 2;
-	}
-	for (i = 0; i < i_sec_count; i++) {
-
-		const char * psz_sec_name = gf_cfg_get_section_name(p_conf, i);
-
-		const char * psz_type = gf_cfg_get_key(p_conf, psz_sec_name, "type");
-
-		if (strcmp(psz_type, "video") == 0) {
-
-			VideoData * p_vconf = gf_malloc(sizeof(VideoData));
-			strcpy(p_vconf->psz_name, psz_sec_name);
-//			strcpy(p_vconf->psz_codec,
-//					gf_cfg_get_key(p_conf, psz_sec_name, "codec"));
-			p_vconf->i_bitrate = atoi(
-					gf_cfg_get_key(p_conf, psz_sec_name, "bitrate"));
-//			p_vconf->i_framerate = atoi(
-//					gf_cfg_get_key(p_conf, psz_sec_name, "framerate"));
-			p_vconf->i_height = atoi(
-					gf_cfg_get_key(p_conf, psz_sec_name, "height"));
-			p_vconf->i_width = atoi(
-					gf_cfg_get_key(p_conf, psz_sec_name, "width"));
-
-			gf_list_add(p_cmdd->p_video_lst, (void *) p_vconf);
-		} else if (strcmp(psz_type, "audio") == 0) {
-
-			AudioData * p_aconf = gf_malloc(sizeof(AudioData));
-			strcpy(p_aconf->psz_name, psz_sec_name);
-//			strcpy(p_aconf->psz_codec,
-//					gf_cfg_get_key(p_conf, psz_sec_name, "codec"));
-			p_aconf->i_bitrate = atoi(
-					gf_cfg_get_key(p_conf, psz_sec_name, "bitrate"));
-//			p_aconf->i_samplerate = atoi(
-//					gf_cfg_get_key(p_conf, psz_sec_name, "samplerate"));
-//			p_aconf->i_channels = atoi(
-//					gf_cfg_get_key(p_conf, psz_sec_name, "channels"));
-
-			gf_list_add(p_cmdd->p_audio_lst, (void *) p_aconf);
-
-		} else {
-			printf("Configuration file: type %s is not supported.\n", psz_type);
-		}
-
-	}
-
-	printf("\33[34m\33[1m");
-	printf("Configurations:\n");
-	for (i = 0; i < gf_list_count(p_cmdd->p_video_lst); i++) {
-		VideoData * p_vconf = gf_list_get(p_cmdd->p_video_lst, i);
-		printf("    id:%s\tres:%dx%d\tvbr:%d\n", p_vconf->psz_name,
-				p_vconf->i_width, p_vconf->i_height,
-				p_vconf->i_bitrate/*, p_vconf->i_framerate, p_vconf->psz_codec*/);
-	}
-
-	for (i = 0; i < gf_list_count(p_cmdd->p_audio_lst); i++) {
-		AudioData * p_aconf = gf_list_get(p_cmdd->p_audio_lst, i);
-		printf("    id:%s\tabr:%d\n", p_aconf->psz_name, p_aconf->i_bitrate/*, p_aconf->i_samplerate,
-		 p_aconf->i_channels,p_aconf->psz_codec*/);
-	}
-	printf("\33[0m");
-	fflush(stdout);
-
-	return 0;
-}
-
-/**
- * Parse time from a string to a struct tm.
- */
-static Bool parse_time(const char* str_time, struct tm *tm_time) {
-	if (!tm_time)
-		return GF_FALSE;
-
-#if defined(__GNUC__)
-	strptime(str_time, "%Y-%m-%d %H:%M:%S", tm_time);
-#elif defined(WIN32)
-	assert(0); //TODO
-#else
-#error
-#endif
-
-	return GF_TRUE;
-}
-
-int dc_read_switch_config(CmdData * p_cmdd) {
-
-	u32 i;
-	int src_number;
-
-	char start_time[4096], end_time[4096];
-
-	time_t now_t = time(NULL);
-	struct tm start_tm  = *localtime(&now_t);
-	struct tm end_tm  = *localtime(&now_t);
-
-	GF_Config * p_conf = p_cmdd->p_switch_conf;
-  
-	u32 i_sec_count = gf_cfg_get_section_count(p_conf);
-
-	dc_task_init(&p_cmdd->task_list);
-
-	if (i_sec_count == 0) {
-		return 0;
-	}
-
-	for (i = 0; i < i_sec_count; i++) {
-
-		const char * psz_sec_name = gf_cfg_get_section_name(p_conf, i);
-
-		const char * psz_type = gf_cfg_get_key(p_conf, psz_sec_name, "type");
-
-		if (strcmp(psz_type, "video") == 0) {
-
-			VideoData * p_vconf = gf_malloc(sizeof(VideoData));
-
-			strcpy(p_vconf->psz_source_id, psz_sec_name);
-			strcpy(p_vconf->psz_name,
-					gf_cfg_get_key(p_conf, psz_sec_name, "source"));
-
-			strcpy(start_time, gf_cfg_get_key(p_conf, psz_sec_name, "start"));
-			parse_time(start_time, &start_tm);
-			p_vconf->start_time = mktime(&start_tm);
-			strcpy(end_time, gf_cfg_get_key(p_conf, psz_sec_name, "end"));
-			parse_time(end_time, &end_tm);
-			p_vconf->end_time = mktime(&end_tm);
-
-			gf_list_add(p_cmdd->p_vsrc, (void *) p_vconf);
-
-			src_number = gf_list_count(p_cmdd->p_vsrc);
-
-			dc_task_add(&p_cmdd->task_list, src_number, p_vconf->psz_source_id, p_vconf->start_time, p_vconf->end_time);
-
-		} else if (strcmp(psz_type, "audio") == 0) {
-
-			AudioData * p_aconf = gf_malloc(sizeof(AudioData));
-			strcpy(p_aconf->psz_source_id, psz_sec_name);
-			strcpy(p_aconf->psz_name,
-					gf_cfg_get_key(p_conf, psz_sec_name, "source"));
-
-			strcpy(start_time, gf_cfg_get_key(p_conf, psz_sec_name, "start"));
-			parse_time(start_time, &start_tm);
-			p_aconf->start_time = mktime(&start_tm);
-
-			strcpy(end_time, gf_cfg_get_key(p_conf, psz_sec_name, "end"));
-			parse_time(end_time, &end_tm);
-			p_aconf->end_time = mktime(&end_tm);
-
-			gf_list_add(p_cmdd->p_asrc, (void *) p_aconf);
-
-		} else {
-			printf(
-					"Switch source configuration file: type %s is not supported.\n",
-					psz_type);
-		}
-
-
-	}
-
-	printf("\33[34m\33[1m");
-	printf("Sources:\n");
-	for (i = 0; i < gf_list_count(p_cmdd->p_vsrc); i++) {
-		VideoData * p_vconf = gf_list_get(p_cmdd->p_vsrc, i);
-		strftime(start_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&p_vconf->start_time));
-		strftime(end_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&p_vconf->end_time));
-		printf("    id:%s\tsource:%s\tstart:%s\tend:%s\n", p_vconf->psz_source_id,
-				p_vconf->psz_name, start_time, end_time);
-	}
-
-	for (i = 0; i < gf_list_count(p_cmdd->p_asrc); i++) {
-		AudioData * p_aconf = gf_list_get(p_cmdd->p_asrc, i);
-		strftime(start_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&p_aconf->start_time));
-		strftime(end_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&p_aconf->end_time));
-		printf("    id:%s\tsource:%s\tstart:%s\tend:%s\n", p_aconf->psz_source_id,
-				p_aconf->psz_name, start_time, end_time);
-
-	}
-	printf("\33[0m");
-	fflush(stdout);
-
-	return 0;
-}
-
-void dc_cmd_data_init(CmdData * p_cmdd) {
-
-	dc_audio_data_set_default(&p_cmdd->adata);
-	dc_video_data_set_default(&p_cmdd->vdata);
-
-	p_cmdd->p_conf = NULL;
-	p_cmdd->p_switch_conf = NULL;
-	strcpy(p_cmdd->psz_mpd, "");
-	strcpy(p_cmdd->psz_out, "");
-	p_cmdd->i_seg_marker = 0;
-	p_cmdd->i_exit_signal = 0;
-	p_cmdd->i_mode = ON_DEMAND;
-	p_cmdd->i_no_loop = 0;
-	p_cmdd->i_send_message = 0;
-	p_cmdd->i_seg_dur = 0;
-	p_cmdd->i_frag_dur = 0;
-	p_cmdd->i_ast_offset = -1;
-	p_cmdd->i_time_shift = 0;
-	p_cmdd->f_minbuftime = -1;
-	p_cmdd->i_gdr = 0;
-	p_cmdd->p_audio_lst = gf_list_new(); //FIXME: alloc occur before the memory tracker is set.
-	p_cmdd->p_video_lst = gf_list_new();
-	p_cmdd->p_asrc = gf_list_new();
-	p_cmdd->p_vsrc = gf_list_new();
-	p_cmdd->p_logfile = NULL;
-}
-
-void dc_cmd_data_destroy(CmdData * p_cmdd) {
-
-	gf_list_del(p_cmdd->p_audio_lst);
-	gf_list_del(p_cmdd->p_video_lst);
-	gf_list_del(p_cmdd->p_asrc);
-	gf_list_del(p_cmdd->p_vsrc);
-	gf_cfg_del(p_cmdd->p_conf);
-	gf_cfg_del(p_cmdd->p_switch_conf);
-	if (p_cmdd->p_logfile) fclose(p_cmdd->p_logfile);
-
-	gf_sys_close();
-}
-
-static void on_dc_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
-{
-	FILE *logs = cbk;
-	vfprintf(logs, fmt, list);
-	fflush(logs);
-}
-
-int dc_parse_command(int i_argc, char ** p_argv, CmdData * p_cmdd) {
-
-	int i;
-
-	const char * psz_command_usage =
-			"Usage: DashCast [options]\n"
-					"\n"
-					"Options:\n"
-					"\n"
-					"    -log-file file               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"
-					"    -a inasrc:str                input audio source named inasrc\n"
-			        "                                    - If input is from microphone, inasrc will be \"plughw:[x],[y]\"\n"
-			        "                                    where x is the card number and y is the device number.\n"
-					"    -v invsrc:str                input video source named invsrc\n"
-			        "                                    - If input is from a webcam, invsrc will be \"/dev/video[x]\" \n"
-			        "                                    where x is the video device number.\n"
-			        "                                    - If input is the screen video, invsrc will be \":0.0+[x],[y]\" \n"
-			        "                                    which captures from upper-left at x,y.\n"
-			        "                                    - If input is from stdin, invsrc will be \"pipe:\".\n"
-					"    -av inavsrc:str              a multiplexed audio and video source named inavsrc\n"
-					"                                    - If this option is present, non of '-a' or '-v' can be present.\n"
-					"    -vf invfmt:str               invfmt is the input video format\n"
-					"                                    - To capture from a webcam invfmt will be video4linux2.\n"
-					"                                    - To capture the screen invfmt will be x11grab.\n"
-					"    -v4l2f inv4l2f:str           inv4l2f is the input format for webcam acquisition\n"
-					"                                    - It can be mjpeg, yuyv422, etc.\n"
-					"    -vfr invfr:int               invfr is the input video framerate\n"
-					"    -vres invres:intxint         input video resolution\n"
-					"    -af inafmt:str               inafmt is the input audio format\n"
-					"    -conf confname:str           confname is the configuration file\n"
-					"                                    - The default value is dashcast.conf\n\n"
-
-					"    -seg-dur dur:int             dur is the segment duration in millisecond\n"
-					"                                    - The default value is 1000.\n"
-					"    -frag-dur dur:int            dur is the fragment duration in millisecond\n"
-					"                                    - The default value is 1000.\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\n"
-					"    -seg-marker marker:str       add a marker box named marker at the end of DASH segment\n"
-					"    -gdr                         use Gradual Decoder Refresh feature for video encoding\n\n"
-
-					"    -out outdir:str              outdir is the output data directory\n"
-					"                                    - The default value is output.\n"
-					"    -mpd mpdname:str             mpdname is the MPD file name\n"
-					"                                    - The default value is dashcast.mpd.\n"
-					"    -ast-offset dur:int          dur is the MPD availabilityStartTime shift in milliseconds\n"
-					"                                    - The default value is 1000.\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\n"
-					"                                    - The default value is 1.0.\n\n"
-
-					"    -switch-source confname:str  confname is the name of configuration file for source switching.\n\n"
-
-
-					"Examples:\n"
-			        "\n"
-			        "    DashCast -av test.avi -live-media\n"
-					"    DashCast -a test_audio.mp3 -v test_audio.mp4 -live-media\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"
-
-
-					"\n";
-
-	char * psz_command_error =
-			"\33[31mUnknown option or missing mandatory argument.\33[0m\n";
-
-	if (i_argc == 1) {
-		printf("%s", psz_command_usage);
-		return -1;
-	}
-	gf_sys_init(GF_FALSE);
-
-	i = 1;
-	while (i < i_argc) {
-
-		if (strcmp(p_argv[i], "-a") == 0 || strcmp(p_argv[i], "-v") == 0
-				|| strcmp(p_argv[i], "-av") == 0) {
-
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (strcmp(p_argv[i - 1], "-a") == 0
-					|| strcmp(p_argv[i - 1], "-av") == 0) {
-				if (strcmp(p_cmdd->adata.psz_name, "") != 0) {
-					printf("Audio source has been already specified.\n");
-					printf("%s", psz_command_usage);
-					return -1;
-				}
-				//p_cmdd->psz_asrc = gf_malloc(strlen(p_argv[i]) + 1);
-				strcpy(p_cmdd->adata.psz_name, p_argv[i]);
-			}
-
-			if (strcmp(p_argv[i - 1], "-v") == 0
-					|| strcmp(p_argv[i - 1], "-av") == 0) {
-				if (strcmp(p_cmdd->vdata.psz_name, "") != 0) {
-					printf("Video source has been already specified.\n");
-					printf("%s", psz_command_usage);
-					return -1;
-				}
-
-				//p_cmdd->psz_vsrc = gf_malloc(strlen(p_argv[i]) + 1);
-				strcpy(p_cmdd->vdata.psz_name, p_argv[i]);
-			}
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-af") == 0
-				|| strcmp(p_argv[i], "-vf") == 0) {
-
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (strcmp(p_argv[i - 1], "-af") == 0) {
-				if (strcmp(p_cmdd->adata.psz_format, "") != 0) {
-					printf("Audio format has been already specified.\n");
-					printf("%s", psz_command_usage);
-					return -1;
-				}
-				//p_cmdd->psz_af = gf_malloc(strlen(p_argv[i]) + 1);
-				strcpy(p_cmdd->adata.psz_format, p_argv[i]);
-			}
-
-			if (strcmp(p_argv[i - 1], "-vf") == 0) {
-				if (strcmp(p_cmdd->vdata.psz_format, "") != 0) {
-					printf("Video format has been already specified.\n");
-					printf("%s", psz_command_usage);
-					return -1;
-				}
-
-				//p_cmdd->psz_vf = gf_malloc(strlen(p_argv[i]) + 1);
-				strcpy(p_cmdd->vdata.psz_format, p_argv[i]);
-			}
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-vfr") == 0) {
-
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (p_cmdd->vdata.i_framerate != -1) {
-				printf("Video framerate has been already specified.\n");
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-			//p_cmdd->psz_vfr = gf_malloc(strlen(p_argv[i]) + 1);
-			p_cmdd->vdata.i_framerate = atoi(p_argv[i]);
-			//strcpy(p_cmdd->psz_vfr, p_argv[i]);
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-vres") == 0) {
-
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (p_cmdd->vdata.i_height != -1 && p_cmdd->vdata.i_width != -1) {
-				printf("Video resolution has been already specified.\n");
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-			dc_str_to_resolution(p_argv[i], &p_cmdd->vdata.i_width,
-					&p_cmdd->vdata.i_height);
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-conf") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			p_cmdd->p_conf = gf_cfg_force_new(NULL, p_argv[i]);
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-switch-source") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			p_cmdd->p_switch_conf = gf_cfg_force_new(NULL, p_argv[i]);
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-out") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			strcpy(p_cmdd->psz_out, p_argv[i]);
-
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-v4l2f") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			strcpy(p_cmdd->vdata.psz_v4l2f, p_argv[i]);
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-seg-marker") == 0) {
-			char * m;
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-			m = p_argv[i];
-			if (strlen(m) == 4) {
-				p_cmdd->i_seg_marker = GF_4CC(m[0], m[1], m[2], m[3]);
-			} else {
-				printf("Invalid marker box name specified: %s\n", m);
-				return -1;
-			}
-
-			i++;
-
-		} else if (strcmp(p_argv[i], "-mpd") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (strcmp(p_cmdd->psz_mpd, "") != 0) {
-				printf("MPD file has been already specified.\n");
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			strncpy(p_cmdd->psz_mpd, p_argv[i], GF_MAX_PATH);
-			i++;
-
-		} else if (strcmp(p_argv[i], "-seg-dur") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (p_cmdd->i_seg_dur != 0) {
-				printf("Segment duration has been already specified.\n");
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			p_cmdd->i_seg_dur = atoi(p_argv[i]);
-			i++;
-
-		} else if (strcmp(p_argv[i], "-frag-dur") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (p_cmdd->i_frag_dur != 0) {
-				printf("Fragment duration has been already specified.\n");
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			p_cmdd->i_frag_dur = atoi(p_argv[i]);
-			i++;
-
-		} else if (strcmp(p_argv[i], "-ast-offset") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (p_cmdd->i_ast_offset != -1) {
-				printf(
-						"AvailabilityStartTime offset has been already specified.\n");
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			p_cmdd->i_ast_offset = atoi(p_argv[i]);
-			i++;
-
-		} else if (strcmp(p_argv[i], "-time-shift") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			if (p_cmdd->i_time_shift != 0) {
-				printf("TimeShiftBufferDepth has been already specified.\n");
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			p_cmdd->i_time_shift = atoi(p_argv[i]);
-			i++;
-
-		}
-
-		else if (strcmp(p_argv[i], "-min-buffer") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-			if (p_cmdd->f_minbuftime != -1) {
-				printf("Min Buffer Time has been already specified.\n");
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-
-			p_cmdd->f_minbuftime = (float)atof(p_argv[i]);
-			i++;
-
-		} else if (strcmp(p_argv[i], "-live") == 0) {
-			p_cmdd->i_mode = LIVE_CAMERA;
-			i++;
-		} else if (strcmp(p_argv[i], "-live-media") == 0) {
-			p_cmdd->i_mode = LIVE_MEDIA;
-			i++;
-		} else if (strcmp(p_argv[i], "-no-loop") == 0) {
-			p_cmdd->i_no_loop = 1;
-			i++;
-		} else if (strcmp(p_argv[i], "-send-message") == 0) {
-			p_cmdd->i_send_message = 1;
-			i++;
-		} else if (strcmp(p_argv[i], "-logs") == 0) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-			if (gf_log_set_tools_levels(p_argv[i]) != GF_OK) {
-				printf("Invalid log format %s", p_argv[i]);
-				return 1;
-			}
-			i++;
-		} else if (strcmp(p_argv[i], "-mem-track") == 0) {
-			i++;
-#ifdef GPAC_MEMORY_TRACKING
-			gf_sys_close();
-			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"); 
-#endif
-		} else if (!strcmp(p_argv[i], "-lf") || !strcmp(p_argv[i], "-log-file")) {
-			i++;
-			if (i >= i_argc) {
-				printf("%s", psz_command_error);
-				printf("%s", psz_command_usage);
-				return -1;
-			}
-			p_cmdd->p_logfile = gf_f64_open(p_argv[i], "wt");
-			gf_log_set_callback(p_cmdd->p_logfile, on_dc_log);
-			i++;
-		} else if (strcmp(p_argv[i], "-gdr") == 0) {
-			p_cmdd->i_gdr = 1;
-			i++;
-		} else {
-			printf("%s", psz_command_error);
-			printf("%s", psz_command_usage);
-			return -1;
-		}
-
-	}
-
-	if (strcmp(p_cmdd->psz_mpd, "") == 0) {
-		strcpy(p_cmdd->psz_mpd, "dashcast.mpd");
-	}
-
-	if (strcmp(p_cmdd->psz_out, "") == 0) {
-		struct stat status;
-
-		strcpy(p_cmdd->psz_out, "output/");
-
-		if (stat(p_cmdd->psz_out, &status) != 0) {
-			gf_mkdir(p_cmdd->psz_out);
-		}
-	}
-
-	if (strcmp(p_cmdd->vdata.psz_name, "") == 0
-			&& strcmp(p_cmdd->adata.psz_name, "") == 0) {
-		printf("Audio/Video source must be specified.\n");
-		printf("%s", psz_command_usage);
-		return -1;
-	}
-
-	if (p_cmdd->i_seg_dur == 0) {
-		p_cmdd->i_seg_dur = 1000;
-	}
-
-	if (p_cmdd->i_frag_dur == 0) {
-		p_cmdd->i_frag_dur = p_cmdd->i_seg_dur;
-	}
-
-	if (p_cmdd->i_ast_offset == -1) {
-		p_cmdd->i_ast_offset = 1000;
-	}
-
-	if (p_cmdd->i_mode == ON_DEMAND)
-		p_cmdd->i_time_shift = -1;
-	else {
-		if (p_cmdd->i_time_shift == 0) {
-			p_cmdd->i_time_shift = 10;
-		}
-	}
-
-	if (p_cmdd->f_minbuftime == -1) {
-		p_cmdd->f_minbuftime = 1.0;
-	}
-
-	printf("\33[34m\33[1m");
-	printf("Options:\n");
-	printf("    video source: %s\n", p_cmdd->vdata.psz_name);
-	if (strcmp(p_cmdd->vdata.psz_format, "") != 0) {
-		printf("    video format: %s\n", p_cmdd->vdata.psz_format);
-	}
-	if (strcmp(p_cmdd->vdata.psz_v4l2f, "") != 0) {
-		printf("    v4l2 format: %s\n", p_cmdd->vdata.psz_v4l2f);
-	}
-	if (p_cmdd->vdata.i_framerate != -1) {
-		printf("    video framerate: %d\n", p_cmdd->vdata.i_framerate);
-	}
-	if (p_cmdd->vdata.i_height != -1 && p_cmdd->vdata.i_width != -1) {
-		printf("    video resolution: %dx%d\n", p_cmdd->vdata.i_width,
-				p_cmdd->vdata.i_height);
-	}
-
-	printf("    audio source: %s\n", p_cmdd->adata.psz_name);
-	if (strcmp(p_cmdd->adata.psz_format, "") != 0) {
-		printf("    audio format: %s\n", p_cmdd->adata.psz_format);
-	}
-	printf("\33[0m");
-	fflush(stdout);
-
-	if (!p_cmdd->p_conf) {
-		p_cmdd->p_conf = gf_cfg_force_new(NULL, "dashcast.conf");
-	}
-
-	if (!p_cmdd->p_switch_conf) {
-		p_cmdd->p_switch_conf = gf_cfg_force_new(NULL, "switch.conf");
-	}
-
-	dc_read_configuration(p_cmdd);
-
-	dc_read_switch_config(p_cmdd);
-
-	return 0;
-}
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Arash Shafiei
+ *			Copyright (c) Telecom ParisTech 2000-2013
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / dashcast
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "cmd_data.h"
+
+
+#define DASHCAST_CHECK_NEXT_ARG \
+			i++; \
+			if (i >= argc) { \
+				fprintf(stderr, "%s: %s", command_error, argv[i]); \
+				fprintf(stderr, "%s", command_usage); \
+				return -1; \
+			}
+
+
+int dc_str_to_resolution(char *str, int *width, int *height)
+{
+	char *token = strtok(str, "x");
+	if (!token) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse resolution string.\n"));
+		return -1;
+	}
+	*width = atoi(token);
+
+	token = strtok(NULL, " ");
+	if (!token) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot parse resolution string.\n"));
+		return -1;
+	}
+	*height = atoi(token);
+
+	return 0;
+}
+
+
+#define DEFAULT_VIDEO_BITRATE    400000
+#define DEFAULT_VIDEO_FRAMERATE  25
+#define DEFAULT_VIDEO_WIDTH      640
+#define DEFAULT_VIDEO_HEIGHT     480
+#define DEFAULT_VIDEO_CODEC      "libx264"
+#define DEFAULT_AUDIO_BITRATE    192000
+#define DEFAULT_AUDIO_SAMPLERATE 48000
+#define DEFAULT_AUDIO_CHANNELS   2
+#define DEFAULT_AUDIO_CODEC      "mp2"
+
+
+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);
+	if (!sec_count) {
+		gf_cfg_set_key(conf, "v1", "type", "video");
+		gf_cfg_set_key(conf, "a1", "type", "audio");
+		sec_count = gf_cfg_get_section_count(conf);
+	}
+	for (i=0; i<sec_count; i++) {
+		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");
+
+		if (strcmp(section_type, "video") == 0) {
+			if (!gf_cfg_get_key(conf, section_name, "bitrate")) {
+				if (cmd_data->video_data_conf.bitrate == -1)
+					cmd_data->video_data_conf.bitrate = DEFAULT_VIDEO_BITRATE;
+				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, "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)
+					cmd_data->audio_data_conf.bitrate = DEFAULT_AUDIO_BITRATE;
+				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);
+		}
+	}
+}
+
+int dc_read_configuration(CmdData *cmd_data)
+{
+	const char *opt;
+	u32 i;
+	GF_Config *conf = cmd_data->conf;
+
+	u32 sec_count = gf_cfg_get_section_count(conf);
+	for (i=0; i<sec_count; i++) {
+		const char *section_name = gf_cfg_get_section_name(conf, i);
+		const char *section_type = gf_cfg_get_key(conf, section_name, "type");
+
+		if (strcmp(section_type, "video") == 0) {
+			VideoDataConf *video_data_conf;
+			GF_SAFEALLOC(video_data_conf, VideoDataConf);
+			strcpy(video_data_conf->filename, section_name);
+			opt = gf_cfg_get_key(conf, section_name, "codec");
+			if (!opt) opt = DEFAULT_VIDEO_CODEC;
+			strcpy(video_data_conf->codec, opt);
+			opt = gf_cfg_get_key(conf, section_name, "bitrate");
+			video_data_conf->bitrate = opt ? atoi(opt) : DEFAULT_VIDEO_BITRATE;
+			opt = gf_cfg_get_key(conf, section_name, "framerate");
+			video_data_conf->framerate = opt ? atoi(opt) : DEFAULT_VIDEO_FRAMERATE;
+			opt = gf_cfg_get_key(conf, section_name, "height");
+			video_data_conf->height = opt ? atoi(opt) : DEFAULT_VIDEO_HEIGHT;
+			opt = gf_cfg_get_key(conf, section_name, "width");
+			video_data_conf->width = opt ? atoi(opt) : DEFAULT_VIDEO_WIDTH;
+			opt = gf_cfg_get_key(conf, section_name, "crop_x");
+			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, "custom");
+			video_data_conf->custom = opt ? gf_strdup(opt) : NULL;
+			gf_list_add(cmd_data->video_lst, (void *) video_data_conf);
+		}
+		else if (strcmp(section_type, "audio") == 0)
+		{
+			AudioDataConf *audio_data_conf;
+			GF_SAFEALLOC(audio_data_conf, AudioDataConf);
+			strcpy(audio_data_conf->filename, section_name);
+			opt = gf_cfg_get_key(conf, section_name, "codec");
+			if (!opt) opt = DEFAULT_AUDIO_CODEC;
+			strcpy(audio_data_conf->codec, opt);
+			opt = gf_cfg_get_key(conf, section_name, "bitrate");
+			audio_data_conf->bitrate = opt ? atoi(opt) : DEFAULT_AUDIO_BITRATE;
+			opt = gf_cfg_get_key(conf, section_name, "samplerate");
+			audio_data_conf->samplerate = opt ? atoi(opt) : DEFAULT_AUDIO_SAMPLERATE;
+			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;
+			gf_list_add(cmd_data->audio_lst, (void *) audio_data_conf);
+		} else {
+			fprintf(stderr, "Configuration file: type %s is not supported.\n", section_type);
+		}
+	}
+
+	fprintf(stdout, "\33[34m\33[1m");
+	fprintf(stdout, "Configurations:\n");
+	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*/);	}
+
+	for (i=0; i<gf_list_count(cmd_data->audio_lst); i++) {
+		AudioDataConf *audio_data_conf = gf_list_get(cmd_data->audio_lst, i);
+		fprintf(stdout, "    id:%s\tabr:%d\n", audio_data_conf->filename, audio_data_conf->bitrate/*, audio_data_conf->samplerate, audio_data_conf->channels,audio_data_conf->codec*/);
+	}
+	fprintf(stdout, "\33[0m");
+	fflush(stdout);
+
+	return 0;
+}
+
+/**
+ * Parse time from a string to a struct tm.
+ */
+static Bool parse_time(const char* str_time, struct tm *tm_time)
+{
+	if (!tm_time)
+		return GF_FALSE;
+
+#if defined(__GNUC__)
+	strptime(str_time, "%Y-%m-%d %H:%M:%S", tm_time);
+#elif defined(WIN32)
+	assert(0); //TODO
+#else
+#error
+#endif
+
+	return GF_TRUE;
+}
+
+int dc_read_switch_config(CmdData *cmd_data)
+{
+	u32 i;
+	int src_number;
+	char start_time[4096], end_time[4096];
+
+	time_t now_t = time(NULL);
+	struct tm start_tm = *localtime(&now_t);
+	struct tm end_tm = *localtime(&now_t);
+
+	GF_Config *conf = cmd_data->switch_conf;
+	u32 sec_count = gf_cfg_get_section_count(conf);
+
+	dc_task_init(&cmd_data->task_list);
+
+	if (sec_count == 0) {
+		return 0;
+	}
+
+	for (i = 0; i < sec_count; i++) {
+		const char *section_name = gf_cfg_get_section_name(conf, i);
+		const char *section_type = gf_cfg_get_key(conf, section_name, "type");
+
+		if (strcmp(section_type, "video") == 0) {
+			VideoDataConf *video_data_conf = gf_malloc(sizeof(VideoDataConf));
+
+			strcpy(video_data_conf->source_id, section_name);
+			strcpy(video_data_conf->filename, gf_cfg_get_key(conf, section_name, "source"));
+
+			strcpy(start_time, gf_cfg_get_key(conf, section_name, "start"));
+			parse_time(start_time, &start_tm);
+			video_data_conf->start_time = mktime(&start_tm);
+			strcpy(end_time, gf_cfg_get_key(conf, section_name, "end"));
+			parse_time(end_time, &end_tm);
+			video_data_conf->end_time = mktime(&end_tm);
+
+			gf_list_add(cmd_data->vsrc, (void *) video_data_conf);
+
+			src_number = gf_list_count(cmd_data->vsrc);
+
+			dc_task_add(&cmd_data->task_list, src_number, video_data_conf->source_id, video_data_conf->start_time, video_data_conf->end_time);
+		}
+		else if (strcmp(section_type, "audio") == 0)
+		{
+			AudioDataConf *audio_data_conf = gf_malloc(sizeof(AudioDataConf));
+			strcpy(audio_data_conf->source_id, section_name);
+			strcpy(audio_data_conf->filename, gf_cfg_get_key(conf, section_name, "source"));
+
+			strcpy(start_time, gf_cfg_get_key(conf, section_name, "start"));
+			parse_time(start_time, &start_tm);
+			audio_data_conf->start_time = mktime(&start_tm);
+
+			strcpy(end_time, gf_cfg_get_key(conf, section_name, "end"));
+			parse_time(end_time, &end_tm);
+			audio_data_conf->end_time = mktime(&end_tm);
+
+			gf_list_add(cmd_data->asrc, (void *) audio_data_conf);
+		} else {
+			fprintf(stdout, "Switch source configuration file: type %s is not supported.\n", section_type);
+		}
+	}
+
+	fprintf(stdout, "\33[34m\33[1m");
+	fprintf(stdout, "Sources:\n");
+	for (i=0; i<gf_list_count(cmd_data->vsrc); i++) {
+		VideoDataConf *video_data_conf = gf_list_get(cmd_data->vsrc, i);
+		strftime(start_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&video_data_conf->start_time));
+		strftime(end_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&video_data_conf->end_time));
+		fprintf(stdout, "    id:%s\tsource:%s\tstart:%s\tend:%s\n", video_data_conf->source_id, video_data_conf->filename, start_time, end_time);
+	}
+
+	for (i=0; i<gf_list_count(cmd_data->asrc); i++) {
+		AudioDataConf *audio_data_conf = gf_list_get(cmd_data->asrc, i);
+		strftime(start_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&audio_data_conf->start_time));
+		strftime(end_time, 20, "%Y-%m-%d %H:%M:%S", localtime(&audio_data_conf->end_time));
+		fprintf(stdout, "    id:%s\tsource:%s\tstart:%s\tend:%s\n", audio_data_conf->source_id, audio_data_conf->filename, start_time, end_time);
+	}
+	fprintf(stdout, "\33[0m");
+	fflush(stdout);
+
+	return 0;
+}
+
+void dc_cmd_data_init(CmdData *cmd_data)
+{
+	memset(cmd_data, 0, sizeof(CmdData));
+	dc_audio_data_set_default(&cmd_data->audio_data_conf);
+	dc_video_data_set_default(&cmd_data->video_data_conf);
+
+	cmd_data->mode = ON_DEMAND;
+	cmd_data->ast_offset = -1;
+	cmd_data->min_buffer_time = -1;
+	cmd_data->minimum_update_period = -1;
+	cmd_data->use_source_timing = 1;
+
+	cmd_data->audio_lst = gf_list_new();
+	cmd_data->video_lst = gf_list_new();
+	cmd_data->asrc = gf_list_new();
+	cmd_data->vsrc = gf_list_new();
+}
+
+void dc_cmd_data_destroy(CmdData *cmd_data)
+{
+	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);
+	}
+	gf_list_del(cmd_data->audio_lst);
+
+	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);
+	}
+	gf_list_del(cmd_data->video_lst);
+
+	gf_list_del(cmd_data->asrc);
+	gf_list_del(cmd_data->vsrc);
+	gf_cfg_del(cmd_data->conf);
+	gf_cfg_del(cmd_data->switch_conf);
+	if (cmd_data->logfile)
+		fclose(cmd_data->logfile);
+
+	dc_task_destroy(&cmd_data->task_list);
+
+	gf_sys_close();
+}
+
+static void on_dc_log(void *cbk, u32 ll, u32 lm, const char *av_fmt_ctx, va_list list)
+{
+	FILE *logs = cbk;
+	vfprintf(logs, av_fmt_ctx, list);
+	fflush(logs);
+}
+
+int dc_parse_command(int argc, char **argv, CmdData *cmd_data)
+{
+	Bool use_mem_track = GF_FALSE;
+	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"
+#ifdef GPAC_MEMORY_TRACKING
+					"    -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"
+#ifdef WIN32
+					"                                - 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"
+#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"
+#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"
+#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"
+#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"
+#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"
+#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"
+#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"
+#endif
+					"\n";
+
+	const char *command_error = "\33[31mUnknown option or missing mandatory argument.\33[0m\n";
+
+	if (argc == 1) {
+		fprintf(stderr, "%s", command_usage);
+		return -2;
+	}
+
+#ifdef GPAC_MEMORY_TRACKING
+	i = 1;
+	while (i < argc) {
+		if (strcmp(argv[i], "-mem-track") == 0) {
+			use_mem_track = GF_TRUE;
+			break;
+		}
+		i++;
+	}
+#endif
+
+	gf_sys_init(use_mem_track);
+
+	if (use_mem_track) {
+		gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
+	}
+
+	/* Initialize command data */
+	dc_cmd_data_init(cmd_data);
+
+	i = 1;
+	while (i < argc) {
+		if (strcmp(argv[i], "-a") == 0 || strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "-av") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(argv[i - 1], "-a") == 0 || strcmp(argv[i - 1], "-av") == 0) {
+				if (strcmp(cmd_data->audio_data_conf.filename, "") != 0) {
+					fprintf(stderr, "Audio source has already been specified.\n");
+					fprintf(stderr, "%s", command_usage);
+					return -1;
+				}
+				strcpy(cmd_data->audio_data_conf.filename, argv[i]);
+			}
+
+			if (strcmp(argv[i - 1], "-v") == 0 || strcmp(argv[i - 1], "-av") == 0) {
+				if (strcmp(cmd_data->video_data_conf.filename, "") != 0) {
+					fprintf(stderr, "Video source has already been specified.\n");
+					fprintf(stderr, "%s", command_usage);
+					return -1;
+				}
+				strcpy(cmd_data->video_data_conf.filename, argv[i]);
+			}
+
+			i++;
+		} else if (strcmp(argv[i], "-af") == 0 || strcmp(argv[i], "-vf") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(argv[i - 1], "-af") == 0) {
+				if (strcmp(cmd_data->audio_data_conf.format, "") != 0) {
+					fprintf(stderr, "Audio format has already been specified.\n");
+					fprintf(stderr, "%s", command_usage);
+					return -1;
+				}
+				strcpy(cmd_data->audio_data_conf.format, argv[i]);
+			}
+			if (strcmp(argv[i - 1], "-vf") == 0) {
+				if (strcmp(cmd_data->video_data_conf.format, "") != 0) {
+					fprintf(stderr, "Video format has already been specified.\n");
+					fprintf(stderr, "%s", command_usage);
+					return -1;
+				}
+				strcpy(cmd_data->video_data_conf.format, argv[i]);
+			}
+			i++;
+		} else if (strcmp(argv[i], "-pixf") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(cmd_data->video_data_conf.pixel_format, "") != 0) {
+				fprintf(stderr, "Input pixel format has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			strcpy(cmd_data->video_data_conf.pixel_format, argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-vfr") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->video_data_conf.framerate != -1) {
+				fprintf(stderr, "Video framerate has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			cmd_data->video_data_conf.framerate = atoi(argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-vres") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->video_data_conf.height != -1 && cmd_data->video_data_conf.width != -1) {
+				fprintf(stderr, "Video resolution has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			dc_str_to_resolution(argv[i], &cmd_data->video_data_conf.width, &cmd_data->video_data_conf.height);
+			i++;
+		} else if (strcmp(argv[i], "-vcrop") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->video_data_conf.crop_x && cmd_data->video_data_conf.crop_y) {
+				fprintf(stderr, "Video crop has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			dc_str_to_resolution(argv[i], &cmd_data->video_data_conf.crop_x, &cmd_data->video_data_conf.crop_y);
+			i++;
+		} else if (strcmp(argv[i], "-vcodec") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(cmd_data->video_data_conf.codec, "") != 0) {
+				fprintf(stderr, "Video codec has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			strncpy(cmd_data->video_data_conf.codec, argv[i], GF_MAX_PATH);
+			i++;
+		} else if (strcmp(argv[i], "-vcustom") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(cmd_data->video_data_conf.custom, "") != 0) {
+				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);
+			i++;
+		} else if (strcmp(argv[i], "-acodec") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(cmd_data->audio_data_conf.codec, "") != 0) {
+				fprintf(stderr, "Audio codec has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			strncpy(cmd_data->audio_data_conf.codec, argv[i], GF_MAX_PATH);
+			i++;
+		} else if (strcmp(argv[i], "-acustom") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(cmd_data->audio_data_conf.custom, "") != 0) {
+				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);
+			i++;
+		} else if (strcmp(argv[i], "-conf") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			cmd_data->conf = gf_cfg_force_new(NULL, argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-switch-source") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			cmd_data->switch_conf = gf_cfg_force_new(NULL, argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-out") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			strcpy(cmd_data->out_dir, argv[i]);
+			i++;
+#ifndef WIN32
+		} else if (strcmp(argv[i], "-v4l2f") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			strcpy(cmd_data->video_data_conf.v4l2f, argv[i]);
+			i++;
+#endif
+		} else if (strcmp(argv[i], "-seg-marker") == 0) {
+			char *m;
+			DASHCAST_CHECK_NEXT_ARG
+			m = argv[i];
+			if (strlen(m) == 4) {
+				cmd_data->seg_marker = GF_4CC(m[0], m[1], m[2], m[3]);
+			} else {
+				fprintf(stderr, "Invalid marker box name specified: %s\n", m);
+				return -1;
+			}
+			i++;
+		} else if (strcmp(argv[i], "-mpd") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(cmd_data->mpd_filename, "") != 0) {
+				fprintf(stderr, "MPD file has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			strncpy(cmd_data->mpd_filename, argv[i], GF_MAX_PATH);
+			i++;
+		} else if (strcmp(argv[i], "-seg-dur") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->seg_dur != 0) {
+				fprintf(stderr, "Segment duration has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			cmd_data->seg_dur = atoi(argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-frag-dur") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->frag_dur != 0) {
+				fprintf(stderr, "Fragment duration has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			cmd_data->frag_dur = atoi(argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-ast-offset") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->ast_offset != -1) {
+				fprintf(stderr, "AvailabilityStartTime offset has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			cmd_data->ast_offset = atoi(argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-mpd-refresh") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->minimum_update_period != -1) {
+				fprintf(stderr, "minimumUpdatePeriod (mpd-refresh) has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			cmd_data->minimum_update_period = atoi(argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-time-shift") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->time_shift != 0) {
+				fprintf(stderr, "TimeShiftBufferDepth has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			cmd_data->time_shift = atoi(argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-gop") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->gop_size != 0) {
+				fprintf(stderr, "GOP size has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			cmd_data->gop_size = atoi(argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-min-buffer") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (cmd_data->min_buffer_time != -1) {
+				fprintf(stderr, "Min Buffer Time has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			cmd_data->min_buffer_time = (float)atof(argv[i]);
+			i++;
+		} else if (strcmp(argv[i], "-base-url") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (strcmp(cmd_data->base_url, "") != 0) {
+				fprintf(stderr, "BaseURL has already been specified.\n");
+				fprintf(stderr, "%s", command_usage);
+				return -1;
+			}
+			strncpy(cmd_data->base_url, argv[i], GF_MAX_PATH);
+			i++;
+		} else if (strcmp(argv[i], "-live") == 0) {
+			cmd_data->mode = LIVE_CAMERA;
+			i++;
+		} else if (strcmp(argv[i], "-npts") == 0) {
+			cmd_data->use_source_timing = 0;
+			i++;
+		} else if (strcmp(argv[i], "-live-media") == 0) {
+			cmd_data->mode = LIVE_MEDIA;
+			i++;
+		} else if (strcmp(argv[i], "-no-loop") == 0) {
+			cmd_data->no_loop = 1;
+			i++;
+		} else if (strcmp(argv[i], "-insert-utc") == 0) {
+			cmd_data->insert_utc = 1;
+			i++;
+		} else if (strcmp(argv[i], "-dynamic-ast") == 0) {
+			cmd_data->use_dynamic_ast = 1;
+			i++;
+		} else if (strcmp(argv[i], "-send-message") == 0) {
+			//FIXME: unreferenced option. Seems related to a separate fragment thread.
+			cmd_data->send_message = 1;
+			i++;
+		} else if (strcmp(argv[i], "-logs") == 0) {
+			DASHCAST_CHECK_NEXT_ARG
+			if (gf_log_set_tools_levels(argv[i]) != GF_OK) {
+				fprintf(stderr, "Invalid log format %s", argv[i]);
+				return 1;
+			}
+			i++;
+		} else if (strcmp(argv[i], "-mem-track") == 0) {
+			i++;
+#ifndef GPAC_MEMORY_TRACKING
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("WARNING - GPAC not compiled with Memory Tracker - ignoring \"-mem-track\"\n"));
+#endif
+		} else if (!strcmp(argv[i], "-lf") || !strcmp(argv[i], "-log-file")) {
+			DASHCAST_CHECK_NEXT_ARG
+			cmd_data->logfile = gf_f64_open(argv[i], "wt");
+			gf_log_set_callback(cmd_data->logfile, on_dc_log);
+			i++;
+		} else if (strcmp(argv[i], "-gdr") == 0) {
+			if ( (i+1 <= argc) && (argv[i+1][0] != '-')) {
+				DASHCAST_CHECK_NEXT_ARG
+				cmd_data->gdr = atoi(argv[i]);
+			} else {
+				//for historical reasons in dashcast
+				cmd_data->gdr = 8;
+			}
+			i++;
+		} else {
+			fprintf(stderr, "%s: %s", command_error, argv[i]);
+			fprintf(stderr, "%s", command_usage);
+			return -1;
+		}
+	}
+
+	if (strcmp(cmd_data->mpd_filename, "") == 0) {
+		strcpy(cmd_data->mpd_filename, "dashcast.mpd");
+	}
+
+	if (strcmp(cmd_data->out_dir, "") == 0) {
+		struct stat status;
+		strcpy(cmd_data->out_dir, "output");
+		if (stat(cmd_data->out_dir, &status) != 0) {
+			gf_mkdir(cmd_data->out_dir);
+		}
+	}
+
+	if (strcmp(cmd_data->video_data_conf.filename, "") == 0 && strcmp(cmd_data->audio_data_conf.filename, "") == 0) {
+		fprintf(stderr, "Audio/Video source must be specified.\n");
+		fprintf(stderr, "%s", command_usage);
+		return -1;
+	}
+
+	if (cmd_data->seg_dur == 0) {
+		cmd_data->seg_dur = 1000;
+	}
+
+	if (cmd_data->frag_dur == 0) {
+		cmd_data->frag_dur = cmd_data->seg_dur;
+	}
+
+	if (cmd_data->ast_offset == -1) {
+		//generate MPD as soon as possible (no offset)
+		cmd_data->ast_offset = 0;
+	}
+
+	if (cmd_data->mode == ON_DEMAND)
+		cmd_data->time_shift = -1;
+	else {
+		if (cmd_data->time_shift == 0) {
+			cmd_data->time_shift = 10;
+		}
+	}
+
+	if (cmd_data->min_buffer_time == -1) {
+		cmd_data->min_buffer_time = 1.0;
+	}
+
+	//safety checks
+	if (cmd_data->video_data_conf.crop_x || cmd_data->video_data_conf.crop_y) {
+		if (cmd_data->video_data_conf.width == -1 && cmd_data->video_data_conf.height == -1) {
+			fprintf(stderr, "You cannot use '-vcrop' without '-vres'. Please check usage.\n");
+			fprintf(stderr, "%s", command_usage);
+			return -1;
+		}
+	}
+
+	fprintf(stdout, "\33[34m\33[1m");
+	fprintf(stdout, "Options:\n");
+	fprintf(stdout, "    video source: %s\n", cmd_data->video_data_conf.filename);
+	if (strcmp(cmd_data->video_data_conf.format, "") != 0) {
+		fprintf(stdout, "    video format: %s\n", cmd_data->video_data_conf.format);
+	}
+#ifndef WIN32
+	if (strcmp(cmd_data->video_data_conf.v4l2f, "") != 0) {
+		fprintf(stdout, "    v4l2 format: %s\n", cmd_data->video_data_conf.v4l2f);
+	}
+#endif
+	if (cmd_data->video_data_conf.framerate != -1) {
+		fprintf(stdout, "    video framerate: %d\n", cmd_data->video_data_conf.framerate);
+	}
+	if (cmd_data->video_data_conf.height != -1 && cmd_data->video_data_conf.width != -1) {
+		fprintf(stdout, "    video resolution: %dx%d\n", cmd_data->video_data_conf.width, cmd_data->video_data_conf.height);
+	}
+	if (cmd_data->video_data_conf.crop_x != -1 && cmd_data->video_data_conf.crop_y != -1) {
+		fprintf(stdout, "    video crop: %dx%d\n", cmd_data->video_data_conf.crop_x, cmd_data->video_data_conf.crop_y);
+	}
+
+	fprintf(stdout, "    audio source: %s\n", cmd_data->audio_data_conf.filename);
+	if (strcmp(cmd_data->audio_data_conf.format, "") != 0) {
+		fprintf(stdout, "    audio format: %s\n", cmd_data->audio_data_conf.format);
+	}
+	fprintf(stdout, "\33[0m");
+//	fflush(stdout);
+		
+	if (!cmd_data->conf) {
+		cmd_data->conf = gf_cfg_force_new(NULL, "dashcast.conf");
+		dc_create_configuration(cmd_data);
+	}
+	dc_read_configuration(cmd_data);
+
+	if (!cmd_data->switch_conf) {
+		cmd_data->switch_conf = gf_cfg_force_new(NULL, "switch.conf");
+	}
+	dc_read_switch_config(cmd_data);
+
+	return 0;
+}

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/cmd_data.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/cmd_data.h Changed

@@ -28,7 +28,6 @@
 
 #define MAX_SOURCE_NUMBER 20
 
-#define _XOPEN_SOURCE
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -41,86 +40,97 @@
 #include "video_data.h"
 #include "task.h"
 
+
 /*
  * This structure corresponds to
  * the data in command line
  */
-typedef struct  {
+typedef struct {
 	/* input video */
-	VideoData vdata;
+	VideoDataConf video_data_conf;
 	/* audio input data */
-	AudioData adata;
+	AudioDataConf audio_data_conf;
 	/* Configuration file */
-	GF_Config * p_conf;
+	GF_Config *conf;
 	/* Switch source configuration file */
-	GF_Config * p_switch_conf;
+	GF_Config *switch_conf;
 	/* MPD file */
-	char psz_mpd[GF_MAX_PATH];
+	char mpd_filename[GF_MAX_PATH];
 	/* segment duration */
-	int i_seg_dur;
+	int seg_dur;
 	/* fragment duration */
-	int i_frag_dur;
+	int frag_dur;
 	/* Exit signal emitting from user to end the program */
-	int i_exit_signal;
+	volatile int exit_signal;
 	/* List of entries for video in configuration file */
-	GF_List * p_video_lst;
+	GF_List *video_lst;
 	/* List of entries for audio in configuration file */
-	GF_List * p_audio_lst;
+	GF_List *audio_lst;
 	/* Indicates that the system is live */
 	/* List of video input sources */
-	GF_List * p_vsrc;
+	GF_List *vsrc;
 	/* List of audio input sources */
-	GF_List * p_asrc;
-	//int i_live;
+	GF_List *asrc;
+	//int live;
 	/* Indicates that the system is live from a media input */
-	//int i_live_media;
+	//int live_media;
 	/* The mode of the system: ON_DEMAND, LIVE_CAMERA, LIVE_MEDIA */
-	int i_mode;
+	int mode;
 	/* Does not loop on input */
-	int i_no_loop;
+	int no_loop;
 	/* MPD AvailabilityStartTime offset in milliseconds. Default is 1000 milliseconds delay */
-	int i_ast_offset;
+	int ast_offset;
 	/* MPD time shift buffer depth in seconds */
-	int i_time_shift;
+	int time_shift;
+	/* MPD minimumUpdatePeriod in seconds */
+	int minimum_update_period;
 	/* Send message on port 1234 once fragment is ready */
-	int i_send_message;
+	int send_message;
 	/* End of Segment Box name */
-	u32 i_seg_marker;
+	u32 seg_marker;
 	/* GDR */
-	int i_gdr;
+	int gdr;
+	/* GOP size in frames - 0 means framerate (1 sec)*/
+	int gop_size;
 	/* MPD min buffer time */
-	float f_minbuftime;
+	float min_buffer_time;
+	/* MPD BaseURL*/
+	char base_url[GF_MAX_PATH];
 	/* output directory name */
-	char psz_out[GF_MAX_PATH];
+	char out_dir[GF_MAX_PATH];
 	/* switch source configuration file */
-	//char psz_switch[GF_MAX_PATH];
-	FILE *p_logfile;
+	//char switch_cfg_filename[GF_MAX_PATH];
+	FILE *logfile;
 	TaskList task_list;
+	/*dynamic ast*/
+	int use_dynamic_ast;
+	/*insert UTC */
+	int insert_utc;
 
+	Bool use_source_timing;
 } CmdData;
+
 /*
  * Initilize the command data structure
  * 
- * @param cmdd [out] structure to be initilize
- *
+ * @param cmd_data [out] structure to be initialize
  */
-void dc_cmd_data_init(CmdData * cmdd);
+void dc_cmd_data_init(CmdData *cmd_data);
+
 /*
  * Destroy the command data structure
  *
- * @param cmdd [out] structure to be destroyed
- *
+ * @param cmd_data [out] structure to be destroyed
  */
-void dc_cmd_data_destroy(CmdData * cmdd);
+void dc_cmd_data_destroy(CmdData *cmd_data);
+
 /*
  * Parse command line
  *
  * @param argc [in] number of arguments
  * @param argv [in] a list of strings each containing one argument
- * @param cmdd [out] the data structure to fill
- *
+ * @param cmd_data [out] the data structure to fill
  */
-int dc_parse_command(int argc, char ** argv, CmdData * cmdd);
-
+int dc_parse_command(int argc, char **argv, CmdData *cmd_data);
 
 #endif /* CMD_DATA_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/controler.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/controler.c Changed

@@ -1,1606 +1,1564 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Arash Shafiei
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include "controler.h"
-
-#if (!defined(__DARWIN__) && !defined(__APPLE__))
-#include <malloc.h>
-#endif
-
-#include <time.h>
-//FIXME: use GPAC utility functions
-#if defined(__GNUC__)
-#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;
-}
-#else
-#error
-#endif
-
-//#define MAX_SOURCE_NUMBER 20
-#define DASHER 0
-#define FRAGMENTER 0
-//#define DEBUG 1
-
-//#define VIDEO_MUXER FFMPEG_VIDEO_MUXER
-//#define VIDEO_MUXER RAW_VIDEO_H264
-//#define VIDEO_MUXER GPAC_VIDEO_MUXER
-#define VIDEO_MUXER GPAC_INIT_VIDEO_MUXER
-
-//#define AUDIO_MUXER FFMPEG_AUDIO_MUXER
-//#define AUDIO_MUXER GPAC_AUDIO_MUXER
-#define AUDIO_MUXER GPAC_INIT_AUDIO_MUXER
-
-#define DASHCAST_PRINT
-
-#define AUDIO_FRAME_SIZE 1024
-
-void optimize_seg_frag_dur(int * seg, int * frag) {
-
-	int seg_nb = *seg;
-	int frag_nb = *frag;
-
-	int min_rem = seg_nb % frag_nb;
-
-	if (seg_nb % (frag_nb + 1) < min_rem) {
-		min_rem = seg_nb % (frag_nb + 1);
-		*seg = seg_nb;
-		*frag = frag_nb + 1;
-	}
-
-	if ((seg_nb + 1) % frag_nb < min_rem) {
-		min_rem = (seg_nb + 1) % frag_nb;
-		*seg = seg_nb + 1;
-		*frag = frag_nb;
-	}
-
-	if ((seg_nb + 1) % (frag_nb + 1) < min_rem) {
-		min_rem = (seg_nb + 1) % (frag_nb + 1);
-		*seg = seg_nb + 1;
-		*frag = frag_nb + 1;
-	}
-
-	*seg -= min_rem;
-
-}
-
-Bool change_source_thread(void * p_params) {
-
-	int ret = 0;
-
-	return ret;
-}
-
-u32 send_frag_event(void * p_params) {
-
-	int ret;
-	//int status;
-	ThreadParam * p_th_param = (ThreadParam *) p_params;
-	CmdData * p_cmdd = p_th_param->p_in_data;
-	MessageQueue * p_mq = p_th_param->p_mq;
-
-	char buff[512];
-
-	while (1) {
-
-		if (p_cmdd->i_exit_signal) {
-			break;
-		}
-
-		ret = dc_message_queue_get(p_mq, (void*) buff);
-
-		if (ret > 0) {
-			printf("Message received: %s\n", buff);
-		}
-
-		if (p_cmdd->i_exit_signal) {
-			break;
-		}
-
-	}
-
-	return 0;
-
-}
-
-static u32 mpd_thread(void * p_params) {
-
-	u32 i;
-
-	ThreadParam * p_th_param = (ThreadParam *) p_params;
-	CmdData * p_cmddata = p_th_param->p_in_data;
-	MessageQueue * p_mq = p_th_param->p_mq;
-	char availability_start_time[512];
-	char presentation_duration[512];
-	char time_shift[512] = "";
-
-	int audio_frame_size = AUDIO_FRAME_SIZE;
-	char psz_name[512];
-
-	int audio_seg_dur = 0, video_seg_dur = 0, audio_frag_dur = 0,
-			video_frag_dur = 0;
-
-	AudioData * p_adata = NULL;
-	VideoData * p_vdata = NULL;
-
-	if (p_cmddata->i_mode == LIVE_CAMERA || p_cmddata->i_mode == LIVE_MEDIA) {
-
-		time_t t;
-		int ms;
-		u64 time = 0;
-
-		if (strcmp(p_cmddata->adata.psz_name, "") != 0) {
-			dc_message_queue_get(p_mq, &time);
-		}
-
-		if (strcmp(p_cmddata->vdata.psz_name, "") != 0) {
-			dc_message_queue_get(p_mq, &time);
-		}
-
-		time += p_cmddata->i_ast_offset;
-
-		t = time / 1000;
-		ms = time % 1000;
-
-		//t += (1 * (p_cmddata->i_seg_dur / 1000.0));
-		//t += p_cmddata->i_ast_offset;
-		{	
-			struct tm ast_time = *gmtime(&t);
-			strftime(availability_start_time, 64, "%Y-%m-%dT%H:%M:%S", &ast_time);
-			sprintf(availability_start_time,"%s.%dZ", availability_start_time, ms);
-			//sprintf(availability_start_time, "%d-%02d-%02dT%02d:%02d:%02dZ",
-			//		time.tm_year + 1900, time.tm_mon + 1, time.tm_mday, time.tm_hour,
-			//		time.tm_min, time.tm_sec);
-			printf("StartTime: %s\n", availability_start_time);
-		}
-
-		if (p_cmddata->i_time_shift != -1) {
-			int ts, h, m, s;
-			ts = p_cmddata->i_time_shift;
-			h = ts / 3600;
-			ts = ts % 3600;
-			m = ts / 60;
-			s = ts % 60;
-			sprintf(time_shift, "timeShiftBufferDepth=\"PT%02dH%02dM%02dS\"", h,
-					m, s);
-		}
-
-	} else {
-
-		int a_dur = 0;
-		int v_dur = 0;
-
-		if (strcmp(p_cmddata->adata.psz_name, "") != 0) {
-			dc_message_queue_get(p_mq, &a_dur);
-		}
-
-		if (strcmp(p_cmddata->vdata.psz_name, "") != 0) {
-			dc_message_queue_get(p_mq, &v_dur);
-		}
-
-		{
-			int dur, h, m, s, ms;
-			dur = v_dur > a_dur ? v_dur : a_dur;
-			h = dur / 3600000;
-			dur = dur % 3600000;
-			m = dur / 60000;
-			dur = dur % 60000;
-			s = dur / 1000;
-			ms = dur % 1000;
-			sprintf(presentation_duration, "PT%02dH%02dM%02d.%03dS", h, m, s, ms);
-			printf("Duration: %s\n", presentation_duration);
-		}
-	}
-
-	sprintf(psz_name, "%s/%s", p_cmddata->psz_out, p_cmddata->psz_mpd);
-
-	if (strcmp(p_cmddata->adata.psz_name, "") != 0) {
-
-		p_adata = gf_list_get(p_cmddata->p_audio_lst, 0);
-
-		audio_seg_dur = (int)((p_adata->i_samplerate / (double) audio_frame_size) * (p_cmddata->i_seg_dur / 1000.0));
-		audio_frag_dur = (int)((p_adata->i_samplerate / (double) audio_frame_size) * (p_cmddata->i_frag_dur / 1000.0));
-		optimize_seg_frag_dur(&audio_seg_dur, &audio_frag_dur);
-
-	}
-
-	if (strcmp(p_cmddata->vdata.psz_name, "") != 0) {
-
-		p_vdata = gf_list_get(p_cmddata->p_video_lst, 0);
-
-		video_seg_dur = (int)(p_vdata->i_framerate * (p_cmddata->i_seg_dur / 1000.0));
-		video_frag_dur = (int)(p_vdata->i_framerate * (p_cmddata->i_frag_dur / 1000.0));
-		optimize_seg_frag_dur(&video_seg_dur, &video_frag_dur);
-
-	}
-
-	{
-		FILE * p_f = fopen(psz_name, "w");
-
-  	//	time_t t = time(NULL);
-  	//	time_t t2 = t + 2;
-  	//	t += (2 * (p_cmddata->i_seg_dur / 1000.0));
-  	//	tm = *gmtime(&t2);
-  	//	sprintf(availability_start_time, "%d-%d-%dT%d:%d:%dZ", tm.tm_year + 1900,
-  	//			tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
-  	//	printf("%s \n", availability_start_time);
-
-		fprintf(p_f, "<?xml version=\"1.0\"?>\n");
-		fprintf(p_f, "<MPD xmlns=\"urn:mpeg:dash:schema:mpd:2011\" "
-				"%s=\"%s\" "
-				"minBufferTime=\"PT%fS\" %s type=\"%s\" "
-				"profiles=\"urn:mpeg:dash:profile:full:2011\">\n",
-				(p_cmddata->i_mode == ON_DEMAND) ?
-						"mediaPresentationDuration" : "availabilityStartTime",
-				(p_cmddata->i_mode == ON_DEMAND) ?
-						presentation_duration : availability_start_time,
-				p_cmddata->f_minbuftime, time_shift,
-				(p_cmddata->i_mode == ON_DEMAND) ? "static" : "dynamic");
-
-		fprintf(p_f,
-				" <ProgramInformation moreInformationURL=\"http://gpac.sourceforge.net\">\n"
-						"  <Title>%s</Title>\n"
-						" </ProgramInformation>\n", p_cmddata->psz_mpd);
-
-		fprintf(p_f, " <Period id=\"\">\n");
-
-		if (strcmp(p_cmddata->adata.psz_name, "") != 0) {
-			fprintf(p_f,
-					"  <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"false\">\n");
-
-			fprintf(p_f,
-					"   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" "
-							"value=\"2\"/>\n");
-
-			fprintf(p_f,
-					"   <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"$RepresentationID$_$Number$_gpac.m4s\""
-							" startNumber=\"1\" initialization=\"$RepresentationID$_init_gpac.mp4\"/>\n",
-					p_adata->i_samplerate, audio_seg_dur * audio_frame_size);
-
-			for (i = 0; i < gf_list_count(p_cmddata->p_audio_lst); i++) {
-
-				p_adata = gf_list_get(p_cmddata->p_audio_lst, i);
-				fprintf(p_f,
-						"   <Representation id=\"%s\" mimeType=\"audio/mp4\" codecs=\"mp4a.40.2\" "
-								"audioSamplingRate=\"%d\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
-								"   </Representation>\n", p_adata->psz_name,
-						p_adata->i_samplerate, p_adata->i_bitrate);
-
-			}
-
-			fprintf(p_f, "  </AdaptationSet>\n");
-		}
-
-		if (strcmp(p_cmddata->vdata.psz_name, "") != 0) {
-			fprintf(p_f,
-					"  <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"false\">\n");
-
-			fprintf(p_f,
-					"   <SegmentTemplate timescale=\"%d\" duration=\"%d\" media=\"$RepresentationID$_$Number$_gpac.m4s\""
-							" startNumber=\"1\" initialization=\"$RepresentationID$_init_gpac.mp4\"/>\n",
-					p_vdata->i_framerate, video_seg_dur);
-
-			for (i = 0; i < gf_list_count(p_cmddata->p_video_lst); i++) {
-
-				p_vdata = gf_list_get(p_cmddata->p_video_lst, i);
-				fprintf(p_f,
-						"   <Representation id=\"%s\" mimeType=\"video/mp4\" codecs=\"avc3\" "
-								"width=\"%d\" height=\"%d\" frameRate=\"%d\" sar=\"1:1\" startWithSAP=\"1\" bandwidth=\"%d\">\n"
-								"   </Representation>\n", p_vdata->psz_name,
-						p_vdata->i_width, p_vdata->i_height, p_vdata->i_framerate,
-						p_vdata->i_bitrate);
-
-			}
-
-			fprintf(p_f, "  </AdaptationSet>\n");
-		}
-
-		fprintf(p_f, " </Period>\n");
-
-		fprintf(p_f, "</MPD>\n");
-
-		fclose(p_f);
-	}
-
-	printf("\33[34m\33[1m");
-	printf("MPD file generated: %s/%s\n", p_cmddata->psz_out,
-			p_cmddata->psz_mpd);
-	printf("\33[0m");
-
-	return 0;
-}
-
-u32 delete_seg_thread(void * p_params) {
-
-	int ret;
-	//int status;
-	ThreadParam * p_th_param = (ThreadParam *) p_params;
-	CmdData * p_cmdd = p_th_param->p_in_data;
-	MessageQueue * p_mq = p_th_param->p_mq;
-
-	char buff[512];
-
-	while (1) {
-
-		ret = dc_message_queue_get(p_mq, (void*) buff);
-
-		if (ret > 0) {
-			//printf("Message received: %s\n", buff);
-			unlink(buff);
-
-			//if (status != 0) {
-			//	printf("Unable to delete the file %s\n", buff);
-			//}
-		}
-
-		if (p_cmdd->i_exit_signal) {
-			break;
-		}
-
-	}
-
-	return 0;
-}
-
-Bool fragmenter_thread(void * p_params) {
-
-	int ret;
-	ThreadParam * p_th_param = (ThreadParam *) p_params;
-	CmdData * p_cmdd = p_th_param->p_in_data;
-	MessageQueue * p_mq = p_th_param->p_mq;
-
-	char buff[256];
-
-	while (1) {
-
-		ret = dc_message_queue_get(p_mq, (void*) buff);
-
-		if (ret > 0) {
-			printf("Message received: %s\n", buff);
-		}
-
-		if (p_cmdd->i_exit_signal) {
-			break;
-		}
-
-	}
-
-	return 0;
-}
-
-Bool dasher_thread(void * p_params) {
-
-//	int i;
-//	ThreadParam * p_th_param = (ThreadParam *) p_params;
-//	CmdData * p_cmdd = p_th_param->p_in_data;
-//
-//	char sz_mpd[GF_MAX_PATH];
-//	GF_DashSegmenterInput * dash_inputs;
-//	u32 nb_dash_inputs = 0;
-//	Bool use_url_template = 0;
-//	GF_Err e;
-//	s32 subsegs_per_sidx = 0;
-//	Bool daisy_chain_sidx = 0;
-//	char *seg_ext = NULL;
-//	const char *dash_title = NULL;
-//	const char *dash_source = NULL;
-//	const char *dash_more_info = NULL;
-//	char *tmpdir = NULL, *cprt = NULL, *seg_name = NULL;
-//	char **mpd_base_urls = NULL;
-//	u32 nb_mpd_base_urls = 0;
-//	Bool single_segment = 0;
-//
-//	Bool single_file = 0;
-//	GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
-//	Bool seg_at_rap = 0;
-//	Bool frag_at_rap = 0;
-//
-//	Double interleaving_time = 0.0;
-//	u32 time_shift_depth = 0;
-//	Double dash_duration = 0.0, dash_subduration = 0.0;
-//	u32 mpd_update_time = 0;
-//
-//
-//	GF_DashProfile dash_profile = GF_DASH_PROFILE_UNKNOWN;
-//	u32 dash_dynamic = 0;
-//	GF_Config *dash_ctx = NULL;
-//
-//	int video_list_size = gf_list_count(p_cmdd->p_video_lst);
-//	int audio_list_size = gf_list_count(p_cmdd->p_audio_lst);
-//	nb_dash_inputs = video_list_size + audio_list_size;
-//
-//	dash_inputs = gf_malloc(nb_dash_inputs * sizeof(GF_DashSegmenterInput));
-//
-//	for (i = 0; i < video_list_size; i++) {
-//
-//		VideoData * p_vdata = gf_list_get(p_cmdd->p_video_lst, i);
-//		dash_inputs[i].file_name = p_vdata->psz_name;
-//		sprintf(dash_inputs[i].representationID, "%d", i);
-//		strcpy(dash_inputs[i].periodID, "");
-//		strcpy(dash_inputs[i].role, "");
-//
-//	}
-//
-//	for (i = 0; i < audio_list_size; i++) {
-//
-//		AudioData * p_adata = gf_list_get(p_cmdd->p_audio_lst, i);
-//		dash_inputs[i + video_list_size].file_name = p_adata->psz_name;
-//		sprintf(dash_inputs[i + video_list_size].representationID, "%d",
-//				i + video_list_size);
-//		strcpy(dash_inputs[i + video_list_size].periodID, "");
-//		strcpy(dash_inputs[i + video_list_size].role, "");
-//
-//	}
-//
-//	dash_profile = p_cmdd->i_live ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_MAIN;
-//	strncpy(sz_mpd, p_cmdd->psz_mpd, GF_MAX_PATH);
-//
-//	dash_duration = p_cmdd->i_dash_dur ? p_cmdd->i_dash_dur / 1000 : 1;
-//
-//	if (p_cmdd->i_live) {
-//		dash_ctx = gf_cfg_new(NULL, NULL);
-//	}
-//
-//	if (!dash_dynamic) {
-//		time_shift_depth = 0;
-//		mpd_update_time = 0;
-//	} else if ((dash_profile >= GF_DASH_PROFILE_MAIN) && !use_url_template
-//			&& !mpd_update_time) {
-//		/*use a default MPD update of dash_duration sec*/
-//		mpd_update_time = (u32) (
-//				dash_subduration ? dash_subduration : dash_duration);
-//		fprintf(stderr, "Using default MPD refresh of %d seconds\n",
-//				mpd_update_time);
-//	}
-//
-//	if (p_cmdd->i_live)
-//		gf_sleep(dash_duration * 1000);
-//
-//	while (1) {
-//
-//		//TODO Signiture of this API has changed!
-//		/*
-//		e = gf_dasher_segment_files(sz_mpd, 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, single_segment, single_file,
-//				bitstream_switching_mode, seg_at_rap, dash_duration, seg_name,
-//				seg_ext, interleaving_time, subsegs_per_sidx, daisy_chain_sidx,
-//				frag_at_rap, tmpdir, dash_ctx, dash_dynamic, mpd_update_time,
-//				time_shift_depth, dash_subduration);
-//
-//		if (e) {
-//			printf("Error while segmenting.\n");
-//			break;
-//		}
-//		*/
-//
-//		if (!p_cmdd->i_live)
-//			break;
-//
-//		u32 sleep_for = gf_dasher_next_update_time(dash_ctx, mpd_update_time);
-//
-//		if (p_cmdd->i_exit_signal) {
-//			break;
-//		}
-//
-//		if (sleep_for) {
-//			if (dash_dynamic != 2) {
-//				fprintf(stderr, "sleep for %d ms\n", sleep_for);
-//				gf_sleep(sleep_for);
-//			}
-//		}
-//
-//	}
-
-	return 0;
-}
-
-static u32 keyboard_thread(void * p_params) {
-
-	ThreadParam * p_th_param = (ThreadParam *) p_params;
-	CmdData * p_in_data = p_th_param->p_in_data;
-	char c;
-
-	while (1) {
-		if (gf_prompt_has_input()) {
-			c = gf_prompt_get_char();
-			if (c == 'q' || c == 'Q') {
-				p_in_data->i_exit_signal = 1;
-				break;
-			}
-		}
-
-		if (p_in_data->i_exit_signal)
-			break;
-	}
-
-	return 0;
-}
-
-u32 video_decoder_thread(void * p_params) {
-#ifdef DASHCAST_PRINT
-	int i = 0;
-#endif
-
-	int ret;
-	int source_number = 0;
-
-	//int first_time = 1;
-	struct timeval time_start, time_end, time_wait;
-	VideoThreadParam * p_thread_params = (VideoThreadParam *) p_params;
-
-	CmdData * p_in_data = p_thread_params->p_in_data;
-	VideoInputData * p_vind = p_thread_params->p_vind;
-	VideoInputFile ** p_vinf = p_thread_params->p_vinf;
-
-	suseconds_t total_wait_time = 1000000 / p_in_data->vdata.i_framerate;
-	suseconds_t pick_packet_delay, select_delay = 0, real_wait,
-			other_delays = 2;
-
-	Task t;
-	//printf("wait time : %f\n", total_wait_time);
-
-	if (!gf_list_count(p_in_data->p_video_lst))
-		return 0;
-
-	while (1) {
-
-		dc_task_get_current(&p_in_data->task_list, &t);
-		source_number = t.source_number;
-
-		//printf("sourcenumber: %d\n", source_number);
-
-		if (p_vinf[source_number]->i_mode == LIVE_MEDIA) {
-			gettimeofday(&time_start, NULL);
-		}
-
-		ret = dc_video_decoder_read(p_vinf[source_number], p_vind,
-				source_number);
-
-#ifdef DASHCAST_PRINT
-		printf("Read video frame %d\r", i++);
-		fflush(stdout);
-#endif
-
-		if (ret == -2) {
-
-#ifdef DEBUG
-			printf("Video reader has no more frame to read.\n");
-#endif
-			break;
-		}
-		if (ret == -1) {
-			fprintf(stderr, "An error occurred while reading video frame.\n");
-			break;
-		}
-
-		if (p_in_data->i_exit_signal) {
-			dc_video_input_data_end_signal(p_vind);
-			break;
-		}
-
-		if (p_vinf[source_number]->i_mode == LIVE_MEDIA) {
-
-			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;
-			//printf("delay: %ld = %ld - %ld\n", time_wait.tv_usec,
-			//				total_wait_time, pick_packet_delay);
-
-			gettimeofday(&time_start, NULL);
-
-			select(0, NULL, NULL, NULL, &time_wait);
-
-			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;
-
-		}
-
-	}
-
-#ifdef DEBUG
-	printf("Video decoder is exiting...\n");
-#endif
-	return 0;
-}
-
-u32 audio_decoder_thread(void * p_params) {
-#ifdef DASHCAST_PRINT
-	int i = 0;
-#endif
-
-	int ret;
-	struct timeval time_start, time_end, time_wait;
-	AudioThreadParam * p_thread_params = (AudioThreadParam *) p_params;
-
-	CmdData * p_in_data = p_thread_params->p_in_data;
-	AudioInputData * p_aind = p_thread_params->p_aind;
-	AudioInputFile * p_ainf = p_thread_params->p_ainf;
-
-	suseconds_t total_wait_time = 1000000
-			/ (p_in_data->adata.i_samplerate / 1024);
-	suseconds_t pick_packet_delay, select_delay = 0, real_wait,
-			other_delays = 1;
-	;
-
-	//printf("wait time : %ld\n", total_wait_time);
-	//printf("sample-rate : %ld\n", p_in_data->adata.i_samplerate);
-
-	if (!gf_list_count(p_in_data->p_audio_lst))
-		return 0;
-
-	while (1) {
-
-		if (p_ainf->i_mode == LIVE_MEDIA) {
-			gettimeofday(&time_start, NULL);
-		}
-
-		ret = dc_audio_decoder_read(p_ainf, p_aind);
-
-#ifdef DASHCAST_PRINT
-		printf("Read audio frame %d\r", i++);
-		fflush(stdout);
-#endif
-
-		if (ret == -2) {
-#ifdef DEBUG
-			printf("Audio decoder has no more frame to read.\n");
-#endif
-			break;
-		}
-		if (ret == -1) {
-			fprintf(stderr, "An error occurred while reading video frame.\n");
-			break;
-		}
-
-		if (p_in_data->i_exit_signal) {
-			dc_audio_inout_data_end_signal(p_aind);
-			break;
-		}
-
-		if (p_ainf->i_mode == LIVE_MEDIA) {
-
-			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);
-
-			select(0, NULL, NULL, NULL, &time_wait);
-
-			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;
-
-		}
-
-	}
-
-#ifdef DEBUG
-	printf("Audio decoder is exiting...\n");
-#endif
-	return 0;
-}
-
-u32 video_scaler_thread(void * p_params) {
-
-	int ret;
-
-	VideoThreadParam * p_thread_params = (VideoThreadParam *) p_params;
-
-	CmdData * p_in_data = p_thread_params->p_in_data;
-	VideoInputData * p_vind = p_thread_params->p_vind;
-	VideoScaledData * p_vsd = p_thread_params->p_vsd;
-
-	if (!gf_list_count(p_in_data->p_video_lst))
-		return 0;
-
-	while (1) {
-
-		ret = dc_video_scaler_scale(p_vind, p_vsd);
-
-		if (ret == -2) {
-#ifdef DEBUG
-			printf("Video scaler has no more frame to read.\n");
-#endif
-			break;
-		}
-	}
-
-	dc_video_scaler_end_signal(p_vsd);
-
-#ifdef DEBUG
-	printf("Video scaler is exiting...\n");
-#endif
-	return 0;
-}
-
-u32 video_encoder_thread(void * p_params) {
-
-	int ret;
-	int frame_nb;
-	int seg_frame_max;
-	int frag_frame_max;
-	int seg_nb = 0;
-	int quit = 0;
-	char name_to_delete[512];
-	char name_to_send[512];
-	int shift;
-
-	VideoMuxerType muxer_type = VIDEO_MUXER;
-
-	VideoThreadParam * p_thread_params = (VideoThreadParam *) p_params;
-
-	CmdData * p_in_data = p_thread_params->p_in_data;
-	int video_conf_idx = p_thread_params->video_conf_idx;
-	VideoData * p_vdata = gf_list_get(p_in_data->p_video_lst, video_conf_idx);
-
-	VideoScaledData * p_vsd = p_thread_params->p_vsd;
-	VideoOutputFile out_file;
-
-	MessageQueue * p_mq = p_thread_params->p_mq;
-	MessageQueue * p_delete_seg_mq = p_thread_params->p_delete_seg_mq;
-	MessageQueue * p_send_seg_mq = p_thread_params->p_send_seg_mq;
-
-#ifndef FRAGMENTER
-	MessageQueue * p_mq = p_thread_params->p_mq;
-#endif
-
-	if (!gf_list_count(p_in_data->p_video_lst))
-		return 0;
-
-	seg_frame_max = (int)(p_vdata->i_framerate * (float) (p_in_data->i_seg_dur / 1000.0));
-	frag_frame_max = (int)(p_vdata->i_framerate * (float) (p_in_data->i_frag_dur / 1000.0));
-
-	optimize_seg_frag_dur(&seg_frame_max, &frag_frame_max);
-
-	out_file.i_gop_size = seg_frame_max;
-
-	if (seg_frame_max <= 0)
-		seg_frame_max = -1;
-
-	if (dc_video_muxer_init(&out_file, p_vdata, muxer_type, seg_frame_max,
-			frag_frame_max, p_in_data->i_seg_marker, p_in_data->i_gdr) < 0) {
-		fprintf(stderr, "Cannot init output video file.\n");
-		p_in_data->i_exit_signal = 1;
-		return -1;
-	}
-
-	if (dc_video_encoder_open(&out_file, p_vdata) < 0) {
-		fprintf(stderr, "Cannot open output video stream.\n");
-		p_in_data->i_exit_signal = 1;
-		return -1;
-	}
-
-	while (1) {
-
-		frame_nb = 0;
-
-		if (dc_video_muxer_open(&out_file, p_in_data->psz_out,
-				p_vdata->psz_name, seg_nb) < 0) {
-			fprintf(stderr, "Cannot open output video file.\n");
-			p_in_data->i_exit_signal = 1;
-			return -1;
-		}
-
-//		printf("Header size: %d\n", ret);
-
-		while (1) {
-
-//			if (seg_frame_max > 0) {
-//				if (frame_nb == seg_frame_max)
-//					break;
-//			}
-
-			ret = dc_video_encoder_encode(&out_file, p_vsd);
-
-			if (ret == -2) {
-#ifdef DEBUG
-				printf("Audio encoder has no more data to encode.\n");
-#endif
-				quit = 1;
-				break;
-			}
-			if (ret == -1) {
-				fprintf(stderr,
-						"An error occured while writing video frame.\n");
-				quit = 1;
-				break;
-			}
-
-			if (ret > 0) {
-
-				int r = dc_video_muxer_write(&out_file, frame_nb);
-
-				if (r == 1) {
-					//printf("fragment is written!\n");
-					if (p_in_data->i_send_message == 1) {
-						sprintf(name_to_send, "%s/%s_%d_gpac.m4s",
-								p_in_data->psz_out, p_vdata->psz_name, seg_nb);
-						dc_message_queue_put(p_send_seg_mq, name_to_send,
-								sizeof(name_to_send));
-					}
-
-					break;
-				}
-
-				frame_nb++;
-			}
-		}
-
-		dc_video_muxer_close(&out_file);
-
-#ifndef FRAGMENTER
-		dc_message_queue_put(p_mq, p_vdata->psz_name,
-				sizeof(p_vdata->psz_name));
-#endif
-
-		// If system is live,
-		// Send the time that the first segment is available to MPD generator thread.
-		if (seg_nb == 0) {
-			if (p_in_data->i_mode == LIVE_MEDIA
-					|| p_in_data->i_mode == LIVE_CAMERA) {
-				if (p_thread_params->video_conf_idx == 0) {
-					u64 t = gf_net_get_utc();
-					//time_t t = time(NULL);
-					dc_message_queue_put(p_mq, &t, sizeof(t));
-				}
-			}
-		}
-
-		if (p_in_data->i_time_shift != -1) {
-			shift = (p_in_data->i_time_shift * p_in_data->i_seg_dur) / 1000;
-			sprintf(name_to_delete, "%s/%s_%d_gpac.m4s", p_in_data->psz_out,
-					p_vdata->psz_name, (seg_nb - shift));
-			dc_message_queue_put(p_delete_seg_mq, name_to_delete,
-					sizeof(name_to_delete));
-
-		}
-
-		seg_nb++;
-
-		if (quit)
-			break;
-
-	}
-
-	// If system is not live,
-	// Send the duration of the video
-	if (p_in_data->i_mode == ON_DEMAND) {
-		if (p_thread_params->video_conf_idx == 0) {
-			int dur = (seg_nb * seg_frame_max * 1000) / p_vdata->i_framerate;
-			int dur_tot = (out_file.p_codec_ctx->frame_number * 1000)
-					/ p_vdata->i_framerate;
-			if (dur > dur_tot)
-				dur = dur_tot;
-			//printf("Duration: %d \n", dur);
-			dc_message_queue_put(p_mq, &dur, sizeof(dur));
-		}
-	}
-
-	/* Close output video file */
-	dc_video_encoder_close(&out_file);
-
-	dc_video_muxer_free(&out_file);
-
-#ifdef DEBUG
-	printf("Video encoder is exiting...\n");
-#endif
-	return 0;
-}
-
-u32 audio_encoder_thread(void * p_params) {
-
-	int ret;
-	int exit_loop = 0;
-	int quit = 0;
-	int seg_nb = 0;
-	//int seg_frame_max;
-	//int frag_frame_max;
-	int frame_per_seg;
-	int frame_per_frag;
-	int frame_nb;
-	//int audio_frame_size = AUDIO_FRAME_SIZE;
-	char name_to_delete[512];
-	int shift;
-
-	AudioMuxerType muxer_type = AUDIO_MUXER;
-
-	AudioThreadParam * p_thread_params = (AudioThreadParam *) p_params;
-
-	CmdData * p_in_data = p_thread_params->p_in_data;
-	int audio_conf_idx = p_thread_params->audio_conf_idx;
-	AudioData * p_adata = gf_list_get(p_in_data->p_audio_lst, audio_conf_idx);
-
-	AudioInputData * p_aind = p_thread_params->p_aind;
-	AudioOutputFile aout;
-
-	MessageQueue * p_mq = p_thread_params->p_mq;
-	MessageQueue * p_delete_seg_mq = p_thread_params->p_delete_seg_mq;
-
-#ifndef FRAGMENTER
-	MessageQueue * p_mq = p_thread_params->p_mq;
-#endif
-
-	if (!gf_list_count(p_in_data->p_audio_lst))
-		return 0;
-
-	//seg_frame_max = p_adata->i_samplerate
-	//		* (float) (p_in_data->i_seg_dur / 1000.0);
-
-	//frag_frame_max = p_adata->i_samplerate * (float) (p_in_data->i_frag_dur / 1000.0);
-	//if (seg_frame_max <= 0)
-	//	seg_frame_max = -1;
-
-	if (dc_audio_encoder_open(&aout, p_adata) < 0) {
-		fprintf(stderr, "Cannot open output audio stream.\n");
-		p_in_data->i_exit_signal = 1;
-		return -1;
-	}
-
-	frame_per_seg  = (int)((p_adata->i_samplerate / (double) aout.i_frame_size) * (p_in_data->i_seg_dur  / 1000.0));
-	frame_per_frag = (int)((p_adata->i_samplerate / (double) aout.i_frame_size) * (p_in_data->i_frag_dur / 1000.0));
-
-	optimize_seg_frag_dur(&frame_per_seg, &frame_per_frag);
-
-	if (dc_audio_muxer_init(&aout, p_adata, muxer_type, frame_per_seg,
-			frame_per_frag, p_in_data->i_seg_marker) < 0) {
-		fprintf(stderr, "Cannot init output audio.\n");
-		p_in_data->i_exit_signal = 1;
-		return -1;
-	}
-
-	while (1) {
-
-		frame_nb = 0;
-		quit = 0;
-
-		if (dc_audio_muxer_open(&aout, p_in_data->psz_out, p_adata->psz_name,
-				seg_nb) < 0) {
-			fprintf(stderr, "Cannot open output audio.\n");
-			p_in_data->i_exit_signal = 1;
-			return -1;
-		}
-
-		while (1) {
-
-			exit_loop = 0;
-
-//			if (frame_per_seg > 0) {
-//				if (frame_nb == frame_per_seg) {
-//
-//					//if (dc_audio_encoder_flush(&aout, p_aind) == 0) {
-//					//	dc_audio_muxer_write(&aout);
-//					//	frame_nb ++;//= aout.p_codec_ctx->frame_size; //aout.acc_samples;
-//					//}
-//
-//					exit_loop = 1;
-//					break;
-//				}
-//			}
-
-			ret = dc_audio_encoder_read(&aout, p_aind);
-
-			if (ret == -2) {
-#ifdef DEBUG
-				printf("Audio encoder has no more data to encode.\n");
-#endif
-				//if (dc_audio_encoder_flush(&aout, p_aind) == 0) {
-				//	dc_audio_muxer_write(&aout);
-				//	frame_nb ++;//= aout.p_codec_ctx->frame_size; //aout.acc_samples;
-				//}
-
-				quit = 1;
-				break;
-			}
-
-			while (1) {
-
-				ret = dc_audio_encoder_encode(&aout, p_aind);
-
-				if (ret == 1) {
-					break;
-				}
-
-				if (ret == -1) {
-					fprintf(stderr,
-							"An error occured while encoding audio frame.\n");
-					quit = 1;
-					break;
-				}
-
-				ret = dc_audio_muxer_write(&aout, frame_nb);
-
-				if (ret == -1) {
-					fprintf(stderr,
-							"An error occured while writing audio frame.\n");
-					quit = 1;
-					break;
-				}
-
-				if (ret == 1) {
-					exit_loop = 1;
-					break;
-				}
-
-				frame_nb++; //= aout.p_codec_ctx->frame_size; //aout.acc_samples;
-
-			}
-
-			if (exit_loop || quit)
-				break;
-
-		}
-
-		dc_audio_muxer_close(&aout);
-
-#ifndef FRAGMENTER
-		dc_message_queue_put(p_mq, p_adata->psz_name,
-				sizeof(p_adata->psz_name));
-#endif
-
-		// Send the time that the first segment is available to MPD generator thread.
-		if (seg_nb == 0) {
-			if (p_in_data->i_mode == LIVE_CAMERA
-					|| p_in_data->i_mode == LIVE_MEDIA) {
-				if (p_thread_params->audio_conf_idx == 0) {
-					u64 t = gf_net_get_utc();
-					//time_t t = time(NULL);
-					dc_message_queue_put(p_mq, &t, sizeof(t));
-				}
-			}
-
-		}
-
-		if (p_in_data->i_time_shift != -1) {
-			shift = (p_in_data->i_time_shift * p_in_data->i_seg_dur) / 1000;
-			sprintf(name_to_delete, "%s/%s_%d_gpac.m4s", p_in_data->psz_out,
-					p_adata->psz_name, (seg_nb - shift));
-			dc_message_queue_put(p_delete_seg_mq, name_to_delete,
-					sizeof(name_to_delete));
-
-		}
-
-		seg_nb++;
-
-		if (quit)
-			break;
-
-	}
-
-	// If system is not live,
-	// Send the duration of the video
-	if (p_in_data->i_mode == ON_DEMAND) {
-		if (p_thread_params->audio_conf_idx == 0) {
-			int dur = (seg_nb * aout.i_frame_size * frame_per_seg * 1000)
-					/ p_adata->i_samplerate;
-			int dur_tot = (aout.p_codec_ctx->frame_number * aout.i_frame_size
-					* 1000) / p_adata->i_samplerate;
-			if (dur > dur_tot)
-				dur = dur_tot;
-			//printf("Duration: %d \n", dur);
-			dc_message_queue_put(p_mq, &dur, sizeof(dur));
-		}
-	}
-
-	dc_audio_muxer_free(&aout);
-
-	/* Close output audio file */
-	dc_audio_encoder_close(&aout);
-
-#ifdef DEBUG
-	printf("Audio encoder is exiting...\n");
-#endif
-	return 0;
-}
-
-int dc_run_controler(CmdData * p_in_data) {
-
-	u32 i, j;
-	
-	ThreadParam keyboard_th_params;
-	ThreadParam mpd_th_params;
-	ThreadParam delete_seg_th_params;
-	ThreadParam send_frag_th_params;
-
-	//Video parameters
-	VideoThreadParam vdecoder_th_params;
-	VideoThreadParam *vencoder_th_params = alloca(gf_list_count(p_in_data->p_video_lst) * sizeof(VideoThreadParam));
-	VideoInputData vind;
-	VideoInputFile * vinf[MAX_SOURCE_NUMBER];
-	VideoScaledDataList p_vsdl;
-	VideoThreadParam * vscaler_th_params = NULL;
-
-	//Audio parameters
-	AudioThreadParam adecoder_th_params;
-	AudioThreadParam *aencoder_th_params = alloca(gf_list_count(p_in_data->p_audio_lst) * sizeof(AudioThreadParam));
-	AudioInputData aind;
-	AudioInputFile ainf;
-
-#ifndef DASHER
-	ThreadParam dasher_th_params;
-#endif
-
-#ifndef FRAGMENTER
-	ThreadParam fragmenter_th_params;
-#endif
-
-	MessageQueue mq;
-	MessageQueue delete_seg_mq;
-	MessageQueue send_frag_mq;
-
-	dc_register_libav();
-
-	for (i = 0; i < MAX_SOURCE_NUMBER; i++)
-		vinf[i] = gf_malloc(sizeof(VideoInputFile));
-
-	dc_message_queue_init(&mq);
-	dc_message_queue_init(&delete_seg_mq);
-	dc_message_queue_init(&send_frag_mq);
-
-	if (strcmp(p_in_data->vdata.psz_name, "") != 0) {
-
-		dc_video_scaler_list_init(&p_vsdl, p_in_data->p_video_lst);
-
-		vscaler_th_params = gf_malloc(p_vsdl.i_size * sizeof(VideoThreadParam));
-
-		/* Open input video */
-		if (dc_video_decoder_open(vinf[0], &p_in_data->vdata, p_in_data->i_mode,
-				p_in_data->i_no_loop) < 0) {
-			fprintf(stderr, "Cannot open input video.\n");
-			return -1;
-		}
-
-		if (dc_video_input_data_init(&vind, /*vinf[0]->i_width, vinf[0]->i_height,
-		 vinf[0]->i_pix_fmt,*/p_vsdl.i_size, p_in_data->i_mode, MAX_SOURCE_NUMBER)
-				< 0) {
-			fprintf(stderr, "Cannot initialize audio data.\n");
-			return -1;
-		}
-
-		/* open other input videos for source switching */
-		for (i = 0; i < gf_list_count(p_in_data->p_vsrc); i++) {
-			VideoData * p_vconf = gf_list_get(p_in_data->p_vsrc, i);
-			if (dc_video_decoder_open(vinf[i + 1], p_vconf, LIVE_MEDIA, 1)
-					< 0) {
-				fprintf(stderr, "Cannot open input video.\n");
-				return -1;
-			}
-
-//			if (dc_video_input_data_init(&vind, vinf[i + 1]->i_width,
-//					vinf[i + 1]->i_height, vinf[i + 1]->i_pix_fmt, p_vsdl.i_size,
-//					p_in_data->i_mode, MAX_SOURCE_NUMBER) < 0) {
-//				fprintf(stderr, "Cannot initialize audio data.\n");
-//				return -1;
-//			}
-		}
-
-//		dc_video_input_data_set_prop(&vind, 0, vinf[1]->i_width,
-//				vinf[1]->i_height, vinf[1]->i_pix_fmt);
-
-		//int source_nb = gf_list_count(p_in_data->p_vsrc);
-		//printf("source_nb: %d \n", source_nb);
-		for (i = 0; i < gf_list_count(p_in_data->p_vsrc) + 1; i++) {
-			dc_video_input_data_set_prop(&vind, i, vinf[i]->i_width,
-					vinf[i]->i_height, vinf[i]->i_pix_fmt);
-		}
-
-		for (i = 0; i < (u32)p_vsdl.i_size; i++) {
-			dc_video_scaler_data_init(&vind, p_vsdl.p_vsd[i],
-					MAX_SOURCE_NUMBER);
-
-			for (j = 0; j < gf_list_count(p_in_data->p_vsrc) + 1; j++) {
-				dc_video_scaler_data_set_prop(&vind, p_vsdl.p_vsd[i], j);
-			}
-		}
-
-		/* Initialize video decoder thread */
-		vdecoder_th_params.p_thread = gf_th_new("video_decoder_thread");
-
-		for (i = 0; i < (u32)p_vsdl.i_size; i++) {
-			vscaler_th_params[i].p_thread = gf_th_new("video_scaler_thread");
-		}
-
-		/* Initialize video encoder threads */
-		for (i = 0; i < gf_list_count(p_in_data->p_video_lst); i++)
-			vencoder_th_params[i].p_thread = gf_th_new("video_encoder_thread");
-
-	}
-
-	if (strcmp(p_in_data->adata.psz_name, "") != 0) {
-
-		/* Open input audio */
-		if (dc_audio_decoder_open(&ainf, &p_in_data->adata, p_in_data->i_mode,
-				p_in_data->i_no_loop) < 0) {
-			fprintf(stderr, "Cannot open input audio.\n");
-			return -1;
-		}
-
-		if (dc_audio_input_data_init(&aind, p_in_data->adata.i_channels,
-				p_in_data->adata.i_samplerate,
-				gf_list_count(p_in_data->p_audio_lst), p_in_data->i_mode) < 0) {
-			fprintf(stderr, "Cannot initialize audio data.\n");
-			return -1;
-		}
-
-		/* Initialize audio decoder thread */
-		adecoder_th_params.p_thread = gf_th_new("audio_decoder_thread");
-
-		/* Initialize audio encoder threads */
-		for (i = 0; i < gf_list_count(p_in_data->p_audio_lst); i++)
-			aencoder_th_params[i].p_thread = gf_th_new("video_encoder_thread");
-
-	}
-
-	/******** Keyboard controler Thread ********/
-
-	/* Initialize keyboard controller thread */
-	keyboard_th_params.p_thread = gf_th_new("keyboard_thread");
-	
-	/* Create keyboard controller thread */
-	keyboard_th_params.p_in_data = p_in_data;
-	if (gf_th_run(keyboard_th_params.p_thread, keyboard_thread, (void *)&keyboard_th_params) != GF_OK) {
-
-		fprintf(stderr,
-				"Error while doing pthread_create for keyboard_thread.\n");
-	}
-
-	/********************************************/
-
-	//Communication between decoder and audio encoder
-	for (i = 0; i < gf_list_count(p_in_data->p_audio_lst); i++) {
-		AudioData * p_tmp_adata = gf_list_get(p_in_data->p_audio_lst, i);
-		p_tmp_adata->i_channels = p_in_data->adata.i_channels;
-		p_tmp_adata->i_samplerate = p_in_data->adata.i_samplerate;
-	}
-
-	//Communication between decoder and video encoder
-	for (i = 0; i < gf_list_count(p_in_data->p_video_lst); i++) {
-		VideoData * p_tmp_vdata = gf_list_get(p_in_data->p_video_lst, i);
-		p_tmp_vdata->i_framerate = p_in_data->vdata.i_framerate;
-	}
-	
-	/******** MPD Thread ********/
-
-	/* Initialize MPD generator thread */
-	mpd_th_params.p_thread = gf_th_new("mpd_thread");
-	
-	/* Create MPD generator thread */
-	mpd_th_params.p_in_data = p_in_data;
-	mpd_th_params.p_mq = &mq;
-	if (gf_th_run(mpd_th_params.p_thread, mpd_thread, (void *)&mpd_th_params) != GF_OK) {
-
-		fprintf(stderr, "Error while doing pthread_create for mpd_thread.\n");
-	}
-
-	/****************************/
-
-	if (strcmp(p_in_data->vdata.psz_name, "") != 0) {
-		/* Create video encoder threads */
-		for (i = 0; i < gf_list_count(p_in_data->p_video_lst); i++) {
-
-			VideoData * p_vconf = gf_list_get(p_in_data->p_video_lst, i);
-
-			vencoder_th_params[i].p_in_data = p_in_data;
-			vencoder_th_params[i].video_conf_idx = i;
-			vencoder_th_params[i].p_vsd = dc_video_scaler_get_data(&p_vsdl,
-					p_vconf->i_width, p_vconf->i_height);
-
-			vencoder_th_params[i].p_mq = &mq;
-			vencoder_th_params[i].p_delete_seg_mq = &delete_seg_mq;
-			vencoder_th_params[i].p_send_seg_mq = &send_frag_mq;
-
-			if (gf_th_run(vencoder_th_params[i].p_thread, video_encoder_thread,
-					(void *) &vencoder_th_params[i]) != GF_OK) {
-				fprintf(stderr,
-						"Error while doing pthread_create for video_encoder_thread.\n");
-			}
-		}
-
-		/* Create video scaler threads */
-		for (i = 0; i < (u32)p_vsdl.i_size; i++) {
-
-			vscaler_th_params[i].p_in_data = p_in_data;
-			vscaler_th_params[i].p_vsd = p_vsdl.p_vsd[i];
-			vscaler_th_params[i].p_vind = &vind;
-
-			if (gf_th_run(vscaler_th_params[i].p_thread, video_scaler_thread,
-					(void *) &vscaler_th_params[i]) != GF_OK) {
-				fprintf(stderr,
-						"Error while doing pthread_create for video_scaler_thread.\n");
-			}
-		}
-	}
-
-	if (strcmp(p_in_data->adata.psz_name, "") != 0) {
-		/* Create audio encoder threads */
-		for (i = 0; i < gf_list_count(p_in_data->p_audio_lst); i++) {
-
-			aencoder_th_params[i].p_in_data = p_in_data;
-			aencoder_th_params[i].audio_conf_idx = i;
-			aencoder_th_params[i].p_aind = &aind;
-
-			aencoder_th_params[i].p_mq = &mq;
-			aencoder_th_params[i].p_delete_seg_mq = &delete_seg_mq;
-			aencoder_th_params[i].p_send_seg_mq = &send_frag_mq;
-
-			if (gf_th_run(aencoder_th_params[i].p_thread, audio_encoder_thread,
-					(void *) &aencoder_th_params[i]) != GF_OK) {
-				fprintf(stderr,
-						"Error while doing pthread_create for audio_encoder_thread.\n");
-			}
-		}
-	}
-
-	if (strcmp(p_in_data->vdata.psz_name, "") != 0) {
-		/* Create video decoder thread */
-		vdecoder_th_params.p_in_data = p_in_data;
-		vdecoder_th_params.p_vind = &vind;
-		vdecoder_th_params.p_vinf = vinf;
-		if (gf_th_run(vdecoder_th_params.p_thread, video_decoder_thread,
-				(void *) &vdecoder_th_params) != GF_OK) {
-
-			fprintf(stderr,
-					"Error while doing pthread_create for video_decoder_thread.\n");
-		}
-	}
-
-	if (strcmp(p_in_data->adata.psz_name, "") != 0) {
-		/* Create audio decoder thread */
-		adecoder_th_params.p_in_data = p_in_data;
-		adecoder_th_params.p_aind = &aind;
-		adecoder_th_params.p_ainf = &ainf;
-		if (gf_th_run(adecoder_th_params.p_thread, audio_decoder_thread,
-				(void *) &adecoder_th_params) != GF_OK) {
-
-			fprintf(stderr,
-					"Error while doing pthread_create for audio_decoder_thread.\n");
-		}
-	}
-
-	if (p_in_data->i_time_shift != -1) {
-
-		/* Initialize delete segment thread */
-		delete_seg_th_params.p_thread = gf_th_new("delete_seg_thread");
-
-		delete_seg_th_params.p_in_data = p_in_data;
-		delete_seg_th_params.p_mq = &delete_seg_mq;
-		if (gf_th_run(delete_seg_th_params.p_thread, delete_seg_thread,
-				(void *) &delete_seg_th_params) != GF_OK) {
-
-			fprintf(stderr,
-					"Error while doing pthread_create for delete_seg_thread.\n");
-		}
-
-	}
-
-	if (p_in_data->i_send_message == 1) {
-
-		/* Initialize delete segment thread */
-		send_frag_th_params.p_thread = gf_th_new("send_frag_event_thread");
-
-		send_frag_th_params.p_in_data = p_in_data;
-		send_frag_th_params.p_mq = &send_frag_mq;
-		if (gf_th_run(send_frag_th_params.p_thread, send_frag_event,
-				(void *) &send_frag_th_params) != GF_OK) {
-
-			fprintf(stderr,
-					"Error while doing pthread_create for send_frag_event_thread.\n");
-		}
-
-	}
-
-#ifndef FRAGMENTER
-
-	if (strcmp(p_in_data->psz_mpd, "") != 0) {
-
-		/* Initialize keyboard controller thread */
-		fragmenter_th_params.p_thread = gf_th_new("fragmenter_thread");
-
-		fragmenter_th_params.p_in_data = p_in_data;
-		fragmenter_th_params.p_mq = &mq;
-		if (gf_th_run(fragmenter_th_params.p_thread, fragmenter_thread,
-						(void *) &fragmenter_th_params) != GF_OK) {
-
-			fprintf(stderr,
-					"Error while doing pthread_create for fragmenter_thread.\n");
-		}
-
-	}
-
-#endif
-
-#ifndef DASHER
-
-	if (p_in_data->i_live && strcmp(p_in_data->psz_mpd, "") != 0) {
-
-		/* Initialize keyboard controller thread */
-		dasher_th_params.p_thread = gf_th_new("dasher_thread");
-
-		dasher_th_params.p_in_data = p_in_data;
-		if (gf_th_run(dasher_th_params.p_thread, dasher_thread,
-						(void *) &dasher_th_params) != GF_OK) {
-
-			fprintf(stderr,
-					"Error while doing pthread_create for dasher_thread.\n");
-		}
-
-	}
-
-#endif
-
-	printf("Press q or Q to exit...\n");
-
-	if (strcmp(p_in_data->adata.psz_name, "") != 0) {
-		/* Wait for and destroy audio decoder threads */
-		gf_th_stop(adecoder_th_params.p_thread);
-		gf_th_del(adecoder_th_params.p_thread);
-	}
-
-	if (strcmp(p_in_data->vdata.psz_name, "") != 0) {
-		/* Wait for and destroy video decoder threads */
-		gf_th_stop(vdecoder_th_params.p_thread);
-		gf_th_del(vdecoder_th_params.p_thread);
-	}
-
-	if (strcmp(p_in_data->adata.psz_name, "") != 0) {
-		/* Wait for and destroy audio encoder threads */
-		for (i = 0; i < gf_list_count(p_in_data->p_audio_lst); i++) {
-			gf_th_stop(aencoder_th_params[i].p_thread);
-			gf_th_del(aencoder_th_params[i].p_thread);
-		}
-	}
-
-	if (strcmp(p_in_data->vdata.psz_name, "") != 0) {
-		/* Wait for and destroy video encoder threads */
-		for (i = 0; i < gf_list_count(p_in_data->p_video_lst); i++) {
-			gf_th_stop(vencoder_th_params[i].p_thread);
-			gf_th_del(vencoder_th_params[i].p_thread);
-		}
-
-		/* Wait for and destroy video scaler threads */
-		for (i = 0; i < (u32)p_vsdl.i_size; i++) {
-			gf_th_stop(vscaler_th_params[i].p_thread);
-			gf_th_del(vscaler_th_params[i].p_thread);
-		}
-	}
-
-#ifndef DASHER
-	if (p_in_data->i_live && strcmp(p_in_data->psz_mpd, "") != 0) {
-		/* Wait for and destroy dasher thread */
-		gf_th_stop(dasher_th_params.p_thread);
-		gf_th_del(dasher_th_params.p_thread);
-	}
-
-#endif
-
-	if (strcmp(p_in_data->adata.psz_name, "") != 0) {
-		/* Destroy audio input data */
-		dc_audio_input_data_destroy(&aind);
-		/* Close input audio */
-		dc_audio_decoder_close(&ainf);
-	}
-
-	if (strcmp(p_in_data->vdata.psz_name, "") != 0) {
-
-		/* Destroy video input data */
-		dc_video_input_data_destroy(&vind);
-
-		for (i = 0; i < gf_list_count(p_in_data->p_vsrc); i++) {
-			/* Close input video */
-			dc_video_decoder_close(vinf[i]);
-		}
-
-		/* Destroy video scaled data */
-		dc_video_scaler_list_destroy(&p_vsdl);
-	}
-
-	keyboard_th_params.p_in_data->i_exit_signal = 1;
-
-#ifndef FRAGMENTER
-
-	dc_message_queue_flush(&mq);
-
-	if (strcmp(p_in_data->psz_mpd, "") != 0) {
-		/* Wait for and destroy dasher thread */
-		gf_th_stop(fragmenter_th_params.p_thread);
-		gf_th_del(fragmenter_th_params.p_thread);
-	}
-
-#endif
-
-	/********** Keyboard thread ***********/
-
-	/* Wait for and destroy keyboard controler thread */
-	gf_th_stop(keyboard_th_params.p_thread);
-	gf_th_del(keyboard_th_params.p_thread);
-
-	/**************************************/
-
-	/********** MPD generator thread ***********/
-
-	/* Wait for and destroy MPD generator thread */
-	gf_th_stop(mpd_th_params.p_thread);
-	gf_th_del(mpd_th_params.p_thread);
-
-	/**************************************/
-
-	if (p_in_data->i_time_shift != -1) {
-		//	dc_message_queue_flush(&delete_seg_mq);
-		/* Wait for and destroy delete segment thread */
-		gf_th_stop(delete_seg_th_params.p_thread);
-		gf_th_del(delete_seg_th_params.p_thread);
-	}
-
-	if (p_in_data->i_send_message == 1) {
-		/* Wait for and destroy delete segment thread */
-		gf_th_stop(send_frag_th_params.p_thread);
-		gf_th_del(send_frag_th_params.p_thread);
-	}
-
-#ifndef DASHER
-	if (!p_in_data->i_live && strcmp(p_in_data->psz_mpd, "") != 0) {
-		dasher_th_params.p_in_data = p_in_data;
-		dasher_thread((void*) &dasher_th_params);
-	}
-#endif
-
-	if (vscaler_th_params)
-		gf_free(vscaler_th_params);
-
-	return 0;
-}
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Arash Shafiei
+ *			Copyright (c) Telecom ParisTech 2000-2013
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / dashcast
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "controler.h"
+
+
+#if (!defined(__DARWIN__) && !defined(__APPLE__))
+#include <malloc.h>
+#endif
+
+#include <time.h>
+//FIXME: use GPAC utility functions
+#if defined(__GNUC__)
+#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;
+}
+#else
+#error
+#endif
+
+
+typedef struct {
+	int segnum;
+	u64 time;
+} segtime;
+
+
+//#define MAX_SOURCE_NUMBER 20
+#define DASHER 0
+#define FRAGMENTER 0
+//#define DEBUG 1
+
+//#define VIDEO_MUXER FFMPEG_VIDEO_MUXER
+//#define VIDEO_MUXER RAW_VIDEO_H264
+//#define VIDEO_MUXER GPAC_VIDEO_MUXER
+#define VIDEO_MUXER GPAC_INIT_VIDEO_MUXER_AVC1
+//#define VIDEO_MUXER GPAC_INIT_VIDEO_MUXER_AVC3
+
+//#define AUDIO_MUXER FFMPEG_AUDIO_MUXER
+//#define AUDIO_MUXER GPAC_AUDIO_MUXER
+#define AUDIO_MUXER GPAC_INIT_AUDIO_MUXER
+
+#define DASHCAST_PRINT
+
+#define AUDIO_FRAME_SIZE 1024
+
+
+void optimize_seg_frag_dur(int *seg, int *frag)
+{
+	int seg_nb = *seg;
+	int frag_nb = *frag;
+
+	int min_rem = seg_nb % frag_nb;
+	if (seg_nb % (frag_nb + 1) < min_rem) {
+		min_rem = seg_nb % (frag_nb + 1);
+		*seg = seg_nb;
+		*frag = frag_nb + 1;
+	}
+
+	if ((seg_nb + 1) % frag_nb < min_rem) {
+		min_rem = (seg_nb + 1) % frag_nb;
+		*seg = seg_nb + 1;
+		*frag = frag_nb;
+	}
+
+	if ((seg_nb + 1) % (frag_nb + 1) < min_rem) {
+		min_rem = (seg_nb + 1) % (frag_nb + 1);
+		*seg = seg_nb + 1;
+		*frag = frag_nb + 1;
+	}
+
+	*seg -= min_rem;
+}
+
+Bool change_source_thread(void *params)
+{
+	int ret = 0;
+	return ret;
+}
+
+u32 send_frag_event(void *params)
+{
+	int ret;
+	//int status;
+	char buff[GF_MAX_PATH];
+	ThreadParam *th_param = (ThreadParam*)params;
+	CmdData *cmd_data = th_param->in_data;
+	MessageQueue *mq = th_param->mq;
+
+	while (1) {
+		if (cmd_data->exit_signal) {
+			break;
+		}
+
+		ret = dc_message_queue_get(mq, (void*) buff);
+		if (ret > 0) {
+			fprintf(stdout, "Message received: %s\n", buff);
+		}
+	}
+
+	return 0;
+}
+
+static void dc_write_mpd(CmdData *cmddata, const AudioDataConf *audio_data_conf, const VideoDataConf *video_data_conf, const char *presentation_duration, const char *availability_start_time, const char *time_shift, const int segnum, const int ast_offset)
+{
+	u32 i = 0;
+	int audio_seg_dur = 0, video_seg_dur = 0, audio_frag_dur = 0,	video_frag_dur = 0;
+	int audio_frame_size = AUDIO_FRAME_SIZE;
+	FILE *f;
+
+	char name[GF_MAX_PATH];
+	snprintf(name, sizeof(name), "%s/%s", cmddata->out_dir, cmddata->mpd_filename);
+
+	if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
+		audio_data_conf = gf_list_get(cmddata->audio_lst, 0);
+		audio_seg_dur = (int)((audio_data_conf->samplerate / (double) audio_frame_size) * (cmddata->seg_dur / 1000.0));
+		audio_frag_dur = (int)((audio_data_conf->samplerate / (double) audio_frame_size) * (cmddata->frag_dur / 1000.0));
+		optimize_seg_frag_dur(&audio_seg_dur, &audio_frag_dur);
+	}
+
+	if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
+		video_data_conf = gf_list_get(cmddata->video_lst, 0);
+		video_seg_dur = (int)(video_data_conf->framerate * (cmddata->seg_dur / 1000.0));
+		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) ...
+
+	//	time_t t = time(NULL);
+	//	time_t t2 = t + 2;
+	//	t += (2 * (cmddata->seg_dur / 1000.0));
+	//	tm = *gmtime(&t2);
+	//	snprintf(availability_start_time, "%d-%d-%dT%d:%d:%dZ", tm.tm_year + 1900,
+	//			tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec);
+	//	fprintf(stdout, "%s \n", availability_start_time);
+
+	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");
+	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);
+
+	if (strcmp(cmddata->base_url, "") != 0) {
+		fprintf(f, " <BaseURL>%s</BaseURL>\n", cmddata->base_url);
+	}
+
+	fprintf(f, " <Period start=\"0\" id=\"\">\n");
+
+	if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
+		fprintf(f, "  <AdaptationSet segmentAlignment=\"true\" bitstreamSwitching=\"false\">\n");
+
+		fprintf(f,
+			"   <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);
+
+		if (ast_offset<0) {
+			fprintf(f, " availabilityTimeOffset=\"%g\"", -ast_offset/1000.0);	
+		}
+		fprintf(f, "/>\n");
+
+
+
+		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);
+		}
+
+		fprintf(f, "  </AdaptationSet>\n");
+	}
+
+	if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
+		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);
+
+
+		if (ast_offset<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);
+		}
+
+		fprintf(f, "  </AdaptationSet>\n");
+	}
+
+	fprintf(f, " </Period>\n");
+
+	fprintf(f, "</MPD>\n");
+
+	fclose(f);
+
+//	fprintf(stdout, "\33[34m\33[1m");
+	fprintf(stdout, "MPD file generated: %s/%s\n", cmddata->out_dir, cmddata->mpd_filename);
+//	fprintf(stdout, "\33[0m");
+}
+
+static u32 mpd_thread(void *params)
+{
+	ThreadParam *th_param = (ThreadParam*)params;
+	CmdData *cmddata = th_param->in_data;
+	MessageQueue *mq = th_param->mq;
+	char availability_start_time[GF_MAX_PATH];
+	char presentation_duration[GF_MAX_PATH];
+	char time_shift[GF_MAX_PATH] = "";
+	AudioDataConf *audio_data_conf = NULL;
+	VideoDataConf *video_data_conf = NULL;
+	struct tm ast_time;
+
+	segtime main_seg_time;
+	Bool first = GF_TRUE;
+	main_seg_time.segnum = 0;
+	main_seg_time.time = 0;
+
+	if (cmddata->mode == LIVE_CAMERA || cmddata->mode == LIVE_MEDIA) {
+		while (1) {
+			u32 msecs;
+			time_t t;
+			segtime seg_time;
+			seg_time.segnum = 0;
+			seg_time.time = 0;
+
+			if (cmddata->exit_signal) {
+				break;
+			}
+
+			if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
+				dc_message_queue_get(mq, &seg_time);
+			}
+
+			if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
+				if (dc_message_queue_get(mq, &seg_time)<0) {
+					continue;
+				}
+
+				if (cmddata->ast_offset>0) {
+					seg_time.time += cmddata->ast_offset;
+				}
+
+				if (cmddata->use_dynamic_ast) {
+					main_seg_time = seg_time;
+				} else {
+					//get the last notification of AST 
+					if (first) {
+						if (seg_time.segnum) {
+							first = GF_FALSE;
+						} else {
+							main_seg_time = seg_time;
+						}
+					} else {
+						assert(seg_time.segnum);
+					}
+				}
+			}
+
+			//printf time at which we generate MPD
+			t = seg_time.time / 1000;
+			msecs = (u32) ( (seg_time.time - t*1000) );
+			ast_time = *gmtime(&t);
+			strftime(availability_start_time, 64, "%Y-%m-%dT%H:%M:%S", &ast_time);
+			fprintf(stdout, "Generating MPD at %s.%d\n", availability_start_time, msecs);
+
+			t = main_seg_time.time / 1000;
+			msecs = (u32) ( (main_seg_time.time - t*1000) );
+			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;
+				h = ts / 3600;
+				ts = ts % 3600;
+				m = ts / 60;
+				s = ts % 60;
+				snprintf(time_shift, sizeof(time_shift), "timeShiftBufferDepth=\"PT%02dH%02dM%02dS\"", h, m, s);
+			}
+
+			dc_write_mpd(cmddata, audio_data_conf, video_data_conf, presentation_duration, availability_start_time, time_shift, main_seg_time.segnum, cmddata->ast_offset);
+		}
+	} else {
+
+		int a_dur = 0;
+		int v_dur = 0;
+
+		if (strcmp(cmddata->audio_data_conf.filename, "") != 0) {
+			dc_message_queue_get(mq, &a_dur);
+		}
+
+		if (strcmp(cmddata->video_data_conf.filename, "") != 0) {
+			dc_message_queue_get(mq, &v_dur);
+		}
+
+		{
+			int dur, h, m, s, ms;
+			dur = v_dur > a_dur ? v_dur : a_dur;
+			h = dur / 3600000;
+			dur = dur % 3600000;
+			m = dur / 60000;
+			dur = dur % 60000;
+			s = dur / 1000;
+			ms = dur % 1000;
+			snprintf(presentation_duration, sizeof(presentation_duration), "PT%02dH%02dM%02d.%03dS", h, m, s, ms);
+			fprintf(stdout, "Duration: %s\n", presentation_duration);
+		}
+
+		dc_write_mpd(cmddata, audio_data_conf, video_data_conf, presentation_duration, availability_start_time, time_shift, 0, cmddata->ast_offset);
+	}
+
+	return 0;
+}
+
+u32 delete_seg_thread(void *params)
+{
+	int ret;
+	ThreadParam *th_param = (ThreadParam*)params;CmdData *cmd_data = th_param->in_data;
+	MessageQueue *mq = th_param->mq;
+
+	char buff[GF_MAX_PATH];
+
+	while (1) {
+		ret = dc_message_queue_get(mq, (void*) buff);
+		if (ret > 0) {
+			int status;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Message received: %s\n", buff));
+			status = unlink(buff);
+			if (status != 0) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Unable to delete the file %s\n", buff));
+			}
+		}
+
+		if (cmd_data->exit_signal) {
+			break;
+		}
+	}
+
+	return 0;
+}
+
+Bool fragmenter_thread(void *params)
+{
+	int ret;
+	ThreadParam *th_param = (ThreadParam*)params;
+	CmdData *cmd_data = th_param->in_data;
+	MessageQueue *mq = th_param->mq;
+
+	char buff[GF_MAX_PATH];
+
+	while (1) {
+		ret = dc_message_queue_get(mq, (void*) buff);
+		if (ret > 0) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Message received: %s\n", buff));
+		}
+
+		if (cmd_data->exit_signal) {
+			break;
+		}
+	}
+
+	return 0;
+}
+
+Bool dasher_thread(void *params)
+{
+//	int i;
+//	ThreadParam *th_param = (ThreadParam *) params;
+//	CmdData *cmd_data = th_param->in_data;
+//
+//	char sz_mpd[GF_MAX_PATH];
+//	GF_DashSegmenterInput *dash_inputs;
+//	u32 nb_dash_inputs = 0;
+//	Bool use_url_template = 0;
+//	GF_Err e;
+//	s32 subsegs_per_sidx = 0;
+//	Bool daisy_chain_sidx = 0;
+//	char *seg_ext = NULL;
+//	const char *dash_title = NULL;
+//	const char *dash_source = NULL;
+//	const char *dash_more_info = NULL;
+//	char *tmpdir = NULL, *cprt = NULL, *seg_name = NULL;
+//	char **mpd_base_urls = NULL;
+//	u32 nb_mpd_base_urls = 0;
+//	Bool single_segment = 0;
+//
+//	Bool single_file = 0;
+//	GF_DashSwitchingMode bitstream_switching_mode = GF_DASH_BSMODE_INBAND;
+//	Bool seg_at_rap = 0;
+//	Bool frag_at_rap = 0;
+//
+//	Double interleaving_time = 0.0;
+//	u32 time_shift_depth = 0;
+//	Double dash_duration = 0.0, dash_subduration = 0.0;
+//	u32 mpd_update_time = 0;
+//
+//
+//	GF_DashProfile dash_profile = GF_DASH_PROFILE_UNKNOWN;
+//	u32 dash_dynamic = 0;
+//	GF_Config *dash_ctx = NULL;
+//
+//	int video_list_size = gf_list_count(cmd_data->video_lst);
+//	int audio_list_size = gf_list_count(cmd_data->audio_lst);
+//	nb_dash_inputs = video_list_size + audio_list_size;
+//
+//	dash_inputs = gf_malloc(nb_dash_inputs * sizeof(GF_DashSegmenterInput));
+//
+//	for (i = 0; i < video_list_size; i++) {
+//
+//		VideoDataConf *video_data_conf = gf_list_get(cmd_data->video_lst, i);
+//		dash_inputs[i].file_name = video_data_conf->filename;
+//		snprintf(dash_inputs[i].representationID, "%d", i);
+//		strcpy(dash_inputs[i].periodID, "");
+//		strcpy(dash_inputs[i].role, "");
+//
+//	}
+//
+//	for (i = 0; i < audio_list_size; i++) {
+//
+//		AudioDataConf *audio_data_conf = gf_list_get(cmd_data->audio_lst, i);
+//		dash_inputs[i + video_list_size].file_name = audio_data_conf->filename;
+//		snprintf(dash_inputs[i + video_list_size].representationID, "%d",
+//				i + video_list_size);
+//		strcpy(dash_inputs[i + video_list_size].periodID, "");
+//		strcpy(dash_inputs[i + video_list_size].role, "");
+//
+//	}
+//
+//	dash_profile = cmd_data->live ? GF_DASH_PROFILE_LIVE : GF_DASH_PROFILE_MAIN;
+//	strncpy(sz_mpd, cmd_data->mpd_filename, GF_MAX_PATH);
+//
+//	dash_duration = cmd_data->dash_dur ? cmd_data->dash_dur / 1000 : 1;
+//
+//	if (cmd_data->live) {
+//		dash_ctx = gf_cfg_new(NULL, NULL);
+//	}
+//
+//	if (!dash_dynamic) {
+//		time_shift_depth = 0;
+//		mpd_update_time = 0;
+//	} else if ((dash_profile >= GF_DASH_PROFILE_MAIN) && !use_url_template
+//			&& !mpd_update_time) {
+//		/*use a default MPD update of dash_duration sec*/
+//		mpd_update_time = (u32) (
+//				dash_subduration ? dash_subduration : dash_duration);
+//		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Using default MPD refresh of %d seconds\n",
+//				mpd_update_time);
+//	}
+//
+//	if (cmd_data->live)
+//		gf_sleep(dash_duration * 1000);
+//
+//	while (1) {
+//
+//		//TODO Signiture of this API has changed!
+//		/*
+//		e = gf_dasher_segment_files(sz_mpd, 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, single_segment, single_file,
+//				bitstream_switching_mode, seg_at_rap, dash_duration, seg_name,
+//				seg_ext, interleaving_time, subsegs_per_sidx, daisy_chain_sidx,
+//				frag_at_rap, tmpdir, dash_ctx, dash_dynamic, mpd_update_time,
+//				time_shift_depth, dash_subduration);
+//
+//		if (e) {
+//			fprintf(stdout, "Error while segmenting.\n");
+//			break;
+//		}
+//		*/
+//
+//		if (!cmd_data->live)
+//			break;
+//
+//		u32 sleefor = gf_dasher_next_update_time(dash_ctx, mpd_update_time);
+//
+//		if (cmd_data->exit_signal) {
+//			break;
+//		}
+//
+//		if (sleefor) {
+//			if (dash_dynamic != 2) {
+//				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("sleep for %d ms\n", sleefor);
+//				gf_sleep(sleefor);
+//			}
+//		}
+//
+//	}
+
+	return 0;
+}
+
+static u32 keyboard_thread(void *params)
+{
+
+	ThreadParam *th_param = (ThreadParam*)params;
+	CmdData *in_data = th_param->in_data;
+	char c;
+
+	while (1) {
+		if (gf_prompt_has_input()) {
+			c = gf_prompt_get_char();
+			if (c == 'q' || c == 'Q') {
+				in_data->exit_signal = 1;
+				break;
+			}
+		}
+
+		if (in_data->exit_signal) {
+			break;
+		}
+
+		gf_sleep(100);
+	}
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Keyboard thread exit\n"));
+	return 0;
+}
+
+u32 video_decoder_thread(void *params)
+{
+#ifdef DASHCAST_PRINT
+	int i = 0;
+#endif
+	int ret;
+	int source_number = 0;
+
+	//int first_time = 1;
+	struct timeval time_start, time_end, time_wait;
+	VideoThreadParam *thread_params = (VideoThreadParam *) params;
+
+	CmdData *in_data = thread_params->in_data;
+	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 pick_packet_delay, select_delay = 0, real_wait, other_delays = 2;
+
+	Task t;
+	//fprintf(stdout, "wait time : %f\n", total_wait_time);
+
+	if (!gf_list_count(in_data->video_lst))
+		return 0;
+
+	while (1) {
+		dc_task_get_current(&in_data->task_list, &t);
+		source_number = t.source_number;
+
+		//fprintf(stdout, "sourcenumber: %d\n", source_number);
+
+		if (video_input_file[source_number]->mode == LIVE_MEDIA) {
+			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);
+#ifdef DASHCAST_PRINT
+		fprintf(stdout, "Read video frame %d\r", i++);
+		fflush(stdout);
+#endif
+		if (ret == -2) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video reader has no more frame to read.\n"));
+			break;
+		}
+		if (ret == -1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occurred while reading video frame.\n"));
+			break;
+		}
+
+		if (in_data->exit_signal) {
+			dc_video_input_data_end_signal(video_input_data);
+			break;
+		}
+
+		if (video_input_file[source_number]->mode == LIVE_MEDIA) {
+			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);
+			select(0, NULL, NULL, NULL, &time_wait);
+			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;
+		}
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Video decoder is exiting...\n"));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("video decoder thread exit\n"));
+	return 0;
+}
+
+u32 audio_decoder_thread(void *params)
+{
+#ifdef DASHCAST_PRINT
+	int i = 0;
+#endif
+	int ret;
+	struct timeval time_start, time_end, time_wait;
+	AudioThreadParam *thread_params = (AudioThreadParam*)params;
+
+	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) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error: invalid audio sample rate: %d\n", in_data->audio_data_conf.samplerate));
+		dc_audio_inout_data_end_signal(audio_input_data);
+		//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);
+	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));
+
+	if (!gf_list_count(in_data->audio_lst))
+		return 0;
+
+	while (1) {
+		if (audio_input_file->mode == LIVE_MEDIA) {
+			gettimeofday(&time_start, NULL);
+		}
+
+		ret = dc_audio_decoder_read(audio_input_file, audio_input_data);
+#ifdef DASHCAST_PRINT
+		fprintf(stdout, "Read audio frame %d\r", i++);
+		fflush(stdout);
+#endif
+		if (ret == -2) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio decoder has no more frame to read.\n"));
+			break;
+		}
+		if (ret == -1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occurred while reading video frame.\n"));
+			break;
+		}
+
+		if (in_data->exit_signal) {
+			dc_audio_inout_data_end_signal(audio_input_data);
+			break;
+		}
+
+		if (audio_input_file->mode == LIVE_MEDIA) {
+			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);
+			select(0, NULL, NULL, NULL, &time_wait);
+			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;
+		}
+	}
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio decoder is exiting...\n"));
+	return 0;
+}
+
+u32 video_scaler_thread(void *params)
+{
+	int ret;
+	VideoThreadParam *thread_params = (VideoThreadParam *) params;
+	CmdData *in_data = thread_params->in_data;
+	VideoInputData *video_input_data = thread_params->video_input_data;
+	VideoScaledData *video_scaled_data = thread_params->video_scaled_data;
+
+	if (!gf_list_count(in_data->video_lst))
+		return 0;
+
+	while (1) {
+		ret = dc_video_scaler_scale(video_input_data, video_scaled_data);
+		if (ret == -2) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Video scaler has no more frame to read.\n"));
+			break;
+		}
+	}
+
+	dc_video_scaler_end_signal(video_scaled_data);
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("video scaler thread exit\n"));
+	return 0;
+}
+
+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;
+	char name_to_delete[GF_MAX_PATH], name_to_send[GF_MAX_PATH];
+	u64 start_utc, seg_utc;
+	segtime time_at_segment_start;
+	VideoMuxerType muxer_type = VIDEO_MUXER;
+	VideoThreadParam *thread_params = (VideoThreadParam*)params;
+
+	CmdData *in_data = thread_params->in_data;
+	int video_conf_idx = thread_params->video_conf_idx;
+	VideoDataConf *video_data_conf = gf_list_get(in_data->video_lst, video_conf_idx);
+
+	VideoScaledData *video_scaled_data = thread_params->video_scaled_data;
+	int video_cb_size = (in_data->mode == LIVE_MEDIA || in_data->mode == LIVE_CAMERA) ? 1 : VIDEO_CB_DEFAULT_SIZE;
+	VideoOutputFile out_file;
+
+	MessageQueue *mq = thread_params->mq;
+	MessageQueue *delete_seg_mq = thread_params->delete_seg_mq;
+	MessageQueue *send_seg_mq = thread_params->send_seg_mq;
+#ifndef FRAGMENTER
+	MessageQueue *mq = thread_params->mq;
+#endif
+
+	if (!gf_list_count(in_data->video_lst))
+		return 0;
+
+	seg_frame_max = (int)(video_data_conf->framerate * (float) (in_data->seg_dur / 1000.0));
+	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);
+
+	if (seg_frame_max <= 0)
+		seg_frame_max = -1;
+
+	shift = 0;
+	if (in_data->use_source_timing) {
+		//ugly patch ...
+		shift = 1000;
+		while (!video_scaled_data->frame_duration && shift) {
+			gf_sleep(1);
+			shift--;
+		}
+		shift = (u32) video_scaled_data->frame_duration;
+	}
+	if (dc_video_muxer_init(&out_file, video_data_conf, muxer_type, seg_frame_max, frag_frame_max, in_data->seg_marker, in_data->gdr, in_data->seg_dur, in_data->frag_dur, shift, in_data->gop_size, video_cb_size) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot init output video file.\n"));
+		in_data->exit_signal = 1;
+		return -1;
+	}
+
+	if (dc_video_encoder_open(&out_file, video_data_conf, in_data->use_source_timing) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video stream.\n"));
+		in_data->exit_signal = 1;
+		return -1;
+	}
+
+	start_utc = gf_net_get_utc();
+	seg_utc = 0;
+	while (1) {
+		frame_nb = 0;
+		//log time at segment start, because segment availabilityStartTime is computed from AST anchor + segment duration
+		//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;
+			return -1;
+		}
+//		fprintf(stdout, "Header size: %d\n", ret);
+		while (1) {
+//			if (seg_frame_max > 0) {
+//				if (frame_nb == seg_frame_max)
+//					break;
+//			}
+			//we have the RAP already encoded, skip coder
+			if (loss_state == 2) {
+				ret = 1;
+				loss_state = 0;
+			} else {
+				ret = dc_video_encoder_encode(&out_file, video_scaled_data);
+			}
+
+			if (ret == -2) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio encoder has no more data to encode.\n"));
+				quit = 1;
+				break;
+			}
+			if (ret == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occured while writing video frame.\n"));
+				quit = 1;
+				break;
+			}
+
+			if (ret > 0) {
+				int r;
+				/*resync at first RAP: flush current broken segment and restart next one on rap*/
+				if ((loss_state==1) && out_file.codec_ctx->coded_frame->key_frame) {
+					loss_state = 2;
+					break;
+				}
+
+				r = dc_video_muxer_write(&out_file, frame_nb, in_data->insert_utc);
+				if (r < 0) {
+					quit = 1;
+					in_data->exit_signal = 1;
+					break;
+				} else if (r == 1) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("fragment is written!\n"));
+					if (in_data->send_message == 1) {
+						snprintf(name_to_send, sizeof(name_to_send), "%s/%s_%d_gpac.m4s", in_data->out_dir, video_data_conf->filename, seg_nb);
+						dc_message_queue_put(send_seg_mq, name_to_send, sizeof(name_to_send));
+					}
+
+					break;
+				}
+
+				frame_nb++;
+			}
+		}
+
+		dc_video_muxer_close(&out_file);
+
+#ifndef FRAGMENTER
+		dc_message_queue_put(mq, video_data_conf->filename, sizeof(video_data_conf->filename));
+#endif
+
+		// If system is live,
+		// Send the time that a segment is available to MPD generator thread.
+		if (in_data->mode == LIVE_MEDIA || in_data->mode == LIVE_CAMERA) {
+			//check we don't loose sync
+			int diff;
+			int seg_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, ("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) {
+					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;
+					}
+				}
+				//wait for RAP to cut next segment
+				loss_state = 1;
+			} else {
+#define SYNC_SAFE	800
+
+				seg_diff = diff;
+				seg_diff -= (seg_nb+1) * in_data->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));			
+				}
+				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));			
+				} 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));			
+				}
+			}
+
+			//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) {
+				snprintf(name_to_delete, sizeof(name_to_delete), "%s/%s_%d_gpac.m4s", in_data->out_dir, video_data_conf->filename, (seg_nb - shift));
+				dc_message_queue_put(delete_seg_mq, name_to_delete, sizeof(name_to_delete));
+			}
+		}
+
+		seg_nb++;
+
+		if (quit)
+			break;
+	}
+
+	// If system is not live,
+	// Send the duration of the video
+	if (in_data->mode == ON_DEMAND) {
+		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;
+			if (dur > dur_tot)
+				dur = dur_tot;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Duration: %d \n", dur));
+			dc_message_queue_put(mq, &dur, sizeof(dur));
+		}
+	}
+
+	/* Close output video file */
+	dc_video_encoder_close(&out_file);
+
+	dc_video_muxer_free(&out_file);
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("video encoder thread exit\n"));
+	return 0;
+}
+
+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 seg_frame_max;
+	//int frag_frame_max;
+	//int audio_frame_size = AUDIO_FRAME_SIZE;
+	char name_to_delete[GF_MAX_PATH];
+	u64 start_utc, seg_utc;
+
+	AudioMuxerType muxer_type = AUDIO_MUXER;
+	AudioThreadParam *thread_params = (AudioThreadParam *) params;
+
+	CmdData *in_data = thread_params->in_data;
+	int audio_conf_idx = thread_params->audio_conf_idx;
+	AudioDataConf *audio_data_conf = gf_list_get(in_data->audio_lst, audio_conf_idx);
+
+	AudioInputData *audio_input_data = thread_params->audio_input_data;
+	AudioOutputFile audio_output_file;
+
+	MessageQueue *mq = thread_params->mq;
+	MessageQueue *delete_seg_mq = thread_params->delete_seg_mq;
+#ifndef FRAGMENTER
+	MessageQueue *mq = thread_params->mq;
+#endif
+
+	if (!gf_list_count(in_data->audio_lst))
+		return 0;
+
+	//seg_frame_max = audio_data_conf->samplerate
+	//		* (float) (in_data->seg_dur / 1000.0);
+
+	//frag_frame_max = audio_data_conf->samplerate * (float) (in_data->frag_dur / 1000.0);
+	//if (seg_frame_max <= 0)
+	//	seg_frame_max = -1;
+
+	if (dc_audio_encoder_open(&audio_output_file, audio_data_conf) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output audio stream.\n"));
+		in_data->exit_signal = 1;
+		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));
+	optimize_seg_frag_dur(&frame_per_seg, &frame_per_frag);
+
+	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;
+		return -1;
+	}
+
+	start_utc = gf_net_get_utc();
+	seg_utc = 0;
+	while (1) {
+		frame_nb = 0;
+		quit = 0;
+		if (dc_audio_muxer_open(&audio_output_file, in_data->out_dir, audio_data_conf->filename, seg_nb) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output audio.\n"));
+			in_data->exit_signal = 1;
+			return -1;
+		}
+
+		while (1) {
+			exit_loop = 0;
+//			if (frame_per_seg > 0) {
+//				if (frame_nb == frame_per_seg) {
+//
+//					//if (dc_audio_encoder_flush(&audio_output_file, audio_input_data) == 0) {
+//					//	dc_audio_muxer_write(&audio_output_file);
+//					//	frame_nb++;//= audio_output_file.codec_ctx->frame_size; //audio_output_file.acc_samples;
+//					//}
+//
+//					exit_loop = 1;
+//					break;
+//				}
+//			}
+
+			ret = dc_audio_encoder_read(&audio_output_file, audio_input_data);
+			if (ret == -2) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio encoder has no more data to encode.\n"));
+				//if (dc_audio_encoder_flush(&audio_output_file, audio_input_data) == 0) {
+				//	dc_audio_muxer_write(&audio_output_file);
+				//	frame_nb++;//= audio_output_file.codec_ctx->frame_size; //audio_output_file.acc_samples;
+				//}
+				quit = 1;
+				break;
+			}
+
+			while (1) {
+				ret = dc_audio_encoder_encode(&audio_output_file, audio_input_data);
+				if (ret == 1) {
+					break;
+				}
+				if (ret == -1) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occured while encoding audio frame.\n"));
+					quit = 1;
+					break;
+				}
+
+				ret = dc_audio_muxer_write(&audio_output_file, frame_nb);
+				if (ret == -1) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("An error occured while writing audio frame.\n"));
+					quit = 1;
+					break;
+				}
+
+				if (ret == 1) {
+					exit_loop = 1;
+					break;
+				}
+
+				frame_nb++; //= audio_output_file.codec_ctx->frame_size; //audio_output_file.acc_samples;
+			}
+
+			if (exit_loop || quit)
+				break;
+		}
+
+		dc_audio_muxer_close(&audio_output_file);
+
+#ifndef FRAGMENTER
+		dc_message_queue_put(mq, audio_data_conf->filename, sizeof(audio_data_conf->filename));
+#endif
+
+		// Send the time that a segment is available to MPD generator thread.
+		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) {
+						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));
+				t.segnum = seg_nb;
+				t.time = gf_net_get_utc();
+				//time_t t = time(NULL);
+				dc_message_queue_put(mq, &t, sizeof(t));
+			}
+		}
+
+		if (in_data->time_shift != -1) {
+			shift = 1000 * in_data->time_shift / in_data->seg_dur;
+			snprintf(name_to_delete, sizeof(name_to_delete), "%s/%s_%d_gpac.m4s", in_data->out_dir, audio_data_conf->filename, (seg_nb - shift));
+			dc_message_queue_put(delete_seg_mq, name_to_delete, sizeof(name_to_delete));
+		}
+
+		seg_nb++;
+
+		if (quit)
+			break;
+	}
+
+	// If system is not live,
+	// 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;
+			if (dur > dur_tot)
+				dur = dur_tot;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Duration: %d \n", dur));
+			dc_message_queue_put(mq, &dur, sizeof(dur));
+		}
+	}
+
+	dc_audio_muxer_free(&audio_output_file);
+
+	/* Close output audio file */
+	dc_audio_encoder_close(&audio_output_file);
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Audio encoder is exiting...\n"));
+	return 0;
+}
+
+int dc_run_controler(CmdData *in_data)
+{
+	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;
+	ThreadParam send_frag_th_params;
+
+	//Video parameters
+	VideoThreadParam vdecoder_th_params;
+	VideoThreadParam *vencoder_th_params = alloca(gf_list_count(in_data->video_lst) * sizeof(VideoThreadParam));
+	VideoInputData video_input_data;
+	VideoInputFile *video_input_file[MAX_SOURCE_NUMBER];
+	VideoScaledDataList video_scaled_data_list;
+	VideoThreadParam *vscaler_th_params = NULL;
+
+	//Audio parameters
+	AudioThreadParam adecoder_th_params;
+	AudioThreadParam *aencoder_th_params = alloca(gf_list_count(in_data->audio_lst) * sizeof(AudioThreadParam));
+	AudioInputData audio_input_data;
+	AudioInputFile audio_input_file;
+
+#ifndef DASHER
+	ThreadParam dasher_th_params;
+#endif
+
+#ifndef FRAGMENTER
+	ThreadParam fragmenter_th_params;
+#endif
+
+	MessageQueue mq;
+	MessageQueue delete_seg_mq;
+	MessageQueue send_frag_mq;
+
+	dc_register_libav();
+
+	for (i = 0; i < MAX_SOURCE_NUMBER; i++)
+		video_input_file[i] = gf_malloc(sizeof(VideoInputFile));
+
+	dc_message_queue_init(&mq);
+	dc_message_queue_init(&delete_seg_mq);
+	dc_message_queue_init(&send_frag_mq);
+
+	memset(&audio_input_data, 0, sizeof(AudioInputData));;
+	memset(&audio_input_file, 0, sizeof(AudioInputFile));
+	memset(&video_input_data, 0, sizeof(VideoInputData));
+
+
+	if (in_data->mode == LIVE_CAMERA || in_data->mode == LIVE_MEDIA)
+		video_cb_size  = 1;
+
+	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
+		dc_video_scaler_list_init(&video_scaled_data_list, in_data->video_lst);
+		vscaler_th_params = gf_malloc(video_scaled_data_list.size * sizeof(VideoThreadParam));
+
+		/* Open input video */
+		if (dc_video_decoder_open(video_input_file[0], &in_data->video_data_conf, in_data->mode, in_data->no_loop, video_scaled_data_list.size) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input video.\n"));
+			ret = -1;
+			goto exit;
+		}
+
+		if (dc_video_input_data_init(&video_input_data, /*video_input_file[0]->width, video_input_file[0]->height,
+		  video_input_file[0]->pix_fmt,*/video_scaled_data_list.size, in_data->mode, MAX_SOURCE_NUMBER, video_cb_size) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot initialize audio data.\n"));
+			ret = -1;
+			goto exit;
+		}
+
+		/* open other input videos for source switching */
+		for (i = 0; i < gf_list_count(in_data->vsrc); i++) {
+			VideoDataConf *video_data_conf = gf_list_get(in_data->vsrc, i);
+			if (dc_video_decoder_open(video_input_file[i + 1], video_data_conf, LIVE_MEDIA, 1, video_scaled_data_list.size) < 0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input video.\n"));
+				ret = -1;
+				goto exit;
+			}
+		}
+
+		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);
+		}
+
+		for (i=0; i<video_scaled_data_list.size; i++) {
+			dc_video_scaler_data_init(&video_input_data, video_scaled_data_list.video_scaled_data[i], MAX_SOURCE_NUMBER, video_cb_size);
+
+			for (j=0; j<gf_list_count(in_data->vsrc) + 1; j++) {
+				dc_video_scaler_data_set_prop(&video_input_data, video_scaled_data_list.video_scaled_data[i], j);
+			}
+		}
+
+		/* Initialize video decoder thread */
+		vdecoder_th_params.thread = gf_th_new("video_decoder_thread");
+
+		for (i=0; i<video_scaled_data_list.size; i++) {
+			vscaler_th_params[i].thread = gf_th_new("video_scaler_thread");
+		}
+
+		/* Initialize video encoder threads */
+		for (i=0; i<gf_list_count(in_data->video_lst); i++)
+			vencoder_th_params[i].thread = gf_th_new("video_encoder_thread");
+	}
+
+	/* When video and audio share the same source, open it once. This allow to read from unicast streams */
+	if (!strcmp(in_data->video_data_conf.filename, in_data->audio_data_conf.filename)) {
+		audio_input_file.av_fmt_ctx = video_input_file[0]->av_fmt_ctx;
+		video_input_file[0]->av_fmt_ctx_ref_cnt++;
+		audio_input_file.av_pkt_list = video_input_file[0]->av_pkt_list = gf_list_new();
+		audio_input_file.av_pkt_list_mutex = video_input_file[0]->av_pkt_list_mutex = gf_mx_new("Demux AVPackets List");
+	}
+
+	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
+		/* Open input audio */
+		if (dc_audio_decoder_open(&audio_input_file, &in_data->audio_data_conf, in_data->mode, in_data->no_loop) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open input audio.\n"));
+			ret = -1;
+			goto exit;
+		}
+
+		if (dc_audio_input_data_init(&audio_input_data, in_data->audio_data_conf.channels, in_data->audio_data_conf.samplerate, gf_list_count(in_data->audio_lst), in_data->mode) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot initialize audio data.\n"));
+			ret = -1;
+			goto exit;
+		}
+
+		/* Initialize audio decoder thread */
+		adecoder_th_params.thread = gf_th_new("audio_decoder_thread");
+
+		/* Initialize audio encoder threads */
+		for (i = 0; i < gf_list_count(in_data->audio_lst); i++)
+			aencoder_th_params[i].thread = gf_th_new("video_encoder_thread");
+	}
+
+	/******** Keyboard controler Thread ********/
+
+	/* 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) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for keyboard_thread.\n"));
+	}
+
+	/********************************************/
+
+	//Communication between decoder and audio encoder
+	for (i = 0; i < gf_list_count(in_data->audio_lst); i++) {
+		AudioDataConf *tmadata = gf_list_get(in_data->audio_lst, i);
+		tmadata->channels = in_data->audio_data_conf.channels;
+		tmadata->samplerate = in_data->audio_data_conf.samplerate;
+	}
+
+	//Communication between decoder and video encoder
+	for (i = 0; i < gf_list_count(in_data->video_lst); i++) {
+		VideoDataConf *tmvdata = gf_list_get(in_data->video_lst, i);
+		tmvdata->framerate = in_data->video_data_conf.framerate;
+		if (in_data->use_source_timing) {
+			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;
+	if (gf_th_run(mpd_th_params.thread, mpd_thread, (void *)&mpd_th_params) != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for mpd_thread.\n"));
+	}
+
+	/****************************/
+
+	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
+		/* Create video encoder threads */
+		for (i=0; i<gf_list_count(in_data->video_lst); i++) {
+			VideoDataConf * video_data_conf = gf_list_get(in_data->video_lst, i);
+
+			vencoder_th_params[i].in_data = in_data;
+			vencoder_th_params[i].video_conf_idx = i;
+			vencoder_th_params[i].video_scaled_data = dc_video_scaler_get_data(&video_scaled_data_list, video_data_conf->width, video_data_conf->height);
+
+			vencoder_th_params[i].mq = &mq;
+			vencoder_th_params[i].delete_seg_mq = &delete_seg_mq;
+			vencoder_th_params[i].send_seg_mq = &send_frag_mq;
+
+			if (gf_th_run(vencoder_th_params[i].thread, video_encoder_thread, (void*)&vencoder_th_params[i]) != GF_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for video_encoder_thread.\n"));
+			}
+		}
+
+		/* Create video scaler threads */
+		for (i=0; i<video_scaled_data_list.size; i++) {
+			vscaler_th_params[i].in_data = in_data;
+			vscaler_th_params[i].video_scaled_data = video_scaled_data_list.video_scaled_data[i];
+			vscaler_th_params[i].video_input_data = &video_input_data;
+
+			if (gf_th_run(vscaler_th_params[i].thread, video_scaler_thread, (void*)&vscaler_th_params[i]) != GF_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for video_scaler_thread.\n"));
+			}
+		}
+	}
+
+	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
+		/* Create audio encoder threads */
+		for (i = 0; i < gf_list_count(in_data->audio_lst); i++) {
+			aencoder_th_params[i].in_data = in_data;
+			aencoder_th_params[i].audio_conf_idx = i;
+			aencoder_th_params[i].audio_input_data = &audio_input_data;
+
+			aencoder_th_params[i].mq = &mq;
+			aencoder_th_params[i].delete_seg_mq = &delete_seg_mq;
+			aencoder_th_params[i].send_seg_mq = &send_frag_mq;
+
+			if (gf_th_run(aencoder_th_params[i].thread, audio_encoder_thread, (void *) &aencoder_th_params[i]) != GF_OK) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for audio_encoder_thread.\n"));
+			}
+		}
+	}
+
+	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
+		/* Create video decoder thread */
+		vdecoder_th_params.in_data = in_data;
+		vdecoder_th_params.video_input_data = &video_input_data;
+		vdecoder_th_params.video_input_file = video_input_file;
+		if (gf_th_run(vdecoder_th_params.thread, video_decoder_thread, (void *) &vdecoder_th_params) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for video_decoder_thread.\n"));
+		}
+	}
+
+	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
+		/* Create audio decoder thread */
+		adecoder_th_params.in_data = in_data;
+		adecoder_th_params.audio_input_data = &audio_input_data;
+		adecoder_th_params.audio_input_file = &audio_input_file;
+		if (gf_th_run(adecoder_th_params.thread, audio_decoder_thread, (void *) &adecoder_th_params) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for audio_decoder_thread.\n"));
+		}
+	}
+
+	if (in_data->time_shift != -1) {
+		/* Initialize delete segment thread */
+		delete_seg_th_params.thread = gf_th_new("delete_seg_thread");
+		delete_seg_th_params.in_data = in_data;
+		delete_seg_th_params.mq = &delete_seg_mq;
+		if (gf_th_run(delete_seg_th_params.thread, delete_seg_thread, (void *) &delete_seg_th_params) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for delete_seg_thread.\n"));
+		}
+	}
+
+	if (in_data->send_message == 1) {
+		/* Initialize delete segment thread */
+		send_frag_th_params.thread = gf_th_new("send_frag_event_thread");
+		send_frag_th_params.in_data = in_data;
+		send_frag_th_params.mq = &send_frag_mq;
+		if (gf_th_run(send_frag_th_params.thread, send_frag_event, (void *) &send_frag_th_params) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for send_frag_event_thread.\n"));
+		}
+	}
+
+#ifndef FRAGMENTER
+	if (strcmp(in_data->mpd_filename, "") != 0) {
+		/* Initialize keyboard controller thread */
+		fragmenter_th_params.thread = gf_th_new("fragmenter_thread");
+		fragmenter_th_params.in_data = in_data;
+		fragmenter_th_params.mq = &mq;
+		if (gf_th_run(fragmenter_th_params.thread, fragmenter_thread, (void *) &fragmenter_th_params) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for fragmenter_thread.\n"));
+		}
+	}
+#endif
+
+#ifndef DASHER
+	if (in_data->live && strcmp(in_data->mpd_filename, "") != 0) {
+		/* Initialize keyboard controller thread */
+		dasher_th_params.thread = gf_th_new("dasher_thread");
+		dasher_th_params.in_data = in_data;
+		if (gf_th_run(dasher_th_params.thread, dasher_thread, (void *) &dasher_th_params) != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while doing pthread_create for dasher_thread.\n"));
+		}
+	}
+#endif
+
+	fprintf(stdout, "Press q or Q to exit...\n");
+
+	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
+		/* Wait for and destroy audio decoder threads */
+		gf_th_stop(adecoder_th_params.thread);
+		gf_th_del(adecoder_th_params.thread);
+	}
+
+	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
+		/* Wait for and destroy video decoder threads */
+		gf_th_stop(vdecoder_th_params.thread);
+		gf_th_del(vdecoder_th_params.thread);
+	}
+
+	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
+		/* Wait for and destroy audio encoder threads */
+		for (i = 0; i < gf_list_count(in_data->audio_lst); i++) {
+			gf_th_stop(aencoder_th_params[i].thread);
+			gf_th_del(aencoder_th_params[i].thread);
+		}
+	}
+
+	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
+		/* Wait for and destroy video encoder threads */
+		for (i=0; i<gf_list_count(in_data->video_lst); i++) {
+			gf_th_stop(vencoder_th_params[i].thread);
+			gf_th_del(vencoder_th_params[i].thread);
+		}
+
+		/* Wait for and destroy video scaler threads */
+		for (i=0; i<video_scaled_data_list.size; i++) {
+			gf_th_stop(vscaler_th_params[i].thread);
+			gf_th_del(vscaler_th_params[i].thread);
+		}
+	}
+
+#ifndef DASHER
+	if (in_data->live && strcmp(in_data->mpd_filename, "") != 0) {
+		/* Wait for and destroy dasher thread */
+		gf_th_stop(dasher_th_params.thread);
+		gf_th_del(dasher_th_params.thread);
+	}
+#endif
+
+	keyboard_th_params.in_data->exit_signal = 1;
+
+#ifndef FRAGMENTER
+	dc_message_queue_flush(&mq);
+
+	if (strcmp(in_data->mpd_filename, "") != 0) {
+		/* Wait for and destroy dasher thread */
+		gf_th_stop(fragmenter_th_params.thread);
+		gf_th_del(fragmenter_th_params.thread);
+	}
+#endif
+
+	/********** Keyboard thread ***********/
+
+	/* Wait for and destroy keyboard controler thread */
+	gf_th_stop(keyboard_th_params.thread);
+	gf_th_del(keyboard_th_params.thread);
+
+	/**************************************/
+
+	/********** MPD generator thread ***********/
+
+	/* Wait for and destroy MPD generator thread */
+	gf_th_stop(mpd_th_params.thread);
+	gf_th_del(mpd_th_params.thread);
+
+	/**************************************/
+
+	if (in_data->time_shift != -1) {
+		//	dc_message_queue_flush(&delete_seg_mq);
+		/* Wait for and destroy delete segment thread */
+		gf_th_stop(delete_seg_th_params.thread);
+		gf_th_del(delete_seg_th_params.thread);
+	}
+
+	if (in_data->send_message == 1) {
+		/* Wait for and destroy delete segment thread */
+		gf_th_stop(send_frag_th_params.thread);
+		gf_th_del(send_frag_th_params.thread);
+	}
+
+#ifndef DASHER
+	if (!in_data->live && strcmp(in_data->mpd_filename, "") != 0) {
+		dasher_th_params.in_data = in_data;
+		dasher_thread((void*) &dasher_th_params);
+	}
+#endif
+	
+exit:
+	if (strcmp(in_data->audio_data_conf.filename, "") != 0) {
+		/* Destroy audio input data */
+		dc_audio_input_data_destroy(&audio_input_data);
+		/* Close input audio */
+		dc_audio_decoder_close(&audio_input_file);
+	}
+
+	if (strcmp(in_data->video_data_conf.filename, "") != 0) {
+		/* Destroy video input data */
+		dc_video_input_data_destroy(&video_input_data);
+
+		for (i = 0; i < gf_list_count(in_data->vsrc); i++) {
+			/* Close input video */
+			dc_video_decoder_close(video_input_file[i]);
+		}
+
+		for (i=0; i<video_scaled_data_list.size; i++) {
+			dc_video_scaler_data_destroy(video_scaled_data_list.video_scaled_data[i]);
+		}
+
+		/* Destroy video scaled data */
+		dc_video_scaler_list_destroy(&video_scaled_data_list);
+	}
+
+	if (vscaler_th_params)
+		gf_free(vscaler_th_params);
+
+	for (i = 0; i < MAX_SOURCE_NUMBER; i++)
+		gf_free(video_input_file[i]);
+
+	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.svn4668.tar.bz2/applications/dashcast/controler.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/controler.h Changed

@@ -38,81 +38,60 @@
 #include "cmd_data.h"
 #include "message_queue.h"
 
+
 /* General thread parameters */
 typedef struct {
 	/* command data */
-	CmdData * p_in_data;
+	CmdData *in_data;
 	/* handle to thread */
-	GF_Thread * p_thread;
-
-	MessageQueue * p_mq;
+	GF_Thread *thread;
 
+	MessageQueue *mq;
 } ThreadParam;
 
 /* Video thread parameters */
 typedef struct {
 	/* command data */
-	CmdData * p_in_data;
-	/* The index in the configuration file
-	 * to a video entry corresponding to
-	 * the thread.
-	 */
+	CmdData *in_data;
+	/* The index in the configuration file to a video entry corresponding to the thread. */
 	int video_conf_idx;
-	/* Video input data structure
-	 * corresponding to the thread. (This data
-	 * is shared between video decoder and 
-	 * video scaler)
-	 */
-	VideoInputData * p_vind;
-	/* Video scaled data structure
-	 * corresponding to the thread. (This data
-	 * is shared between video scaler and
-	 * video encoder)
-	 */
-	VideoScaledData * p_vsd;
-	/* Video input file structure 
-	 * corresponding to the thread
-	 */
-	VideoInputFile ** p_vinf;
+	/* Video input data structure corresponding to the thread. (This data is shared between video decoder and video scaler) */
+	VideoInputData *video_input_data;
+	/* Video scaled data structure corresponding to the thread. (This data is shared between video scaler and video encoder) */
+	VideoScaledData *video_scaled_data;
+	/* Video input file structure corresponding to the thread */
+	VideoInputFile **video_input_file;
 	/* handle to the thread */
-	GF_Thread * p_thread;
-
-	MessageQueue * p_mq;
-	MessageQueue * p_delete_seg_mq;
-	MessageQueue * p_send_seg_mq;
+	GF_Thread *thread;
 
+	MessageQueue *mq;
+	MessageQueue *delete_seg_mq;
+	MessageQueue *send_seg_mq;
 } VideoThreadParam;
 
 /* Audio thread parameters */
 typedef struct {
 	/* command data */
-	CmdData * p_in_data;
-	/* The index in the configuration file
-	 * to an audio entry corresponding to
-	 * the thread
-	 */
+	CmdData *in_data;
+	/* The index in the configuration file to an audio entry corresponding to the thread */
 	int audio_conf_idx;
-	/* Audio input data
-	 * (This data is shared between audio 
-	 * decoder and audio encoder
-	 */
-	AudioInputData * p_aind;
+	/* Audio input data (This data is shared between audio decoder and audio encoder */
+	AudioInputData *audio_input_data;
 	/* Audio input file structure */
-	AudioInputFile * p_ainf;
+	AudioInputFile *audio_input_file;
 	/* handle to the thread */
-	GF_Thread * p_thread;
-
-	MessageQueue * p_mq;
-	MessageQueue * p_delete_seg_mq;
-	MessageQueue * p_send_seg_mq;
+	GF_Thread *thread;
 
+	MessageQueue *mq;
+	MessageQueue *delete_seg_mq;
+	MessageQueue *send_seg_mq;
 } AudioThreadParam;
 
 /* 
  * Run controler runs all decoder, scalers, and encoders
  * of audio and video
  * 
- * @param cmdd [in] command data 
+ * @param cmd_data [in] command data 
  * 
  * @return 0 on success, -1 on failure
  */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/dashcast.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/dashcast.c Changed

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/libav_compat.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/libav_compat.h Changed

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/message_queue.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/message_queue.c Changed

@@ -25,39 +25,26 @@
 
 #include "message_queue.h"
 
-void dc_message_queue_init(MessageQueue *mq) {
 
+void dc_message_queue_init(MessageQueue *mq)
+{
 	memset(mq, 0, sizeof(MessageQueue));
 	mq->first_node = NULL;
 	mq->last_node = NULL;
 	mq->nb_nodes = 0;
-#ifdef GPAC_THREAD
-	mq->mux = gf_mx_new("MessageQueue Mutex");
-#ifdef SEM
+	mq->mutex = gf_mx_new("MessageQueue Mutex");
 	mq->sem = gf_sema_new(1000, 0); //TODO: why 1000 (at other places too)
-#else
-	mq->cond = gf_cond_new();
-#endif
-#else
-	pthread_mutex_init(&mq->mux, NULL);
-	pthread_cond_init(&mq->cond, NULL);
-#endif
-
 }
 
-void dc_message_queue_put(MessageQueue *mq, void *data, int size) {
-
-	MessageQueueNode * mqn = gf_malloc(sizeof(MessageQueueNode));
+void dc_message_queue_put(MessageQueue *mq, void *data, u32 size)
+{
+	MessageQueueNode *mqn = gf_malloc(sizeof(MessageQueueNode));
 	mqn->data = gf_malloc(size);
 	memcpy(mqn->data, data, size);
 	mqn->size = size;
 	mqn->next = NULL;
 
-#ifdef GPAC_THREAD
-	gf_mx_p(mq->mux);
-#else
-	pthread_mutex_lock(&mq->mux);
-#endif
+	gf_mx_p(mq->mutex);
 
 	if (!mq->last_node)
 		mq->first_node = mqn;
@@ -67,51 +54,29 @@
 	mq->last_node = mqn;
 	mq->nb_nodes++;
 
-#ifdef GPAC_THREAD
-#ifdef SEM
 	gf_sema_notify(mq->sem, 1);
-#else
-	gf_cond_signal(mq->cond);
-#endif
-	gf_mx_v(mq->mux);
-#else
-	pthread_cond_signal(&mq->cond);
-	pthread_mutex_unlock(&mq->mux);
-#endif
-
+	gf_mx_v(mq->mutex);
 }
 
-int dc_message_queue_get(MessageQueue *mq, void * data) {
-
+int dc_message_queue_get(MessageQueue *mq, void * data)
+{
 	int ret = 0;
-	MessageQueueNode * mqn;
+	MessageQueueNode *mqn;
 
-#ifdef GPAC_THREAD
-	gf_mx_p(mq->mux);
-#else
-	pthread_mutex_lock(&mq->mux);
-#endif
+	gf_mx_p(mq->mutex);
 
 	mqn = mq->first_node;
-
-	if(!mqn) {
-#ifdef GPAC_THREAD
-#ifdef SEM
-		gf_mx_v(mq->mux);
-		gf_sema_wait(mq->sem);
-		gf_mx_p(mq->mux);
-#else
-		//FIXME: doesn't work: semaphore based replacement above
-		gf_cond_wait(mq->cond, mq->mux);
-#endif
-#else
-		pthread_cond_wait(&mq->cond, &mq->mux);
-#endif
+	if (!mqn) {
+		gf_mx_v(mq->mutex);
+		ret = gf_sema_wait_for(mq->sem, 10000);
+		gf_mx_p(mq->mutex);
 
 		mqn = mq->first_node;
 
-		if (!mqn)
+		if (!ret || !mqn) {
+			gf_mx_v(mq->mutex);
 			return -1;
+		}
 	}
 	if (mqn) {
 		mq->first_node = mqn->next;
@@ -119,30 +84,21 @@
 			mq->last_node = NULL;
 		mq->nb_nodes--;
 		memcpy(data, mqn->data, mqn->size);
-		ret = mqn->size;
+		ret = (int)mqn->size;
 		gf_free(mqn->data);
 		gf_free(mqn);
 	}
 
-#ifdef GPAC_THREAD
-	gf_mx_v(mq->mux);
-#else
-	pthread_mutex_unlock(&mq->mux);
-#endif
+	gf_mx_v(mq->mutex);
 
 	return ret;
-
 }
 
-void dc_message_queue_flush(MessageQueue *mq) {
-
-	MessageQueueNode * mqn, *mqn1;
+void dc_message_queue_flush(MessageQueue *mq)
+{
+	MessageQueueNode *mqn, *mqn1;
 
-#ifdef GPAC_THREAD
-	gf_mx_p(mq->mux);
-#else
-	pthread_mutex_lock(&mq->mux);
-#endif
+	gf_mx_p(mq->mutex);
 
 	for (mqn = mq->first_node; mqn != NULL; mqn = mqn1) {
 		mqn1 = mqn->next;
@@ -152,33 +108,13 @@
 	mq->first_node = NULL;
 	mq->nb_nodes = 0;
 
-
-#ifdef GPAC_THREAD
-#ifdef SEM
 	gf_sema_notify(mq->sem, 1);
-#else
-	gf_cond_signal(mq->cond);
-#endif
-	gf_mx_v(mq->mux);
-#else
-	pthread_cond_signal(&mq->cond);
-	pthread_mutex_unlock(&mq->mux);
-#endif
-
+	gf_mx_v(mq->mutex);
 }
 
-void dc_message_queue_free(MessageQueue *mq) {
+void dc_message_queue_free(MessageQueue *mq)
+{
 	dc_message_queue_flush(mq);
-#ifdef GPAC_THREAD
-	gf_mx_del(mq->mux);
-#ifdef SEM
+	gf_mx_del(mq->mutex);
 	gf_sema_del(mq->sem);
-#else
-	gf_cond_del(mq->cond);
-#endif
-#else
-	pthread_mutex_destroy(&mq->mux);
-	pthread_cond_destroy(&mq->cond);
-#endif
 }
-

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/message_queue.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/message_queue.h Changed

@@ -26,51 +26,33 @@
 #ifndef MESSAGE_QUEUE_H_
 #define MESSAGE_QUEUE_H_
 
-#define GPAC_THREAD
-#ifdef WIN32
-#define SEM
-#endif
-
 #include <string.h>
 #include <stdlib.h>
-
-#ifdef GPAC_THREAD
 #include <gpac/thread.h>
-#else
-#include <pthread.h>
-#endif
-
-typedef struct MessageQueueNode {
 
-	void * data;
-	int size;
-	struct MessageQueueNode * next;
 
+typedef struct MessageQueueNode {
+	void *data;
+	u32 size;
+	struct MessageQueueNode *next;
 } MessageQueueNode;
 
 typedef struct MessageQueue {
-
-	MessageQueueNode * last_node;
-	MessageQueueNode * first_node;
+	MessageQueueNode *last_node;
+	MessageQueueNode *first_node;
 	int nb_nodes;
-#ifdef GPAC_THREAD
-#ifdef SEM
-	GF_Semaphore * sem;
-#else
-	GF_Condition * cond;
-#endif
-	GF_Mutex * mux;
-#else
-	pthread_mutex_t mux;
-	pthread_cond_t cond;
-#endif
-
+	GF_Semaphore *sem;
+	GF_Mutex *mutex;
 } MessageQueue;
 
 void dc_message_queue_init(MessageQueue *mq);
-void dc_message_queue_put(MessageQueue *mq, void * data, int size);
-int dc_message_queue_get(MessageQueue *mq, void * data);
+
+void dc_message_queue_put(MessageQueue *mq, void *data, u32 size);
+
+int dc_message_queue_get(MessageQueue *mq, void *data);
+
 void dc_message_queue_flush(MessageQueue *mq);
+
 void dc_message_queue_free(MessageQueue *mq);
 
 #endif /* MESSAGE_QUEUE_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/register.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/register.c Changed

@@ -25,11 +25,21 @@
 
 #include "register.h"
 
-int lock_call_back(void ** mutex, enum AVLockOp op) {
+
+static GF_List *av_mutex = NULL;
+
+int lock_call_back(void ** mutex, enum AVLockOp op)
+{
 	switch (op) {
 	case AV_LOCK_CREATE:
-		*mutex = gf_mx_new("AVLIB callback mutex");
-		break;
+		{
+			static int i = 0;
+			char mxName[64];
+			snprintf(mxName, 64, "AVLIB callback mutex %d", i++);
+			*mutex = gf_mx_new(mxName);
+			gf_list_add(av_mutex, *mutex);
+			break;
+		}
 	case AV_LOCK_OBTAIN:
 		gf_mx_p(*mutex);
 		break;
@@ -37,23 +47,39 @@
 		gf_mx_v(*mutex);
 		break;
 	case AV_LOCK_DESTROY:
+		gf_list_del_item(av_mutex, *mutex);
 		gf_mx_del(*mutex);
+		*mutex = NULL;
 		break;
 	}
 
 	return 0;
-
 }
 
-void dc_register_libav() {
+void dc_register_libav()
+{
+	av_mutex = gf_list_new();
 
 	av_register_all();
 	avcodec_register_all();
-#ifndef WIN32
 	avdevice_register_all();
-#endif
 	avformat_network_init();
 
 	av_lockmgr_register(&lock_call_back);
+}
+
+void dc_unregister_libav() 
+{
+	av_lockmgr_register(NULL);
 
+	if (av_mutex) {
+		while (gf_list_count(av_mutex)) {
+			GF_Mutex *mx = gf_list_last(av_mutex);
+			gf_list_rem_last(av_mutex);
+			gf_mx_del(mx);
+		}
+		gf_list_del(av_mutex);
+		av_mutex = NULL;
+	}
 }
+

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/register.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/register.h Changed

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/task.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/task.c Changed

@@ -26,43 +26,35 @@
 #include "task.h"
 
 
-void dc_task_init(TaskList * list) {
-
+void dc_task_init(TaskList *list)
+{
 	list->tasks = gf_list_new();
 	list->size = 0;
 }
 
-void dc_task_destroy(TaskList * list) {
-
+void dc_task_destroy(TaskList *list)
+{
 	gf_list_del(list->tasks);
 }
 
-void dc_task_add(TaskList * list, int source_number, char * id, time_t start, time_t end) {
-
-	Task * task = gf_malloc(sizeof(Task));
-
+void dc_task_add(TaskList *list, int source_number, char *id_name, time_t start, time_t end)
+{
+	Task *task = gf_malloc(sizeof(Task));
 	task->source_number = source_number;
-	strncpy(task->id, id, MAX_ID_SIZE);
-	//memcpy(&task->start_time, start, sizeof(struct tm));
-	//memcpy(&task->end_time, end, sizeof(struct tm));
+	strncpy(task->id, id_name, MAX_ID_SIZE);
 	task->start_time_t = start;
 	task->end_time_t = end;
 	gf_list_add(list->tasks, task);
-	list->size ++;
+	list->size++;
 }
 
-int dc_task_get_current(TaskList * list, Task * task) {
-
-	int i;
-
+int dc_task_get_current(TaskList *list, Task *task)
+{
+	u32 i;
 	time_t now_time = time(NULL);
-
 	for (i = 0; i<list->size; i++) {
-		Task * cur_task = gf_list_get(list->tasks, i);
-
-
-		if(now_time > cur_task->start_time_t  && now_time < cur_task->end_time_t) {
-
+		Task *cur_task = gf_list_get(list->tasks, i);
+		if (now_time > cur_task->start_time_t && now_time < cur_task->end_time_t) {
 			//strncpy(task->id, cur_task->id, MAX_ID_SIZE);
 			//memcpy(&task->start_time, &cur_task->start_time, sizeof(struct tm));
 			//memcpy(&task->end_time, &cur_task->end_time, sizeof(struct tm));
@@ -75,4 +67,3 @@
 	return -1;
 }
 
-

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/task.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/task.h Changed

@@ -32,35 +32,38 @@
 #include <time.h>
 #include <gpac/list.h>
 
+
 typedef struct {
 	char id[MAX_ID_SIZE];
 	int source_number;
-	//struct tm start_time;
-	//struct tm end_time;
 	time_t start_time_t;
 	time_t end_time_t;
-
 } Task;
 
 typedef struct {
-
-	GF_List * tasks;
-
-	int size;
-
+	GF_List *tasks;
+	u32 size;
 } TaskList;
 
-/* initialize a list of task */
-void dc_task_init(TaskList * list);
+/**
+ * initialize a list of task
+ */
+void dc_task_init(TaskList *list);
 
-/* destroy the list of task */
-void dc_task_destroy(TaskList * list);
+/**
+ * destroy the list of task
+ */
+void dc_task_destroy(TaskList *list);
 
-/* ad a task to the list */
-void dc_task_add(TaskList * list, int source_number, char * id, time_t start, time_t end);
+/**
+ * audio_input_data a task to the list
+ */
+void dc_task_add(TaskList *list, int source_number, char *id_name, time_t start, time_t end);
 
-/* give the task which corresponds to the time=NOW */
-/* note: in the case of infering tasks, the first one is picked */
-int dc_task_get_current(TaskList * list, Task * task);
+/**
+ * give the task which corresponds to the time=NOW
+ * note: in the case of infering tasks, the first one is picked
+ */
+int dc_task_get_current(TaskList *list, Task *task);
 
 #endif /* TASK_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_data.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_data.c Changed

@@ -25,69 +25,68 @@
 
 #include "video_data.h"
 
-void dc_video_data_set_default(VideoData * vdata) {
 
-	strcpy(vdata->psz_name, "");
-	strcpy(vdata->psz_format, "");
-	strcpy(vdata->psz_codec, "");
-	strcpy(vdata->psz_v4l2f, "");
-	vdata->i_bitrate = -1;
-	vdata->i_framerate = -1;
-	vdata->i_height = -1;
-	vdata->i_width = -1;
+void dc_video_data_set_default(VideoDataConf *video_data_conf)
+{
+	memset(video_data_conf, 0, sizeof(VideoDataConf));
+	video_data_conf->bitrate = -1;
+	video_data_conf->framerate = -1;
+	video_data_conf->crop_x = 0;
+	video_data_conf->crop_y = 0;
+	video_data_conf->height = -1;
+	video_data_conf->width = -1;
 }
 
-
-void dc_video_input_data_end_signal(VideoInputData * p_vconv) {
-
-	dc_producer_end_signal(&p_vconv->pro, &p_vconv->p_cb);
-	dc_producer_end_signal_previous(&p_vconv->pro, &p_vconv->p_cb);
-
+void dc_video_input_data_end_signal(VideoInputData *video_input_data)
+{
+	dc_producer_end_signal(&video_input_data->producer, &video_input_data->circular_buf);
+	dc_producer_end_signal_previous(&video_input_data->producer, &video_input_data->circular_buf);
 }
 
-int dc_video_input_data_init(VideoInputData * p_vin_data, /*int i_width, int i_height, int i_pix_fmt*/
-		int i_con_nb, int mode, int max_source) {
-
+int dc_video_input_data_init(VideoInputData *video_input_data, /*int width, int height, int pix_fmt*/ int num_consumers, int mode, int max_source, int video_cb_size)
+{
 	int i;
 
-	dc_producer_init(&p_vin_data->pro, VIDEO_CB_SIZE, "video decoder");
+	dc_producer_init(&video_input_data->producer, video_cb_size, "video decoder");
 
-	//p_vin_data->i_width = i_width;
-	//p_vin_data->i_height = i_height;
-	//p_vin_data->i_pix_fmt = i_pix_fmt;
+	//video_input_data->width = width;
+	//video_input_data->height = height;
+	//video_input_data->pix_fmt = pix_fmt;
 
-	p_vin_data->p_vprop = gf_malloc(max_source * sizeof(VideoInputProp));
+	video_input_data->vprop = gf_malloc(max_source * sizeof(VideoInputProp));
 
-	dc_circular_buffer_create(&p_vin_data->p_cb, VIDEO_CB_SIZE, mode,
-				i_con_nb);
+	dc_circular_buffer_create(&video_input_data->circular_buf, video_cb_size, mode, num_consumers);
 
-	for (i = 0; i < VIDEO_CB_SIZE; i++) {
-		VideoDataNode * p_vdn = gf_malloc(sizeof(VideoDataNode));
-		p_vin_data->p_cb.p_list[i].p_data = (void *) p_vdn;
-		p_vdn->p_vframe = avcodec_alloc_frame();
+	for (i=0; i<video_cb_size; i++) {
+		VideoDataNode *video_data_node;
+		GF_SAFEALLOC(video_data_node, VideoDataNode);
+		video_input_data->circular_buf.list[i].data = (void *) video_data_node;
+		video_data_node->vframe = FF_ALLOC_FRAME();
 	}
 
 	return 0;
 }
 
-void dc_video_input_data_set_prop(VideoInputData * p_vind, int index, int width, int height, int pix_fmt) {
-
-	p_vind->p_vprop[index].i_width = width;
-	p_vind->p_vprop[index].i_height = height;
-	p_vind->p_vprop[index].i_pix_fmt = pix_fmt;
+void dc_video_input_data_set_prop(VideoInputData *video_input_data, int index, int width, int height, int crop_x, int crop_y, int pix_fmt)
+{
+	video_input_data->vprop[index].width = width;
+	video_input_data->vprop[index].height = height;
+	video_input_data->vprop[index].crop_x = crop_x;
+	video_input_data->vprop[index].crop_y = crop_y;
+	video_input_data->vprop[index].pix_fmt = pix_fmt;
 }
 
-
-void dc_video_input_data_destroy(VideoInputData * p_vd) {
-
+void dc_video_input_data_destroy(VideoInputData *video_input_data)
+{
 	int i;
-
-	for (i = 0; i < VIDEO_CB_SIZE; i++) {
-		VideoDataNode * p_vdn = p_vd->p_cb.p_list[i].p_data;
-		av_free(p_vdn->p_vframe);
-		gf_free(p_vdn);
+	for (i=0; i<(int) video_input_data->circular_buf.size; i++) {
+		if (video_input_data->circular_buf.list) {
+			VideoDataNode *video_data_node = video_input_data->circular_buf.list[i].data;
+			av_free(video_data_node->vframe);
+			gf_free(video_data_node);
+		}
 	}
 
-	dc_circular_buffer_destroy(&p_vd->p_cb);
-
+	dc_circular_buffer_destroy(&video_input_data->circular_buf);
+	gf_free(video_input_data->vprop);
 }

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_data.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_data.h Changed

@@ -29,12 +29,15 @@
 #include "../../modules/ffmpeg_in/ffmpeg_in.h"
 #include "libavcodec/avcodec.h"
 #include "libswscale/swscale.h"
+#include "libav_compat.h"
 
 #include "circular_buffer.h"
 
 #include <time.h>
 
-#define VIDEO_CB_SIZE 3
+//anything different is broken in dash cast (random frame inversions at encoding time ...)
+#define VIDEO_CB_DEFAULT_SIZE 1
+
 
 /*
  * This structure corresponds to an
@@ -42,42 +45,47 @@
  * configuration file.
  */
 typedef struct {
-
 	/* video file name */
-	char psz_name[256];
+	char filename[GF_MAX_PATH];
 	/* video format */
-	char psz_format[256];
+	char format[GF_MAX_PATH];
+	/* video format */
+	char pixel_format[GF_MAX_PATH];
 	/* v4l2 format */
-	char psz_v4l2f[256];
-	/* video width */
-	int i_width;
-	/* video height */
-	int i_height;
+	char v4l2f[GF_MAX_PATH];
+	/* left crop */
+	int crop_x;
+	/* top crop */
+	int crop_y;
+	/* video final width */
+	int width;
+	/* video final height */
+	int height;
 	/* video bitrate */
-	int i_bitrate;
+	int bitrate;
 	/* video frame rate */
-	int i_framerate;
+	int framerate;
 	/* video codec */
-	char psz_codec[256];
+	char codec[GF_MAX_PATH];
+	/* custom parameter to be passed directly to the encoder - free it once you're done */
+	char *custom;
 
 	/* used for source switching */
-	char psz_source_id[256];
+	char source_id[GF_MAX_PATH];
 	time_t start_time;
 	time_t end_time;
 
-} VideoData;
-
+	//copy over from source file
+	AVRational time_base;
+	u64 frame_duration;
+} VideoDataConf;
 
 typedef struct {
-
-	/*
-	 * Width, height and pixel format
-	 * of the input video
-	 */
-	int i_width;
-	int i_height;
-	int i_pix_fmt;
-
+	/* Width, height and pixel format of the input video. */
+	int width;
+	int height;
+	int crop_x, crop_y;
+	int pix_fmt;
 } VideoInputProp;
 
 /*
@@ -85,30 +93,19 @@
  * of input video in a circular buffer.
  * The circular buffer has its own mechanism for synchronization.
  */
-
-
 typedef struct {
-	/*
-	 * The circular buffer of
-	 * the video frames after decoding.
-	 */
-	CircularBuffer p_cb;
-	/*
-	 * The user of circular buffer has an index to it,
-	 * which is in this variable.
-	 */
-	Producer pro;
-
-	VideoInputProp * p_vprop;
-
-	/*
-	 * Width, height and pixel format
-	 * of the input video
-	 */
-	//int i_width;
-	//int i_height;
-	//int i_pix_fmt;
-
+	/* The circular buffer of the video frames after decoding. */
+	CircularBuffer circular_buf;
+	/* The user of circular buffer has an index to it, which is in this variable. */
+	Producer producer;
+
+	VideoInputProp *vprop;
+
+	/* Width, height and pixel format of the input video */
+	//int width;
+	//int height;
+	//int pix_fmt;
+	u64 frame_duration;
 } VideoInputData;
 
 
@@ -119,23 +116,22 @@
  * an AVFrame.
  */
 typedef struct {
-
-	AVFrame * p_vframe;
-
+	AVFrame * vframe;
 	int source_number;
-
+	uint8_t nb_raw_frames_ref;
+	AVPacket raw_packet;
 } VideoDataNode;
 
-void dc_video_data_set_default(VideoData * vdata);
+void dc_video_data_set_default(VideoDataConf *video_data_conf);
 
 /*
  * Initialize a VideoInputData.
  *
- * @param vind [out] is the structure to be initialize.
+ * @param video_input_data [out] is the structure to be initialize.
  * @param width [in] input video width
  * @param height [in] input video height
  * @param pixfmt [in] input video pixel format
- * @param maxcon [in] contains information on the number of users of circular buffer;
+ * @param num_consumers [in] contains information on the number of users of circular buffer;
  * which means the number of video encoders.
  * @param live [in] indicates the system is live
  *
@@ -143,22 +139,26 @@
  *
  * @note Must use dc_video_data_destroy to free memory.
  */
-int dc_video_input_data_init(VideoInputData * vind,/* int width, int height, int pix_fmt,*/ int maxcon, int mode, int maxsource);
+int dc_video_input_data_init(VideoInputData *video_input_data,/* int width, int height, int pix_fmt,*/ int num_consumers, int mode, int num_producers, int video_cb_size);
+
+/*
+ * Set properties for a VideoInputData.
+ */
+void dc_video_input_data_set_prop(VideoInputData *video_input_data, int index, int width, int height, int crop_x, int crop_y, int pix_fmt);
 
-void dc_video_input_data_set_prop(VideoInputData * vind, int index, int width, int height, int pix_fmt);
 /*
- * Destroy a VideoInputData
+ * Destroy a VideoInputData.
  *
- * @param vind [in] the structure to be destroyed.
+ * @param video_input_data [in] the structure to be destroyed.
  */
-void dc_video_input_data_destroy(VideoInputData * vind);
+void dc_video_input_data_destroy(VideoInputData *video_input_data);
 
 /*
  * Signal to all the users of the circular buffer in the VideoInputData
  * which the current node is the last node to consume.
  *
- * @param vind [in] the structure to be signaled on.
+ * @param video_input_data [in] the structure to be signaled on.
  */
-void dc_video_input_data_end_signal(VideoInputData * vind);
+void dc_video_input_data_end_signal(VideoInputData *video_input_data);
 
 #endif /* VIDEO_DATA_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_decoder.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_decoder.c Changed

@@ -27,276 +27,352 @@
 #include <time.h>
 #include <gpac/network.h>
 
+
 //#define DASHCAST_DEBUG_TIME_
 
-int dc_video_decoder_open(VideoInputFile * p_vin, VideoData * p_vdata,
-		int i_mode, int i_no_loop) {
 
+int dc_video_decoder_open(VideoInputFile *video_input_file, VideoDataConf *video_data_conf, int mode, int no_loop, int nb_consumers)
+{
+	s32 ret;
 	u32 i;
-	AVInputFormat * p_in_fmt = NULL;
-	AVDictionary * p_options = NULL;
-	AVCodecContext * p_codec_ctx;
-	AVCodec * p_codec;
+	s32 open_res;
+	AVInputFormat *in_fmt = NULL;
+	AVDictionary *options = NULL;
+	AVCodecContext *codec_ctx;
+	AVCodec *codec;
 
-	if (p_vdata->i_framerate > 0) {
-		char vfr[16];
-		sprintf(vfr, "%d", p_vdata->i_framerate);
-		av_dict_set(&p_options, "framerate", vfr, 0);
+	memset(video_input_file, 0, sizeof(VideoInputFile));
+
+	if (video_data_conf->width > 0 && video_data_conf->height > 0) {
+		char vres[16];
+		snprintf(vres, sizeof(vres), "%dx%d", video_data_conf->width, video_data_conf->height);
+		ret = av_dict_set(&options, "video_size", vres, 0);
+		if (ret < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set video size %s.\n", vres));
+			return -1;
+		}
 	}
 
-	if (strcmp(p_vdata->psz_v4l2f, "") != 0) {
-		av_dict_set(&p_options, "input_format", p_vdata->psz_v4l2f, 0);
+	if (video_data_conf->framerate > 0) {
+		char vfr[16];
+		snprintf(vfr, sizeof(vfr), "%d", video_data_conf->framerate);
+		ret = av_dict_set(&options, "framerate", vfr, 0);
+		if (ret < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set video framerate %s.\n", vfr));
+			return -1;
+		}
 	}
 
-	if (p_vdata->i_width > 0 && p_vdata->i_height > 0) {
-		char vres[16];
-		sprintf(vres, "%dx%d", p_vdata->i_width, p_vdata->i_height);
-		av_dict_set(&p_options, "video_size", vres, 0);
+	if (strlen(video_data_conf->pixel_format)) {
+		ret = av_dict_set(&options, "pixel_format", video_data_conf->pixel_format, 0);
+		if (ret < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set pixel format %s.\n", video_data_conf->pixel_format));
+			return -1;
+		}
 	}
 
-	if (p_vdata->psz_format && strcmp(p_vdata->psz_format, "") != 0) {
-		p_in_fmt = av_find_input_format(p_vdata->psz_format);
-		if (p_in_fmt == NULL) {
-			printf("Cannot find the format %s.\n", p_vdata->psz_format);
+#ifndef WIN32
+	if (strcmp(video_data_conf->v4l2f, "") != 0) {
+		ret = av_dict_set(&options, "input_format", video_data_conf->v4l2f, 0);
+		if (ret < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Could not set input format %s.\n", video_data_conf->v4l2f));
+			return -1;
+		}
+	}
+#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) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find the format %s.\n", video_data_conf->format));
 			return -1;
 		}
 	}
 
-	p_vin->p_fmt_ctx = NULL;
+	video_input_file->av_fmt_ctx = NULL;
 
-	/*  Open video */
-	if (avformat_open_input(&p_vin->p_fmt_ctx, p_vdata->psz_name, p_in_fmt,
-			p_options == NULL ? NULL : &p_options) != 0) {
-		fprintf(stderr, "Cannot open file %s\n", p_vdata->psz_name);
+	/* Open video */
+	open_res = avformat_open_input(&video_input_file->av_fmt_ctx, video_data_conf->filename, in_fmt, options ? &options : NULL);
+	if ( (open_res < 0) && !stricmp(video_data_conf->filename, "screen-capture-recorder") ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Buggy screen capture input (open failed with code %d), retrying without specifying resolution\n", open_res));
+		av_dict_set(&options, "video_size", NULL, 0);
+		open_res = avformat_open_input(&video_input_file->av_fmt_ctx, video_data_conf->filename, in_fmt, options ? &options : NULL);
+	}
+
+	if ( (open_res < 0) && options) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error %d opening input - retrying without options\n", open_res));
+		av_dict_free(&options);
+		open_res = avformat_open_input(&video_input_file->av_fmt_ctx, video_data_conf->filename, in_fmt, NULL);
+	}
+
+	if (open_res < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open file %s\n", video_data_conf->filename));
 		return -1;
 	}
 
-	/*  Retrieve stream information */
-	if (avformat_find_stream_info(p_vin->p_fmt_ctx,
-			p_options == NULL ? NULL : &p_options) < 0) {
-		fprintf(stderr, "Cannot find stream information\n");
+	/* Retrieve stream information */
+	if (avformat_find_stream_info(video_input_file->av_fmt_ctx, NULL) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find stream information\n"));
 		return -1;
 	}
 
-	av_dump_format(p_vin->p_fmt_ctx, 0, p_vdata->psz_name, 0);
+	av_dump_format(video_input_file->av_fmt_ctx, 0, video_data_conf->filename, 0);
 
-	/*  Find the first video stream */
-	p_vin->i_vstream_idx = -1;
-	for (i = 0; i < p_vin->p_fmt_ctx->nb_streams; i++) {
-		if (p_vin->p_fmt_ctx->streams[i]->codec->codec_type
-				== AVMEDIA_TYPE_VIDEO) {
-			p_vin->i_vstream_idx = i;
+	/* Find the first video stream */
+	video_input_file->vstream_idx = -1;
+	for (i = 0; i < video_input_file->av_fmt_ctx->nb_streams; i++) {
+		if (video_input_file->av_fmt_ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+			video_input_file->vstream_idx = i;
 			break;
 		}
 	}
-	if (p_vin->i_vstream_idx == -1) {
-		fprintf(stderr, "Cannot find a video stream\n");
+	if (video_input_file->vstream_idx == -1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find a video stream\n"));
 		return -1;
 	}
 
-	/*  Get a pointer to the codec context for the video stream */
-	p_codec_ctx = p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->codec;
+	/* Get a pointer to the codec context for the video stream */
+	codec_ctx = video_input_file->av_fmt_ctx->streams[video_input_file->vstream_idx]->codec;
 
-	//int64_t dur = p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->duration;
-	//int time_base = p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->time_base.den;
-	//printf("DURATION: %d \n", dur/time_base);
-
-	/*  Find the decoder for the video stream */
-	p_codec = avcodec_find_decoder(p_codec_ctx->codec_id);
-	if (p_codec == NULL) {
-		fprintf(stderr, "Codec is not supported.\n");
-		avformat_close_input(&p_vin->p_fmt_ctx);
+	/* Find the decoder for the video stream */
+	codec = avcodec_find_decoder(codec_ctx->codec_id);
+	if (codec == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Codec is not supported.\n"));
+		if (!video_input_file->av_fmt_ctx_ref_cnt)
+			avformat_close_input(&video_input_file->av_fmt_ctx);
 		return -1;
 	}
 
-	/*  Open codec */
-	if (avcodec_open2(p_codec_ctx, p_codec, NULL) < 0) {
-		fprintf(stderr, "Cannot open codec.\n");
-		avformat_close_input(&p_vin->p_fmt_ctx);
+	/* Open codec */
+	if (avcodec_open2(codec_ctx, codec, NULL) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open codec.\n"));
+		if (!video_input_file->av_fmt_ctx_ref_cnt)
+			avformat_close_input(&video_input_file->av_fmt_ctx);
 		return -1;
 	}
 
-	p_vin->i_width = p_codec_ctx->width;
-	p_vin->i_height = p_codec_ctx->height;
-	p_vin->i_pix_fmt = p_codec_ctx->pix_fmt;
-
-	p_vdata->i_framerate = p_codec_ctx->time_base.den;
-
-	if (p_vdata->i_framerate / 1000 != 0)
-		p_vdata->i_framerate = p_vdata->i_framerate / 1000;
-
-	if (p_vdata->i_framerate <= 1 || p_vdata->i_framerate > 30) {
-
-		p_vdata->i_framerate =
-				p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->avg_frame_rate.num
-						/ (p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->avg_frame_rate.den
-								== 0 ?
-								1 :
-								p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->avg_frame_rate.den);
-
-		if (p_vdata->i_framerate / 1000 != 0)
-			p_vdata->i_framerate = p_vdata->i_framerate / 1000;
-
-		if (p_vdata->i_framerate <= 1 || p_vdata->i_framerate > 30) {
-			p_vdata->i_framerate =
-					p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->r_frame_rate.num
-							/ (p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->r_frame_rate.den
-									== 0 ?
-									1 :
-									p_vin->p_fmt_ctx->streams[p_vin->i_vstream_idx]->r_frame_rate.den);
-
-			if (p_vdata->i_framerate / 1000 != 0)
-				p_vdata->i_framerate = p_vdata->i_framerate / 1000;
-
+	video_input_file->width = codec_ctx->width;
+	video_input_file->height = codec_ctx->height;
+	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 <= 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;
+		const int den = video_input_file->av_fmt_ctx->streams[video_input_file->vstream_idx]->avg_frame_rate.den == 0 ? 1 : video_input_file->av_fmt_ctx->streams[video_input_file->vstream_idx]->avg_frame_rate.den;
+		video_data_conf->framerate = num / den;
+		if (video_data_conf->framerate / 1000 != 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Framerate %d was divided by 1000: %d\n", video_data_conf->framerate, video_data_conf->framerate/1000));
+			video_data_conf->framerate = video_data_conf->framerate / 1000;
 		}
 
+		if (video_data_conf->framerate <= 1 || video_data_conf->framerate > 1000) {
+			video_data_conf->framerate = num / den;
+			if (video_data_conf->framerate / 1000 != 0) {
+				video_data_conf->framerate = video_data_conf->framerate / 1000;
+			}
+		}
 	}
 
-	if (p_vdata->i_framerate <= 1 || p_vdata->i_framerate > 30) {
-		printf("Invalid input framerate.\n");
+	if (video_data_conf->framerate <= 1 || video_data_conf->framerate > 1000) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Invalid input framerate.\n"));
 		return -1;
 	}
 
-	p_vin->i_mode = i_mode;
-	p_vin->i_no_loop = i_no_loop;
-
+	video_data_conf->time_base = video_input_file->av_fmt_ctx->streams[video_input_file->vstream_idx]->time_base;
+	video_input_file->mode = mode;
+	video_input_file->no_loop = no_loop;
+	video_input_file->nb_consumers = nb_consumers;
 	return 0;
 }
 
-int dc_video_decoder_read(VideoInputFile * p_in_ctx, VideoInputData * p_vd,
-		int source_number) {
-
+int dc_video_decoder_read(VideoInputFile *video_input_file, VideoInputData *video_input_data, int source_number, int use_source_timing, int is_live_capture, const int *exit_signal_addr)
+{
 #ifdef DASHCAST_DEBUG_TIME_
 	struct timeval start, end;
 	long elapsed_time;
 #endif
-
-	int ret;
 	AVPacket packet;
-	int i_got_frame;
-	int already_locked = 0;
-	AVCodecContext * p_codec_ctx;
-	VideoDataNode * p_vdn;
+	int ret, got_frame, already_locked = 0;
+	AVCodecContext *codec_ctx;
+	VideoDataNode *video_data_node;
 
-	/*  Get a pointer to the codec context for the video stream */
-	p_codec_ctx = p_in_ctx->p_fmt_ctx->streams[p_in_ctx->i_vstream_idx]->codec;
+	/* Get a pointer to the codec context for the video stream */
+	codec_ctx = video_input_file->av_fmt_ctx->streams[video_input_file->vstream_idx]->codec;
 
-	/*  Read frames */
+	/* Read frames */
 	while (1) {
-
 #ifdef DASHCAST_DEBUG_TIME_
 		gettimeofday(&start, NULL);
 #endif
-
-		ret = av_read_frame(p_in_ctx->p_fmt_ctx, &packet);
-
+		memset(&packet, 0, sizeof(AVPacket));
+		ret = av_read_frame(video_input_file->av_fmt_ctx, &packet);
 #ifdef DASHCAST_DEBUG_TIME_
 		gettimeofday(&end, NULL);
 		elapsed_time = (end.tv_sec * 1000000 + end.tv_usec) - (start.tv_sec * 1000000 + start.tv_usec);
-		printf("fps: %f\n", 1000000.0/elapsed_time);
+		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;
+			if (ret != AVERROR_EOF) {
+				GF_SAFEALLOC(packet_copy, AVPacket);
+				memcpy(packet_copy, &packet, sizeof(AVPacket));
+			}
 
-		if (ret == AVERROR_EOF) {
+			assert(video_input_file->av_pkt_list);
+			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;
+			}
+		}
 
-			if (p_in_ctx->i_mode == LIVE_MEDIA && p_in_ctx->i_no_loop == 0) {
-				av_seek_frame(p_in_ctx->p_fmt_ctx, p_in_ctx->i_vstream_idx, 0,
-						0);
+		if (ret == AVERROR_EOF) {
+			if (video_input_file->mode == LIVE_MEDIA && video_input_file->no_loop == 0) {
+				av_seek_frame(video_input_file->av_fmt_ctx, video_input_file->vstream_idx, 0, 0);
 				av_free_packet(&packet);
 				continue;
 			}
 
-			dc_producer_lock(&p_vd->pro, &p_vd->p_cb);
-			dc_producer_unlock_previous(&p_vd->pro, &p_vd->p_cb);
-			p_vdn = (VideoDataNode *) dc_producer_produce(&p_vd->pro,
-					&p_vd->p_cb);
-
-			p_vdn->source_number = source_number;
+			dc_producer_lock(&video_input_data->producer, &video_input_data->circular_buf);
+			dc_producer_unlock_previous(&video_input_data->producer, &video_input_data->circular_buf);
+			video_data_node = (VideoDataNode *) dc_producer_produce(&video_input_data->producer, &video_input_data->circular_buf);
+			video_data_node->source_number = source_number;
 			/* Flush decoder */
-			packet.data = NULL;
-			packet.size = 0;
-			avcodec_get_frame_defaults(p_vdn->p_vframe);
-			avcodec_decode_video2(p_codec_ctx, p_vdn->p_vframe, &i_got_frame,
-					&packet);
-
-			if (i_got_frame) {
-				dc_producer_advance(&p_vd->pro);
+			memset(&packet, 0, sizeof(AVPacket));
+			avcodec_get_frame_defaults(video_data_node->vframe);
+			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);
 				return 0;
 			}
 
-			dc_producer_end_signal(&p_vd->pro, &p_vd->p_cb);
-			dc_producer_unlock(&p_vd->pro, &p_vd->p_cb);
+			dc_producer_end_signal(&video_input_data->producer, &video_input_data->circular_buf);
+			dc_producer_unlock(&video_input_data->producer, &video_input_data->circular_buf);
 			return -2;
 		}
-
-		else if (ret < 0) {
-			fprintf(stderr, "Cannot read video frame.\n");
+		else if (ret < 0)
+		{
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot read video frame.\n"));
 			continue;
 		}
 
-		/*  Is this a packet from the video stream? */
-		if (packet.stream_index == p_in_ctx->i_vstream_idx) {
-
+		/* Is this a packet from the video stream? */
+		if (packet.stream_index == video_input_file->vstream_idx) {
 			if (!already_locked) {
-
-				if (dc_producer_lock(&p_vd->pro, &p_vd->p_cb) < 0) {
-					printf("[dashcast] Live system dropped a video frame\n");
+				if (dc_producer_lock(&video_input_data->producer, &video_input_data->circular_buf) < 0) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[dashcast] Live system dropped a video frame\n"));
 					continue;
 				}
 
-				dc_producer_unlock_previous(&p_vd->pro, &p_vd->p_cb);
+				dc_producer_unlock_previous(&video_input_data->producer, &video_input_data->circular_buf);
 
 				already_locked = 1;
 			}
 
-			p_vdn = (VideoDataNode *) dc_producer_produce(&p_vd->pro,
-					&p_vd->p_cb);
+			video_data_node = (VideoDataNode *) dc_producer_produce(&video_input_data->producer, &video_input_data->circular_buf);
+			video_data_node->source_number = source_number;
 
-			p_vdn->source_number = source_number;
+			/* Set video frame to default */
+			avcodec_get_frame_defaults(video_data_node->vframe);
 
-			/*  Set video frame to default */
-			avcodec_get_frame_defaults(p_vdn->p_vframe);
-
-			/*  Decode video frame */
-			if (avcodec_decode_video2(p_codec_ctx, p_vdn->p_vframe,
-					&i_got_frame, &packet) < 0) {
+			/* Decode video frame */
+			if (avcodec_decode_video2(codec_ctx, video_data_node->vframe, &got_frame, &packet) < 0) {
 				av_free_packet(&packet);
-				fprintf(stderr, "Error while decoding video.\n");
-				dc_producer_end_signal(&p_vd->pro, &p_vd->p_cb);
-				dc_producer_unlock(&p_vd->pro, &p_vd->p_cb);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while decoding video.\n"));
+				dc_producer_end_signal(&video_input_data->producer, &video_input_data->circular_buf);
+				dc_producer_unlock(&video_input_data->producer, &video_input_data->circular_buf);
 				return -1;
 			}
 
-			/*  Did we get a video frame? */
-			if (i_got_frame) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH,
-						("[DashCast] Video Frame TS "LLU" decoded at UTC "LLU" ms\n", p_vdn->p_vframe->pts, gf_net_get_utc() ));
-				//TODO: This might cause some problems in future.
+			/* Did we get a video frame? */
+			if (got_frame) {
+				if (use_source_timing && is_live_capture) {
+					u64 pts;
+					if (video_input_file->pts_init == 0) {
+						video_input_file->pts_init = 1;
+						video_input_file->utc_at_init = gf_net_get_utc();
+						video_input_file->first_pts = packet.pts;
+						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;	
+					if (pts - video_input_file->prev_pts > video_input_file->sync_tolerance) {
+						u32 nb_lost=0;
+						while (pts > video_input_file->computed_pts) {
+							video_input_file->computed_pts += video_input_data->frame_duration;
+							nb_lost++;
+						}
+
+						if (nb_lost) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DashCast] Capture lost %d video frames \n", nb_lost));
+						}
+					}
+
+//					fprintf(stdout, "Capture PTS %g - UTC diff %g - Computed PTS %g\n", (Double) pts / codec_ctx->time_base.den, (Double) (gf_net_get_utc() - video_input_file->utc_at_init) / 1000, (Double) video_input_file->computed_pts / codec_ctx->time_base.den);
+
+					video_input_file->prev_pts = pts;
+					video_data_node->vframe->pts = video_input_file->computed_pts;
+					video_input_file->computed_pts += video_input_data->frame_duration;
+				}
+
+				if (video_data_node->vframe->pts==AV_NOPTS_VALUE) {
+					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;
+					}
+				}
+				video_input_file->frame_decoded++;
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Video Frame TS "LLU" decoded at UTC "LLU" ms\n", video_data_node->vframe->pts, gf_net_get_utc() ));
+
 				// For a decode/encode process we must free this memory.
 				//But if the input is raw and there is no need to decode then
-				// the packet is directly passed for decoded frame. So freeing it cause problem.
-				// Strange thing is that it happens only when the pixel format is BGRA.
-				// More tests are needed here.
-				if (p_codec_ctx->codec->id != CODEC_ID_RAWVIDEO
-						|| p_codec_ctx->pix_fmt != PIX_FMT_BGRA)
+				// the packet is directly passed for decoded frame. We must wait until rescale is done before freeing it
+
+				if (codec_ctx->codec->id == CODEC_ID_RAWVIDEO) {
+					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) {
+						gf_sleep(0);
+					}
+				} else {
+					dc_producer_advance(&video_input_data->producer, &video_input_data->circular_buf);
 					av_free_packet(&packet);
-				dc_producer_advance(&p_vd->pro);
+				}
 				return 0;
+
 			}
 		}
 
-		/*  Free the packet that was allocated by av_read_frame */
+		/* Free the packet that was allocated by av_read_frame */
 		av_free_packet(&packet);
-
 	}
 
-	fprintf(stderr, "Unknown error while reading video frame.\n");
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Unknown error while reading video frame.\n"));
 	return -1;
-
 }
 
-void dc_video_decoder_close(VideoInputFile * p_in_ctx) {
-
-	/*  Close the video format context */
-	avformat_close_input(&p_in_ctx->p_fmt_ctx);
-
+void dc_video_decoder_close(VideoInputFile *video_input_file)
+{
+	/* 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.svn4668.tar.bz2/applications/dashcast/video_decoder.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_decoder.h Changed

@@ -29,9 +29,7 @@
 #include "video_data.h"
 
 #include "libavformat/avformat.h"
-#ifndef WIN32
 #include "libavdevice/avdevice.h"
-#endif
 
 
 /*
@@ -39,56 +37,58 @@
  * input video file.
  */
 typedef struct {
+	/* Format context structure provided by avlib to open and read from a media file. */
+	AVFormatContext *av_fmt_ctx;
+	/* A reference counter on the format context (may be shared with other sources). Currently redundant with av_pkt_list non-NULLness. */
+	int av_fmt_ctx_ref_cnt;
+	/* A list of AVPackets and return value to be processed: when this parameter is non-null,
+	 * the video thread makes the demux and pushes the packets. Packets must be freed when retrieved.*/
+	GF_List  *av_pkt_list;
+	GF_Mutex *av_pkt_list_mutex;
+	/* The index of the video stream in the file. */
+	int vstream_idx;
+	/* video width, height, and pixel format. */
+	int width;
+	int height;
+	int pix_fmt;
 
-	/*
-	 * Format context structure provided by avlib
-	 * to open and read from a media file
-	 */
-	AVFormatContext * p_fmt_ctx;
-	/*
-	 * The index of the video stream
-	 * in the file
-	 */
-	int i_vstream_idx;
-	/*
-	 * video width, height, and pixel format
-	 */
-	int i_width;
-	int i_height;
-	int i_pix_fmt;
-
-	int i_mode;
-	int i_no_loop;
+	int mode;
+	int no_loop, nb_consumers;
 
+	u32 frame_decoded;
+	Bool pts_init;
+	u64 first_pts, prev_pts, computed_pts, sync_tolerance;
+	u64 utc_at_init;
 } VideoInputFile;
 
 /*
  * Open the input video
  *
- * @param cmdd [in] contains information about the file name
+ * @param cmd_data [in] contains information about the file name
  * and the video format.
  *
- * @param vinf [out] pointer to the structure which we want to
+ * @param video_input_file [out] pointer to the structure which we want to
  * open the file
  *
  * @return 0 on success -1 on failure.
  */
-int dc_video_decoder_open(VideoInputFile * vinf, VideoData *vdata, int mode, int no_loop);
+int dc_video_decoder_open(VideoInputFile *video_input_file, VideoDataConf *video_data_conf, int mode, int no_loop, int nb_consumers);
+
 /*
  * Read and decode video and put decoded frames on circular buffer
  *
- * @param vinf [in] contains info on input video.
- * @param vind [out] the decoded samples will be put
+ * @param video_input_file [in] contains info on input video.
+ * @param video_input_data [out] the decoded samples will be put
  * on the circular buffer of this parameter.
  *
  * @return 0 on success, -1 on failure, -2 on EOF (end of the file)
- *
  */
-int dc_video_decoder_read(VideoInputFile * vinf, VideoInputData * vind, int source_number);
+int dc_video_decoder_read(VideoInputFile *video_input_file, VideoInputData *video_input_data, int source_number, int use_source_timing, int is_live_capture, const int *exit_signal_addr);
+
 /*
  * Close the input video
  *
- * @param vinf [in] the video file to be closed
+ * @param video_input_file [in] the video file to be closed
  *
  */
 void dc_video_decoder_close(VideoInputFile *);

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_encoder.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_encoder.c Changed

@@ -24,84 +24,107 @@
  */
 
 #include "video_encoder.h"
-
 #include "libavutil/opt.h"
+#include "libavdevice/avdevice.h"
+
+
+#if (defined(WIN32) || defined(_WIN32_WCE)) && !defined(__GNUC__)
+
+#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
+
 
 //#define DEBUG 1
 
-int dc_video_encoder_open(VideoOutputFile * p_voutf, VideoData * p_vdata) {
 
-	//AVCodec * p_video_codec;
-	//AVStream * p_video_stream;
+/**
+ * A function which pushes argument to a libav codec using its private data.
+ * param priv_data
+ * param options a list of space separated and ':' affected options (e.g. "a:b c:d e:f"). @options be non NULL.
+ */
+void build_dict(void *priv_data, const char *options) {
+	char *opt = gf_strdup(options);
+	char *tok = strtok(opt, "=");
+	char *tokval = NULL;
+	while (tok && (tokval=strtok(NULL, " "))) {
+		if (av_opt_set(priv_data, tok, tokval, 0) < 0)
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Unknown custom option \"%s\" with value \"%s\" in %s\n", tok, tokval, options));
+		tok = strtok(NULL, "=");
+	}
+	gf_free(opt);
+}
 
-	p_voutf->i_vbuf_size = 9 * p_vdata->i_width * p_vdata->i_height + 10000;
-	p_voutf->p_vbuf = (uint8_t *) av_malloc(p_voutf->i_vbuf_size);
+int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, Bool use_source_timing)
+{
+	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);
 
-//	p_voutf->p_codec = avcodec_find_encoder_by_name("libx264"/*p_vdata->psz_codec*/);
-	p_voutf->p_codec = avcodec_find_encoder(CODEC_ID_H264);
-	if (p_voutf->p_codec == NULL) {
-		fprintf(stderr, "Output video codec not found\n");
+//	video_output_file->codec = avcodec_find_encoder_by_name("libx264"/*video_data_conf->codec*/);
+	video_output_file->codec = avcodec_find_encoder(CODEC_ID_H264);
+	if (video_output_file->codec == NULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Output video codec %d not found\n", CODEC_ID_H264));
 		return -1;
 	}
 
-	p_voutf->p_codec_ctx = avcodec_alloc_context3(p_voutf->p_codec);
+	video_output_file->codec_ctx = avcodec_alloc_context3(video_output_file->codec);
 
 	//Create new video stream
-//	p_video_stream = avformat_new_stream(p_voutf->p_fmt, p_video_codec);
-//	if (!p_video_stream) {
-//		fprintf(stderr, "Cannot create output video stream\n");
+//	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;
 //	}
 
-	p_voutf->p_codec_ctx->codec_id = p_voutf->p_codec->id;
-	p_voutf->p_codec_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
-	p_voutf->p_codec_ctx->bit_rate = p_vdata->i_bitrate;
-	p_voutf->p_codec_ctx->width = p_vdata->i_width;
-	p_voutf->p_codec_ctx->height = p_vdata->i_height;
-	{
-		AVRational time_base; 
-		time_base.num = 1;
-		time_base.den = p_vdata->i_framerate;
-		p_voutf->p_codec_ctx->time_base = time_base;
-	}
-	p_voutf->p_codec_ctx->pix_fmt = PIX_FMT_YUV420P;
-	p_voutf->p_codec_ctx->gop_size = p_voutf->i_gop_size;//p_vdata->i_framerate;
-
-	av_opt_set(p_voutf->p_codec_ctx->priv_data, "preset", "ultrafast", 0);
-	av_opt_set(p_voutf->p_codec_ctx->priv_data, "tune", "zerolatency", 0);
-
-	if(p_voutf->i_gdr == 1) {
-		av_opt_set_int(p_voutf->p_codec_ctx->priv_data, "intra-refresh", 1, 0);
-		av_opt_set_int(p_voutf->p_codec_ctx->priv_data, "key-int", 8, 0);
+	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->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
+		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;
 	}
-
-//	if (p_voutf->p_fmt->oformat->flags & AVFMT_GLOBALHEADER)
-//		p_voutf->p_codec_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
-//	p_video_stream->codec->codec_id = p_video_codec->id;
-//	p_video_stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-//	p_video_stream->codec->bit_rate = p_voutf->p_vdata->i_bitrate;
-//	p_video_stream->codec->width = p_voutf->p_vdata->i_width;
-//	p_video_stream->codec->height = p_voutf->p_vdata->i_height;
-//	p_video_stream->codec->time_base = (AVRational) {1 ,
-//				p_voutf->p_vdata->i_framerate};
-//	p_video_stream->codec->pix_fmt = PIX_FMT_YUV420P;
-//	p_video_stream->codec->gop_size = p_voutf->p_vdata->i_framerate;
+	video_output_file->codec_ctx->pix_fmt = PIX_FMT_YUV420P;
+	video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
+
+//	video_output_file->codec_ctx->codec_id = video_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->time_base = (AVRational) {1 ,
+//				video_output_file->video_data_conf->framerate};
+//	video_output_file->codec_ctx->codec->pix_fmt = PIX_FMT_YUV420P;
+	video_output_file->codec_ctx->gop_size = video_data_conf->framerate;
 //
-//	av_opt_set(p_video_stream->codec->priv_data, "preset", "ultrafast", 0);
-//	av_opt_set(p_video_stream->codec->priv_data, "tune", "zerolatency", 0);
+//	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);
 
 	/*
-	 p_video_stream->codec->max_b_frames = 0;
-	 p_video_stream->codec->thread_count = 1;
-	 p_video_stream->codec->delay = 0;
-	 p_video_stream->codec->rc_lookahead = 0;
+	 video_output_file->codec_ctx->max_b_frames = 0;
+	 video_output_file->codec_ctx->thread_count = 1;
+	 video_output_file->codec_ctx->delay = 0;
+	 video_output_file->codec_ctx->rc_lookahead = 0;
 	 */
 
 	/*
-	 * p_video_stream->codec->gop_size = p_voutf->i_vfr;
-	 * videoStream->codec->gop_size = 1;
-	 * p_video_stream->codec->rc_lookahead = 0;
+	 * video_stream->codec->gosize = video_output_file->vfr;
+	 * videoStream->codec->gosize = 1;
+	 * video_stream->codec->rc_lookahead = 0;
 	 * videoStream->time_base = (AVRational) {1 , 1000000};
 	 * videoStream->r_frame_rate = (AVRational) {outVideoCtx->video_framerate, 1};
 	 * av_opt_set(videoStream->codec->priv_data, "preset", "slow", 0);
@@ -115,103 +138,138 @@
 	 *
 	 */
 
-//	if (p_voutf->p_fmt->oformat->flags & AVFMT_GLOBALHEADER)
-//		p_video_stream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+	if (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 {
+		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);
+	}
+
+	if (video_output_file->gdr) {
+		av_opt_set_int(video_output_file->codec_ctx->priv_data, "intra-refresh", 1, 0);
+		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;
 
-	p_voutf->i_vstream_idx = 0;//p_video_stream->index;
+//	if (video_output_file->av_fmt_ctx->oformat->flags & AVFMT_GLOBALHEADER)
+//		video_stream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
 
-	/* open the video codec */
-	if (avcodec_open2(p_voutf->p_codec_ctx, p_voutf->p_codec, NULL) < 0) {
-		fprintf(stderr, "Cannot open output video codec\n");
+	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(p_video_stream->codec, p_video_codec, NULL) < 0) {
-//		fprintf(stderr, "Cannot open output video codec\n");
+//	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 * p_voutf, VideoScaledData * p_vsd) {
-
+int dc_video_encoder_encode(VideoOutputFile *video_output_file, VideoScaledData *video_scaled_data)
+{
 	//AVPacket pkt;
-	VideoDataNode * p_vn;
+	VideoDataNode *video_data_node;
 	int ret;
-	//int i_out_size;
-
-//	AVStream * p_video_stream = p_voutf->p_fmt->streams[p_voutf->i_vstream_idx];
-//	AVCodecContext * p_video_codec_ctx = p_video_stream->codec;
-	AVCodecContext * p_video_codec_ctx = p_voutf->p_codec_ctx;
-
+	//int out_size;
 
-	ret = dc_consumer_lock(&p_voutf->vcon, &p_vsd->p_cb);
+//	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
+	ret = dc_consumer_lock(&video_output_file->consumer, &video_scaled_data->circular_buf);
 	if (ret < 0) {
-#ifdef DEBUG
-		printf("Video encoder got to end of buffer!\n");
-#endif
-
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video encoder got an end of buffer!\n"));
 		return -2;
 	}
 
-	dc_consumer_unlock_previous(&p_voutf->vcon, &p_vsd->p_cb);
+	if (video_scaled_data->circular_buf.size > 1)
+		dc_consumer_unlock_previous(&video_output_file->consumer, &video_scaled_data->circular_buf);
 
-	p_vn = (VideoDataNode *) dc_consumer_consume(&p_voutf->vcon, &p_vsd->p_cb);
+	video_data_node = (VideoDataNode*)dc_consumer_consume(&video_output_file->consumer, &video_scaled_data->circular_buf);
 
 	/*
 	 * Set PTS (method 1)
 	 */
-	p_vn->p_vframe->pts = p_video_codec_ctx->frame_number;
-
-
-	/*
-	 * Set PTS (method 2)
-	 */
-	//int64_t now = av_gettime();
-	//p_vn->p_vframe->pts = av_rescale_q(now, AV_TIME_BASE_Q,
-	//p_video_codec_ctx->time_base);
-
-
+	if (!video_output_file->use_source_timing) {
+		video_data_node->vframe->pts = video_codec_ctx->frame_number;
+	}	
+	
 	/* Encoding video */
-	p_voutf->i_encoded_frame_size = avcodec_encode_video(p_video_codec_ctx,
-			p_voutf->p_vbuf, p_voutf->i_vbuf_size, p_vn->p_vframe);
+	{
+		int got_packet = 0;
+		AVPacket pkt;
+		av_init_packet(&pkt);
+		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
+		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);
+		//this is not true with libav !
+		if (video_output_file->encoded_frame_size >= 0)
+			video_output_file->encoded_frame_size = pkt.size;
+#endif
+		if (video_output_file->encoded_frame_size >= 0) {
+			if (got_packet) {
+				video_codec_ctx->coded_frame->pts = video_codec_ctx->coded_frame->pkt_pts = pkt.pts;
+				video_codec_ctx->coded_frame->pkt_dts = pkt.dts;
+				video_codec_ctx->coded_frame->key_frame = (pkt.flags & AV_PKT_FLAG_KEY) ? 1 : 0;
+			}
+		}
+	}
+
+	dc_consumer_advance(&video_output_file->consumer);
 
-	dc_consumer_advance(&p_voutf->vcon);
+	if (video_scaled_data->circular_buf.size == 1)
+		dc_consumer_unlock_previous(&video_output_file->consumer, &video_scaled_data->circular_buf);
 
-	if (p_voutf->i_encoded_frame_size < 0) {
-		fprintf(stderr, "Error occured while encoding video frame.\n");
+	if (video_output_file->encoded_frame_size < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error occured while encoding video frame.\n"));
 		return -1;
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DashCast] Video Frame TS "LLU" encoded at UTC "LLU" ms\n", /*p_vn->source_number, */p_vn->p_vframe->pts, gf_net_get_utc() ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Video %s Frame TS "LLU" encoded at UTC "LLU" ms\n", video_output_file->rep_id, /*video_data_node->source_number, */video_data_node->vframe->pts, gf_net_get_utc() ));
 
 	/* if zero size, it means the image was buffered */
-//	if (i_out_size > 0) {
+//	if (out_size > 0) {
 //
 //		av_init_packet(&pkt);
 //		pkt.data = NULL;
 //		pkt.size = 0;
 //
-//		if (p_video_codec_ctx->coded_frame->pts != AV_NOPTS_VALUE) {
-//			pkt.pts = av_rescale_q(p_video_codec_ctx->coded_frame->pts,
-//					p_video_codec_ctx->time_base, p_video_stream->time_base);
+//		if (video_codec_ctx->coded_frame->pts != AV_NOPTS_VALUE) {
+//			pkt.pts = av_rescale_q(video_codec_ctx->coded_frame->pts,
+//					video_codec_ctx->time_base, video_stream->time_base);
 //		}
 //
 //
-//		if (p_video_codec_ctx->coded_frame->key_frame)
+//		if (video_codec_ctx->coded_frame->key_frame)
 //			pkt.flags |= AV_PKT_FLAG_KEY;
 //
-//		pkt.stream_index = p_video_stream->index;
-//		pkt.data = p_voutf->p_vbuf;
-//		pkt.size = i_out_size;
+//		pkt.stream_index = video_stream->index;
+//		pkt.data = video_output_file->vbuf;
+//		pkt.size = out_size;
 //
 //		// write the compressed frame in the media file
-//		if (av_interleaved_write_frame(p_voutf->p_fmt, &pkt)
+//		if (av_interleaved_write_frame(video_output_file->av_fmt_ctx, &pkt)
 //				!= 0) {
-//			fprintf(stderr, "Writing frame is not successful\n");
+//			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Writing frame is not successful\n"));
 //			return -1;
 //		}
 //
@@ -219,22 +277,19 @@
 //
 //	}
 
-	return p_voutf->i_encoded_frame_size;
+	return video_output_file->encoded_frame_size;
 }
 
-void dc_video_encoder_close(VideoOutputFile * p_voutf) {
-
+void dc_video_encoder_close(VideoOutputFile *video_output_file)
+{
 //	int i;
 //
 //	// free the streams
-//	for (i = 0; i < p_voutf->p_fmt->nb_streams; i++) {
-//		avcodec_close(p_voutf->p_fmt->streams[i]->codec);
-//		av_freep(&p_voutf->p_fmt->streams[i]->info);
+//	for (i = 0; i < video_output_file->av_fmt_ctx->nb_streams; i++) {
+//		avcodec_close(video_output_file->av_fmt_ctx->streams[i]->codec);
+//		av_freep(&video_output_file->av_fmt_ctx->streams[i]->info);
 //	}
-
-	av_free(p_voutf->p_vbuf);
-
-	avcodec_close(p_voutf->p_codec_ctx);
-	av_free(p_voutf->p_codec_ctx);
-
+	av_free(video_output_file->vbuf);
+	avcodec_close(video_output_file->codec_ctx);
+	av_free(video_output_file->codec_ctx);
 }

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_encoder.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_encoder.h Changed

@@ -32,34 +32,32 @@
 /*
  * Open an video stream
  *
- * @param voutf [in] add a video stream to the file
+ * @param video_output_file [in] add a video stream to the file
  * with the parameters already passed to open_video_output
  *
  * @return 0 on success, -1 on failure
  */
-int dc_video_encoder_open(VideoOutputFile * voutf, VideoData * vdata);
+int dc_video_encoder_open(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, Bool use_source_timing);
 
 /*
  * Read the decoded video frames from circular buffer
  * of the corresponding resolution
  * and encode and write them on the output file
  *
- * @param voutf [in] video output file
- * @param vsd [in] scaled video data structure which
+ * @param video_output_file [in] video output file
+ * @param video_scaled_data [in] scaled video data structure which
  * contains a circular buffer with video frames
  *
  * @return 0 on success, -1 on failure, -2 on finishing;
  * when there is no more data on circular buffer to encode
  */
-int dc_video_encoder_encode(VideoOutputFile * voutf, VideoScaledData * vsd);
-
+int dc_video_encoder_encode(VideoOutputFile *video_output_file, VideoScaledData *video_scaled_data);
 
 /*
  * Close the output video file
  *
- * @param voutf [in] video output file
+ * @param video_output_file [in] video output file
  */
-void dc_video_encoder_close(VideoOutputFile * voutf);
-
+void dc_video_encoder_close(VideoOutputFile *video_output_file);
 
 #endif /* VIDEO_ENCODER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_muxer.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_muxer.c Changed

@@ -26,153 +26,257 @@
 #include "video_muxer.h"
 #include "libavutil/opt.h"
 
-int dc_gpac_video_moov_create(VideoOutputFile * p_voutf, char * psz_name) {
 
+/**
+ * A function which takes FFmpeg H264 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 avc_import_ffextradata(const u8 *extradata, const u64 extradata_size, GF_AVCConfig *dstcfg)
+{
+#ifdef GPAC_DISABLE_AV_PARSERS
+	return GF_OK;
+#else
+	u8 nal_size;
+	AVCState avc;
+	GF_BitStream *bs;
+	if (!extradata || !extradata_size)
+		return GF_BAD_PARAM;
+	bs = gf_bs_new(extradata, extradata_size, GF_BITSTREAM_READ);
+	if (!bs)
+		return GF_BAD_PARAM;
+	if (gf_bs_read_u32(bs) != 0x00000001) {
+		gf_bs_del(bs);
+		return GF_BAD_PARAM;
+	}
+
+	//SPS
+	{
+		s32 idx;
+		char *buffer = NULL;
+		const u64 nal_start = 4;
+		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;
+		}
+		buffer = (char*)gf_malloc(nal_size);
+		gf_bs_read_data(bs, buffer, nal_size);
+		gf_bs_seek(bs, nal_start);
+		if ((gf_bs_read_u8(bs) & 0x1F) != GF_AVC_NALU_SEQ_PARAM) {
+			gf_bs_del(bs);
+			gf_free(buffer);
+			return GF_BAD_PARAM;
+		}
+
+		idx = gf_media_avc_read_sps(buffer, nal_size, &avc, 0, NULL);
+		if (idx < 0) {
+			gf_bs_del(bs);
+			gf_free(buffer);
+			return GF_BAD_PARAM;
+		}
+
+		dstcfg->configurationVersion = 1;
+		dstcfg->profile_compatibility = avc.sps[idx].prof_compat;
+		dstcfg->AVCProfileIndication = avc.sps[idx].profile_idc;
+		dstcfg->AVCLevelIndication = avc.sps[idx].level_idc;
+		dstcfg->chroma_format = avc.sps[idx].chroma_format;
+		dstcfg->luma_bit_depth = 8 + avc.sps[idx].luma_bit_depth_m8;
+		dstcfg->chroma_bit_depth = 8 + avc.sps[idx].chroma_bit_depth_m8;
+
+		{
+			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			slc->size = nal_size;
+			slc->id = idx;
+			slc->data = buffer;
+			gf_list_add(dstcfg->sequenceParameterSets, slc);
+		}
+	}
+
+	//PPS
+	{
+		s32 idx;
+		char *buffer = NULL;
+		const u64 nal_start = 4 + nal_size + 4;
+		gf_bs_seek(bs, nal_start);
+		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;
+		}
+		buffer = (char*)gf_malloc(nal_size);
+		gf_bs_read_data(bs, buffer, nal_size);
+		gf_bs_seek(bs, nal_start);
+		if ((gf_bs_read_u8(bs) & 0x1F) != GF_AVC_NALU_PIC_PARAM) {
+			gf_bs_del(bs);
+			gf_free(buffer);
+			return GF_BAD_PARAM;
+		}
+		
+		idx = gf_media_avc_read_pps(buffer, nal_size, &avc);
+		if (idx < 0) {
+			gf_bs_del(bs);
+			gf_free(buffer);
+			return GF_BAD_PARAM;
+		}
+
+		{
+			GF_AVCConfigSlot *slc = (GF_AVCConfigSlot*)gf_malloc(sizeof(GF_AVCConfigSlot));
+			slc->size = nal_size;
+			slc->id = idx;
+			slc->data = buffer;
+			gf_list_add(dstcfg->pictureParameterSets, slc);
+		}
+	}
+
+	gf_bs_del(bs);
+	return GF_OK;
+#endif
+}
+
+int dc_gpac_video_moov_create(VideoOutputFile *video_output_file, char *filename)
+{
 	GF_Err ret;
-	//AVStream * p_video_stream =
-	//		p_voutf->p_fmt->streams[p_voutf->i_vstream_idx];
-	//AVCodecContext * p_video_codec_ctx = p_video_stream->codec;
+	//AVStream *video_stream = video_output_file->av_fmt_ctx->streams[video_output_file->vstream_idx];
+	//AVCodecContext *video_codec_ctx = video_stream->codec;
 
-	AVCodecContext * p_video_codec_ctx = p_voutf->p_codec_ctx;
+	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
 	GF_AVCConfig *avccfg;
-	u32 di;
-	u32 track;
+	u32 di, track;
 
 	// T0D0: For the moment it is fixed
-	//u32 sample_dur = p_voutf->p_codec_ctx->time_base.den;
+	//u32 sample_dur = video_output_file->codec_ctx->time_base.den;
 
 	avccfg = gf_odf_avc_cfg_new();
-
 	if (!avccfg) {
-		fprintf(stderr, "Cannot create AVCConfig\n");
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create AVCConfig\n"));
 		return -1;
 	}
 
 	//int64_t profile = 0;
-	//av_opt_get_int(p_voutf->p_codec_ctx->priv_data, "level", AV_OPT_SEARCH_CHILDREN, &profile);
-
-	avccfg->configurationVersion = 1; //0
-	//avccfg->AVCProfileIndication = 66; //0
-	//avccfg->profile_compatibility = 192; //0
-	//avccfg->AVCLevelIndication = 30; //24
-	//avccfg->nal_unit_size = 4;
+	//av_opt_get_int(video_output_file->codec_ctx->priv_data, "level", AV_OPT_SEARCH_CHILDREN, &profile);
 
-	p_voutf->p_isof = gf_isom_open(psz_name, GF_ISOM_OPEN_WRITE, NULL);
+	{
+		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"));
+			gf_odf_avc_cfg_del(avccfg);
+			return -1;
+		}
+	}
 
-	if (!p_voutf->p_isof) {
-		fprintf(stderr, "Cannot open iso file %s\n", psz_name);
+	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));
 		return -1;
 	}
-	//gf_isom_store_movie_config(p_voutf->p_isof, 0);
-	track = gf_isom_new_track(p_voutf->p_isof, 1, GF_ISOM_MEDIA_VISUAL,
-			p_video_codec_ctx->time_base.den);
+	//gf_isom_store_movie_config(video_output_file->isof, 0);
+	track = gf_isom_new_track(video_output_file->isof, 0, GF_ISOM_MEDIA_VISUAL, video_codec_ctx->time_base.den);
+	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) 
+		video_output_file->frame_dur = video_codec_ctx->time_base.num;
 
 	if (!track) {
-		fprintf(stderr, "Cannot create new track\n");
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create new track\n"));
 		return -1;
 	}
 
-	ret = gf_isom_set_track_enabled(p_voutf->p_isof, 1, 1);
+	ret = gf_isom_set_track_enabled(video_output_file->isof, track, 1);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_set_track_enabled\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_track_enabled\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	ret = gf_isom_avc_config_new(p_voutf->p_isof, 1, avccfg, NULL, NULL, &di);
+	ret = gf_isom_avc_config_new(video_output_file->isof, track, avccfg, NULL, NULL, &di);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_avc_config_new\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_avc_config_new\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
 	gf_odf_avc_cfg_del(avccfg);
-	//printf("time scale: %d \n",
-	//		p_video_codec_ctx->time_base.den);
+	//fprintf(stdout, "time scale: %d \n", video_codec_ctx->time_base.den);
 
-	ret = gf_isom_avc_set_inband_config(p_voutf->p_isof, track, 1);
-	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_avc_set_inband_config\n",
-				gf_error_to_string(ret));
-		return -1;
+	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(p_voutf->p_isof, 1, 1, 1, 0, 0, 0, 0);
+	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) {
-		fprintf(stderr, "%s: gf_isom_setup_track_fragment\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_setutrack_fragment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-	//gf_isom_add_track_to_root_od(p_voutf->p_isof,1);
+	//gf_isom_add_track_to_root_od(video_output_file->isof,1);
 
-	ret = gf_isom_finalize_for_fragment(p_voutf->p_isof, 1);
+	ret = gf_isom_finalize_for_fragment(video_output_file->isof, track);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_finalize_for_fragment\n",
-				gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_finalize_for_fragment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
 	return 0;
 }
 
-int dc_gpac_video_isom_open_seg(VideoOutputFile * p_voutf, char * psz_name) {
-
+int dc_gpac_video_isom_open_seg(VideoOutputFile *video_output_file, char *filename)
+{
 	GF_Err ret;
-
-	ret = gf_isom_start_segment(p_voutf->p_isof, psz_name, 1);
+	ret = gf_isom_start_segment(video_output_file->isof, filename, 1);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_start_segment\n", gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_start_segment\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
-//	ret = gf_isom_set_traf_base_media_decode_time(p_voutf->p_isof, 1,
-//			p_voutf->first_dts);
+//	ret = gf_isom_set_traf_base_media_decode_time(video_output_file->isof, 1,
+//			video_output_file->first_dts);
 //	if (ret != GF_OK) {
-//		fprintf(stderr, "%s: gf_isom_set_traf_base_media_decode_time\n",
-//				gf_error_to_string(ret));
+//		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_set_traf_base_media_decode_time\n", gf_error_to_string(ret)));
 //		return -1;
 //	}
 //
-//	p_voutf->first_dts += p_voutf->frame_per_segment;
+//	video_output_file->first_dts += video_output_file->frame_per_segment;
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Opening new segment %s at UTC "LLU" ms\n", psz_name, gf_net_get_utc() ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Opening new segment %s at UTC "LLU" ms\n", filename, gf_net_get_utc() ));
 	return 0;
 }
 
-int dc_gpac_video_isom_write(VideoOutputFile * p_voutf) {
-
+int dc_gpac_video_isom_write(VideoOutputFile *video_output_file)
+{
 	GF_Err ret;
-	//AVStream * p_video_stream =
-	//		p_voutf->p_fmt->streams[p_voutf->i_vstream_idx];
-	//AVCodecContext * p_video_codec_ctx = p_video_stream->codec;
-
-	AVCodecContext * p_video_codec_ctx = p_voutf->p_codec_ctx;
+	//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;
 	u32 nalu_size = 0;
 
-	u32 buf_len = p_voutf->i_encoded_frame_size;
-	u8 *buf_ptr = p_voutf->p_vbuf;
-
-	GF_BitStream * out_bs = gf_bs_new(NULL, 2 * buf_len, GF_BITSTREAM_WRITE);
+	u32 buf_len = video_output_file->encoded_frame_size;
+	u8 *buf_ptr = video_output_file->vbuf;
 
+	GF_BitStream *out_bs = gf_bs_new(NULL, 2 * buf_len, GF_BITSTREAM_WRITE);
 	nalu_size = gf_media_nalu_next_start_code(buf_ptr, buf_len, &sc_size);
-
 	if (nalu_size != 0) {
 		gf_bs_write_u32(out_bs, nalu_size);
 		gf_bs_write_data(out_bs, (const char*) buf_ptr, nalu_size);
 	}
-
 	if (sc_size) {
 		buf_ptr += (nalu_size + sc_size);
 		buf_len -= (nalu_size + sc_size);
 	}
 
 	while (buf_len) {
-
 		nalu_size = gf_media_nalu_next_start_code(buf_ptr, buf_len, &sc_size);
-
 		if (nalu_size != 0) {
 			gf_bs_write_u32(out_bs, nalu_size);
 			gf_bs_write_data(out_bs, (const char*) buf_ptr, nalu_size);
@@ -184,178 +288,174 @@
 			break;
 		buf_len -= nalu_size + sc_size;
 		buf_ptr += sc_size;
-
 	}
 
-	gf_bs_get_content(out_bs, &p_voutf->p_sample->data,
-			&p_voutf->p_sample->dataLength);
-	//p_voutf->p_sample->data = //(char *) (p_voutf->p_vbuf + nalu_size + sc_size);
-	//p_voutf->p_sample->dataLength = //p_voutf->i_encoded_frame_size - (sc_size + nalu_size);
-
-	p_voutf->p_sample->DTS = p_video_codec_ctx->coded_frame->pts;
-	p_voutf->p_sample->IsRAP = p_video_codec_ctx->coded_frame->key_frame;
-	//printf("RAP %d , DTS %ld \n", p_voutf->p_sample->IsRAP, p_voutf->p_sample->DTS);
+	gf_bs_get_content(out_bs, &video_output_file->sample->data, &video_output_file->sample->dataLength);
+	//video_output_file->sample->data = //(char *) (video_output_file->vbuf + nalu_size + sc_size);
+	//video_output_file->sample->dataLength = //video_output_file->encoded_frame_size - (sc_size + nalu_size);
 
-	ret = gf_isom_fragment_add_sample(p_voutf->p_isof, 1, p_voutf->p_sample, 1,
-			1, 0, 0, 0);
+	video_output_file->sample->DTS = video_codec_ctx->coded_frame->pkt_dts;
+	video_output_file->sample->CTS_Offset = (s32) (video_codec_ctx->coded_frame->pts - video_output_file->sample->DTS);
+	video_output_file->sample->IsRAP = video_codec_ctx->coded_frame->key_frame;
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Isom Write: RAP %d , DTS "LLD" CTS offset %d \n", video_output_file->sample->IsRAP, video_output_file->sample->DTS, video_output_file->sample->CTS_Offset));
 
+	ret = gf_isom_fragment_add_sample(video_output_file->isof, video_output_file->trackID, video_output_file->sample, 1, video_output_file->use_source_timing ? (u32) video_output_file->frame_dur : 1, 0, 0, 0);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_fragment_add_sample\n",
-				gf_error_to_string(ret));
+		gf_bs_del(out_bs);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_fragment_add_sample\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
+	//free data but keep sample structure alive
+	gf_free(video_output_file->sample->data);
+	video_output_file->sample->data = NULL;
+	video_output_file->sample->dataLength = 0;
+
+	gf_bs_del(out_bs);
 	return 0;
 }
 
-int dc_gpac_video_isom_close_seg(VideoOutputFile * p_voutf) {
-
+int dc_gpac_video_isom_close_seg(VideoOutputFile *video_output_file)
+{
 	GF_Err ret;
-
-	ret = gf_isom_close_segment(p_voutf->p_isof, 0, 0, 0, 0, 0, 1, p_voutf->i_seg_marker, NULL,
-			NULL);
+	ret = gf_isom_close_segment(video_output_file->isof, 0, 0, 0, 0, 0, 0, 1, video_output_file->seg_marker, NULL, NULL);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_close_segment\n", gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_close_segment\n", gf_error_to_string(ret)));
 		return -1;
 	}
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Closing segment at UTC "LLU" ms\n", gf_net_get_utc() ));
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Rep %s Closing segment at UTC "LLU" ms\n", video_output_file->rep_id, gf_net_get_utc() ));
 
 	return 0;
 }
 
-int dc_gpac_video_isom_close(VideoOutputFile * p_voutf) {
-
+int dc_gpac_video_isom_close(VideoOutputFile *video_output_file)
+{
 	GF_Err ret;
-
-	ret = gf_isom_close(p_voutf->p_isof);
+	ret = gf_isom_close(video_output_file->isof);
 	if (ret != GF_OK) {
-		fprintf(stderr, "%s: gf_isom_close\n", gf_error_to_string(ret));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("%s: gf_isom_close\n", gf_error_to_string(ret)));
 		return -1;
 	}
 
 	return 0;
 }
 
-int dc_raw_h264_open(VideoOutputFile * p_voutf, char * psz_name) {
-
-	p_voutf->p_file = fopen(psz_name, "w");
+int dc_raw_h264_open(VideoOutputFile *video_output_file, char *filename)
+{
+	video_output_file->file = fopen(filename, "w");
 	return 0;
 }
 
-int dc_raw_h264_write(VideoOutputFile * p_voutf) {
-
-	fwrite(p_voutf->p_vbuf, p_voutf->i_encoded_frame_size, 1, p_voutf->p_file);
+int dc_raw_h264_write(VideoOutputFile *video_output_file)
+{
+	fwrite(video_output_file->vbuf, video_output_file->encoded_frame_size, 1, video_output_file->file);
 	return 0;
 }
 
-int dc_raw_h264_close(VideoOutputFile * p_voutf) {
-
-	fclose(p_voutf->p_file);
+int dc_raw_h264_close(VideoOutputFile *video_output_file)
+{
+	fclose(video_output_file->file);
 	return 0;
 }
 
-int dc_ffmpeg_video_muxer_open(VideoOutputFile * p_voutf, char * psz_name) {
-
-	AVStream * p_video_stream;
-	AVOutputFormat * p_output_fmt;
+int dc_ffmpeg_video_muxer_open(VideoOutputFile *video_output_file, char *filename)
+{
+	AVStream *video_stream;
+	AVOutputFormat *output_fmt;
 
-	AVCodecContext * p_video_codec_ctx = p_voutf->p_codec_ctx;
-	p_voutf->p_fmt = NULL;
+	AVCodecContext *video_codec_ctx = video_output_file->codec_ctx;
+	video_output_file->av_fmt_ctx = NULL;
 
-//	p_voutf->i_vbr = p_vconf->i_bitrate;
-//	p_voutf->i_vfr = p_vconf->i_framerate;
-//	p_voutf->i_width = p_vconf->i_width;
-//	p_voutf->i_height = p_vconf->i_height;
-//	strcpy(p_voutf->psz_name, p_vconf->psz_name);
-//	strcpy(p_voutf->psz_codec, p_vconf->psz_codec);
+//	video_output_file->vbr = video_data_conf->bitrate;
+//	video_output_file->vfr = video_data_conf->framerate;
+//	video_output_file->width = video_data_conf->width;
+//	video_output_file->height = video_data_conf->height;
+//	strcpy(video_output_file->filename, video_data_conf->filename);
+//	strcpy(video_output_file->codec, video_data_conf->codec);
 
 	/* Find output format */
-	p_output_fmt = av_guess_format(NULL, psz_name, NULL);
-	if (!p_output_fmt) {
-		fprintf(stderr, "Cannot find suitable output format\n");
+	output_fmt = av_guess_format(NULL, filename, NULL);
+	if (!output_fmt) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot find suitable output format\n"));
 		return -1;
 	}
 
-	p_voutf->p_fmt = avformat_alloc_context();
-	if (!p_voutf->p_fmt) {
-		fprintf(stderr, "Cannot allocate memory for pOutVideoFormatCtx\n");
+	video_output_file->av_fmt_ctx = avformat_alloc_context();
+	if (!video_output_file->av_fmt_ctx) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate memory for pOutVideoFormatCtx\n"));
 		return -1;
 	}
 
-	p_voutf->p_fmt->oformat = p_output_fmt;
-	strcpy(p_voutf->p_fmt->filename, psz_name);
+	video_output_file->av_fmt_ctx->oformat = output_fmt;
+	strcpy(video_output_file->av_fmt_ctx->filename, filename);
 
 	/* Open the output file */
-	if (!(p_output_fmt->flags & AVFMT_NOFILE)) {
-		if (avio_open(&p_voutf->p_fmt->pb, psz_name, URL_WRONLY) < 0) {
-			fprintf(stderr, "Cannot not open '%s'\n", psz_name);
+	if (!(output_fmt->flags & AVFMT_NOFILE)) {
+		if (avio_open(&video_output_file->av_fmt_ctx->pb, filename, URL_WRONLY) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot not open '%s'\n", filename));
 			return -1;
 		}
 	}
 
-	p_video_stream = avformat_new_stream(p_voutf->p_fmt,
-			p_voutf->p_codec);
-	if (!p_video_stream) {
-		fprintf(stderr, "Cannot create output video stream\n");
+	video_stream = avformat_new_stream(video_output_file->av_fmt_ctx,
+			video_output_file->codec);
+	if (!video_stream) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot create output video stream\n"));
 		return -1;
 	}
 
-	//p_video_stream->codec = p_voutf->p_codec_ctx;
+	//video_stream->codec = video_output_file->codec_ctx;
 
-	p_video_stream->codec->codec_id = p_voutf->p_codec->id;
-	p_video_stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-	p_video_stream->codec->bit_rate = p_video_codec_ctx->bit_rate; //p_voutf->p_vdata->i_bitrate;
-	p_video_stream->codec->width = p_video_codec_ctx->width; //p_voutf->p_vdata->i_width;
-	p_video_stream->codec->height = p_video_codec_ctx->height; //p_voutf->p_vdata->i_height;
-	{
-		AVRational time_base; 
-		time_base.num = p_video_codec_ctx->time_base.num;
-		time_base.den = p_video_codec_ctx->time_base.den;
-		p_video_stream->codec->time_base = time_base;
-	}
-	p_video_stream->codec->pix_fmt = PIX_FMT_YUV420P;
-	p_video_stream->codec->gop_size = p_video_codec_ctx->time_base.den; //p_voutf->p_vdata->i_framerate;
+	video_stream->codec->codec_id = video_output_file->codec->id;
+	video_stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+	video_stream->codec->bit_rate = video_codec_ctx->bit_rate; //video_output_file->video_data_conf->bitrate;
+	video_stream->codec->width = video_codec_ctx->width; //video_output_file->video_data_conf->width;
+	video_stream->codec->height = video_codec_ctx->height; //video_output_file->video_data_conf->height;
 
-	av_opt_set(p_video_stream->codec->priv_data, "preset", "ultrafast", 0);
-	av_opt_set(p_video_stream->codec->priv_data, "tune", "zerolatency", 0);
+	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;
+
+	av_opt_set(video_stream->codec->priv_data, "preset", "ultrafast", 0);
+	av_opt_set(video_stream->codec->priv_data, "tune", "zerolatency", 0);
 
 	/* open the video codec */
-	if (avcodec_open2(p_video_stream->codec, p_voutf->p_codec, NULL) < 0) {
-		fprintf(stderr, "Cannot open output video codec\n");
+	if (avcodec_open2(video_stream->codec, video_output_file->codec, NULL) < 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot open output video codec\n"));
 		return -1;
 	}
 
-	avformat_write_header(p_voutf->p_fmt, NULL);
+	avformat_write_header(video_output_file->av_fmt_ctx, NULL);
 
+	video_output_file->timescale = video_codec_ctx->time_base.den;
 	return 0;
 }
 
-int dc_ffmpeg_video_muxer_write(VideoOutputFile * p_voutf) {
-
+int dc_ffmpeg_video_muxer_write(VideoOutputFile *video_output_file)
+{
 	AVPacket pkt;
-
-	AVStream * p_video_stream = p_voutf->p_fmt->streams[p_voutf->i_vstream_idx];
-	AVCodecContext * p_video_codec_ctx = p_video_stream->codec;
+	AVStream *video_stream = video_output_file->av_fmt_ctx->streams[video_output_file->vstream_idx];
+	AVCodecContext *video_codec_ctx = video_stream->codec;
 
 	av_init_packet(&pkt);
 	pkt.data = NULL;
 	pkt.size = 0;
 
-	if (p_video_codec_ctx->coded_frame->pts != AV_NOPTS_VALUE) {
-		pkt.pts = av_rescale_q(p_video_codec_ctx->coded_frame->pts,
-				p_video_codec_ctx->time_base, p_video_stream->time_base);
+	if (video_codec_ctx->coded_frame->pts != AV_NOPTS_VALUE) {
+		pkt.pts = av_rescale_q(video_codec_ctx->coded_frame->pts, video_codec_ctx->time_base, video_stream->time_base);
 	}
 
-	if (p_video_codec_ctx->coded_frame->key_frame)
+	if (video_codec_ctx->coded_frame->key_frame)
 		pkt.flags |= AV_PKT_FLAG_KEY;
 
-	pkt.stream_index = p_video_stream->index;
-	pkt.data = p_voutf->p_vbuf;
-	pkt.size = p_voutf->i_encoded_frame_size;
+	pkt.stream_index = video_stream->index;
+	pkt.data = video_output_file->vbuf;
+	pkt.size = video_output_file->encoded_frame_size;
 
 	// write the compressed frame in the media file
-	if (av_interleaved_write_frame(p_voutf->p_fmt, &pkt) != 0) {
-		fprintf(stderr, "Writing frame is not successful\n");
+	if (av_interleaved_write_frame(video_output_file->av_fmt_ctx, &pkt) != 0) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Writing frame is not successful\n"));
 		return -1;
 	}
 
@@ -364,83 +464,93 @@
 	return 0;
 }
 
-int dc_ffmpeg_video_muxer_close(VideoOutputFile * p_voutf) {
-
+int dc_ffmpeg_video_muxer_close(VideoOutputFile *video_output_file)
+{
 	u32 i;
 
-	av_write_trailer(p_voutf->p_fmt);
+	av_write_trailer(video_output_file->av_fmt_ctx);
 
-	avio_close(p_voutf->p_fmt->pb);
+	avio_close(video_output_file->av_fmt_ctx->pb);
 
 	// free the streams
-	for (i = 0; i < p_voutf->p_fmt->nb_streams; i++) {
-		avcodec_close(p_voutf->p_fmt->streams[i]->codec);
-		av_freep(&p_voutf->p_fmt->streams[i]->info);
+	for (i = 0; i < video_output_file->av_fmt_ctx->nb_streams; i++) {
+		avcodec_close(video_output_file->av_fmt_ctx->streams[i]->codec);
+		av_freep(&video_output_file->av_fmt_ctx->streams[i]->info);
 	}
 
-	//p_voutf->p_fmt->streams[p_voutf->i_vstream_idx]->codec = NULL;
-	avformat_free_context(p_voutf->p_fmt);
+	//video_output_file->av_fmt_ctx->streams[video_output_file->vstream_idx]->codec = NULL;
+	avformat_free_context(video_output_file->av_fmt_ctx);
 
 	return 0;
 }
 
-int dc_video_muxer_init(VideoOutputFile * p_voutf, VideoData * p_vdata,
-		VideoMuxerType muxer_type, int frame_per_segment,
-		int frame_per_fragment, u32 seg_marker, int gdr) {
+int dc_video_muxer_init(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, VideoMuxerType muxer_type, int frame_per_segment, int frame_per_fragment, u32 seg_marker, int gdr, int seg_dur, int frag_dur, int frame_dur, int gop_size, int video_cb_size)
+{
+	char name[GF_MAX_PATH];
+	memset(video_output_file, 0, sizeof(VideoOutputFile));
+	snprintf(name, sizeof(name), "video encoder %s", video_data_conf->filename);
+	dc_consumer_init(&video_output_file->consumer, video_cb_size, name);
 
-	char name[256];
-	sprintf(name, "video encoder %s", p_vdata->psz_name);
-	dc_consumer_init(&p_voutf->vcon, VIDEO_CB_SIZE, name);
+	video_output_file->sample = gf_isom_sample_new();
+	video_output_file->isof = NULL;
+	video_output_file->muxer_type = muxer_type;
 
-	p_voutf->p_sample = gf_isom_sample_new();
-	p_voutf->p_isof = NULL;
-	p_voutf->muxer_type = muxer_type;
+	video_output_file->frame_per_segment = frame_per_segment;
+	video_output_file->frame_per_fragment = frame_per_fragment;
 
-	p_voutf->frame_per_segment = frame_per_segment;
-	p_voutf->frame_per_fragment = frame_per_fragment;
+	video_output_file->seg_dur = seg_dur;
+	video_output_file->frag_dur = frag_dur;
 
-	p_voutf->i_seg_marker = seg_marker;
-	p_voutf->i_gdr = gdr;
+	video_output_file->seg_marker = seg_marker;
+	video_output_file->gdr = gdr;
+	video_output_file->gop_size = gop_size;
+	video_output_file->frame_dur = frame_dur;
 
 	return 0;
 }
 
-int dc_video_muxer_free(VideoOutputFile * p_voutf) {
-
-	if (p_voutf->p_isof != NULL) {
-		gf_isom_close(p_voutf->p_isof);
+int dc_video_muxer_free(VideoOutputFile *video_output_file)
+{
+	if (video_output_file->isof != NULL) {
+		gf_isom_close(video_output_file->isof);
 	}
 
-	gf_isom_sample_del(&p_voutf->p_sample);
+	gf_isom_sample_del(&video_output_file->sample);
 
 	return 0;
 }
 
-GF_Err dc_video_muxer_open(VideoOutputFile * p_voutf, char * psz_directory,
-		char * psz_id, int i_seg) {
-
-	char psz_name[256];
-
-	switch (p_voutf->muxer_type) {
+GF_Err dc_video_muxer_open(VideoOutputFile *video_output_file, char *directory, char *id_name, int seg)
+{
+	char name[GF_MAX_PATH];
 
+	switch (video_output_file->muxer_type) {
 	case FFMPEG_VIDEO_MUXER:
-		sprintf(psz_name, "%s/%s_%d_ffmpeg.mp4", psz_directory, psz_id, i_seg);
-		return dc_ffmpeg_video_muxer_open(p_voutf, psz_name);
+		snprintf(name, sizeof(name), "%s/%s_%d_ffmpeg.mp4", directory, id_name, seg);
+		return dc_ffmpeg_video_muxer_open(video_output_file, name);
 	case RAW_VIDEO_H264:
-		sprintf(psz_name, "%s/%s_%d.264", psz_directory, psz_id, i_seg);
-		return dc_raw_h264_open(p_voutf, psz_name);
+		snprintf(name, sizeof(name), "%s/%s_%d.264", directory, id_name, seg);
+		return dc_raw_h264_open(video_output_file, name);
 	case GPAC_VIDEO_MUXER:
-		sprintf(psz_name, "%s/%s_%d_gpac.mp4", psz_directory, psz_id, i_seg);
-		dc_gpac_video_moov_create(p_voutf, psz_name);
-		return dc_gpac_video_isom_open_seg(p_voutf, NULL);
-	case GPAC_INIT_VIDEO_MUXER:
-		if (i_seg == 0) {
-			sprintf(psz_name, "%s/%s_init_gpac.mp4", psz_directory, psz_id);
-			dc_gpac_video_moov_create(p_voutf, psz_name);
-			p_voutf->first_dts = 0;
+		snprintf(name, sizeof(name), "%s/%s_%d_gpac.mp4", directory, id_name, seg);
+		dc_gpac_video_moov_create(video_output_file, name);
+		return dc_gpac_video_isom_open_seg(video_output_file, NULL);
+	case GPAC_INIT_VIDEO_MUXER_AVC1:
+		if (seg == 0) {
+			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
+			dc_gpac_video_moov_create(video_output_file, name);
+			video_output_file->first_dts = 0;
+		}
+		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
+		return dc_gpac_video_isom_open_seg(video_output_file, name);
+	case GPAC_INIT_VIDEO_MUXER_AVC3:
+		if (seg == 0) {
+			snprintf(name, sizeof(name), "%s/%s_init_gpac.mp4", directory, id_name);
+			dc_gpac_video_moov_create(video_output_file, name);
+			video_output_file->first_dts = 0;
 		}
-		sprintf(psz_name, "%s/%s_%d_gpac.m4s", psz_directory, psz_id, i_seg);
-		return dc_gpac_video_isom_open_seg(p_voutf, psz_name);
+		snprintf(name, sizeof(name), "%s/%s_%d_gpac.m4s", directory, id_name, seg);
+		return dc_gpac_video_isom_open_seg(video_output_file, name);
 	default:
 		return GF_BAD_PARAM;
 	};
@@ -448,56 +558,133 @@
 	return -2;
 }
 
-int dc_video_muxer_write(VideoOutputFile * p_voutf, int i_frame_nb) {
-
-	//GF_Err ret;
-	switch (p_voutf->muxer_type) {
-
+int dc_video_muxer_write(VideoOutputFile *video_output_file, int frame_nb, Bool insert_utc)
+{
+	u64 frame_dur;
+	GF_Err ret;
+	switch (video_output_file->muxer_type) {
 	case FFMPEG_VIDEO_MUXER:
-		return dc_ffmpeg_video_muxer_write(p_voutf);
+		return dc_ffmpeg_video_muxer_write(video_output_file);
 	case RAW_VIDEO_H264:
-		return dc_raw_h264_write(p_voutf);
+		return dc_raw_h264_write(video_output_file);
 	case GPAC_VIDEO_MUXER:
-	case GPAC_INIT_VIDEO_MUXER:
-		if (i_frame_nb % p_voutf->frame_per_fragment == 0) {
-			gf_isom_start_fragment(p_voutf->p_isof, 1);
+	case GPAC_INIT_VIDEO_MUXER_AVC1:
+	case GPAC_INIT_VIDEO_MUXER_AVC3:
+		if (video_output_file->use_source_timing) {
+			if (!video_output_file->fragment_started) {
+				video_output_file->fragment_started = 1;
+				ret = gf_isom_start_fragment(video_output_file->isof, 1);
+				if (ret < 0)
+					return -1;
+
+				video_output_file->first_dts = video_output_file->codec_ctx->coded_frame->pkt_dts;
+				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;
+
+					if (insert_utc) {
+						gf_net_get_ntp(&sec, &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);
+					}
+				}
+				gf_isom_set_traf_base_media_decode_time(video_output_file->isof, video_output_file->trackID, video_output_file->first_dts);
+			}
+
+			//keep track of previous frame dur and use last dur as the default duration for next sample
+			//this works fine because we perform frame rate regulation at the capture stage
+			frame_dur = video_output_file->codec_ctx->coded_frame->pts - video_output_file->last_pts;
+			if (frame_dur && (video_output_file->frame_dur>(u32) frame_dur)) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("New frame dur detected: %d vs %d old\n", (u32) frame_dur, (u32) video_output_file->frame_dur));
+				video_output_file->frame_dur = (u32)frame_dur;
+			}
+
+			if (dc_gpac_video_isom_write(video_output_file) < 0) {
+				return -1;
+			}
+			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) {
+				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));
+			}
+
+			//we may have rounding errors on the input PTS :( add half frame dur safety
+			if (1000 * ( video_output_file->last_pts - video_output_file->pts_at_segment_start + 3*video_output_file->frame_dur/2) /video_output_file->timescale >= video_output_file->seg_dur ) {
+				return 1;
+			}
+			return 0;
+		}
+
+		if (frame_nb % video_output_file->frame_per_fragment == 0) {
+			gf_isom_start_fragment(video_output_file->isof, 1);
+
+			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;
+
+				if (insert_utc) {
+					time_t secs;
+					struct tm t;
+					gf_net_get_ntp(&sec, &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;
+					t = *gmtime(&secs);
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DashCast] Producer reference clock: Timestamp %d matches sender NTP time %d-%02d-%02dT%02d:%02d:%02dZ (NTP frac part %u) \n", (u32) video_output_file->pts_at_segment_start, 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, (u32) frac ));
 
-			gf_isom_set_traf_base_media_decode_time(p_voutf->p_isof, 1,
-					p_voutf->first_dts);
-			p_voutf->first_dts += p_voutf->frame_per_fragment;
+				}
+			}
+
+
+			gf_isom_set_traf_base_media_decode_time(video_output_file->isof, video_output_file->trackID, video_output_file->first_dts);
+			video_output_file->first_dts += video_output_file->frame_per_fragment;
 		}
-		dc_gpac_video_isom_write(p_voutf);
-		if (i_frame_nb % p_voutf->frame_per_fragment == p_voutf->frame_per_fragment - 1) {
-			gf_isom_flush_fragments(p_voutf->p_isof, 1);
 
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DashCast] Flushed fragment to disk at UTC "LLU" ms - last coded frame PTS %d\n", gf_net_get_utc(), p_voutf->p_codec_ctx->coded_frame->pts));
+		dc_gpac_video_isom_write(video_output_file);
+
+		if (frame_nb % video_output_file->frame_per_fragment == video_output_file->frame_per_fragment - 1) {
+			gf_isom_flush_fragments(video_output_file->isof, 1);
+			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));
 		}
-		if (i_frame_nb + 1 == p_voutf->frame_per_segment)
+
+		if (frame_nb + 1 == video_output_file->frame_per_segment)
 			return 1;
+
 		return 0;
 	default:
 		return -2;
-	};
+	}
 
 	return -2;
 }
 
-int dc_video_muxer_close(VideoOutputFile * p_voutf) {
-
-	switch (p_voutf->muxer_type) {
+int dc_video_muxer_close(VideoOutputFile *video_output_file)
+{
+	video_output_file->fragment_started = video_output_file->segment_started = 0;
 
+	switch (video_output_file->muxer_type) {
 	case FFMPEG_VIDEO_MUXER:
-		return dc_ffmpeg_video_muxer_close(p_voutf);
+		return dc_ffmpeg_video_muxer_close(video_output_file);
 	case RAW_VIDEO_H264:
-		return dc_raw_h264_close(p_voutf);
+		return dc_raw_h264_close(video_output_file);
 	case GPAC_VIDEO_MUXER:
-		dc_gpac_video_isom_close_seg(p_voutf);
-		return dc_gpac_video_isom_close(p_voutf);
-	case GPAC_INIT_VIDEO_MUXER:
-		return dc_gpac_video_isom_close_seg(p_voutf);
+		dc_gpac_video_isom_close_seg(video_output_file);
+		return dc_gpac_video_isom_close(video_output_file);
+	case GPAC_INIT_VIDEO_MUXER_AVC1:
+	case GPAC_INIT_VIDEO_MUXER_AVC3:
+		return dc_gpac_video_isom_close_seg(video_output_file);
 	default:
 		return -2;
-	};
+	}
 
 	return -2;
 }

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_muxer.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_muxer.h Changed

@@ -28,78 +28,83 @@
 
 #include "../../modules/ffmpeg_in/ffmpeg_in.h"
 #include "libavformat/avformat.h"
-#ifndef WIN32
 #include "libavdevice/avdevice.h"
-#endif
 #include "libswscale/swscale.h"
 #include "libavutil/mathematics.h"
 #include <gpac/isomedia.h>
 #include <gpac/internal/media_dev.h>
 
 #include "video_scaler.h"
-#include "libav_compat.h"
 
 
 typedef enum {
-
 	FFMPEG_VIDEO_MUXER,
 	RAW_VIDEO_H264,
 	GPAC_VIDEO_MUXER,
-	GPAC_INIT_VIDEO_MUXER
-
+	GPAC_INIT_VIDEO_MUXER_AVC1,
+	GPAC_INIT_VIDEO_MUXER_AVC3
 } VideoMuxerType;
 
 /*
- * VideoOutputFile structure has the data needed
- * to encode video frames and write them on the file.
- * It reads the data from a circular buffer so it needs
- * to keep the index to that circular buffer. This index is
+ * VideoOutputFile structure has the data needed to encode video frames and write them on the file.
+ * It reads the data from a circular buffer so it needs to keep the index to that circular buffer. This index is
  * available in Consumer data structure.
- *
  */
 typedef struct {
-
-	//VideoData * p_vdata;
-
+	//VideoDataConf *video_data_conf;
 	VideoMuxerType muxer_type;
 
 	/* file format context structure */
-	AVFormatContext * p_fmt;
-	AVCodecContext * p_codec_ctx;
-	AVCodec * p_codec;
-
-	FILE * p_file;
+	AVFormatContext *av_fmt_ctx;
+	AVCodecContext *codec_ctx;
+	AVCodec *codec;
 
-	GF_ISOFile * p_isof;
-	GF_ISOSample * p_sample;
+	FILE *file;
 
+	GF_ISOFile *isof;
+	GF_ISOSample *sample;
+	u32 trackID;
 	/* Index of the video stream in the file */
-	int i_vstream_idx;
+	int vstream_idx;
 	/* keeps the index with which encoder access to the circular buffer (as a consumer) */
-	Consumer vcon;
+	Consumer consumer;
 
 	/* Variables that encoder needs to encode data */
-	uint8_t * p_vbuf;
-	int i_vbuf_size;
-	int i_encoded_frame_size;
+	uint8_t *vbuf;
+	int vbuf_size;
+	int encoded_frame_size;
 
 	int frame_per_fragment;
 	int frame_per_segment;
+
+	int seg_dur;
+	int frag_dur;
+
 	u64 first_dts;
 
-	u32 i_seg_marker;
+	u32 seg_marker;
+
+	int gop_size;
+	int gdr;
 
-	int i_gop_size;
-	int i_gdr;
+	Bool use_source_timing;
 
+	u64 pts_at_segment_start;
+	u64 last_pts, last_dts;
+	u64 frame_dur;
+	u32 timescale;
+	Bool fragment_started, segment_started;
+	const char *rep_id;
 } VideoOutputFile;
 
-int dc_video_muxer_init(VideoOutputFile * p_voutf, VideoData * p_vdata,
-		VideoMuxerType muxer_type, int frame_per_segment, int frame_per_fragment, u32 seg_marker, int gdr);
-int dc_video_muxer_free(VideoOutputFile * p_voutf);
+int dc_video_muxer_init(VideoOutputFile *video_output_file, VideoDataConf *video_data_conf, VideoMuxerType muxer_type, int frame_per_segment, int frame_per_fragment, u32 seg_marker, int gdr, int seg_dur, int frag_dur, int frame_dur, int gop_size, int video_cb_size);
+
+int dc_video_muxer_free(VideoOutputFile *video_output_file);
+
+int dc_video_muxer_open(VideoOutputFile *video_output_file, char *directory, char *id_name, int seg);
+
+int dc_video_muxer_write(VideoOutputFile *video_output_file, int frame_nb, Bool insert_utc);
 
-int dc_video_muxer_open(VideoOutputFile * p_voutf, char * psz_directory, char * psz_id, int i_seg);
-int dc_video_muxer_write(VideoOutputFile * p_voutf, int i_frame_nb);
-int dc_video_muxer_close(VideoOutputFile * p_voutf);
+int dc_video_muxer_close(VideoOutputFile *video_output_file);
 
 #endif /* VIDEO_MUXER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_scaler.c -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_scaler.c Changed

@@ -25,220 +25,233 @@
 
 #include "video_scaler.h"
 
-VideoScaledDataNode * dc_video_scaler_node_create(int i_width, int i_height,
-		int i_pix_fmt) {
 
-	int num_bytes;
-	VideoScaledDataNode * p_vsdn;
-	p_vsdn = gf_malloc(sizeof(VideoDataNode));
-
-	p_vsdn->p_vframe = avcodec_alloc_frame();
+#ifdef GPAC_USE_LIBAV
+#define av_frame_free	av_free
+#endif
 
-	if (p_vsdn->p_vframe == NULL) {
-		fprintf(stderr, "Cannot allocate VideoNode!\n");
+VideoScaledDataNode * dc_video_scaler_node_create(int width, int height, int crop_x, int crop_y, int pix_fmt)
+{
+	VideoScaledDataNode *video_scaled_data_node = gf_malloc(sizeof(VideoDataNode));
+	if (video_scaled_data_node) {
+		video_scaled_data_node->v_frame = FF_ALLOC_FRAME();
+		if (crop_x || crop_y) {
+			video_scaled_data_node->cropped_frame = FF_ALLOC_FRAME();
+		} else {
+			video_scaled_data_node->cropped_frame = NULL;
+		}
+	}
+	if (!video_scaled_data_node || !video_scaled_data_node->v_frame || ((crop_x || crop_y) && !video_scaled_data_node->cropped_frame)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Cannot allocate VideoNode!\n"));
+		av_frame_free(&video_scaled_data_node->v_frame);
+		av_frame_free(&video_scaled_data_node->cropped_frame);
+		gf_free(video_scaled_data_node);
 		return NULL;
 	}
 
 	/* Determine required buffer size and allocate buffer */
-	num_bytes = avpicture_get_size(i_pix_fmt, i_width, i_height);
-
-	p_vsdn->p_pic_data_buf = (uint8_t *) av_malloc(num_bytes * sizeof(uint8_t));
-
-	avpicture_fill((AVPicture *) p_vsdn->p_vframe, p_vsdn->p_pic_data_buf,
-			i_pix_fmt, i_width, i_height);
+	avpicture_alloc((AVPicture*)video_scaled_data_node->v_frame, pix_fmt, width, height);
+	if (video_scaled_data_node->cropped_frame) {
+		avpicture_alloc((AVPicture*)video_scaled_data_node->cropped_frame, pix_fmt, width-crop_x, height-crop_y);
+	}
 
-	return p_vsdn;
+	return video_scaled_data_node;
 }
 
-void dc_video_scaler_node_destroy(VideoScaledDataNode * p_vsdn) {
-
-	av_free(p_vsdn->p_vframe);
-	av_free(p_vsdn->p_pic_data_buf);
-
-	gf_free(p_vsdn);
-
+void dc_video_scaler_node_destroy(VideoScaledDataNode *video_scaled_data_node)
+{
+	av_frame_free(&video_scaled_data_node->v_frame);
+	gf_free(video_scaled_data_node);
 }
 
-void dc_video_scaler_list_init(VideoScaledDataList * p_vsdl,
-		GF_List * p_video_lst) {
-
-	u32 i;
-	int j;
+void dc_video_scaler_list_init(VideoScaledDataList *video_scaled_data_list, GF_List * video_lst)
+{
+	u32 i, j;
 	int found;
 
-	p_vsdl->i_size = 0;
-	p_vsdl->p_vsd = NULL;
+	video_scaled_data_list->size = 0;
+	video_scaled_data_list->video_scaled_data = NULL;
 
-	for (i = 0; i < gf_list_count(p_video_lst); i++) {
-
-		VideoData * p_vconf = (VideoData*)gf_list_get(p_video_lst, i);
+	for (i=0; i<gf_list_count(video_lst); i++) {
+		VideoDataConf *video_data_conf = (VideoDataConf*)gf_list_get(video_lst, i);
 		found = 0;
-		for (j = 0; j < p_vsdl->i_size; j++) {
-			if (p_vsdl->p_vsd[j]->i_out_height == p_vconf->i_height
-					&& p_vsdl->p_vsd[j]->i_out_width == p_vconf->i_width) {
-
+		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) {
 				found = 1;
-
-				p_vsdl->p_vsd[j]->i_maxcon++;
-
+				video_scaled_data_list->video_scaled_data[j]->num_consumers++;
 				break;
 			}
 		}
 		if (!found) {
+			VideoScaledData *video_scaled_data;
+			GF_SAFEALLOC(video_scaled_data, VideoScaledData);
+			video_scaled_data->out_width  = video_data_conf->width;
+			video_scaled_data->out_height = video_data_conf->height;
+			video_scaled_data->num_consumers = 1;
 
-			VideoScaledData * p_vsd = gf_malloc(sizeof(VideoScaledData));
-			p_vsd->i_out_width = p_vconf->i_width;
-			p_vsd->i_out_height = p_vconf->i_height;
-
-			p_vsd->i_maxcon = 1;
-
-			if (p_vsdl->p_vsd == NULL) {
-				p_vsdl->p_vsd = gf_malloc(sizeof(VideoScaledData *));
-			} else {
-				p_vsdl->p_vsd = realloc(p_vsdl->p_vsd,
-						(p_vsdl->i_size + 1) * sizeof(VideoScaledData *));
-			}
-
-			p_vsdl->p_vsd[p_vsdl->i_size] = p_vsd;
+			video_scaled_data_list->video_scaled_data = gf_realloc(video_scaled_data_list->video_scaled_data, (video_scaled_data_list->size+1)*sizeof(VideoScaledData*));
 
-			p_vsdl->i_size++;
+			video_scaled_data_list->video_scaled_data[video_scaled_data_list->size] = video_scaled_data;
+			video_scaled_data_list->size++;
 		}
 	}
-
 }
 
-void dc_video_scaler_list_destroy(VideoScaledDataList * p_vsdl) {
-	int i;
-	for (i = 0; i < p_vsdl->i_size; i++)
-		gf_free(p_vsdl->p_vsd[i]);
+void dc_video_scaler_list_destroy(VideoScaledDataList *video_scaled_data_list)
+{
+	u32 i;
+	for (i=0; i<video_scaled_data_list->size; i++)
+		gf_free(video_scaled_data_list->video_scaled_data[i]);
 
-	gf_free(p_vsdl->p_vsd);
+	gf_free(video_scaled_data_list->video_scaled_data);
 }
 
-void dc_video_scaler_end_signal(VideoScaledData * p_vconv) {
-
-	dc_producer_end_signal(&p_vconv->svpro, &p_vconv->p_cb);
-	dc_producer_unlock_previous(&p_vconv->svpro, &p_vconv->p_cb);
+void dc_video_scaler_end_signal(VideoScaledData *video_scaled_data)
+{
+	dc_producer_end_signal(&video_scaled_data->producer, &video_scaled_data->circular_buf);
+	dc_producer_unlock_previous(&video_scaled_data->producer, &video_scaled_data->circular_buf);
 }
 
-int dc_video_scaler_data_init(VideoInputData * p_vin, VideoScaledData * p_vsd, int max_source) {
-
+int dc_video_scaler_data_init(VideoInputData *video_input_data, VideoScaledData *video_scaled_data, int max_source, int video_cb_size)
+{
 	int i;
+	char name[GF_MAX_PATH];
+	snprintf(name, sizeof(name), "video scaler %dx%d", video_scaled_data->out_width, video_scaled_data->out_height);
 
-	char name[256];
-	sprintf(name, "video scaler %dx%d", p_vsd->i_out_width,
-			p_vsd->i_out_height);
-	dc_producer_init(&p_vsd->svpro, VIDEO_CB_SIZE, name);
-	dc_consumer_init(&p_vsd->svcon, VIDEO_CB_SIZE, name);
-
-	p_vsd->i_maxsource = max_source;
-	p_vsd->i_out_pix_fmt = PIX_FMT_YUV420P;
-	p_vsd->p_vsprop = gf_malloc(max_source * sizeof(VideoScaledProp));
+	dc_producer_init(&video_scaled_data->producer, video_cb_size, name);
+	dc_consumer_init(&video_scaled_data->consumer, video_cb_size, name);
 
-	dc_circular_buffer_create(&p_vsd->p_cb, VIDEO_CB_SIZE, p_vin->p_cb.mode,
-			p_vsd->i_maxcon);
+	video_scaled_data->num_producers = max_source;
+	video_scaled_data->out_pix_fmt = PIX_FMT_YUV420P;
+	GF_SAFE_ALLOC_N(video_scaled_data->vsprop, max_source, VideoScaledProp);
+	memset(video_scaled_data->vsprop, 0, max_source * sizeof(VideoScaledProp));
 
-	for (i = 0; i < VIDEO_CB_SIZE; i++) {
-		p_vsd->p_cb.p_list[i].p_data = dc_video_scaler_node_create(
-				p_vsd->i_out_width, p_vsd->i_out_height, p_vsd->i_out_pix_fmt);
+	dc_circular_buffer_create(&video_scaled_data->circular_buf, video_cb_size, video_input_data->circular_buf.mode, video_scaled_data->num_consumers);
+	for (i=0; i<video_cb_size; i++) {
+		video_scaled_data->circular_buf.list[i].data = dc_video_scaler_node_create(video_scaled_data->out_width, video_scaled_data->out_height, video_input_data->vprop[i].crop_x, video_input_data->vprop[i].crop_y, video_scaled_data->out_pix_fmt);
 	}
 
 	return 0;
 }
 
-int dc_video_scaler_data_set_prop(VideoInputData * p_vin,
-		VideoScaledData * p_vsd, int index) {
-
-
-	p_vsd->p_vsprop[index].i_in_width = p_vin->p_vprop[index].i_width;
-	p_vsd->p_vsprop[index].i_in_height = p_vin->p_vprop[index].i_height;
-	p_vsd->p_vsprop[index].i_in_pix_fmt = p_vin->p_vprop[index].i_pix_fmt;
-
-	p_vsd->p_vsprop[index].p_sws_ctx = sws_getContext(
-			p_vsd->p_vsprop[index].i_in_width,
-			p_vsd->p_vsprop[index].i_in_height,
-			p_vsd->p_vsprop[index].i_in_pix_fmt, /* p_vin->i_width, p_vin->i_height,
-			 p_vin->i_pix_fmt,*/p_vsd->i_out_width, p_vsd->i_out_height,
-			p_vsd->i_out_pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
-
-	if (p_vsd->p_vsprop[index].p_sws_ctx == NULL) {
-		fprintf(stderr, "Cannot initialize the conversion context!\n");
+int dc_video_scaler_data_set_prop(VideoInputData *video_input_data, VideoScaledData *video_scaled_data, int index)
+{
+	video_scaled_data->vsprop[index].in_width   = video_input_data->vprop[index].width - video_input_data->vprop[index].crop_x;
+	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->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);
+	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;
 	}
 
 	return 0;
 }
 
-int dc_video_scaler_scale(VideoInputData * p_vin, VideoScaledData * p_vsd) {
-
-	int ret;
-	int index;
-	VideoDataNode * p_vdn;
-	VideoScaledDataNode * p_vsdn;
-
-	ret = dc_consumer_lock(&p_vsd->svcon, &p_vin->p_cb);
+int dc_video_scaler_scale(VideoInputData *video_input_data, VideoScaledData *video_scaled_data)
+{
+	int ret, index, src_height;
+	VideoDataNode *video_data_node;
+	VideoScaledDataNode *video_scaled_data_node;
+	AVFrame *src_vframe;
 
+	ret = dc_consumer_lock(&video_scaled_data->consumer, &video_input_data->circular_buf);
 	if (ret < 0) {
-#ifdef DEBUG
-		printf("Video scaler got to end of buffer!\n");
-#endif
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler got an end of buffer!\n"));
 		return -2;
 	}
 
-	dc_consumer_unlock_previous(&p_vsd->svcon, &p_vin->p_cb);
+	if (video_input_data->circular_buf.size > 1) 
+		dc_consumer_unlock_previous(&video_scaled_data->consumer, &video_input_data->circular_buf);
 
-	dc_producer_lock(&p_vsd->svpro, &p_vsd->p_cb);
-	dc_producer_unlock_previous(&p_vsd->svpro, &p_vsd->p_cb);
+	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);
 
+	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;
 
-	p_vdn = (VideoDataNode *) dc_consumer_consume(&p_vsd->svcon, &p_vin->p_cb);
-	p_vsdn = (VideoScaledDataNode *) dc_producer_produce(&p_vsd->svpro,
-			&p_vsd->p_cb);
+	video_scaled_data->frame_duration = video_input_data->frame_duration;
 
-	index = p_vdn->source_number;
+	//crop if necessary
+	if (video_input_data->vprop[index].crop_x || video_input_data->vprop[index].crop_y) {
+#if 0
+		av_frame_copy_props(video_scaled_data_node->cropped_frame, video_data_node->vframe);
+		video_scaled_data_node->cropped_frame->width  = video_input_data->vprop[index].width  - video_input_data->vprop[index].crop_x;
+		video_scaled_data_node->cropped_frame->height = video_input_data->vprop[index].height - video_input_data->vprop[index].crop_y;
+#endif
+		if (av_picture_crop((AVPicture*)video_scaled_data_node->cropped_frame, (AVPicture*)video_data_node->vframe, PIX_FMT_YUV420P, video_input_data->vprop[index].crop_y, video_input_data->vprop[index].crop_x) < 0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Video scaler: error while cropping picture.\n"));
+			return -1;
+		}
+		src_vframe = video_scaled_data_node->cropped_frame;
+		src_height = video_input_data->vprop[index].height - video_input_data->vprop[index].crop_y;
+	} else {
+		assert(!video_scaled_data_node->cropped_frame);
+		src_vframe = video_data_node->vframe;
+		src_height = video_input_data->vprop[index].height;
+	}
 
-	sws_scale(p_vsd->p_vsprop[index].p_sws_ctx,
-			(const uint8_t * const *) p_vdn->p_vframe->data,
-			p_vdn->p_vframe->linesize, 0,
-			p_vin->p_vprop[index].i_height/*p_vin->i_height*/,
-			p_vsdn->p_vframe->data, p_vsdn->p_vframe->linesize);
+	//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);
+	
+	video_scaled_data_node->v_frame->pts = video_data_node->vframe->pts;
+
+	if (video_data_node->nb_raw_frames_ref) {
+		if (video_data_node->nb_raw_frames_ref==1) {
+#ifndef GPAC_USE_LIBAV
+			av_frame_unref(video_data_node->vframe);
+#endif
+			av_free_packet(&video_data_node->raw_packet);
+		}
+		video_data_node->nb_raw_frames_ref--;
+	}
 
-	dc_consumer_advance(&p_vsd->svcon);
-	dc_producer_advance(&p_vsd->svpro);
+	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) 
+		dc_consumer_unlock_previous(&video_scaled_data->consumer, &video_input_data->circular_buf);
 	return 0;
 }
 
-int dc_video_scaler_data_destroy(VideoScaledData * p_vsd) {
-
+int dc_video_scaler_data_destroy(VideoScaledData *video_scaled_data)
+{
 	int i;
-
-	for (i = 0; i < VIDEO_CB_SIZE; i++) {
-		dc_video_scaler_node_destroy(p_vsd->p_cb.p_list[i].p_data);
+	for (i=0; i<(int) video_scaled_data->circular_buf.size; i++) {
+		if (video_scaled_data->circular_buf.list) {
+			dc_video_scaler_node_destroy(video_scaled_data->circular_buf.list[i].data);
+		}
 	}
 
-
-	for (i = 0 ; i<p_vsd->i_maxsource ; i++) {
-		av_free(p_vsd->p_vsprop[i].p_sws_ctx);
+	for (i=0 ; i<video_scaled_data->num_producers; i++) {
+		if (video_scaled_data->vsprop[i].sws_ctx)
+			av_free(video_scaled_data->vsprop[i].sws_ctx);
 	}
-	gf_free(p_vsd->p_vsprop);
-	//av_free(p_vsd->p_sws_ctx);
+	gf_free(video_scaled_data->vsprop);
+	//av_free(video_scaled_data->sws_ctx);
 
-	dc_circular_buffer_destroy(&p_vsd->p_cb);
+	dc_circular_buffer_destroy(&video_scaled_data->circular_buf);
 
 	return 0;
 }
 
-VideoScaledData * dc_video_scaler_get_data(VideoScaledDataList * p_vsdl,
-		int i_width, int i_height) {
-	int i;
-
-	for (i = 0; i < p_vsdl->i_size; i++) {
-		if (p_vsdl->p_vsd[i]->i_out_width == i_width
-				&& p_vsdl->p_vsd[i]->i_out_height == i_height)
-			return p_vsdl->p_vsd[i];
+VideoScaledData * dc_video_scaler_get_data(VideoScaledDataList *video_scaled_data_list, int width, int height)
+{
+	u32 i;
+	for (i=0; i<video_scaled_data_list->size; i++) {
+		if (video_scaled_data_list->video_scaled_data[i]->out_width == width && video_scaled_data_list->video_scaled_data[i]->out_height == height)
+			return video_scaled_data_list->video_scaled_data[i];
 	}
 
 	return NULL;
 }
-

gpac-0.5.0.svn4668.tar.bz2/applications/dashcast/video_scaler.h -> gpac-0.5.0.svn5178.tar.bz2/applications/dashcast/video_scaler.h Changed

@@ -31,143 +31,137 @@
 
 #include "video_data.h"
 
+
 typedef struct {
 	/* scaler of the libav */
-	struct SwsContext * p_sws_ctx;
+	struct SwsContext *sws_ctx;
 	/* width, height, and the pixel format of the scaled video */
-	int i_in_width;
-	int i_in_height;
-	int i_in_pix_fmt;
+	int in_width;
+	int in_height;
+	int in_pix_fmt;
 } VideoScaledProp;
+
 /*
  * VideoScaledData keeps a circular buffer
  * of video frame with a defined resolution.
- *
  */
 typedef struct {
+	VideoScaledProp *vsprop;
 
-	VideoScaledProp * p_vsprop;
-
-	int i_out_width;
-	int i_out_height;
-	int i_out_pix_fmt;
+	int out_width;
+	int out_height;
+	int out_pix_fmt;
 
 	/* scaler of the libav */
-	//struct SwsContext * p_sws_ctx;
+	//struct SwsContext * sws_ctx;
 	/* width, height, and the pixel format of the scaled video */
-	//int i_width;
-	//int i_height;
-	//int i_pix_fmt;
+	//int width;
+	//int height;
+	//int pix_fmt;
 
 	/* circular buffer containing the scaled video frames */
-	CircularBuffer p_cb;
+	CircularBuffer circular_buf;
+
 	/* Scaler is a consumer and also producer.
-	 * It consumes from the video input data and
-	 * it produces the video scaled data.
-	 * So it deals with two circular buffer and we
-	 * need to keep the index for both.
-	 */
-	Producer svpro;
-	Consumer svcon;
-
-	/*
-	 * The number of consumer of this circular buffer.
-	 * (Which are the encoders who are using this resolution)
-	 */
-	int i_maxcon;
-	int i_maxsource;
+	 * It consumes from the video input data and it produces the video scaled data.
+	 * So it deals with two circular buffer and we need to keep the index for both. */
+	Producer producer;
+	Consumer consumer;
 
+	/* The number of consumers of this circular buffer.
+	 * (Which are the encoders who are using this resolution) */
+	int num_consumers;
+	int num_producers;
+
+	u64 frame_duration;
 } VideoScaledData;
 
 /*
  * Each node in a circular buffer is a pointer.
- * To use the circular buffer for scaled video frame
- * we must define the node. This structure contains
- * the data needed to encode a video frame.
+ * To use the circular buffer for scaled video frame we must define the node. This structure contains the data needed to encode a video frame.
  */
-
 typedef struct {
-
-	AVFrame * p_vframe;
-	uint8_t * p_pic_data_buf;
-
+	AVFrame *v_frame;
+	AVFrame *cropped_frame;
 } VideoScaledDataNode;
 
 /*
  * A list of pointers to scaled video data.
  */
 typedef struct {
-
-	VideoScaledData ** p_vsd;
-	int i_size;
-
+	VideoScaledData **video_scaled_data;
+	u32 size;
 } VideoScaledDataList;
 
 /*
- * Read the configuration file info and fill the video scaled data list
- * with all the resolution available. Each resolution is associated to a
- * circular buffer in a video scaled data.
- *
- * @param cmdd [in] Command data which contains the configuration file info
- * @param vsdl [out] the list to be filled
+ * Read the configuration file info and fill the video scaled data list with all the resolution available.
+ * Each resolution is associated to a circular buffer in a video scaled data.
  *
+ * @param cmd_data [in] Command data which contains the configuration file info
+ * @param video_scaled_data_list [out] the list to be filled
  */
-void dc_video_scaler_list_init(VideoScaledDataList * vsdl, GF_List * video_lst);
+void dc_video_scaler_list_init(VideoScaledDataList *video_scaled_data_list, GF_List *video_lst);
 
 /*
- * Destroy a video scaled data list
- *
- * @param vsdl [in] the list to be destroyed
+ * Destroy a video scaled data list.
  *
+ * @param video_scaled_data_list [in] the list to be destroyed.
  */
-void dc_video_scaler_list_destroy(VideoScaledDataList * vsdl);
+void dc_video_scaler_list_destroy(VideoScaledDataList *video_scaled_data_list);
 
 /*
  * Signal to all the users of the circular buffer in the VideoScaledData
  * which the current node is the last node to consume.
  *
- * @param vsd [in] the structure to be signaled on.
+ * @param video_scaled_data [in] the structure to be signaled on.
  */
-void dc_video_scaler_end_signal(VideoScaledData * vsd);
+void dc_video_scaler_end_signal(VideoScaledData *video_scaled_data);
+
 /*
  * Initialize a VideoScaledData.
  *
- * @param vind [in] contains the info of the input video
- * @param vsd [out] structure to be initialized
+ * @param video_input_data [in] contains the info of the input video.
+ * @param video_scaled_data [out] structure to be initialized.
  *
  * @return 0 on success, -1 on failure.
  *
  * @note Must use dc_video_scaler_data_destroy to free memory.
  */
-int dc_video_scaler_data_init(VideoInputData * vind, VideoScaledData * vsd, int maxsource);
+int dc_video_scaler_data_init(VideoInputData *video_input_data, VideoScaledData *video_scaled_data, int num_producers, int video_cb_size);
+
+/*
+ * Set properties of a VideoScaledData.
+ */
+int dc_video_scaler_data_set_prop(VideoInputData *video_input_data, VideoScaledData *video_scaled_data, int index);
 
-int dc_video_scaler_data_set_prop(VideoInputData * vind, VideoScaledData * vsd, int index);
 /*
  * Get a frame from the circular buffer on the input video,
  * scale it and put the result on the circular buffer of the
  * video scaled data
  *
- * @param vind [in] contains input frames
- * @param vsd [out] contains scaled frames
+ * @param video_input_data [in] contains input frames
+ * @param video_scaled_data [out] contains scaled frames
  *
  * return 0 on success, -2 if the node is the last node to scale
  */
-int dc_video_scaler_scale(VideoInputData * vind, VideoScaledData * vsd);
+int dc_video_scaler_scale(VideoInputData *video_input_data, VideoScaledData *video_scaled_data);
+
 /*
  * Destroy a VideoScaledData
  *
- * @param vsd [in] structure to be destroyed.
+ * @param video_scaled_data [in] structure to be destroyed.
  */
-int dc_video_scaler_data_destroy(VideoScaledData * vsd);
+int dc_video_scaler_data_destroy(VideoScaledData *video_scaled_data);
+
 /*
  * Return the VideoScaledData from the list which has width and height
  *
- * @param vsdl [in] video scaled data list
+ * @param video_scaled_data_list [in] video scaled data list
  * @param width [in] frame width
  * @param height [in] frame height
  *
  * @return a VideoScaledData which corresponds to the width and height on success, NULL on failure
  */
-VideoScaledData * dc_video_scaler_get_data(VideoScaledDataList * vsdl, int width, int height);
+VideoScaledData * dc_video_scaler_get_data(VideoScaledDataList *video_scaled_data_list, int width, int height);
 
 #endif /* VIDEO_SCALER_H_ */

gpac-0.5.0.svn4668.tar.bz2/applications/generators/MPEG4/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/generators/MPEG4/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/generators/MPEG4/main.c -> gpac-0.5.0.svn5178.tar.bz2/applications/generators/MPEG4/main.c Changed

gpac-0.5.0.svn4668.tar.bz2/applications/generators/SVG/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/generators/SVG/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/generators/X3D/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/generators/X3D/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/mp42avi/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/mp42avi/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/mp42ts/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/mp42ts/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/mp42ts/main.c -> gpac-0.5.0.svn5178.tar.bz2/applications/mp42ts/main.c Changed

@@ -36,8 +36,9 @@
 #include <gpac/scene_engine.h>
 #endif
 
-#define USE_ISOBMF_REWRITE
-
+#ifndef GPAC_DISABLE_TTXT
+#include <gpac/webvtt.h>
+#endif
 
 #ifdef GPAC_DISABLE_ISOM
 
@@ -59,55 +60,79 @@
 #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*/
 
-static GFINLINE void usage(const char * progname) 
+u32 temi_url_insertion_delay = 1000;
+FILE *logfile = NULL;
+
+static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
 {
-	fprintf(stderr, "USAGE: %s -rate=R [[-prog=prog1]..[-prog=progn]] [-audio=url] [-video=url] [-mpeg4-carousel=n] [-mpeg4] [-time=n] [-src=file] DST [[DST]]\n"
+	FILE *logs = cbk;
+	vfprintf(logs, fmt, list);
+	fflush(logs);
+}
+
+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());
+	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"
 #ifdef GPAC_MEMORY_TRACKING
-					"\t-mem-track:  enables memory tracker\n"
+					"-mem-track             enables memory tracker\n"
 #endif
-					"\t-rate=R                specifies target rate in kbps of the multiplex (mandatory)\n"
-					"\t-real-time             specifies the muxer will work in real-time mode\n"
-					"\t                        * automatically set for SDP or BT input\n"
-					"\t-pcr-init=V            sets initial value V for PCR - if not set, random value is used\n"
-					"\t-pcr-offset=V          offsets all timestamps from PCR by V, in 90kHz. Default value: %d\n"
-					"\t-psi-rate=V            sets PSI refresh rate V in ms (default 100ms). If 0, PSI data is only send once at the begining\n"
-					"                          or before each IDR when -rap option is set. This should be set to 0 for DASH streams.\n"
-					"\t-time=n                request the program to stop after n ms\n"
-					"\t-single-au             forces 1 PES = 1 AU (disabled by default)\n"
-					"\t-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"
-					"\t-flush-rap             same as -rap but flushes all other streams (sends remaining PES packets) before inserting PAT/PMT\n"
-					"\t-prog=filename         specifies an input file used for a TS service\n"
-					"\t                        * currently only supports ISO files and SDP files\n"
-					"\t                        * can be used several times, once for each program\n"
-					"\t-nb-pack=N             specifies to pack N TS packets together before sending on network or writing to file\n"
-					"\t-ttl=N                 specifies Time-To-Live for multicast. Default is 1.\n"
-					"\t-ifce=IPIFCE           specifies default IP interface to use. Default is IF_ANY.\n"
-					"\tDST : Destinations, at least one is mandatory\n"
-					"\t  -dst-udp             UDP_address:port (multicast or unicast)\n"
-					"\t  -dst-rtp             RTP_address:port\n"
-					"\t  -dst-file            Supports the following arguments:\n"
-					"\t     -segment-dir=dir       server local directory to store segments\n"
-					"\t     -segment-duration=dur  segment duration in seconds\n"
-					"\t     -segment-manifest=file m3u8 file basename\n"
-					"\t     -segment-http-prefix=p client address for accessing server segments\n"
-					"\t     -segment-number=n      only n segments are used using a cyclic pattern\n"
-					"\t\n"
-					"\tMPEG-4 options\n"
-					"\t-mpeg4-carousel=n      carousel period in ms\n"
-                    "\t-mpeg4 or -4on2        forces usage of MPEG-4 signaling (IOD and SL Config)\n"
-                    "\t-4over2                same as -4on2 and uses PMT to carry OD Updates\n"
-                    "\t-bifs-pes              carries BIFS over PES instead of sections\n"
-                    "\t-bifs-pes-ex           carries BIFS over PES without writing timestamps in SL\n"
-					"\tMisc options\n"
-					"\t-audio=url             may be mp3/udp or aac/http (shoutcast/icecast)\n"
-					"\t-video=url             shall be a raw h264 frame\n"
-					"\t-src=filename          update file: must be either an .sdp or a .bt file\n\n"
-					"\t\n"
-					"\t-logs                  set log tools and levels, formatted as a ':'-separated list of toolX[:toolZ]@levelX\n"
-					"\t-h or -help            print this screen\n"
-					"\n", progname, 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", DEFAULT_PCR_OFFSET
 		);
 }
 
@@ -140,6 +165,7 @@
 {
 	GF_ISOFile *mp4;
 	u32 track, sample_number, sample_count;
+	u32 mstype, mtype;
 	GF_ISOSample *sample;
 	/*refresh rate for images*/
 	u32 image_repeat_ms, nb_repeat_last;
@@ -149,12 +175,12 @@
 	void *dsi_and_rap;
 	Bool loop;
 	Bool is_repeat;
-	u64 ts_offset;
+	s64 ts_offset;
 	M2TSProgram *prog;
 
-#ifndef USE_ISOBMF_REWRITE
-	u32 nalu_size;
-#endif
+	const char *temi_url;
+	u32 last_temi_url;
+
 } GF_ESIMP4;
 
 typedef struct
@@ -194,8 +220,91 @@
 #endif
 };
 
+static u32 format_af_descriptor(char *af_data, u64 timecode, u32 timescale, u64 ntp, const char *temi_url, u32 *last_url_time)
+{
+	u32 res;
+	u32 len;
+	u32 last_time;
+	GF_BitStream *bs = gf_bs_new(af_data, 188, GF_BITSTREAM_WRITE);
+
+	if (ntp) {
+		last_time = 1000*(ntp>>32);
+		last_time += 1000*(ntp&0xFFFFFFFF)/0xFFFFFFFF;
+	} else {
+		last_time = (u32) (1000*timecode/timescale);
+	}
+	if (!*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,	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
+
+		if (strlen(temi_url)) {
+			char *url = (char *)temi_url;
+			if (!strnicmp(temi_url, "http://", 7)) {
+				gf_bs_write_int(bs,	1, 8); //url_scheme
+				url = (char *) temi_url + 7;
+			} else if (!strnicmp(temi_url, "https://", 8)) {
+				gf_bs_write_int(bs,	2, 8); //url_scheme
+				url = (char *) temi_url + 8;
+			} else {
+				gf_bs_write_int(bs,	0, 8); //url_scheme
+			}
+			gf_bs_write_u8(bs, (u32) strlen(url)); //url_path_len
+			gf_bs_write_data(bs, url, (u32) strlen(url) ); //url
+			gf_bs_write_u8(bs, 0); //nb_addons
+		}
+		//rewrite len
+		len = (u32) gf_bs_get_position(bs) - 2;
+		af_data[1] = len;
+	}
+
+	if (timescale || ntp) {
+		len = 3; //3 bytes flags
+
+		if (timescale) len += 4 + ((timecode > 0xFFFFFFFFUL) ? 8 : 4);
+		if (ntp) len += 8;
+
+		//write timeline descriptor
+		gf_bs_write_int(bs,	0x01, 8);
+		gf_bs_write_int(bs,	len, 8);
+
+		gf_bs_write_int(bs,	timescale ? ((timecode > 0xFFFFFFUL) ? 2 : 1) : 0, 2); //has_timestamp
+		gf_bs_write_int(bs,	ntp ? 1 : 0, 1); //has_ntp
+		gf_bs_write_int(bs,	0, 1); //has_ptp
+		gf_bs_write_int(bs,	0, 2); //has_timecode
+		gf_bs_write_int(bs,	0, 1); //force_reload
+		gf_bs_write_int(bs,	0, 1); //paused
+		gf_bs_write_int(bs,	0, 1); //discontinuity
+		gf_bs_write_int(bs,	0xFF, 7); //reserved
+		gf_bs_write_int(bs,	0, 8); //timeline_id
+		if (timescale) {
+			gf_bs_write_u32(bs,	timescale); //timescale
+			if (timecode > 0xFFFFFFUL)  
+				gf_bs_write_u64(bs,	timecode); //timestamp
+			else
+				gf_bs_write_u32(bs,	(u32) timecode); //timestamp
+		}
+		if (ntp) {
+			gf_bs_write_u64(bs,	ntp); //ntp
+		}
+	}
+	res = (u32) gf_bs_get_position(bs);
+	gf_bs_del(bs);
+	return res;
+}
+
 static GF_Err mp4_input_ctrl(GF_ESInterface *ifce, u32 act_type, void *param)
 {
+	char af_data[188];
 	GF_ESIMP4 *priv = (GF_ESIMP4 *)ifce->input_udta;
 	if (!priv) return GF_BAD_PARAM;
 
@@ -203,6 +312,9 @@
 	case GF_ESI_INPUT_DATA_FLUSH:
 	{
 		GF_ESIPacket pck;
+#ifndef GPAC_DISABLE_TTXT
+		GF_List *cues = NULL;
+#endif
 		if (!priv->sample) 
 			priv->sample = gf_isom_get_sample(priv->mp4, priv->track, priv->sample_number+1, NULL);
 
@@ -210,12 +322,18 @@
 			return GF_IO_ERR;
 		}
 
-		pck.flags = 0;
+		memset(&pck, 0, sizeof(GF_ESIPacket));
+
 		pck.flags = GF_ESI_DATA_AU_START | GF_ESI_DATA_HAS_CTS;
 		if (priv->sample->IsRAP) pck.flags |= GF_ESI_DATA_AU_RAP;
 		pck.cts = priv->sample->DTS + priv->ts_offset;
 		if (priv->is_repeat) pck.flags |= GF_ESI_DATA_REPEAT;
 
+		if (priv->temi_url) {
+			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;
+		}
+
 		if (priv->nb_repeat_last) {
 			pck.cts += priv->nb_repeat_last*ifce->timescale * priv->image_repeat_ms / 1000;
 		}
@@ -226,82 +344,51 @@
 			pck.flags |= GF_ESI_DATA_HAS_DTS;
 		}
 
-#ifndef USE_ISOBMF_REWRITE
-		if (priv->nalu_size) {
-			Bool nalu_delim_sent = 0;
-			u32 remain = priv->sample->dataLength;
-			char *ptr = priv->sample->data;
-			u32 v, size;
-			char sc[10];
-
-
-			/*send nalus*/
-			sc[0] = sc[1] = sc[2] = 0; sc[3] = 1;
-			while (remain) {
-				size = 0;
-				v = priv->nalu_size;
-				while (v) {
-					size |= (u8) *ptr;
-					ptr++;
-					remain--;
-					v-=1;
-					if (v) size<<=8;
-				}
-				remain -= size;
-
-				if (!nalu_delim_sent) {
-					nalu_delim_sent = 1;
-					/*send a NALU delim: copy over NAL ref idc*/
-					sc[4] = (ptr[0] & 0x60) | GF_AVC_NALU_ACCESS_UNIT;
-					sc[5] = 0xF0 /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
-
-					pck.data = sc;
-					pck.data_len = 6;
-					ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-					pck.flags &= ~GF_ESI_DATA_AU_START;
-
-					/*and send SPD / PPS if RAP - it is not clear in the specs whether SPS/PPS should be inserted after
-					the AU delimiter NALU*/
-					if (priv->sample->IsRAP && priv->dsi && priv->dsi_size) {
-						pck.data = priv->dsi;
-						pck.data_len = priv->dsi_size;
-						ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-						pck.flags &= ~GF_ESI_DATA_AU_START;
-					}
-				}
-
-				pck.data = sc;
-				pck.data_len = 4;
-				ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-
-				if (!remain) pck.flags |= GF_ESI_DATA_AU_END;
-				pck.flags &= ~GF_ESI_DATA_AU_START;
+		if (priv->sample->IsRAP && priv->dsi && priv->dsi_size) {
+			pck.data = priv->dsi;
+			pck.data_len = priv->dsi_size;
+			ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
+			pck.flags &= ~GF_ESI_DATA_AU_START;
+		}
 
-				pck.data = ptr;
-				pck.data_len = size;
-				ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-				ptr += size;
+		pck.flags |= GF_ESI_DATA_AU_END;
+		pck.data = priv->sample->data;
+		pck.data_len = priv->sample->dataLength;
+		pck.duration = gf_isom_get_sample_duration(priv->mp4, priv->track, priv->sample_number+1);
+#ifndef GPAC_DISABLE_TTXT
+		if (priv->mtype==GF_ISOM_MEDIA_TEXT && priv->mstype==GF_ISOM_SUBTYPE_WVTT) {
+			u64             start;
+			GF_WebVTTCue    *cue;
+			GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, u64 start);
+			start = (priv->sample->DTS * 1000) / ifce->timescale;
+			cues = gf_webvtt_parse_iso_cues(priv->sample, start);
+			if (gf_list_count(cues)>1) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] More than one cue in sample\n"));	
 			}
-
-		} else 
-#endif //USE_ISOBMF_REWRITE
-		
-		{
-
-			if (priv->sample->IsRAP && priv->dsi && priv->dsi_size) {
-				pck.data = priv->dsi;
-				pck.data_len = priv->dsi_size;
-				ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
-				pck.flags &= ~GF_ESI_DATA_AU_START;
+			cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
+			if (cue) {
+				pck.data = cue->text;
+				pck.data_len = (u32)strlen(cue->text)+1;
+			} else {
+				pck.data = NULL;
+				pck.data_len = 0;
 			}
-
-			pck.flags |= GF_ESI_DATA_AU_END;
-			pck.data = priv->sample->data;
-			pck.data_len = priv->sample->dataLength;
-			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));
+		} 
+#endif
+		ifce->output_ctrl(ifce, GF_ESI_OUTPUT_DATA_DISPATCH, &pck);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] Track %d: sample %d CTS %d\n", priv->track, priv->sample_number+1, pck.cts));
+
+#ifndef GPAC_DISABLE_TTXT
+		if (cues) {
+			while (gf_list_count(cues)) {
+				GF_WebVTTCue *cue = (GF_WebVTTCue *)gf_list_get(cues, 0);
+				gf_list_rem(cues, 0);
+				gf_webvtt_cue_del(cue);
+			}
+			gf_list_del(cues);
+			cues = NULL;
 		}
-
+#endif
 		gf_isom_sample_del(&priv->sample);
 		priv->sample_number++;
 
@@ -357,14 +444,17 @@
 {
 	GF_ESIMP4 *priv;
 	char _lan[4];
-	GF_DecoderConfig *dcd;
+	GF_ESD *esd;
 	u64 avg_rate, duration;
 	s32 ref_count;
+	s64 mediaOffset;
 
 	GF_SAFEALLOC(priv, GF_ESIMP4);
 
 	priv->mp4 = mp4;
 	priv->track = track_num;
+	priv->mtype = gf_isom_get_media_type(priv->mp4, priv->track);
+	priv->mstype = gf_isom_get_media_subtype(priv->mp4, priv->track, 1);
 	priv->loop = prog->real_time ? 1 : 0;
 	priv->sample_count = gf_isom_get_sample_count(mp4, track_num);
 	prog->samples_count += priv->sample_count;
@@ -374,61 +464,43 @@
 	priv->prog = prog;
 	memset(ifce, 0, sizeof(GF_ESInterface));
 	ifce->stream_id = gf_isom_get_track_id(mp4, track_num);
-	dcd = gf_isom_get_decoder_config(mp4, track_num, 1);
-	ifce->stream_type = dcd->streamType;
-	ifce->object_type_indication = dcd->objectTypeIndication;
-	if (dcd->decoderSpecificInfo && dcd->decoderSpecificInfo->dataLength) {
-		switch (dcd->objectTypeIndication) {
-		case GPAC_OTI_AUDIO_AAC_MPEG4:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
-		case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
-			ifce->decoder_config = gf_malloc(sizeof(char)*dcd->decoderSpecificInfo->dataLength);
-			ifce->decoder_config_size = dcd->decoderSpecificInfo->dataLength;
-			memcpy(ifce->decoder_config, dcd->decoderSpecificInfo->data, dcd->decoderSpecificInfo->dataLength);
-			break;
-		case GPAC_OTI_VIDEO_MPEG4_PART2:
-			priv->dsi = gf_malloc(sizeof(char)*dcd->decoderSpecificInfo->dataLength);
-			priv->dsi_size = dcd->decoderSpecificInfo->dataLength;
-			memcpy(priv->dsi, dcd->decoderSpecificInfo->data, dcd->decoderSpecificInfo->dataLength);
-			break;
-		case GPAC_OTI_VIDEO_HEVC:
-			gf_isom_set_nalu_extract_mode(mp4, track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG | GF_ISOM_NALU_EXTRACT_VDRD_FLAG);
-			break;
-		case GPAC_OTI_VIDEO_AVC:
-		case GPAC_OTI_VIDEO_SVC:
-#ifdef USE_ISOBMF_REWRITE
-			gf_isom_set_nalu_extract_mode(mp4, track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG | GF_ISOM_NALU_EXTRACT_VDRD_FLAG);
-
-#elif !defined(GPAC_DISABLE_AV_PARSERS)
-			GF_AVCConfigSlot *slc;
-			u32 i;
-			GF_BitStream *bs;
-			GF_AVCConfig *avccfg = gf_isom_avc_config_get(mp4, track_num, 1);
-			priv->nalu_size = avccfg->nal_unit_size;
-
-			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 **) &priv->dsi, &priv->dsi_size);
-			gf_bs_del(bs);
-			gf_odf_avc_cfg_del(avccfg);
-#endif
 
-			break;
+	esd = gf_media_map_esd(mp4, track_num);
+
+	if (esd) {
+		ifce->stream_type = esd->decoderConfig->streamType;
+		ifce->object_type_indication = esd->decoderConfig->objectTypeIndication;
+		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->dataLength) {
+			switch (esd->decoderConfig->objectTypeIndication) {
+			case GPAC_OTI_AUDIO_AAC_MPEG4:
+			case GPAC_OTI_AUDIO_AAC_MPEG2_MP:
+			case GPAC_OTI_AUDIO_AAC_MPEG2_LCP:
+			case GPAC_OTI_AUDIO_AAC_MPEG2_SSRP:
+			case GPAC_OTI_VIDEO_MPEG4_PART2:
+				ifce->decoder_config = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
+				ifce->decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+				memcpy(ifce->decoder_config, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+				break;
+			case GPAC_OTI_VIDEO_HEVC:
+			case GPAC_OTI_VIDEO_SHVC:
+			case GPAC_OTI_VIDEO_AVC:
+			case GPAC_OTI_VIDEO_SVC:
+				gf_isom_set_nalu_extract_mode(mp4, track_num, GF_ISOM_NALU_EXTRACT_LAYER_ONLY | GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG | GF_ISOM_NALU_EXTRACT_ANNEXB_FLAG | GF_ISOM_NALU_EXTRACT_VDRD_FLAG);
+				break;
+			case GPAC_OTI_SCENE_VTT_MP4:
+				ifce->decoder_config = (char *)gf_malloc(sizeof(char)*esd->decoderConfig->decoderSpecificInfo->dataLength);
+				ifce->decoder_config_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+				memcpy(ifce->decoder_config, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+				break;
+			}
 		}
+		gf_odf_desc_del((GF_Descriptor *)esd);
 	}
-	gf_odf_desc_del((GF_Descriptor *)dcd);
 	gf_isom_get_media_language(mp4, track_num, _lan);
-	ifce->lang = GF_4CC(_lan[0],_lan[1],_lan[2],' ');
+	if (!strcmp(_lan, "und"))
+		ifce->lang = 0;
+	else
+		ifce->lang = GF_4CC(_lan[0],_lan[1],_lan[2],' ');
 
 	ifce->timescale = gf_isom_get_media_timescale(mp4, track_num);
 	ifce->duration = gf_isom_get_media_timescale(mp4, track_num);
@@ -472,6 +544,11 @@
 	  ifce->input_udta = priv;
 	}
 
+
+	if (! gf_isom_get_edit_list_type(mp4, track_num, &mediaOffset)) {
+		priv->ts_offset = mediaOffset;
+	}
+
 	ref_count = gf_isom_get_reference_count(mp4, track_num, GF_ISOM_REF_SCAL);
 	if (ref_count > 0) {
 		gf_isom_get_reference_ID(mp4, track_num, GF_ISOM_REF_SCAL, (u32) ref_count, &ifce->depends_on_stream);
@@ -1246,12 +1323,13 @@
 }
 #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)
+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)
 {
 #ifndef GPAC_DISABLE_STREAMING
 	GF_SDPInfo *sdp;
 #endif
 	u32 i;
+	s64 min_offset = 0;
 	
 	memset(prog, 0, sizeof(M2TSProgram));
 	prog->mpeg4_signaling = mpeg4_signaling;
@@ -1275,6 +1353,8 @@
 				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;
 
 			switch(prog->streams[i].stream_type) {
 			case GF_STREAM_OD:
@@ -1296,7 +1376,10 @@
 					check_deps = 1;
 					if (gf_isom_get_sample_count(prog->mp4, i+1)>1) {
 						/*get first visual stream as PCR*/
-						if (!prog->pcr_idx) prog->pcr_idx = i+1;
+						if (!prog->pcr_idx) {
+							prog->pcr_idx = i+1;
+							((GF_ESIMP4 *)prog->streams[i].input_udta)->temi_url = temi_url;
+						}
 					}
 					break;
 				}
@@ -1342,6 +1425,12 @@
 			gf_isom_set_default_sync_track(prog->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;
+			}
+		}
+
 		prog->iod = gf_isom_get_root_od(prog->mp4);
 		if (prog->iod) {
 			GF_ObjectDescriptor*iod = (GF_ObjectDescriptor*)prog->iod;
@@ -1629,17 +1718,22 @@
 	}
 }
 
+/*macro to keep retro compatibility with '=' and spaces in parse_args*/
+#define CHECK_PARAM(param) (!strnicmp(arg, param, strlen(param)) \
+        && (   ((arg[strlen(param)] == '=') && (next_arg = arg+strlen(param)+1)) \
+            || ((strlen(arg) == strlen(param)) && ++i && (i<argc) && (next_arg = argv[i]))))
+
 /*parse MP42TS arguments*/
 static GFINLINE GF_Err parse_args(int argc, char **argv, u32 *mux_rate, u32 *carrousel_rate, 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)
+								  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)
 {
 	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, *error_msg = "no argument found";
+		 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 force_real_time = 0;
 	s32 i;
@@ -1648,16 +1742,16 @@
 	for (i=1; i<argc; i++) {
 		arg = argv[i];
 		if (!stricmp(arg, "-h") || strstr(arg, "-help")) {
-			usage(argv[0]);
+			usage();
 			return GF_EOS;
 		}
-		else if (!strnicmp(arg, "-pcr-init=", 10)) {
-			sscanf(arg, "-pcr-init="LLD, pcr_init_val);
+		else if (CHECK_PARAM("-pcr-init")) {
+			sscanf(next_arg, LLD, pcr_init_val);
 		}
-		else if (!strnicmp(arg, "-pcr-offset=", 12)) {
-			*pcr_offset = atoi(arg+12);
+		else if (CHECK_PARAM("-pcr-offset")) {
+			*pcr_offset = atoi(next_arg);
 		}
-		else if (!strnicmp(arg, "-video=", 7)) {
+		else if (CHECK_PARAM("-video")) {
 			FILE *f;
 			if (video_input_found) {
 				error_msg = "multiple '-video' found";
@@ -1665,8 +1759,7 @@
 				goto error;
 			}
 			video_input_found = 1;
-			arg+=7;
-			f = fopen(arg, "rb");
+			f = fopen(next_arg, "rb");
 			if (!f) {
 				error_msg = "video file not found: ";
 				goto error;
@@ -1682,44 +1775,43 @@
 					fprintf(stderr, "Error while reading video file, has readen %u chars instead of %u.\n", read, *video_buffer_size);
 			}
 			fclose(f);
-		} else if (!strnicmp(arg, "-audio=", 7)) {
+		} else if (CHECK_PARAM("-audio")) {
 			if (audio_input_found) {
 				error_msg = "multiple '-audio' found";
 				arg = NULL;
 				goto error;
 			}
 			audio_input_found = 1;
-			arg+=7;
-			if (!strnicmp(arg, "udp://", 6) || !strnicmp(arg, "rtp://", 6) || !strnicmp(arg, "http://", 7)) {
+			if (!strnicmp(next_arg, "udp://", 6) || !strnicmp(next_arg, "rtp://", 6) || !strnicmp(next_arg, "http://", 7)) {
 				char *sep;
 				/*set audio input type*/
-				if (!strnicmp(arg, "udp://", 6))
+				if (!strnicmp(next_arg, "udp://", 6))
 					*audio_input_type = GF_MP42TS_UDP;
-				else if (!strnicmp(arg, "rtp://", 6))
+				else if (!strnicmp(next_arg, "rtp://", 6))
 					*audio_input_type = GF_MP42TS_RTP;
 #ifndef GPAC_DISABLE_PLAYER
-				else if (!strnicmp(arg, "http://", 7))
+				else if (!strnicmp(next_arg, "http://", 7))
 					*audio_input_type = GF_MP42TS_HTTP;
 #endif
 				/*http needs to get the complete URL*/
 				switch(*audio_input_type) {
 					case GF_MP42TS_UDP:
 					case GF_MP42TS_RTP:
-						sep = strchr(arg+6, ':');
+						sep = strchr(next_arg+6, ':');
 						*real_time=1;
 						if (sep) {
 							*audio_input_port = atoi(sep+1);
 							sep[0]=0;
-							*audio_input_ip = gf_strdup(arg+6);
+							*audio_input_ip = gf_strdup(next_arg+6);
 							sep[0]=':';
 						} else {
-							*audio_input_ip = gf_strdup(arg+6);
+							*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 = arg;
+						*audio_input_ip = next_arg;
 						assert(audio_input_port != 0);
 						break;
 #endif
@@ -1727,11 +1819,11 @@
 						assert(0);
 				}
 			}
-		} else if (!strnicmp(arg, "-psi-rate=", 10) ) {
-			*psi_refresh_rate = atoi(arg+10);
-		} else if (!stricmp(arg, "-bifs-pes") ) {
+		} else if (CHECK_PARAM("-psi-rate")) {
+			*psi_refresh_rate = atoi(next_arg);
+		} else if (!stricmp(arg, "-bifs-pes")) {
 			*bifs_use_pes = 1;
-		} else if (!stricmp(arg, "-bifs-pes-ex") ) {
+		} else if (!stricmp(arg, "-bifs-pes-ex")) {
 			*bifs_use_pes = 2;
 		} else if (!stricmp(arg, "-mpeg4") || !stricmp(arg, "-4on2")) {
 			mpeg4_signaling = GF_M2TS_MPEG4_SIGNALING_FULL;
@@ -1741,40 +1833,40 @@
 #ifdef GPAC_MEMORY_TRACKING
 			gf_sys_close();
 			gf_sys_init(GF_TRUE);
-			gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_DEBUG);
+			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"); 
 #endif
-		} else if (!strnicmp(arg, "-rate=", 6)) {
+		} else if (CHECK_PARAM("-rate")) {
 			if (rate_found) {
 				error_msg = "multiple '-rate' found";
 				arg = NULL;
 				goto error;
 			}
 			rate_found = 1;
-			*mux_rate = 1000*atoi(arg+6);
-		} else if (!strnicmp(arg, "-mpeg4-carousel=", 16)) {
+			*mux_rate = 1000*atoi(next_arg);
+		} else if (CHECK_PARAM("-mpeg4-carousel")) {
 			if (mpeg4_carousel_found) {
 				error_msg = "multiple '-mpeg4-carousel' found";
 				arg = NULL;
 				goto error;
 			}
 			mpeg4_carousel_found = 1;
-			*carrousel_rate = atoi(arg+16);
+			*carrousel_rate = atoi(next_arg);
 		} else if (!strnicmp(arg, "-real-time", 10)) {
 			if (real_time_found) {
 				goto error;
 			}
 			real_time_found = 1;
 			*real_time = 1;
-		} else if (!strnicmp(arg, "-time=", 6)) {
+		} else if (CHECK_PARAM("-time")) {
 			if (time_found) {
 				error_msg = "multiple '-time' found";
 				arg = NULL;
 				goto error;
 			}
 			time_found = 1;
-			*run_time = atoi(arg+6);
+			*run_time = atoi(next_arg);
 		} else if (!stricmp(arg, "-single-au")) {
 			*single_au_pes = 1;
 		} else if (!stricmp(arg, "-rap")) {
@@ -1782,10 +1874,108 @@
 		} else if (!stricmp(arg, "-flush-rap")) {
 			*split_rap = 2;
 		}
-		else if (!strnicmp(arg, "-dst-udp=", 9)) {
+		else if (!strnicmp(arg, "-dst-udp", 8)) {
 			*real_time = 1;
-		} else if (!strnicmp(arg, "-dst-rtp=", 9)) {
+		} 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("-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("-lf")) {
+			logfile = gf_f64_open(next_arg, "wt");
+			gf_log_set_callback(logfile, on_gpac_log);
+		} else if (CHECK_PARAM("-segment-dir")) {
+			if (seg_dir_found) {
+				goto error;
+			}
+			seg_dir_found = 1;
+			*segment_dir = next_arg;
+			/* TODO: add the path separation char, if missing */
+		} else if (CHECK_PARAM("-segment-duration")) {
+			if (seg_dur_found) {
+				goto error;
+			}
+			seg_dur_found = 1;
+			*segment_duration = atoi(next_arg);
+		} else if (CHECK_PARAM("-segment-manifest=")) {
+			if (seg_manifest_found) {
+				goto error;
+			}
+			seg_manifest_found = 1;
+			*segment_manifest = next_arg;
+		} else if (CHECK_PARAM("-segment-http-prefix=")) {
+			if (seg_http_found) {
+				goto error;
+			}
+			seg_http_found = 1;
+			*segment_http_prefix = next_arg;
+		} else if (CHECK_PARAM("-segment-number=")) {
+			if (seg_number_found) {
+				goto error;
+			}
+			seg_number_found = 1;
+			*segment_number = atoi(next_arg);
+		} 
+		else if (CHECK_PARAM("-src")) {
+			if (src_found) {
+				error_msg = "multiple '-src' found";
+				arg = NULL;
+				goto error;
+			}
+			src_found = 1;
+			*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-delay")) {
+			temi_url_insertion_delay = atoi(next_arg);
+		}
+		else if (CHECK_PARAM("-dst-udp")) {
+			char *sep = strchr(next_arg, ':');
+			dst_found = 1;
+			*real_time=1;
+			if (sep) {
+				*output_port = atoi(sep+1);
+				sep[0]=0;
+				*udp_out = gf_strdup(next_arg);
+				sep[0]=':';
+			} else {
+				*udp_out = gf_strdup(next_arg);
+			}
+		}
+		else if (CHECK_PARAM("-dst-rtp")) {
+			char *sep = strchr(next_arg, ':');
+			dst_found = 1;
+			*real_time=1;
+			if (sep) {
+				*output_port = atoi(sep+1);
+				sep[0]=0;
+				*rtp_out = gf_strdup(next_arg);
+				sep[0]=':';
+			} else {
+				*rtp_out = gf_strdup(next_arg);
+			}
+		} else if (strnicmp(arg, "-prog", 5)) { //second pass arguments
+			error_msg = "unknown option";
+			goto error;
 		}
 	}
 	if (*real_time) force_real_time = 1;
@@ -1795,99 +1985,14 @@
 	for (i=1; i<argc; i++) {		
 		arg = argv[i];		
 		if (arg[0]=='-') {
-			if (!strnicmp(arg, "-logs=", 6)) {
-				if (gf_log_set_tools_levels(argv[i+1]+6) != GF_OK)
-					return GF_BAD_PARAM;
-			} else if (!strnicmp(arg, "-prog=", 6)) {
+			if (CHECK_PARAM("-prog")) {
 				u32 res;
-				prog_name = arg+6;
-				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);
+				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;
 				}
-			} else if (!strnicmp(arg, "-segment-dir=", 13)) {
-				if (seg_dir_found) {
-					goto error;
-				}
-				seg_dir_found = 1;
-				*segment_dir = arg+13;
-				/* TODO: add the path separation char, if missing */
-			} else if (!strnicmp(arg, "-segment-duration=", 18)) {
-				if (seg_dur_found) {
-					goto error;
-				}
-				seg_dur_found = 1;
-				*segment_duration = atoi(arg+18);
-			} else if (!strnicmp(arg, "-segment-manifest=", 18)) {
-				if (seg_manifest_found) {
-					goto error;
-				}
-				seg_manifest_found = 1;
-				*segment_manifest = arg+18;
-			} else if (!strnicmp(arg, "-segment-http-prefix=", 21)) {
-				if (seg_http_found) {
-					goto error;
-				}
-				seg_http_found = 1;
-				*segment_http_prefix = arg+21;
-			} else if (!strnicmp(arg, "-segment-number=", 16)) {
-				if (seg_number_found) {
-					goto error;
-				}
-				seg_number_found = 1;
-				*segment_number = atoi(arg+16);
-			} 
-			else if (!strnicmp(arg, "-src=", 5)) {
-				if (src_found) {
-					error_msg = "multiple '-src' found";
-					arg = NULL;
-					goto error;
-				}
-				src_found = 1;
-				*src_name = arg+5;
-			}
-			else if (!strnicmp(arg, "-nb-pack=", 9)) {
-				*nb_pck_pack = atoi(arg+9);
-			} else if (!strnicmp(arg, "-ttl=", 5)) {
-				*ttl = atoi(arg+5);
-			} else if (!strnicmp(arg, "-ifce=", 6)) {
-				*ip_ifce = arg+6;
-			} else if (!strnicmp(arg, "-dst-file=", 10)) {
-				dst_found = 1;
-				*ts_out = gf_strdup(arg+10);
-			}
-			else if (!strnicmp(arg, "-dst-udp=", 9)) {
-				char *sep = strchr(arg+9, ':');
-				dst_found = 1;
-				*real_time=1;
-				if (sep) {
-					*output_port = atoi(sep+1);
-					sep[0]=0;
-					*udp_out = gf_strdup(arg+9);
-					sep[0]=':';
-				} else {
-					*udp_out = gf_strdup(arg+9);
-				}
-			}
-			else if (!strnicmp(arg, "-dst-rtp=", 9)) {
-				char *sep = strchr(arg+9, ':');
-				dst_found = 1;
-				*real_time=1;
-				if (sep) {
-					*output_port = atoi(sep+1);
-					sep[0]=0;
-					*rtp_out = gf_strdup(arg+9);
-					sep[0]=':';
-				} else {
-					*rtp_out = gf_strdup(arg+9);
-				}
-			}
-			else if (!strnicmp(arg, "-audio=", 7) || !strnicmp(arg, "-video=", 7) || !strnicmp(arg, "-mpeg4", 6))
-				; /*already treated on the first pass*/
-			else {
-//				error_msg = "unknown option \"%s\"";
-//				goto error;
 			}
 		} 
 #if 0
@@ -1922,19 +2027,18 @@
 		return GF_OK;
 	} else {
 		if (!dst_found)
-			fprintf(stderr, "Error: Destination argument not found\n\n");
+			fprintf(stderr, "Error: Destination argument not found\n");
 		if (! *nb_progs)
-			fprintf(stderr, "Error: No Programs are available\n\n");
-		if (!rate_found)
-			fprintf(stderr, "Error: Rate argument not found\n\n");
+			fprintf(stderr, "Error: No Programs are available\n");
+		usage();
 		return GF_BAD_PARAM;
 	}
 
 error:	
 	if (!arg) {
-		fprintf(stderr, "Error: %s\n\n", error_msg);
+		fprintf(stderr, "Error: %s\n", error_msg);
 	} else {
-		fprintf(stderr, "Error: %s \"%s\"\n\n", error_msg, arg);
+		fprintf(stderr, "Error: %s \"%s\"\n", error_msg, arg);
 	}
 	return GF_BAD_PARAM;
 }
@@ -2015,6 +2119,7 @@
 	char *audio_input_buffer = NULL;
 	u32 audio_input_buffer_length=65536;
 	char *src_name;
+	const char *insert_temi = 0;
 	M2TSProgram progs[MAX_MUX_SRC_PROG];
 	u32 segment_duration, segment_index, segment_number;
 	char segment_manifest_default[GF_MAX_PATH];
@@ -2081,7 +2186,7 @@
 							&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)) {
+							&segment_dir, &segment_duration, &segment_manifest, &segment_number, &segment_http_prefix, &split_rap, &nb_pck_pack, &ttl, &ip_ifce, &insert_temi)) {
 		goto exit;
 	}
 	
@@ -2416,11 +2521,17 @@
 				}
 			}
 			if (status == GF_M2TS_STATE_IDLE) {
+#if 0
 				/*wait till next packet is ready to be sent*/
 				if (usec_till_next>1000) {
 					//fprintf(stderr, "%d usec till next packet\n", usec_till_next);
 					gf_sleep(usec_till_next / 1000);
 				}
+#else
+				//we don't have enough precision on usec counting and we end up eating one core on most machines, so let's just sleep
+				//one second whenever we are idle - it's maybe too much but the muxer will catchup afterwards
+				gf_sleep(1);
+#endif
 			}
 		}
 
@@ -2462,9 +2573,6 @@
 #ifndef GPAC_DISABLE_STREAMING
 	if (rtp_out) gf_free(rtp_out);
 #endif
-#ifndef GPAC_DISABLE_PLAYER
-	if (aac_reader) AAC_Reader_del(aac_reader);
-#endif
 	if (muxer) gf_m2ts_mux_del(muxer);
 	
 	for (i=0; i<nb_progs; i++) {
@@ -2490,6 +2598,12 @@
 #endif
 		if (progs[i].th) gf_th_del(progs[i].th);
 	}
+
+#ifndef GPAC_DISABLE_PLAYER
+	if (aac_reader) AAC_Reader_del(aac_reader);
+#endif
+
+	if (logfile) fclose(logfile);
 	gf_sys_close();
 	return 0;
 }

gpac-0.5.0.svn4668.tar.bz2/applications/mp4box/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/mp4box/filedump.c -> gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/filedump.c Changed

@@ -42,7 +42,7 @@
 #endif
 #include <gpac/constants.h>
 #include <gpac/avparse.h>
-#include <gpac/media_tools.h>
+#include <gpac/internal/media_dev.h>
 /*for asctime and gmtime*/
 #include <time.h>
 /*ISO 639 languages*/
@@ -52,6 +52,7 @@
 #ifndef GPAC_DISABLE_SMGR
 #include <gpac/scene_manager.h>
 #endif
+#include <gpac/internal/media_dev.h>
 
 extern u32 swf_flags;
 extern Float swf_flatten_angle;
@@ -873,12 +874,14 @@
 }
 
 
-static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, Bool is_hevc)
+#ifndef GPAC_DISABLE_AV_PARSERS
+static void dump_nalu(FILE *dump, char *ptr, u32 ptr_size, Bool is_svc, Bool is_hevc, AVCState *avc)
 {
 	u8 type;
 	u8 dependency_id, quality_id, temporal_id;
 	u8 track_ref_index;
-	u32 data_offset, sps_id, pps_id;
+	u32 data_offset, idx;
+	GF_BitStream *bs;
 	
 	if (is_hevc) {
 #ifndef GPAC_DISABLE_HEVC
@@ -911,32 +914,53 @@
 		case GF_HEVC_NALU_FILLER_DATA: fputs("Filler Data", dump); break;
 		case GF_HEVC_NALU_SEI_PREFIX: fputs("SEI Prefix", dump); break;
 		case GF_HEVC_NALU_SEI_SUFFIX: fputs("SEI Suffix", dump); break;
+		case 48:
+			fputs("HEVCAggregator", dump); 
+			break;
+		case 49:
+			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);
+			break;
 		default:
 			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);
 	switch (type) {
-	case GF_AVC_NALU_NON_IDR_SLICE: fputs("Non IDR slice", dump); break;
+	case GF_AVC_NALU_NON_IDR_SLICE: 
+		gf_media_avc_parse_nalu(bs, ptr[0], avc);
+		fputs("Non IDR slice", dump);
+		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: fputs("IDR slice", dump); break;
+	case GF_AVC_NALU_IDR_SLICE: 
+		gf_media_avc_parse_nalu(bs, ptr[0], avc);
+		fputs("IDR slice", dump);
+		fprintf(dump, "\" poc=\"%d", avc->s_info.poc);
+		break;
 	case GF_AVC_NALU_SEI: fputs("SEI Message", dump); break;
 	case GF_AVC_NALU_SEQ_PARAM: 
-		fputs("SequenceParameterSet", dump); 
-		gf_avc_get_sps_info(ptr, ptr_size, &sps_id, NULL, NULL, NULL, NULL);
-		fprintf(dump, "\" sps_id=\"%d", sps_id);
+		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: 
 		fputs("PictureParameterSet", dump);
-		gf_avc_get_pps_info(ptr, ptr_size, &pps_id, &sps_id);
-		fprintf(dump, "\" pps_id=\"%d\" sps_id=\"%d", pps_id, sps_id);
+		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;
@@ -946,17 +970,20 @@
 	case GF_AVC_NALU_SVC_PREFIX_NALU: fputs("SVCPrefix", dump); break;
 	case GF_AVC_NALU_SVC_SUBSEQ_PARAM: 
 		fputs("SVCSubsequenceParameterSet", dump); 
-		gf_avc_get_sps_info(ptr, ptr_size, &sps_id, NULL, NULL, NULL, NULL);
-		fprintf(dump, "\" sps_id=\"%d", sps_id);
+		idx = gf_media_avc_read_sps(ptr, ptr_size, avc, 1, NULL);
+		assert (idx >= 0);
+		fprintf(dump, "\" sps_id=\"%d", idx - GF_SVC_SSPS_ID_SHIFT);
 		break;
 	case GF_AVC_NALU_SLICE_AUX: fputs("Auxiliary Slice", dump); break;
 
 	case GF_AVC_NALU_SVC_SLICE: 
+		gf_media_avc_parse_nalu(bs, ptr[0], avc);
 		fputs(is_svc ? "SVCSlice" : "CodedSliceExtension", dump);
 		dependency_id = (ptr[2] & 0x70) >> 4;
 		quality_id = (ptr[2] & 0x0F);
 		temporal_id = (ptr[3] & 0xE0) >> 5;
 		fprintf(dump, "\" dependency_id=\"%d\" quality_id=\"%d\" temporal_id=\"%d", dependency_id, quality_id, temporal_id);
+		fprintf(dump, "\" poc=\"%d", avc->s_info.poc);
 		break;
 	case 30: fputs("SVCAggregator", dump); break;
 	case 31:
@@ -970,18 +997,24 @@
 		fputs("UNKNOWN", dump); break;
 	}
 	fputs("\"", dump);
+	if (bs) gf_bs_del(bs);
 }
+#endif
 
 void dump_file_nal(GF_ISOFile *file, u32 trackID, char *inName)
 {
 	u32 i, count, track, nalh_size, timescale, cur_extract_mode;
-	Bool is_hevc = 0;
 	FILE *dump;
 	s32 countRef;
 #ifndef GPAC_DISABLE_AV_PARSERS
+	Bool is_hevc = 0;
+	AVCState avc;
 	GF_AVCConfig *avccfg, *svccfg;
-	GF_HEVCConfig *hevccfg;
+	GF_HEVCConfig *hevccfg, *shvccfg;
 	GF_AVCConfigSlot *slc;
+	Bool is_adobe_protection = GF_FALSE;
+
+	memset(&avc, 0, sizeof(AVCState));
 #endif
 
 	if (inName) {
@@ -1006,6 +1039,7 @@
 	avccfg = gf_isom_avc_config_get(file, track, 1);
 	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);
 	fprintf(dump, " <NALUConfig>\n");
 
 #define DUMP_ARRAY(arr, name)\
@@ -1013,7 +1047,7 @@
 		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);\
+			dump_nalu(dump, slc->data, slc->size, svccfg ? 1 : 0, is_hevc, &avc);\
 			fprintf(dump, "/>\n");\
 		}\
 	}\
@@ -1051,9 +1085,31 @@
 		}
 #endif
 	}
+	if (shvccfg) {
+#ifndef GPAC_DISABLE_HEVC
+		u32 idx;
+		nalh_size = shvccfg->nal_unit_size;
+		is_hevc = 1;
+		for (idx=0; idx<gf_list_count(shvccfg->param_array); idx++) {
+			GF_HEVCParamArray *ar = gf_list_get(shvccfg->param_array, idx);
+			if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+				DUMP_ARRAY(ar->nalus, "HEVCSPSArray")
+			} else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+				DUMP_ARRAY(ar->nalus, "HEVCPPSArray")
+			} else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+				DUMP_ARRAY(ar->nalus, "HEVCVPSArray")
+			} else { 
+				DUMP_ARRAY(ar->nalus, "HEVCUnknownPSArray")
+			}
+		}
+#endif
+	}
 #endif
 	fprintf(dump, " </NALUConfig>\n");
 
+	/*fixme: for dumping encrypted track: we don't have neither avccfg nor svccfg*/
+	if (!nalh_size) nalh_size = 4;
+
 	/*for testing dependency*/
 	countRef = gf_isom_get_reference_count(file, track, GF_ISOM_REF_SCAL);
 	if (countRef > 0)
@@ -1071,6 +1127,7 @@
 
 	fprintf(dump, " <NALUSamples>\n");
 	gf_isom_set_nalu_extract_mode(file, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+	is_adobe_protection = gf_isom_is_adobe_protection_media(file, track, 1);
 	for (i=0; i<count; i++) {
 		u64 dts, cts;
 		u32 size, nal_size, idx;
@@ -1085,6 +1142,18 @@
 		idx = 1;
 		ptr = samp->data;
 		size = samp->dataLength;
+		if (is_adobe_protection) {
+			u8 encrypted_au = ptr[0];
+			if (encrypted_au) {
+				fprintf(dump, "   \n", i+1);
+				fprintf(dump, "  </Sample>\n\n");
+				continue;
+			}
+			else {
+				ptr++;
+				size--;
+			}
+		}
 		while (size) {
 			u32 v = nalh_size;
 			nal_size = 0;
@@ -1099,7 +1168,9 @@
 				break;
 			} else {
 				fprintf(dump, "   <NALU number=\"%d\" size=\"%d\" ", idx, nal_size);
-				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc);
+#ifndef GPAC_DISABLE_AV_PARSERS
+				dump_nalu(dump, ptr, nal_size, svccfg ? 1 : 0, is_hevc, &avc);
+#endif
 				fprintf(dump, "/>\n");
 			}
 			idx++;
@@ -1116,8 +1187,15 @@
 	fprintf(dump, "</NALUTrack>\n");
 
 	if (inName) fclose(dump);
+#ifndef GPAC_DISABLE_AV_PARSERS
 	if (avccfg) gf_odf_avc_cfg_del(avccfg);
 	if (svccfg) gf_odf_avc_cfg_del(svccfg);
+#ifndef GPAC_DISABLE_HEVC
+	if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+	if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
+#endif
+
+#endif
 	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
 }
 
@@ -1284,14 +1362,21 @@
 
 
 
-GF_Err dump_chapters(GF_ISOFile *file, char *inName)
+GF_Err dump_chapters(GF_ISOFile *file, char *inName, Bool dump_ogg)
 {
 	char szName[1024];
 	FILE *t;
 	u32 i, count;
 	count = gf_isom_get_chapter_count(file, 0);
-	sprintf(szName, "%s.chap", inName);
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Extracting chapters to %s\n", szName));
+	strcpy(szName, inName);
+	if (dump_ogg) {
+		strcat(szName, ".txt");
+		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Extracting OGG chapters to %s\n", szName));
+	}
+	else {
+		strcat(szName, ".chap");
+		GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("Extracting chapters to %s\n", szName));
+	}
 
 	t = gf_f64_open(szName, "wt");
 	if (!t) return GF_IO_ERR;
@@ -1299,9 +1384,15 @@
 	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);
-		chapter_time /= 1000;
-		fprintf(t, "AddChapterBySecond("LLD",%s)\n", 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);		
+		} else {
+			chapter_time /= 1000;
+			fprintf(t, "AddChapterBySecond("LLD",%s)\n", chapter_time, name);
+		}
 	}
 	fclose(t);
 	return GF_OK;
@@ -1340,6 +1431,58 @@
 	}
 }
 
+#ifndef GPAC_DISABLE_HEVC
+void dump_hevc_track_info(GF_ISOFile *file, u32 trackNum, GF_HEVCConfig *hevccfg, HEVCState *hevc_state)
+{
+	u32 k, idx;
+	fprintf(stderr, "\t%s Info: Profile %s @ Level %g - Chroma Format %d\n", hevccfg->is_shvc ? "SHVC" : "HEVC", gf_hevc_get_profile_name(hevccfg->profile_idc), ((Double)hevccfg->level_idc) / 30.0, hevccfg->chromaFormat);
+	fprintf(stderr, "\tNAL Unit length bits: %d - general profile compatibility 0x%08X\n", 8*hevccfg->nal_unit_size, hevccfg->general_profile_compatibility_flags);
+	fprintf(stderr, "\tParameter Sets: ");
+	for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
+		GF_HEVCParamArray *ar=gf_list_get(hevccfg->param_array, k);
+		if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+			fprintf(stderr, "%d SPS ", gf_list_count(ar->nalus));
+		}
+		if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+			fprintf(stderr, "%d PPS ", gf_list_count(ar->nalus));
+		}
+		if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+			fprintf(stderr, "%d VPS ", gf_list_count(ar->nalus));
+
+			for (idx=0; idx<gf_list_count(ar->nalus); idx++) {
+				GF_AVCConfigSlot *vps = gf_list_get(ar->nalus, idx);
+				gf_media_hevc_read_vps(vps->data, vps->size, hevc_state);
+			}
+		}
+	}
+
+	fprintf(stderr, "\n");
+	for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
+		GF_HEVCParamArray *ar=gf_list_get(hevccfg->param_array, k);
+		u32 width, height;
+		s32 par_n, par_d;
+
+		if (ar->type !=GF_HEVC_NALU_SEQ_PARAM) continue;
+		for (idx=0; idx<gf_list_count(ar->nalus); idx++) {
+			GF_AVCConfigSlot *sps = gf_list_get(ar->nalus, idx);
+			par_n = par_d = -1;
+			gf_hevc_get_sps_info_with_state(hevc_state, sps->data, sps->size, NULL, &width, &height, &par_n, &par_d);
+			fprintf(stderr, "\tSPS resolution %dx%d", width, height);
+			if ((par_n>0) && (par_d>0)) {
+				u32 tw, th;
+				gf_isom_get_track_layout_info(file, trackNum, &tw, &th, NULL, NULL, NULL);
+				fprintf(stderr, " - Pixel Aspect Ratio %d:%d - Indicated track size %d x %d", par_n, par_d, tw, th);
+			}
+			fprintf(stderr, "\n");
+		}
+	}
+	fprintf(stderr, "\tBit Depth luma %d - Chroma %d - %d temporal layers\n", hevccfg->luma_bit_depth, hevccfg->chroma_bit_depth, hevccfg->numTemporalLayers);
+	if (hevccfg->is_shvc) {
+		fprintf(stderr, "\t%sNum Layers: %d (scalability mask 0x%02X)%s\n", hevccfg->non_hevc_base_layer ? "Non-HEVC base layer - " : "", hevccfg->num_layers, hevccfg->scalability_mask, hevccfg->complete_representation ? "" : " - no VCL data");
+	}
+}
+#endif
+
 void DumpTrackInfo(GF_ISOFile *file, u32 trackID, Bool full_dump)
 {
 	Float scale;
@@ -1371,7 +1514,14 @@
 	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));
-	
+
+	if (gf_isom_is_track_fragmented(file, trackID) ) {
+		u32 frag_samples;
+		u64 frag_duration;
+		gf_isom_get_fragmented_samples_info(file, trackID, &frag_samples, &frag_duration);
+		fprintf(stderr, "Fragmented track: %d samples - Media Duration %s\n", frag_samples, format_duration(frag_duration, timescale, szDur));
+	}
+
 	if (!gf_isom_is_self_contained(file, trackNum, 1)) {
 		const char *url, *urn;
 		gf_isom_get_data_reference(file, trackNum, 1, &url, &urn);
@@ -1392,6 +1542,7 @@
 	}
 
 	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) 
@@ -1404,6 +1555,8 @@
 		|| (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)
 	)  {
 		esd = gf_isom_get_esd(file, trackNum, 1);
 		if (!esd) {
@@ -1500,9 +1653,14 @@
 					}
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
-				} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
+				} else if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC)
+				|| (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SHVC)
+				) {
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
-					GF_HEVCConfig *hevccfg;
+					HEVCState hevc_state;
+					GF_HEVCConfig *hevccfg, *shvccfg;
+					memset(&hevc_state, 0, sizeof(HEVCState));
+					hevc_state.sps_active_idx = -1;
 #endif
 
 					gf_isom_get_visual_info(file, trackNum, 1, &w, &h);
@@ -1510,27 +1668,18 @@
 					fprintf(stderr, "HEVC Video - Visual Size %d x %d\n", w, h);
 #if !defined(GPAC_DISABLE_AV_PARSERS) && !defined(GPAC_DISABLE_HEVC)
 					hevccfg = gf_isom_hevc_config_get(file, trackNum, 1);
-					if (!hevccfg ) {
-						fprintf(stderr, "\n\n\tNon-compliant HEVC track: hvcC not found in sample description\n");
-					} else {
-						u32 k;
-						fprintf(stderr, "\tHEVC Info: Profile IDC %d - Level IDC %d - Chroma Format %d\n", hevccfg->profile_idc, hevccfg->level_idc, hevccfg->chromaFormat);
-						fprintf(stderr, "\tNAL Unit length bits: %d - profile compatibility 0x%08X\n", 8*hevccfg->nal_unit_size, hevccfg->profile_compatibility_indications);
-						fprintf(stderr, "\tParameter Sets: ");
-						for (k=0; k<gf_list_count(hevccfg->param_array); k++) {
-							GF_HEVCParamArray *ar=gf_list_get(hevccfg->param_array, k);
-							if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
-								fprintf(stderr, "%d SPS ", gf_list_count(ar->nalus));
-							}
-							else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
-								fprintf(stderr, "%d PPS ", gf_list_count(ar->nalus));
-							}
-							if (ar->type==GF_HEVC_NALU_VID_PARAM) {
-								fprintf(stderr, "%d VPS ", gf_list_count(ar->nalus));
-							}
-						}
-						fprintf(stderr, "\n\tBit Depth luma %d - Chroma %d - %d temporal layers\n", hevccfg->luma_bit_depth, hevccfg->chroma_bit_depth, hevccfg->numTemporalLayers);
+					shvccfg = gf_isom_shvc_config_get(file, trackNum, 1);
+					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);
+						fprintf(stderr, "\n");
+					}
+					if (shvccfg) {
+						dump_hevc_track_info(file, trackNum, shvccfg, &hevc_state);
+						gf_odf_hevc_cfg_del(shvccfg);
 					}
 #endif /*GPAC_DISABLE_AV_PARSERS  && defined(GPAC_DISABLE_HEVC)*/
 				} 
@@ -1736,6 +1885,13 @@
 
 					fprintf(stderr, "Selective Encryption: %s\n", use_sel_enc ? "Yes" : "No");
 					if (IV_size) fprintf(stderr, "Initialization Vector size: %d bits\n", IV_size*8);
+				} else if(gf_isom_is_cenc_media(file, trackNum, 1)) {
+					gf_isom_get_cenc_info(file, trackNum, 1, NULL, &scheme_type, &version, &IV_size);
+					fprintf(stderr, "\n*Encrypted stream - CENC scheme %s (version %d)\n", gf_4cc_to_str(scheme_type), version);
+					if (IV_size) fprintf(stderr, "Initialization Vector size: %d bits\n", IV_size*8);
+				} else if(gf_isom_is_adobe_protection_media(file, trackNum, 1)) {
+					gf_isom_get_adobe_protection_info(file, trackNum, 1, NULL, &scheme_type, &version);
+					fprintf(stderr, "\n*Encrypted stream - Adobe protection scheme %s (version %d)\n", gf_4cc_to_str(scheme_type), version);
 				} else {
 					fprintf(stderr, "\n*Encrypted stream - unknown scheme %s\n", gf_4cc_to_str(gf_isom_is_media_encrypted(file, trackNum, 1) ));
 				}
@@ -1808,7 +1964,7 @@
 #endif
 	} else if (mtype==GF_ISOM_MEDIA_FLASH) {
 		fprintf(stderr, "Macromedia Flash Movie\n");
-	} else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT)) {
+	} else if ((mtype==GF_ISOM_MEDIA_TEXT) || (mtype==GF_ISOM_MEDIA_SUBT) || (mtype==GF_ISOM_MEDIA_MPEG_SUBT)) {
 		u32 w, h;
 		s16 l;
 		s32 tx, ty;
@@ -1983,8 +2139,18 @@
 	DumpMetaItem(file, 1, 0, "Root Meta");
 	if (!gf_isom_has_movie(file)) {
         if (gf_isom_has_segment(file, &brand, &min)) {
-            fprintf(stderr, "File is a segment: \n");
-            fprintf(stderr, "\tSegment Brand %s - version %d\n", gf_4cc_to_str(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);
+				for (j=0; j<traf_count; j++) {
+					u32 ID;
+					u64 tfdt;
+					ID = gf_isom_segment_get_track_fragment_decode_time(file, i+1, j+1, &tfdt);
+					fprintf(stderr, "\tFragment #%d Track ID %d - TFDT "LLU"\n", i+1, ID, tfdt);
+				}
+			}
         } else {
 		    fprintf(stderr, "File has no movie (moov) - static data container\n");
         }
@@ -2011,7 +2177,7 @@
 	}
 	gf_isom_get_creation_time(file, &create, &modif);
 	fprintf(stderr, "\tCreated: %s", format_date(create, szDur));
-	//fprintf(stderr, "\tModified: %s", format_date(modif, szDur));
+	fprintf(stderr, "\tModified: %s", format_date(modif, szDur));
 	fprintf(stderr, "\n");
 
 	DumpMetaItem(file, 0, 0, "Moov Meta");

gpac-0.5.0.svn4668.tar.bz2/applications/mp4box/fileimport.c -> gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/fileimport.c Changed

@@ -88,6 +88,9 @@
 		}
 		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));
+	}
 	found = 0;
 	for (i=0; i<import.nb_tracks; i++) {
 		if (trackID && (trackID != import.tk_info[i].track_num)) continue;
@@ -100,6 +103,7 @@
 		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;
 		}
 
@@ -183,7 +187,7 @@
 	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;
-	u32 group, handler, rvc_predefined, check_track_for_svc;
+	u32 group, handler, rvc_predefined, check_track_for_svc, check_track_for_shvc;
 	const char *szLan;
 	GF_Err e;
 	GF_MediaImporter import;
@@ -202,11 +206,7 @@
 	memset(&import, 0, sizeof(GF_MediaImporter));
 
 	strcpy(szName, inName);
-	ext = strrchr(inName, '.');
-	if (!ext) {
-		fprintf(stderr, "Unknown input file type\n");
-		return GF_BAD_PARAM;
-	}
+
 	is_chap_file = 0;
 	handler = 0;
 	disable = 0;
@@ -264,11 +264,22 @@
 		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")) import_flags |= GF_IMPORT_SVC_EXPLICIT;
-		else if (!stricmp(ext+1, "nosvc")) import_flags |= GF_IMPORT_SVC_NONE;
+		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)) {
@@ -337,12 +348,17 @@
 		/*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)) {
-			if (!stricmp(ext+9, "splitall") || !stricmp(ext+9, "split"))
+		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(ext+9, "splitbase"))
+			else if (!stricmp(mode, "splitbase"))
 				svc_mode = 1;
-			else if (!stricmp(ext+9, "merged"))
+			else if (!stricmp(mode, "merged"))
 				svc_mode = 0;
 		}
 		else if (!strnicmp(ext+1, "tiles", 5)) {
@@ -444,7 +460,7 @@
 		import.text_y = txty;
 	}
 
-	check_track_for_svc = 0;
+	check_track_for_svc = check_track_for_shvc = 0;
 
 	import.dest = dest;
 	import.video_fps = force_fps;
@@ -517,6 +533,9 @@
 
 			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;
 
 			if (tile_mode) {
 				switch (gf_isom_get_media_subtype(import.dest, i+1, 1)) {
@@ -636,20 +655,27 @@
 					assert(read);
 					assert(read == size);
 					fclose(f);
+#ifdef GPAC_DISABLE_ZLIB
+					fprintf(stderr, "Error: no zlib support - RVC not available\n");
+					e = GF_NOT_SUPPORTED;
+					goto exit;
+#endif
 					gf_gz_compress_payload(&data, size, &size);
-
 					gf_isom_set_rvc_config(import.dest, track, 1, 0, "application/rvc-config+xml+gz", data, size);
 					gf_free(data);
 				}
 			} else if (rvc_predefined>0) {
 				gf_isom_set_rvc_config(import.dest, track, 1, rvc_predefined, NULL, NULL, 0);
 			}
-			
+
 			gf_isom_set_composition_offset_mode(import.dest, track, negative_cts_offset);
 
 			if (gf_isom_get_avc_svc_type(import.dest, track, 1)>=GF_ISOM_AVCTYPE_AVC_SVC)
 				check_track_for_svc = track;
 
+			if (gf_isom_get_hevc_shvc_type(import.dest, track, 1)>=GF_ISOM_HEVCTYPE_HEVC_SHVC)
+				check_track_for_shvc = track;
+
 			if (tile_mode) {
 				switch (gf_isom_get_media_subtype(import.dest, track, 1)) {
 				case GF_ISOM_SUBTYPE_HVC1:
@@ -691,6 +717,14 @@
 			if (e) goto exit;
 		}
 	}
+	if (check_track_for_shvc) {
+		if (svc_mode) {
+			e = gf_media_split_shvc(import.dest, check_track_for_shvc, (svc_mode==1) ? 0 : 1, (svc_mode==3) ? 0 : 1 );
+			if (e) goto exit;
+		} else {
+			//TODO - merge
+		}
+	}
 	if (tile_mode == 2) {
 		gf_media_split_hevc_tiles(import.dest);
 	}
@@ -753,7 +787,9 @@
 	}
 
 
-	strcpy(szName, inName);
+	ext = strrchr(inName, '/');
+	if (!ext) ext = strrchr(inName, '\\');
+	strcpy(szName, ext ? ext+1 : inName);
 	ext = strrchr(szName, '.');
 	if (ext) ext[0] = 0;
 	ext = strrchr(inName, '.');
@@ -794,6 +830,7 @@
 		/*we duplicate text samples at boundaries*/
 		case GF_ISOM_MEDIA_TEXT:
 		case GF_ISOM_MEDIA_SUBT:
+		case GF_ISOM_MEDIA_MPEG_SUBT:
 			tks[nb_tk].can_duplicate = 1;
 		case GF_ISOM_MEDIA_AUDIO:
 			break;
@@ -1177,11 +1214,8 @@
 							break;
 						}
 					}
-					if (rap_split) {
-						if (time <= file_split_dur) break;
-					} else {
-						if (time < file_split_dur) break;
-					}
+
+					if (time <= file_split_dur) break;
 
 					gf_isom_remove_sample(dest, tki->dst_tk, last_samp);
 					tki->last_sample--;
@@ -1303,6 +1337,125 @@
 
 GF_Err cat_multiple_files(GF_ISOFile *dest, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command);
 
+static Bool merge_parameter_set(GF_List *src, GF_List *dst, const char *name)
+{
+	u32 j, k;
+	for (j=0; j<gf_list_count(src); j++) {
+		Bool found = 0;
+		GF_AVCConfigSlot *slc = gf_list_get(src, j);
+		for (k=0; k<gf_list_count(dst); k++) {
+			GF_AVCConfigSlot *slc_dst = gf_list_get(dst, k);
+			if ( (slc->size==slc_dst->size) && !memcmp(slc->data, slc_dst->data, slc->size) ) {
+				found = 1;
+				break;
+			}
+		}
+		if (!found) {
+			return GF_FALSE;
+		}
+	}
+	return GF_TRUE;
+}
+
+static u32 merge_avc_config(GF_ISOFile *dest, u32 tk_id, GF_ISOFile *orig, u32 src_track, Bool force_cat)
+{
+	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) {
+		dst_tk = 0;
+	}
+	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); 
+			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); 
+		}
+
+		/*merge PS*/
+		if (!merge_parameter_set(avc_src->sequenceParameterSets, avc_dst->sequenceParameterSets, "SPS"))
+			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);
+	}
+
+	gf_odf_avc_cfg_del(avc_src);
+	gf_odf_avc_cfg_del(avc_dst);
+
+	if (!dst_tk) {
+		dst_tk = gf_isom_get_track_by_id(dest, tk_id);
+		gf_isom_set_nalu_extract_mode(orig, src_track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+		if (!force_cat) {
+			gf_isom_avc_set_inband_config(dest, dst_tk, 1);
+		} else {
+			fprintf(stderr, "WARNING: Concatenating track ID %d even though sample descriptions do not match\n", tk_id);
+		}
+	}
+	return dst_tk;
+}
+
+static u32 merge_hevc_config(GF_ISOFile *dest, u32 tk_id, GF_ISOFile *orig, u32 src_track, Bool force_cat)
+{
+	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);
+
+	if (hevc_src->profile_idc != hevc_dst->profile_idc) dst_tk = 0;
+	else if (hevc_src->level_idc != hevc_dst->level_idc) dst_tk = 0;
+	else if (hevc_src->general_profile_compatibility_flags != hevc_dst->general_profile_compatibility_flags ) dst_tk = 0;
+	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); 
+			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); 
+		}
+
+		/*merge PS*/
+		for (i=0; i<gf_list_count(hevc_src->param_array); i++) {
+			u32 k;
+			GF_HEVCParamArray *src_ar = gf_list_get(hevc_src->param_array, i);
+			for (k=0; k<gf_list_count(hevc_dst->param_array); k++) {
+				GF_HEVCParamArray *dst_ar = gf_list_get(hevc_dst->param_array, k);
+				if (dst_ar->type==src_ar->type) {
+					if (!merge_parameter_set(src_ar->nalus, dst_ar->nalus, "SPS"))
+						dst_tk = 0;
+					break;
+				}
+			}
+		}
+					
+		gf_isom_hevc_config_update(dest, dst_tk, 1, hevc_dst);
+	}
+
+	gf_odf_hevc_cfg_del(hevc_src);
+	gf_odf_hevc_cfg_del(hevc_dst);
+
+	if (!dst_tk) {
+		dst_tk = gf_isom_get_track_by_id(dest, tk_id);
+		gf_isom_set_nalu_extract_mode(orig, src_track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
+		if (!force_cat) {
+			gf_isom_hevc_set_inband_config(dest, dst_tk, 1);
+		} else {
+			fprintf(stderr, "WARNING: Concatenating track ID %d even though sample descriptions do not match\n", tk_id);
+		}
+	}
+	return dst_tk;
+}
+
 GF_Err cat_isomedia_file(GF_ISOFile *dest, char *fileName, u32 import_flags, Double force_fps, u32 frames_per_sample, char *tmp_dir, Bool force_cat, Bool align_timelines, Bool allow_add_in_command)
 {
 	u32 i, j, count, nb_tracks, nb_samp, nb_done;
@@ -1369,6 +1522,7 @@
 		case GF_ISOM_MEDIA_AUDIO:
 		case GF_ISOM_MEDIA_TEXT:
 		case GF_ISOM_MEDIA_SUBT:
+		case GF_ISOM_MEDIA_MPEG_SUBT:
 		case GF_ISOM_MEDIA_VISUAL:
 		case GF_ISOM_MEDIA_SCENE:
 		case GF_ISOM_MEDIA_OCR:
@@ -1422,6 +1576,7 @@
 			continue;
 		case GF_ISOM_MEDIA_TEXT:
 		case GF_ISOM_MEDIA_SUBT:
+		case GF_ISOM_MEDIA_MPEG_SUBT:
 		case GF_ISOM_MEDIA_SCENE:
 			use_ts_dur = 0;
 		case GF_ISOM_MEDIA_AUDIO:
@@ -1507,78 +1662,21 @@
 				}
 			}
 
-			/*merge AVC config if possible*/
-			if (!dst_tk && ((stype == GF_ISOM_SUBTYPE_AVC_H264) || (stype == GF_ISOM_SUBTYPE_AVC2_H264) || (stype == GF_ISOM_SUBTYPE_AVC3_H264) || (stype == GF_ISOM_SUBTYPE_AVC4_H264))  ) {
-				GF_AVCConfig *avc_src, *avc_dst;
-				dst_tk = gf_isom_get_track_by_id(dest, tk_id);
-				
-				avc_src = gf_isom_avc_config_get(orig, i+1, 1);
-				avc_dst = gf_isom_avc_config_get(dest, dst_tk, 1);
-				
-				if (avc_src->AVCLevelIndication!=avc_dst->AVCLevelIndication) {
-					fprintf(stderr, "Cannot concatenate files: Different AVC Level Indication between source (%d) and destination (%d)\n", avc_src->AVCLevelIndication, avc_dst->AVCLevelIndication);
-					dst_tk = 0;
-				} else if (avc_src->AVCProfileIndication!=avc_dst->AVCProfileIndication) {
-					fprintf(stderr, "Cannot concatenate files: Different AVC Profile Indication between source (%d) and destination (%d)\n", avc_src->AVCProfileIndication, avc_dst->AVCProfileIndication);
-					dst_tk = 0;
+			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) ) {
+					dst_tk = merge_avc_config(dest, tk_id, orig, i+1, force_cat);
 				}
-				else {
-					u32 j, k;
-					/*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); 
-						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, i+1, 8*avc_src->nal_unit_size, 8*avc_dst->nal_unit_size); 
-					}
-
-					/*merge SPS*/
-					for (j=0; j<gf_list_count(avc_src->sequenceParameterSets); j++) {
-						Bool found = 0;
-						GF_AVCConfigSlot *slc = gf_list_get(avc_src->sequenceParameterSets, j);
-						for (k=0; k<gf_list_count(avc_dst->sequenceParameterSets); k++) {
-							GF_AVCConfigSlot *slc_dst = gf_list_get(avc_dst->sequenceParameterSets, k);
-							if ( (slc->size==slc_dst->size) && !memcmp(slc->data, slc_dst->data, slc->size) ) {
-								found = 1;
-								break;
-							}
-						}
-						if (!found) {
-							fprintf(stderr, "WARNING: Concatenating track ID %d with different SPS - result file might be broken\n", tk_id);
-							gf_list_rem(avc_src->sequenceParameterSets, j);
-							j--;
-							gf_list_add(avc_dst->sequenceParameterSets, slc);
-						}
-					}
-
-					/*merge PPS*/
-					for (j=0; j<gf_list_count(avc_src->pictureParameterSets); j++) {
-						Bool found = 0;
-						GF_AVCConfigSlot *slc = gf_list_get(avc_src->pictureParameterSets, j);
-						for (k=0; k<gf_list_count(avc_dst->pictureParameterSets); k++) {
-							GF_AVCConfigSlot *slc_dst = gf_list_get(avc_dst->pictureParameterSets, k);
-							if ( (slc->size==slc_dst->size) && !memcmp(slc->data, slc_dst->data, slc->size) ) {
-								found = 1;
-								break;
-							}
-						}
-						if (!found) {
-							fprintf(stderr, "WARNING: Concatenating track ID %d with different PPS - result file might be broken\n", tk_id);
-							gf_list_rem(avc_src->pictureParameterSets, j);
-							j--;
-							gf_list_add(avc_dst->pictureParameterSets, slc);
-						}
-					}
-					gf_isom_avc_config_update(dest, dst_tk, 1, avc_dst);
+				/*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)) {
+					dst_tk = merge_hevc_config(dest, tk_id, orig, i+1, force_cat);
 				}
-
-				gf_odf_avc_cfg_del(avc_src);
-				gf_odf_avc_cfg_del(avc_dst);
-			}
-
-			if (!dst_tk && force_cat) {
-				dst_tk = gf_isom_get_track_by_id(dest, tk_id);
-				fprintf(stderr, "WARNING: Concatenating track ID %d even though sample descriptions do not match\n", tk_id);
 			}
 		}
 
@@ -2161,12 +2259,12 @@
 #endif /*GPAC_DISABLE_BIFS_ENC*/
 
 /**
- * @chunkFile BT chunk to be encoded
- * @bifs output file name for the BIFS data
- * @inputContext initial BT upon which the chunk is based (shall not be NULL)
- * @outputContext: file name to dump the context after applying the new chunk to the input context 
+ * \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 
                    can be NULL, without .bt
- * @logFile: can be NULL
+ * \param tmpdir can be NULL
  */
 GF_Err EncodeFileChunk(char *chunkFile, char *bifs, char *inputContext, char *outputContext, const char *tmpdir) 
 {
@@ -2419,7 +2517,7 @@
 	if (e) goto exit;
 	/*add self ref*/
 	if (isom_src) {
-		e = gf_isom_add_meta_item(file, 1, 0, 1, NULL, isom_src, NULL, NULL, NULL,  NULL);
+		e = gf_isom_add_meta_item(file, 1, 0, 1, NULL, isom_src, 0, NULL, NULL, NULL,  NULL);
 		if (e) goto exit;
 	}
 	e = gf_isom_set_meta_xml(file, 1, 0, file_name, !ascii);
@@ -2457,7 +2555,7 @@
 		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, mime, NULL, NULL,  NULL);
+		e = gf_isom_add_meta_item(file, 1, 0, 0, item, name, 0, mime, NULL, NULL,  NULL);
 		gf_free(name);
 		if (e) goto exit;
 	}

gpac-0.5.0.svn4668.tar.bz2/applications/mp4box/live.c -> gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/live.c Changed

gpac-0.5.0.svn4668.tar.bz2/applications/mp4box/main.c -> gpac-0.5.0.svn5178.tar.bz2/applications/mp4box/main.c Changed

@@ -83,12 +83,13 @@
 #endif
 
 GF_Err dump_cover_art(GF_ISOFile *file, char *inName);
-GF_Err dump_chapters(GF_ISOFile *file, char *inName);
+GF_Err dump_chapters(GF_ISOFile *file, char *inName, Bool dump_ogg);
 u32 id3_get_genre_tag(const char *name);
 
 /*in filedump.c*/
 #ifndef GPAC_DISABLE_SCENE_DUMP
 GF_Err dump_file_text(char *file, char *inName, u32 dump_mode, Bool do_log);
+//void gf_check_isom_files(char *conf_rules, char *inName);
 #endif
 #ifndef GPAC_DISABLE_SCENE_STATS
 void dump_scene_stats(char *file, char *inName, u32 stat_level);
@@ -189,7 +190,7 @@
 {
 	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"
@@ -264,6 +265,7 @@
 			" -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");
 }
 
@@ -284,10 +286,15 @@
 			"                       * 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"
@@ -321,6 +328,9 @@
 			" -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"
@@ -332,6 +342,9 @@
 			" -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");
 }
@@ -403,12 +416,16 @@
 			" \":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" 
+			" \":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"
@@ -429,14 +446,25 @@
 			"                         - 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"
+			" \":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."
-			" -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"
+			"                         * 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"
@@ -452,9 +480,9 @@
 			" -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"
+			" -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"
@@ -509,9 +537,9 @@
 			"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 \"ISMACrypTrack\" elements\n"
+			"                      File is a list of \"cryptrack\" elements\n"
 			"\n"
-			"ISMACrypTrack attributes are\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"
@@ -568,13 +596,17 @@
 }
 void PrintExtractUsage()
 {
-	fprintf(stderr, "Extracting Options\n"
+	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\" for full dump\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" 
@@ -644,6 +676,7 @@
 			"                        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"
@@ -1077,7 +1110,6 @@
 	char *line;
 } SDPLine;
 
-
 typedef struct
 {
 	/*actions:
@@ -1101,11 +1133,13 @@
 } MetaAction;
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-static Bool parse_meta_args(MetaAction *meta, char *opts)
+static Bool parse_meta_args(MetaAction *meta, u32 act_type, char *opts)
 {
 	Bool ret = 0;
 	char szSlot[1024], *next;
 
+	memset(meta, 0, sizeof(MetaAction));
+	meta->act_type = act_type;
 	meta->mime_type[0] = 0;
 	meta->enc_type[0] = 0;
 	meta->szName[0] = 0;
@@ -1128,6 +1162,7 @@
 			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; }
@@ -1280,6 +1315,7 @@
 	const char *hdl_name;
 	s32 par_num, par_den;
 	u32 dump_type, sample_num;
+	char *out_name;
 } TrackAction;
 
 enum
@@ -1295,7 +1331,13 @@
 	if (mpd_base_urls) gf_free(mpd_base_urls);	\
 	if (sdp_lines) gf_free(sdp_lines); \
 	if (metas) gf_free(metas); \
-	if (tracks) gf_free(tracks); \
+	if (tracks) { \
+		for (i=0; i<nb_track_act; i++) { \
+			if (tracks[i].out_name) \
+				gf_free(tracks[i].out_name); \
+		} \
+		gf_free(tracks); \
+	}\
 	if (tsel_acts) gf_free(tsel_acts); \
 	if (brand_add) gf_free(brand_add); \
 	if (brand_rem) gf_free(brand_rem); \
@@ -1320,11 +1362,34 @@
 		sep[0] = 0;
 		while (opts) {
 			sep = strchr(opts, ':');
+			if (sep && !strncmp(sep, "://", 3)) sep = strchr(sep+3, ':');
 			if (sep) sep[0] = 0;
-			if (!strnicmp(opts, "id=", 3)) strncpy(di->representationID, opts+3, 99);
-			else if (!strnicmp(opts, "period=", 7)) strncpy(di->periodID, opts+7, 99);
+
+			if (!strnicmp(opts, "id=", 3)) {
+				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++) {
+					GF_DashSegmenterInput *other_di;
+					other_di = &dash_inputs[i];
+					if (!strcmp(other_di->representationID, di->representationID)) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: Duplicate Representation ID \"%s\" in command line\n", di->representationID));
+					}
+				}
+			} else if (!strnicmp(opts, "period=", 7)) {
+				if (strlen(opts+7) > 99) {
+					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, "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] = ':';
@@ -1337,6 +1402,56 @@
 	return dash_inputs;
 }
 
+static GF_Err parse_track_action_params(char *string, TrackAction *action)
+{
+	char *param = string;
+	while (param) {
+		param = strchr(param, ':');
+		if (param) {
+			*param = 0;
+			param++;
+#ifndef GPAC_DISABLE_MEDIA_EXPORT
+			if (!strncmp("vttnomerge", param, 10)) {
+				action->dump_type |= GF_EXPORT_WEBVTT_NOMERGE;
+			} else if (!strncmp("layer", param, 5)) {
+				action->dump_type |= GF_EXPORT_SVC_LAYER;
+			} else if (!strncmp("full", param, 4)) {
+				action->dump_type |= GF_EXPORT_NHML_FULL;
+			} else if (!strncmp("embedded", param, 8)) {
+				action->dump_type |= GF_EXPORT_WEBVTT_META_EMBEDDED;
+			} else if (!strncmp("output=", param, 7)) {
+				action->out_name = gf_strdup(param+7);
+			} else if (action->dump_type == GF_EXPORT_RAW_SAMPLES) {
+				action->sample_num = atoi(param);
+			}
+#endif
+		} 
+	}
+	if (!strcmp(string, "*")) {
+		action->trackID = (u32) -1;
+	} else {
+	    action->trackID = atoi(string);
+	}
+	return GF_OK;
+}
+
+static u32 create_new_track_action(char *string, TrackAction **actions, u32 *nb_track_act, u32 dump_type)
+{
+	*actions = (TrackAction *)gf_realloc(*actions, sizeof(TrackAction) * (*nb_track_act+1));
+	memset(&(*actions)[*nb_track_act], 0, sizeof(TrackAction) );
+	(*actions)[*nb_track_act].act_type = 9;
+	(*actions)[*nb_track_act].dump_type = dump_type;
+	parse_track_action_params(string, &(*actions)[*nb_track_act]);
+	(*nb_track_act)++;
+	return dump_type;
+}
+
+static void on_gpac_log(void *cbk, u32 ll, u32 lm, const char *fmt, va_list list)
+{
+	FILE *logs = cbk;
+	vfprintf(logs, fmt, list);
+	fflush(logs);
+}
 
 int mp4boxMain(int argc, char **argv)
 {
@@ -1350,17 +1465,20 @@
 	MetaAction *metas = NULL;
 	TrackAction *tracks = NULL;
 	TSELAction *tsel_acts = NULL;
-	u64 movie_time;
+	u64 movie_time, initial_tfdt;
 	s32 subsegs_per_sidx;
 	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, ismaCrypt, 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;
-	Bool HintIt, needSave, FullInter, Frag, HintInter, dump_std, dump_rtp, dump_mode, regular_iod, trackID, remove_sys_tracks, remove_hint, force_new, remove_root_od, import_subtitle, dump_chap;
-	Bool print_sdp, print_info, open_edit, track_dump_type, 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;
+	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;
+	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;
 	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;
 	Double min_buffer = 1.5;
 	u32 ast_shift_sec = 1;
+	u32 dump_chap = 0;
 	char **mpd_base_urls = NULL;
 	u32 nb_mpd_base_urls=0;
 	u32 dash_scale = 1000;
@@ -1381,6 +1499,8 @@
 	Bool live_scene=0;
 	Bool enable_mem_tracker = 0;
 	Bool dump_iod=0;
+	Bool pssh_in_moof=0;
+	Bool samplegroups_in_traf=0;
 	Bool daisy_chain_sidx=0;
 	Bool single_segment=0;
 	Bool single_file=0;
@@ -1392,6 +1512,7 @@
 	Bool frag_at_rap=0;
 	Bool adjust_split_end = 0;
 	Bool memory_frags = 1;
+	Bool keep_utc = 0;
 	const char *do_wget = NULL;
 	GF_DashSegmenterInput *dash_inputs = NULL;
 	u32 nb_dash_inputs = 0;
@@ -1403,6 +1524,7 @@
 #if !defined(GPAC_DISABLE_STREAMING)
 	const char *grab_m2ts = 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;
@@ -1417,17 +1539,20 @@
 	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;
-	conv_type = HintIt = needSave = print_sdp = print_info = regular_iod = dump_std = open_edit = dump_isom = dump_rtp = dump_cr = dump_chap = dump_srt = dump_ttxt = force_new = dump_timestamps = dump_m2ts = dump_cart = import_subtitle = force_cat = pack_wgt = dash_live = 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;
 	dash_dynamic = 0;
 	/*align cat is the new default behaviour for -cat*/
 	align_cat = 1;
 	subsegs_per_sidx = 0;
 	track_dump_type = 0;
-	ismaCrypt = 0;
+	crypt = 0;
 	time_shift_depth = 0;
 	file = NULL;
 	itunes_tags = pes_dump = NULL;
 	seg_name = dash_ctx_file = NULL;
+	initial_moof_sn = 0;
+	initial_tfdt = 0;
 
 #ifndef GPAC_DISABLE_SCENE_ENCODER
 	memset(&opts, 0, sizeof(opts));
@@ -1502,8 +1627,15 @@
 		else if (!stricmp(arg, "-logs")) {
 			CHECK_NEXT_ARG
 			gf_logs = argv[i+1];
+			if (gf_logs)
+				gf_log_set_tools_levels(gf_logs);
 			i++;
 		}
+		else if (!strcmp(arg, "-log-file") || !strcmp(arg, "-lf")) {
+			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;
@@ -1523,11 +1655,13 @@
 			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")) {
 			dvbhdemux = 1;
@@ -1535,44 +1669,18 @@
 		/********************************************************************************/
 #ifndef GPAC_DISABLE_MEDIA_EXPORT
 		else if (!stricmp(arg, "-raw")) {
-            char *raw_params;
 			CHECK_NEXT_ARG
-			track_dump_type = GF_EXPORT_NATIVE;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			tracks[nb_track_act].act_type = 9;
-			tracks[nb_track_act].dump_type = GF_EXPORT_NATIVE;
-            raw_params = strchr(argv[i+1], ':');
-            if (raw_params) {
-                *raw_params = 0;
-                raw_params++;
-                if (!strcmp("vttnomerge", raw_params)) {
-                    tracks[nb_track_act].dump_type |= GF_EXPORT_WEBVTT_NOMERGE;
-                } else if (!strcmp("layer", raw_params)) {
-                    tracks[nb_track_act].dump_type |= GF_EXPORT_SVC_LAYER;
-                }
-            }
-            tracks[nb_track_act].trackID = atoi(argv[i+1]);
-			nb_track_act++;
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NATIVE);
 			i++;
 		}
 		else if (!stricmp(arg, "-raw-layer")) {
 			CHECK_NEXT_ARG
-			track_dump_type = GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			tracks[nb_track_act].act_type = 9;
-			tracks[nb_track_act].trackID = atoi(argv[i+1]);
-			tracks[nb_track_act].dump_type = GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER;
-			nb_track_act++;
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NATIVE | GF_EXPORT_SVC_LAYER);
 			i++;
 		}
 		else if (!stricmp(arg, "-qcp")) {
 			CHECK_NEXT_ARG
-			track_dump_type = GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			tracks[nb_track_act].act_type = 9;
-			tracks[nb_track_act].trackID = atoi(argv[i+1]);
-			tracks[nb_track_act].dump_type = GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP;
-			nb_track_act++;
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NATIVE | GF_EXPORT_USE_QCP);
 			i++;
 		}
 		else if (!stricmp(arg, "-aviraw")) {
@@ -1584,56 +1692,36 @@
 			}
 			else { fprintf(stderr, "Usage: \"-aviraw video\" or \"-aviraw audio\"\n"); MP4BOX_EXIT_WITH_CODE(1); }
 			track_dump_type = GF_EXPORT_AVI_NATIVE;
-
 			i++;
 		}
 		else if (!stricmp(arg, "-raws")) {
 			CHECK_NEXT_ARG
-			track_dump_type = GF_EXPORT_RAW_SAMPLES;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			tracks[nb_track_act].act_type = 9;
-			if (strchr(argv[i+1], ':')) {
-				sscanf(argv[i+1], "%u:%u", &tracks[nb_track_act].trackID, &tracks[nb_track_act].sample_num);
-			} else {
-				tracks[nb_track_act].trackID = atoi(argv[i+1]);
-			}
-			tracks[nb_track_act].dump_type = GF_EXPORT_RAW_SAMPLES;
-			nb_track_act++;
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_RAW_SAMPLES);
 			i++;
 		}
 		else if (!stricmp(arg, "-nhnt")) {
 			CHECK_NEXT_ARG
-			track_dump_type = GF_EXPORT_NHNT;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			tracks[nb_track_act].act_type = 9;
-			tracks[nb_track_act].trackID = atoi(argv[i+1]);
-			tracks[nb_track_act].dump_type = GF_EXPORT_NHNT;
-			nb_track_act++;
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NHNT);
 			i++;
 		}
 		else if (!stricmp(arg, "-nhml")) {
 			CHECK_NEXT_ARG
-			track_dump_type = GF_EXPORT_NHML;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			tracks[nb_track_act].act_type = 9;
-			tracks[nb_track_act].dump_type = GF_EXPORT_NHML;
-			if (argv[i+1][0]=='+') {
-				track_dump_type |= GF_EXPORT_NHML_FULL;
-				tracks[nb_track_act].trackID = atoi(argv[i+1] + 1);
-			} else {
-				tracks[nb_track_act].trackID = atoi(argv[i+1]);
-			}
-			nb_track_act++;
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_NHML);
+			i++;
+		}
+		else if (!stricmp(arg, "-webvtt-raw")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_WEBVTT_META);
+			i++;
+		}
+		else if (!stricmp(arg, "-six")) {
+			CHECK_NEXT_ARG
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_SIX);
 			i++;
 		}
 		else if (!stricmp(arg, "-avi")) {
 			CHECK_NEXT_ARG
-			track_dump_type = GF_EXPORT_AVI;
-			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
-			tracks[nb_track_act].act_type = 9;
-			tracks[nb_track_act].trackID = atoi(argv[i+1]);
-			tracks[nb_track_act].dump_type = GF_EXPORT_AVI;
-			nb_track_act++;
+			track_dump_type = create_new_track_action(argv[i+1], &tracks, &nb_track_act, GF_EXPORT_AVI);
 			i++;
 		}
 #endif /*GPAC_DISABLE_MEDIA_EXPORT*/
@@ -1677,8 +1765,20 @@
 		else if (!stricmp(arg, "-diso")) dump_isom = 1;
 		else if (!stricmp(arg, "-dump-cover")) dump_cart = 1;
 		else if (!stricmp(arg, "-dump-chap")) dump_chap = 1;
+		else if (!stricmp(arg, "-dump-chap-ogg")) dump_chap = 2;
 		else if (!stricmp(arg, "-hash")) do_hash = 1;
 
+#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) { 
+				gf_check_isom_files(NULL, argv[i+1]);
+			} else {
+				gf_check_isom_files(argv[i+1], argv[i+2]);
+			}
+			MP4BOX_EXIT_WITH_CODE(0);
+		}
+#endif
 		else if (!stricmp(arg, "-dmp4")) {
 			dump_isom = 1;
 			fprintf(stderr, "WARNING: \"-dmp4\" is deprecated - use \"-diso\" option\n");
@@ -1775,6 +1875,10 @@
 		} else if (!stricmp(arg, "-dash")) {
 			CHECK_NEXT_ARG
 			dash_duration = atof(argv[i+1]) / 1000;
+			if (dash_duration == 0.0) {
+				fprintf(stderr, "\tERROR: \"-dash-dash_duration\": invalid parameter %s\n", argv[i+1]);
+				MP4BOX_EXIT_WITH_CODE(1);
+			}
 			i++;
 		} else if (!stricmp(arg, "-subdur")) {
 			CHECK_NEXT_ARG
@@ -1841,6 +1945,17 @@
 			ast_shift_sec = (u32) atoi(argv[i+1]);
 			i++;
 		}
+		else if (!stricmp(arg, "-moof-sn")) { 
+			CHECK_NEXT_ARG 
+			initial_moof_sn = (u32) atoi(argv[i+1]);
+			i++;
+		}
+		else if (!stricmp(arg, "-tfdt")) { 
+			CHECK_NEXT_ARG 
+			sscanf(argv[i+1], LLU, &initial_tfdt);
+			i++;
+		}
+		else if (!stricmp(arg, "-no-frags-default")) { no_fragments_defaults = 1; }
 		else if (!stricmp(arg, "-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++; }
@@ -1863,11 +1978,21 @@
 			single_segment = 1;
 		} else if (!stricmp(arg, "-single-file")) {
 			single_file = 1;
+		} else if (!stricmp(arg, "-pssh-moof")) {
+			pssh_in_moof = 1;
+		} else if (!stricmp(arg, "-sample-groups-traf")) {
+			samplegroups_in_traf = 1;
 		} else if (!stricmp(arg, "-dash-profile") || !stricmp(arg, "-profile")) {
 			CHECK_NEXT_ARG
 			if (!stricmp(argv[i+1], "live") || !stricmp(argv[i+1], "simple")) dash_profile = GF_DASH_PROFILE_LIVE;
 			else if (!stricmp(argv[i+1], "onDemand")) dash_profile = GF_DASH_PROFILE_ONDEMAND;
-			else if (!stricmp(argv[i+1], "main")) dash_profile = GF_DASH_PROFILE_MAIN;
+			else if (!stricmp(argv[i+1], "dashavc264:live")) {
+				dash_profile = GF_DASH_PROFILE_AVC264_LIVE;
+				no_fragments_defaults = 1;
+			} else if (!stricmp(argv[i+1], "dashavc264:onDemand")) {
+				dash_profile = GF_DASH_PROFILE_AVC264_ONDEMAND;
+				no_fragments_defaults = 1;
+			} else if (!stricmp(argv[i+1], "main")) dash_profile = GF_DASH_PROFILE_MAIN;
 			else dash_profile = GF_DASH_PROFILE_FULL;
 			i++;
 		} else if (!strnicmp(arg, "-url-template", 13)) {
@@ -1961,6 +2086,7 @@
 			CHECK_NEXT_ARG
 			track_dump_type = GF_EXPORT_MP4;
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 			tracks[nb_track_act].act_type = 9;
 			tracks[nb_track_act].trackID = atoi(argv[i+1]);
 			tracks[nb_track_act].dump_type = GF_EXPORT_MP4;
@@ -1970,6 +2096,7 @@
 		}
 		else if (!stricmp(arg, "-iod")) regular_iod = 1;
 		else if (!stricmp(arg, "-flat")) do_flat = 1;
+		else if (!stricmp(arg, "-keep-utc")) keep_utc = 1;
 		else if (!stricmp(arg, "-new")) force_new = 1;
 		else if (!stricmp(arg, "-add") || !stricmp(arg, "-import") || !stricmp(arg, "-convert")) {
 			CHECK_NEXT_ARG
@@ -2007,6 +2134,7 @@
 		else if (!stricmp(arg, "-rem") || !stricmp(arg, "-disable") || !stricmp(arg, "-enable")) {
 			CHECK_NEXT_ARG
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
 			if (!stricmp(arg, "-enable")) tracks[nb_track_act].act_type = 6;
 			else if (!stricmp(arg, "-disable")) tracks[nb_track_act].act_type = 7;
@@ -2020,6 +2148,7 @@
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
 			tracks[nb_track_act].act_type = 4;
 			assert(strlen(argv[i+1])+1 <= sizeof(szTK));
@@ -2050,6 +2179,7 @@
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
 			tracks[nb_track_act].act_type = 1;
 			tracks[nb_track_act].lang[3] = 0;
@@ -2074,6 +2204,7 @@
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
 			strcpy(szTK, argv[i+1]);
 			ext = strchr(szTK, '=');
@@ -2093,6 +2224,7 @@
 			char *szTK, *ext;
 			CHECK_NEXT_ARG
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
 			szTK = argv[i+1];
 			ext = strchr(szTK, ':');
@@ -2119,6 +2251,7 @@
 			char szTK[GF_MAX_PATH], *ext;
 			CHECK_NEXT_ARG
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
 			strcpy(szTK, argv[i+1]);
 			ext = strchr(szTK, '=');
@@ -2233,14 +2366,14 @@
 #endif /*GPAC_DISABLE_SCENE_ENCODER*/
 		else if (!strcmp(arg, "-crypt")) {
 			CHECK_NEXT_ARG
-			ismaCrypt = 1;
+			crypt = 1;
 			drm_file = argv[i+1];
 			open_edit = 1;
 			i += 1;
 		}
 		else if (!strcmp(arg, "-decrypt")) {
 			CHECK_NEXT_ARG
-			ismaCrypt = 2;
+			crypt = 2;
 			if (get_file_type_by_ext(argv[i+1])!=1) {
 				drm_file = argv[i+1];
 				i += 1;
@@ -2251,6 +2384,7 @@
 			char szTK[20], *ext;
 			CHECK_NEXT_ARG
 			tracks = gf_realloc(tracks, sizeof(TrackAction) * (nb_track_act+1));
+			memset(&tracks[nb_track_act], 0, sizeof(TrackAction) );
 
 			strncpy(szTK, argv[i+1], 19);
 			ext = strchr(szTK, '=');
@@ -2284,8 +2418,7 @@
 		}
 		else if (!stricmp(arg, "-split-size") || !stricmp(arg, "-splits")) { 
 			CHECK_NEXT_ARG 
-			split_size = atoi(argv[i+1]);
-			if (split_size<0) split_size = 0; 
+			split_size = (u32) atoi(argv[i+1]);
 			i++; 
 			split_duration = 0;
 		}
@@ -2309,70 +2442,54 @@
 		/*meta*/
 		else if (!stricmp(arg, "-set-meta")) { 
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-
-			metas[nb_meta_act].act_type = 0;
-			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], 0, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
 		else if (!stricmp(arg, "-add-item")) { 
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-
-			metas[nb_meta_act].act_type = 1;
-			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], 1, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
 		else if (!stricmp(arg, "-rem-item")) { 
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-
-			metas[nb_meta_act].act_type = 2;
-			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], 2, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
 		else if (!stricmp(arg, "-set-primary")) { 
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-
-			metas[nb_meta_act].act_type = 3;
-			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], 3, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
 		else if (!stricmp(arg, "-set-xml")) { 
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-
-			metas[nb_meta_act].act_type = 4;
-			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], 4, argv[i+1]);
 			nb_meta_act++;
 			open_edit = 1;
 			i++;
 		}
 		else if (!stricmp(arg, "-rem-xml")) { 
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-
-			metas[nb_meta_act].act_type = 6;
-			if (parse_meta_args(&metas[nb_meta_act], argv[i+1])) i++;
+			if (parse_meta_args(&metas[nb_meta_act], 6, argv[i+1])) i++;
 			nb_meta_act++;
 			open_edit = 1;
 		}
 		else if (!stricmp(arg, "-dump-xml")) { 
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-
-			metas[nb_meta_act].act_type = 7;
-			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], 7, argv[i+1]);
 			nb_meta_act++;
 			i++;
 		}
 		else if (!stricmp(arg, "-dump-item")) { 
 			metas = gf_realloc(metas, sizeof(MetaAction) * (nb_meta_act+1));
-
-			metas[nb_meta_act].act_type = 8;
-			parse_meta_args(&metas[nb_meta_act], argv[i+1]);
+			parse_meta_args(&metas[nb_meta_act], 8, argv[i+1]);
 			nb_meta_act++;
 			i++;
 		}
@@ -2573,7 +2690,7 @@
 	}
 
 	if (gf_logs) {
-		gf_log_set_tools_levels(gf_logs);
+		//gf_log_set_tools_levels(gf_logs);
 	} else {
 		u32 level = verbose ? GF_LOG_DEBUG : GF_LOG_INFO;
 		gf_log_set_tool_level(GF_LOG_CONTAINER, level);
@@ -2592,6 +2709,7 @@
 		}
 	}
 
+#if !defined(DISABLE_CORE_TOOLS)
 	if (do_wget != NULL) {
 		e = gf_dm_wget(do_wget, inName, 0, 0);
 		if (e != GF_OK) {
@@ -2599,12 +2717,14 @@
 		}
 		MP4BOX_EXIT_WITH_CODE(1);
 	}
-
+#endif
+    
 #ifndef GPAC_DISABLE_MPD
 	if (do_mpd) {
 		Bool remote = 0;
 		char *mpd_base_url = gf_strdup(inName);
 		if (!strnicmp(inName, "http://", 7)) {
+#if !defined(GPAC_DISABLE_CORE_TOOLS)
 			e = gf_dm_wget(inName, "tmp_main.m3u8", 0, 0);
 			if (e != GF_OK) {
 				fprintf(stderr, "Cannot retrieve M3U8 (%s): %s\n", inName, gf_error_to_string(e));
@@ -2613,9 +2733,14 @@
 			}
 			inName = "tmp_main.m3u8";
 			remote = 1;
+#else
+			fprintf(stderr, "HTTP Downloader disabled in this build\n");
+            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");
 		}
@@ -2845,7 +2970,6 @@
 	} 
 #endif
 
-
 	if (dash_duration) {
 		Bool del_file = GF_FALSE;
 		char szMPD[GF_MAX_PATH], *sep;
@@ -2859,7 +2983,7 @@
 		strcpy(szMPD, outfile);
 		strcat(szMPD, ".mpd");
 
-		if (dash_dynamic)
+		if (dash_dynamic && dash_live)
 			fprintf(stderr, "Live DASH-ing - press 'q' to quit, 's' to save context and quit\n");
 
 		if (!dash_ctx_file && dash_live) {
@@ -2895,7 +3019,8 @@
 									   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);
+									   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);
 			if (e) break;
 
 			if (dash_live) {
@@ -2978,7 +3103,7 @@
 		case 3:
 		/*allowed for svg->lsr**/
 		case 4:
-		/*allowed for swf->bt, swf->xmt*/
+		/*allowed for swf->bt, swf->xmt, swf->svg*/
 		case 5:
 			break;
 		/*used for .saf / .lsr dump*/
@@ -3043,6 +3168,10 @@
 		}
 	}
 
+	if (file && keep_utc && open_edit) {
+		gf_isom_keep_utc_times(file, 1);
+	}
+
 	strcpy(outfile, outName ? outName : inName);
 	if (strrchr(outfile, '.')) {
 		char *szExt = strrchr(outfile, '.');
@@ -3154,7 +3283,7 @@
 		fprintf(stderr, "\n");
 	}
 	if (dump_cart) dump_cover_art(file, outfile);
-	if (dump_chap) dump_chapters(file, outfile);
+	if (dump_chap) dump_chapters(file, outfile, (dump_chap==2) ? 1 : 0);
 
 	if (dump_iod) {
 		GF_InitialObjectDescriptor *iod = (GF_InitialObjectDescriptor *)gf_isom_get_root_od(file);
@@ -3206,15 +3335,28 @@
 			mdump.flags = tka->dump_type;
 			mdump.trackID = tka->trackID;
 			mdump.sample_num = raw_sample_num;
-			if (outName) {
+			if (tka->out_name) {
+				mdump.out_name = tka->out_name;
+			} else if (outName) {
 				mdump.out_name = outName;
 				mdump.flags |= GF_EXPORT_MERGE;
 			} else {
 				sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
 				mdump.out_name = szFile;
 			}
-			e = gf_media_export(&mdump);
-			if (e) goto err_exit;
+			if (tka->trackID==(u32) -1) {
+				u32 j;
+				for (j=0; j<gf_isom_get_track_count(file); j++) {
+					mdump.trackID = gf_isom_get_track_id(file, j+1);
+					sprintf(szFile, "%s_track%d", outfile, mdump.trackID);
+					mdump.out_name = szFile;
+					e = gf_media_export(&mdump);
+					if (e) goto err_exit;
+				}
+			} else {
+				e = gf_media_export(&mdump);
+				if (e) goto err_exit;
+			}
 		}
 	} else if (do_saf) {
 		GF_MediaExporter mdump;
@@ -3246,6 +3388,7 @@
 			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);
@@ -3382,7 +3525,7 @@
 		if ((conv_type == GF_ISOM_CONV_TYPE_ISMA) || (conv_type == GF_ISOM_CONV_TYPE_ISMA_EX)) {
 			fprintf(stderr, "Converting to ISMA Audio-Video MP4 file...\n");
 			/*keep ESIDs when doing ISMACryp*/
-			e = gf_media_make_isma(file, ismaCrypt ? 1 : 0, 0, (conv_type==GF_ISOM_CONV_TYPE_ISMA_EX) ? 1 : 0);
+			e = gf_media_make_isma(file, crypt ? 1 : 0, 0, (conv_type==GF_ISOM_CONV_TYPE_ISMA_EX) ? 1 : 0);
 			if (e) goto err_exit;
 			needSave = 1;
 		}
@@ -3459,16 +3602,16 @@
 		}
 
 #ifndef GPAC_DISABLE_MCRYPT
-		if (ismaCrypt) {
-			if (ismaCrypt == 1) {
-				if (!drm_file) {
-					fprintf(stderr, "Missing DRM file location - usage '-%s drm_file input_file\n", (ismaCrypt==1) ? "crypt" : "decrypt");
-					e = GF_BAD_PARAM;
-					goto err_exit;
-				}
-				e = gf_ismacryp_crypt_file(file, drm_file);
-			} else if (ismaCrypt ==2) {
-				e = gf_ismacryp_decrypt_file(file, drm_file);
+		if (crypt) {
+			if (!drm_file) {
+				fprintf(stderr, "Missing DRM file location - usage '-%s drm_file input_file\n", (crypt==1) ? "crypt" : "decrypt");
+				e = GF_BAD_PARAM;
+				goto err_exit;
+			}
+			if (crypt == 1) {
+				e = gf_crypt_file(file, drm_file);
+			} else if (crypt ==2) {
+				e = gf_decrypt_file(file, drm_file);
 			}
 			if (e) goto err_exit;
 			needSave = 1;

gpac-0.5.0.svn5178.tar.bz2/applications/mp4box_android/jni/README.txt Added

gpac-0.5.0.svn4668.tar.bz2/applications/mp4client/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/mp4client/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/mp4client/main.c -> gpac-0.5.0.svn5178.tar.bz2/applications/mp4client/main.c Changed

@@ -31,10 +31,12 @@
 #include <gpac/options.h>
 #include <gpac/modules/service.h>
 #include <gpac/avparse.h>
+#include <time.h>
 
 /*ISO 639 languages*/
 #include <gpac/iso639.h>
 
+//FIXME we need a plugin for playlists 
 #include <gpac/internal/terminal_dev.h>
 
 
@@ -59,7 +61,7 @@
 void ViewODs(GF_Terminal *term, Bool show_timing);
 void PrintGPACConfig();
 
-static Bool gui_mode = GF_FALSE;
+static u32 gui_mode = 0;
 
 static Bool restart = GF_FALSE;
 static Bool reload = GF_FALSE;
@@ -72,7 +74,10 @@
 static Bool no_audio = GF_FALSE;
 static Bool term_step = GF_FALSE;
 static Bool no_regulation = GF_FALSE;
-static Bool bench_mode = GF_FALSE;
+static u32 bench_mode = 0;
+static u32 bench_mode_start = 0;
+static u32 bench_buffer = 0;
+static Bool eos_seen = GF_FALSE;
 Bool is_connected = GF_FALSE;
 Bool startup_file = GF_FALSE;
 GF_User user;
@@ -80,14 +85,12 @@
 u64 Duration;
 GF_Err last_error = GF_OK;
 
-static Fixed bench_speed = FLT2FIX(20);
-
 static Bool request_next_playlist_item = GF_FALSE;
 FILE *playlist = NULL;
 static Bool readonly_playlist = GF_FALSE;
 
 static GF_Config *cfg_file;
-static Bool display_rti = GF_FALSE;
+static u32 display_rti = 0;
 static Bool Run;
 static Bool CanSeek = GF_FALSE;
 static char the_url[GF_MAX_PATH];
@@ -178,6 +181,7 @@
 		"\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"
 #if defined(__DARWIN__) || defined(__APPLE__)
 		"\t-thread:        enables thread usage for terminal and compositor \n"
@@ -195,6 +199,9 @@
 		"\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"
@@ -251,6 +258,7 @@
 		"\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"
@@ -298,8 +306,6 @@
 }
 
 
-
-
 static void PrintTime(u64 time)
 {
 	u32 ms, h, m, s;
@@ -310,6 +316,8 @@
 	fprintf(stderr, "%02d:%02d:%02d.%03d", h, m, s, ms);
 }
 
+void PrintAVInfo(Bool final);
+
 
 static u32 rti_update_time_ms = 200;
 static FILE *rti_logs = NULL;
@@ -326,15 +334,18 @@
 	if (display_rti) {
 		char szMsg[1024];
 
-		if (rti.total_cpu_usage) {
-			sprintf(szMsg, "FPS %02.2f - CPU %02d (%02d) - Mem %d kB", 
-					gf_term_get_framerate(term, 1), rti.total_cpu_usage, rti.process_cpu_usage, (u32) (rti.gpac_memory / 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));
 		} else {
-			sprintf(szMsg, "FPS %02.2f - CPU %02d - Mem %d kB", 
-				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); 
 		} else {
 			GF_Event evt;
@@ -403,15 +414,14 @@
 }
 #endif
 
-void switch_bench()
+void switch_bench(u32 is_on)
 {
-	if (is_connected) {
-		bench_mode = !bench_mode;
-		display_rti = !display_rti;
-		ResetCaption();
-		gf_term_set_speed(term, bench_mode ? bench_speed : FIX_ONE);
-	}
+	bench_mode = is_on;
+	display_rti = is_on ? 2 : 0;
+	ResetCaption();
+	gf_term_set_option(term, GF_OPT_VIDEO_BENCH, is_on);
 }
+
 #ifndef WIN32
 #include <termios.h>
 int getch() {
@@ -441,7 +451,8 @@
 /**
  * Reads a line of input from stdin
  * @param line the buffer to fill
- * @param
+ * @param maxSize the maximum size of the line to read
+ * @param showContent boolean indicating if the line read should be printed on stderr or not 
  */
 static const char * read_line_input(char * line, int maxSize, Bool showContent){
     char read;
@@ -474,7 +485,9 @@
 	if (!term) return 0;
 	
 	if (gui_mode==1) {
-		if (evt->type==GF_EVENT_QUIT) Run = 0;
+		if (evt->type==GF_EVENT_QUIT) {
+			Run = 0;
+		}
 		return 0;
 	}
 
@@ -495,6 +508,7 @@
 			servName = evt->message.service;
 		}
 
+
 		if (!evt->message.message) return 0;
 
 		if (evt->message.error) {
@@ -509,13 +523,23 @@
 	}
 		break;
 	case GF_EVENT_PROGRESS:
-	{
-		char *szTitle = "";
-		if (evt->progress.progress_type==0) szTitle = "Buffer ";
-		else if (evt->progress.progress_type==1) szTitle = "Download ";
-		else if (evt->progress.progress_type==2) szTitle = "Import ";
-		gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
-	}
+		{
+			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 ";
+			}
+			else if (evt->progress.progress_type==2) szTitle = "Import ";
+			gf_set_progress(szTitle, evt->progress.done, evt->progress.total);
+		}
 		break;
 	
 
@@ -551,7 +575,7 @@
 	case GF_EVENT_KEYUP:
 		switch (evt->key.key_code) {
 		case GF_KEY_SPACE:
-			if (evt->key.flags & GF_KEY_MOD_CTRL) switch_bench();
+			if (evt->key.flags & GF_KEY_MOD_CTRL) switch_bench(!bench_mode);
 			break;
 		}
 		break;
@@ -561,7 +585,7 @@
 		case GF_KEY_SPACE:
 			if (evt->key.flags & GF_KEY_MOD_CTRL) {
 				/*ignore key repeat*/
-				if (!bench_mode) switch_bench();
+				if (!bench_mode) switch_bench(!bench_mode);
 			}
 			break;
 		case GF_KEY_PAGEDOWN:
@@ -640,6 +664,7 @@
 		if (evt->connect.is_connected) {
 			is_connected = 1;
 			fprintf(stderr, "Service Connected\n");
+			eos_seen = GF_FALSE;
 		} else if (is_connected) {
 			fprintf(stderr, "Service %s\n", is_connected ? "Disconnected" : "Connection Failed");
 			is_connected = 0;
@@ -651,6 +676,7 @@
 		ResetCaption();
 		break;
 	case GF_EVENT_EOS:
+		eos_seen = GF_TRUE;
 		if (!playlist && loop_at_end) restart = 1;
 		break;
 	case GF_EVENT_SIZE:
@@ -704,6 +730,9 @@
 		return 1;
 
 	case GF_EVENT_QUIT:
+		if (evt->message.error)  {
+			fprintf(stderr, "A fatal error was encoutered: %s (%s) - exiting ...\n", evt->message.message ? evt->message.message : "no details", gf_error_to_string(evt->message.error) );
+		}
 		Run = 0;
 		break;
 	case GF_EVENT_DISCONNECT:
@@ -750,7 +779,6 @@
 		}
 		return 1;
 	}
-
 	}
 	return 0;
 }
@@ -853,7 +881,13 @@
 		UpdateRTInfo(szMsg + 6 /*"[RTI] "*/);
 	} else {
 		if (log_time_start) fprintf(logs, "[At %d]", gf_sys_clock() - log_time_start);
-		if (log_utc_time) fprintf(logs, "[UTC "LLU"]", gf_net_get_utc() );
+		if (log_utc_time) {
+			u64 utc_clock = gf_net_get_utc() ;
+			time_t secs = utc_clock/1000;
+			struct tm t;
+			t = *gmtime(&secs);
+			fprintf(logs, "[UTC %d-%02d-%02dT%02d:%02d:%02dZ - TS "LLU"]", 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec, utc_clock);
+		}
 		vfprintf(logs, fmt, list);
 		fflush(logs);
 	}
@@ -923,6 +957,7 @@
 	Bool rgbd_dump = GF_FALSE;
 	Bool depth_dump = GF_FALSE;
 	Bool pause_at_first = GF_FALSE;
+	Double play_from = 0;
 #ifdef GPAC_MEMORY_TRACKING
 	Bool enable_mem_tracker = GF_FALSE;
 #endif
@@ -1004,7 +1039,7 @@
 		} else if (!strcmp(arg, "-fill")) {
 			fill_ar = GF_TRUE;
 		} else if (!strcmp(arg, "-gui")) {
-			gui_mode = GF_TRUE;
+			gui_mode = 1;
 		} else if (!strcmp(arg, "-guid")) {
 			gui_mode = 2;
 		} else if (!strcmp(arg, "-show")) {
@@ -1088,6 +1123,9 @@
 		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
@@ -1097,10 +1135,17 @@
 #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++;
 		}
+		else if (!strcmp(arg, "-ifce")) {
+			gf_cfg_set_key(cfg_file, "Network", "DefaultMCastInterface", argv[i+1]);
+			i++;
+		}
 		else if (!stricmp(arg, "-views")) {
 			views = argv[i+1];
 			i++;
@@ -1134,7 +1179,6 @@
 	}
 
 	if (gui_mode) {
-		threading_flags = GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD;
 		if (gui_mode==1) {
 			hide_shell(1);
 			user.init_flags |= GF_TERM_WINDOW_NO_DECORATION;
@@ -1150,6 +1194,13 @@
 
 	if (rti_file) init_rti_logs(rti_file, url_arg, use_rtix);
 
+	{
+		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*/
 	if (dump_mode) {
 		user.init_flags |= GF_TERM_NO_AUDIO | GF_TERM_NO_DECODER_THREAD | GF_TERM_NO_COMPOSITOR_THREAD | GF_TERM_NO_REGULATION /*| GF_TERM_INIT_HIDE*/;
@@ -1181,6 +1232,20 @@
 
 	if (threading_flags & (GF_TERM_NO_DECODER_THREAD|GF_TERM_NO_COMPOSITOR_THREAD) ) term_step = 1;
 
+
+	if (bench_mode) {
+		gf_cfg_discard_changes(user.config);
+		auto_exit = 1;
+		gf_cfg_set_key(user.config, "Audio", "DriverName", "Raw Audio Output");
+		if (bench_mode!=2) {
+			gf_cfg_set_key(user.config, "Video", "DriverName", "Raw Video Output");
+			gf_cfg_set_key(user.config, "RAWVideo", "RawOutput", "null");
+			gf_cfg_set_key(user.config, "Compositor", "OpenGLMode", "disable");
+		} else {
+			gf_cfg_set_key(user.config, "Video", "DisableVSync", "yes");
+		}
+	}
+
 	fprintf(stderr, "Loading GPAC Terminal\n");	
 	i = gf_sys_clock();
 	term = gf_term_new(&user);
@@ -1188,6 +1253,7 @@
 		fprintf(stderr, "\nInit error - check you have at least one video out and one rasterizer...\nFound modules:\n");
 		list_modules(user.modules);
 		gf_modules_del(user.modules);
+		gf_cfg_discard_changes(cfg_file);
 		gf_cfg_del(cfg_file);
 		gf_sys_close();
 		if (logfile) fclose(logfile);
@@ -1195,13 +1261,19 @@
 	}
 	fprintf(stderr, "Terminal Loaded in %d ms\n", gf_sys_clock()-i);
 
+	if (bench_mode) {
+		display_rti = 2;
+		gf_term_set_option(term, GF_OPT_VIDEO_BENCH, (bench_mode==3) ? 2 : 1);
+		if (bench_mode==1) bench_mode=2;
+	}
+
 	if (dump_mode) {
 //		gf_term_set_option(term, GF_OPT_VISIBLE, 0);
 		if (fill_ar) gf_term_set_option(term, GF_OPT_ASPECT_RATIO, GF_ASPECT_RATIO_FILL_SCREEN);
 	} else {
 		/*check video output*/
 		str = gf_cfg_get_key(cfg_file, "Video", "DriverName");
-		if (!strcmp(str, "Raw Video Output")) fprintf(stderr, "WARNING: using raw output video (memory only) - no display used\n");
+		if (!bench_mode && !strcmp(str, "Raw Video Output")) fprintf(stderr, "WARNING: using raw output video (memory only) - no display used\n");
 		/*check audio output*/
 		str = gf_cfg_get_key(cfg_file, "Audio", "DriverName");
 		if (!str || !strcmp(str, "No Audio Output Available")) fprintf(stderr, "WARNING: no audio output available - make sure no other program is locking the sound card\n");
@@ -1276,7 +1348,7 @@
 		} else {
 			fprintf(stderr, "Opening URL %s\n", the_url);
 			if (pause_at_first) fprintf(stderr, "[Status: Paused]\n");
-			gf_term_connect_from_time(term, the_url, 0, pause_at_first);
+			gf_term_connect_from_time(term, the_url, (u64) (play_from*1000), pause_at_first);
 		}
 	} else {
 		fprintf(stderr, "Hit 'h' for help\n\n");
@@ -1299,6 +1371,10 @@
 		sprintf(szTemp, "views://%s", views);
 		gf_term_connect(term, szTemp);
 	}
+	if (bench_mode) {
+		rti_update_time_ms = 500;
+		bench_mode_start = gf_sys_clock();
+	}
 
 	while (Run) {		
 		/*we don't want getchar to block*/
@@ -1320,12 +1396,13 @@
 			if (!use_rtix || display_rti) UpdateRTInfo(NULL);
 			if (term_step) {
 				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);
 			}
+			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))
@@ -1642,6 +1719,21 @@
 			if (e) fprintf(stderr, "Processing command failed: %s\n", gf_error_to_string(e));
 		}
 			break;
+		case 'e':
+		{
+			GF_Err e;
+			char jsCode[8192];
+			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;
+			}
+			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;
 
 		case 'L':
 		{
@@ -1690,7 +1782,7 @@
 			break;
 
 		case 'B':
-			switch_bench();
+			switch_bench(!bench_mode);
 			break;
 
 		case 'Y':
@@ -1780,6 +1872,10 @@
 		}
 	}
 
+	if (bench_mode) { 
+		PrintAVInfo(GF_TRUE);
+	}
+
 	i = gf_sys_clock();
 	gf_term_disconnect(term);
 	if (rti_file) UpdateRTInfo("Disconnected\n");
@@ -1803,6 +1899,164 @@
 	return 0;
 }
 
+static GF_ObjectManager *video_odm = NULL;
+static GF_ObjectManager *audio_odm = NULL;
+static GF_ObjectManager *scene_odm = NULL;
+static u32 last_odm_count = 0;
+void PrintAVInfo(Bool final)
+{
+	GF_MediaInfo a_odi, v_odi, s_odi;
+	Double avg_dec_time=0;
+	u32 tot_time=0;
+	Bool print_codecs = final;
+
+	if (scene_odm) {
+		GF_ObjectManager *root_odm = gf_term_get_root_object(term);
+		u32 count = gf_term_get_object_count(term, root_odm);
+		if (last_odm_count != count) {
+			last_odm_count = count;
+			scene_odm = NULL;
+		}
+	}
+	if (!video_odm && !audio_odm && !scene_odm) {
+		u32 count, i;
+		GF_ObjectManager *root_odm = root_odm = gf_term_get_root_object(term);
+		if (!root_odm) return;
+
+		if (gf_term_get_object_info(term, root_odm, &v_odi)==GF_OK) {
+			if (!scene_odm  && (v_odi.generated_scene== 0)) {
+				scene_odm = root_odm;
+			}
+		}
+
+		count = gf_term_get_object_count(term, root_odm);
+		for (i=0; i<count; i++) {
+			GF_ObjectManager *odm = gf_term_get_object(term, root_odm, i);
+			if (!odm) break;
+			if (gf_term_get_object_info(term, odm, &v_odi) == GF_OK) {
+				if (!video_odm && (v_odi.od_type == GF_STREAM_VISUAL) && (v_odi.raw_media || (v_odi.cb_max_count>1) || v_odi.direct_video_memory) ) {
+					video_odm = odm;
+				}
+				else if (!audio_odm && (v_odi.od_type == GF_STREAM_AUDIO)) {
+					audio_odm = odm;
+				}
+				else if (!scene_odm && (v_odi.od_type == GF_STREAM_SCENE)) {
+					scene_odm = odm;
+				}
+			}
+		}
+	}
+
+	if (bench_buffer) {
+		fprintf(stderr, "Buffering %d %% ", bench_buffer-1);
+		return;
+	}
+
+	if (video_odm) {
+		if (gf_term_get_object_info(term, video_odm, &v_odi)!= GF_OK) {
+			video_odm = NULL;
+			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 (print_codecs && audio_odm) {
+		gf_term_get_object_info(term, audio_odm, &a_odi);
+	}
+	if ((print_codecs || !video_odm) && scene_odm) {
+		gf_term_get_object_info(term, scene_odm, &s_odi);
+	}
+
+	if (final) {
+		tot_time = gf_sys_clock() - bench_mode_start;
+		fprintf(stderr, "                                                                                     \r");
+		fprintf(stderr, "************** Bench Mode Done in %d ms ********************\n", tot_time);
+		if (bench_mode==3) fprintf(stderr, "** Systems layer only (no decoding) **\n");
+
+		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)  );
+		}
+	} 
+	if (print_codecs) {
+		if (video_odm) {
+			fprintf(stderr, "%s %dx%d sar=%d:%d duration %.2fs\n", v_odi.codec_name, v_odi.width, v_odi.height, v_odi.par ? (v_odi.par>>16)&0xFF : 1, v_odi.par ? (v_odi.par)&0xFF : 1, v_odi.duration);
+			if (final) {
+				u32 dec_run_time = v_odi.last_frame_time - v_odi.first_frame_time;
+				if (!dec_run_time) dec_run_time = 1;
+				if (v_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*v_odi.current_time / v_odi.duration ) );
+				fprintf(stderr, "%d frames FPS %.2f (max "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);
+				if (v_odi.nb_droped) {
+					fprintf(stderr, " (Error during bench: %d frames drop)", v_odi.nb_droped);
+				}
+				fprintf(stderr, "\n");
+			}
+		}
+		if (audio_odm) {
+			fprintf(stderr, "%s SR %d num channels %d bpp %d duration %.2fs\n", a_odi.codec_name, a_odi.sample_rate, a_odi.num_channels, a_odi.bits_per_sample, a_odi.duration);
+			if (final) {
+				u32 dec_run_time = a_odi.last_frame_time - a_odi.first_frame_time;
+				if (!dec_run_time) dec_run_time = 1;
+				if (a_odi.duration) fprintf(stderr, "%d%% ", (u32) (100*a_odi.current_time / a_odi.duration ) );
+				fprintf(stderr, "%d frames (ms/f %.2f avg %.2f max) rate avg %d max %d", a_odi.nb_dec_frames, ((Float)dec_run_time)/a_odi.nb_dec_frames, a_odi.max_dec_time/1000.0, (u32) a_odi.avg_bitrate/1000, (u32) a_odi.max_bitrate/1000);
+				if (a_odi.nb_droped) {
+					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) { 
+					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, "\n");
+				} else {
+					u32 nb_frames_drawn;
+					Double FPS = gf_term_get_simulation_frame_rate(term, &nb_frames_drawn);
+					tot_time = gf_sys_clock() - bench_mode_start;
+					FPS = gf_term_get_framerate(term, 0);
+					fprintf(stderr, "%d frames FPS %.2f (abs %.2f)\n", nb_frames_drawn, (1000.0*nb_frames_drawn / tot_time), FPS);
+				}
+			}
+		}
+		if (final) {
+			fprintf(stderr, "**********************************************************\n\n");
+			return;
+		}
+	}
+
+	if (video_odm) {
+		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);
+	}
+	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.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);
+		} 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);
+		}
+	}
+}
 
 void PrintWorldInfo(GF_Terminal *term)
 {
@@ -1994,7 +2248,7 @@
 			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 (%d max)\n\tTotal decoded frames %d\n", 
+		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);
 	}
 	if (odi.protection) fprintf(stderr, "Encrypted Media%s\n", (odi.protection==2) ? " NOT UNLOCKED" : "");
@@ -2222,7 +2476,7 @@
 	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 (%d max)\n",
+	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);
 }

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/MainFrm.cpp -> gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/MainFrm.cpp Changed

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Options.cpp -> gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Options.cpp Changed

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Osmo4.cpp -> gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Osmo4.cpp Changed

@@ -20,7 +20,7 @@
 
 BEGIN_MESSAGE_MAP(Osmo4, CWinApp)
 	//{{AFX_MSG_MAP(Osmo4)
-	ON_COMMAND(ID_FILEOPEN, OnOpenFile)
+	ON_COMMAND(ID_OPEN_FILE, OnOpenFile)
 	ON_COMMAND(ID_FILE_STEP, OnFileStep)
 	ON_COMMAND(ID_OPEN_URL, OnOpenUrl)
 	ON_COMMAND(ID_FILE_RELOAD, OnFileReload)
@@ -926,9 +926,9 @@
 
 void Osmo4::OnSwitchRender() 
 {
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
-	Bool use_gl = (opt && !stricmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
-	gf_cfg_set_key(m_user.config, "Compositor", "ForceOpenGL", use_gl ? "no" : "yes");
+	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "OpenGLMode");
+	Bool use_gl = (opt && !stricmp(opt, "always")) ? GF_TRUE : GF_FALSE;
+	gf_cfg_set_key(m_user.config, "Compositor", "OpenGLMode", use_gl ? "disable" : "always");
 
 	gf_term_set_option(m_term, GF_OPT_USE_OPENGL, !use_gl);
 
@@ -937,8 +937,8 @@
 
 void Osmo4::UpdateRenderSwitch()
 {
-	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "ForceOpenGL");
-	if (opt && !stricmp(opt, "no"))
+	const char *opt = gf_cfg_get_key(m_user.config, "Compositor", "OpenGLMode");
+	if (opt && !stricmp(opt, "disable"))
 		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 10);
 	else
 		((CMainFrame *) m_pMainWnd)->m_wndToolBar.SetButtonInfo(12, ID_SWITCH_RENDER, TBBS_BUTTON, 9);

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/Osmo4.rc -> gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/Osmo4.rc Changed

@@ -13,24 +13,22 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Anglais (États-Unis) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Menu
 //
 
-IDR_MAINFRAME MENU 
+IDR_MAINFRAME MENU
 BEGIN
     POPUP "&File"
     BEGIN
-        MENUITEM "&Open File\tCtrl+O",          ID_OPENFILE
+        MENUITEM "&Open File\tCtrl+O",          ID_OPEN_FILE
         MENUITEM "Open &URL\tCtrl+U",           ID_OPEN_URL
         MENUITEM SEPARATOR
         MENUITEM "File Propert&ies\tCtrl+I",    ID_FILE_PROP
@@ -157,7 +155,7 @@
     CTEXT           "The FreeType Project\nMozilla SpiderMonkey (JavaScript support)\n\nZLIB, the PNG Group, the I.J.G.\nFFMPEG, FAAD, XVID, MAD",IDC_STATIC,9,92,189,41
 END
 
-IDD_PASSWD DIALOG  0, 0, 134, 71
+IDD_PASSWD DIALOG 0, 0, 134, 71
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Enter user name and password"
 FONT 8, "MS Sans Serif"
@@ -217,7 +215,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_ABOUTBOX, DIALOG
     BEGIN
@@ -232,9 +230,9 @@
 // Toolbar
 //
 
-IDR_MAINTOOLS TOOLBAR  16, 15
+IDR_MAINTOOLS TOOLBAR 16, 15
 BEGIN
-    BUTTON      ID_FILEOPEN
+    BUTTON      ID_OPEN_FILE
     BUTTON      ID_NAV_PREV
     BUTTON      ID_NAV_NEXT
     BUTTON      ID_FILE_PLAY
@@ -260,32 +258,32 @@
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDR_MAINFRAME           "Osmo4"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_APP_TITLE       "Osmo4"
     AFX_IDS_IDLEMESSAGE     "Ready"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_EXIT            "Quit the application; prompts to save documents\nExit"
     ID_H_ABOUT              "Display program information, version number and copyright\nAbout"
     ID_PLAYLIST_LOOP        "Restarts playlist from begining when playlist is over"
-    ID_FILEOPEN             "Opens local file"
+    ID_OPEN_FILE             "Opens local file"
     ID_VIEW_ORIGINAL        "restore Original Aspect of presentation"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_SCSIZE          "Change the window size"
     AFX_IDS_SCMOVE          "Change the window position"
@@ -296,13 +294,13 @@
     AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     AFX_IDS_SCRESTORE       "Restore the window to normal size"
     AFX_IDS_SCTASKLIST      "Activate Task List"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_STOP            "Stops current presentation"
     ID_SWITCH_RENDER        "Switch between 2D and 3D renderers"
@@ -312,7 +310,7 @@
     ID_HEADLIGHT            "Turns headlight on/off"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_CLEAR_NAV            "Clears navigation history"
     ID_TIMER                " "
@@ -320,7 +318,7 @@
     ID_VIEW_PL              "View navigation history as a playlist"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_VIEW_FULLSCREEN      "Move to Full Screen mode (Esc to exit)"
     ID_AR_KEEP              "Keep Aspect Ratio of presentation"
@@ -335,7 +333,7 @@
     ID_NAVIGATE_NONE        "Disable navigation"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_NAVIGATE_WALK        "Turn walk navigation on"
     ID_AR_FILL              "Ignores Aspect Ratio and always fill screen"
@@ -344,7 +342,7 @@
     ID_NAV_RESET            "Restore last viewpoint"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_NAVIGATE_VR          "QT-VR like navigation"
     ID_REC_ENABLE           "Enable recording of streaming data"
@@ -352,31 +350,29 @@
     ID_REC_ABORT            "Stops recording and discard data"
 END
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     ID_FILE_COPY            "Copy selected text to clipboard"
     ID_FILE_PASTE           "Paste clipboard"
 END
 
-#endif    // Anglais (États-Unis) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Français (France) resources
+// French (France) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
-#ifdef _WIN32
 LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // Dialog
 //
 
-IDD_OPENFILE DIALOG  0, 0, 301, 23
+IDD_OPENFILE DIALOG 0, 0, 301, 23
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Select Location"
 FONT 8, "MS Sans Serif"
@@ -385,7 +381,7 @@
     DEFPUSHBUTTON   "OK",IDC_BUTGO,279,5,19,13
 END
 
-IDD_OPTIONS DIALOG  0, 0, 174, 106
+IDD_OPTIONS DIALOG 0, 0, 174, 106
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Osmo4 Options"
 FONT 8, "MS Sans Serif"
@@ -395,7 +391,7 @@
     LTEXT           "Category",IDC_STATIC,7,4,29,8
 END
 
-IDD_OPT_GEN DIALOG  0, 20, 169, 76
+IDD_OPT_GEN DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -406,7 +402,7 @@
     CONTROL         "Single Instance",IDC_SINGLE_INSTANCE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,54,65,10
 END
 
-IDD_OPT_RENDER DIALOG  0, 20, 169, 76
+IDD_OPT_RENDER DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -423,7 +419,7 @@
     LTEXT           "Bounds",IDC_STATIC,82,64,25,8
 END
 
-IDD_OPT_AUDIO DIALOG  0, 20, 169, 76
+IDD_OPT_AUDIO DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_CONTROL | WS_CHILD | WS_THICKFRAME
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -441,7 +437,7 @@
     LTEXT           "ms total length",IDC_STATIC,118,18,49,8
 END
 
-IDD_OPT_VIDEO DIALOG  0, 20, 169, 76
+IDD_OPT_VIDEO DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -468,7 +464,7 @@
     CONTROL         "Use proxy",IDC_HTTP_USE_PROXY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,59,47,10
 END
 
-IDD_OPT_FONT DIALOG  0, 20, 169, 76
+IDD_OPT_FONT DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -480,7 +476,7 @@
     LTEXT           "Text Texturing Mode",IDC_STATIC,7,60,69,8
 END
 
-IDD_OPT_SYSTEMS DIALOG  0, 20, 169, 76
+IDD_OPT_SYSTEMS DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -492,7 +488,7 @@
     CONTROL         "Force Single Timeline",IDC_FORCE_DURATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,58,83,10
 END
 
-IDD_OPT_STREAM DIALOG  0, 20, 169, 76
+IDD_OPT_STREAM DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -521,7 +517,7 @@
     CONTROL         "Tab1",IDC_VIEWSEL,"SysTabControl32",TCS_BUTTONS,124,2,208,14
 END
 
-IDD_OPT_DECODER DIALOG  0, 20, 169, 76
+IDD_OPT_DECODER DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -531,7 +527,7 @@
     COMBOBOX        IDC_VIDEC_LIST,25,52,113,55,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
 END
 
-IDD_OPT_RENDER2D DIALOG  0, 20, 169, 76
+IDD_OPT_RENDER2D DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -541,7 +537,7 @@
     CONTROL         "Scalable Zoom",IDC_ZOOM_SCALABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,10,77,10
 END
 
-IDD_OPT_RENDER3D DIALOG  0, 20, 169, 76
+IDD_OPT_RENDER3D DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -586,7 +582,7 @@
     CONTROL         "List4",IDC_FILELIST,"SysListView32",LVS_REPORT | WS_BORDER | WS_TABSTOP,1,0,182,51
 END
 
-IDD_OPT_MCACHE DIALOG  0, 20, 169, 76
+IDD_OPT_MCACHE DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -597,7 +593,7 @@
     EDITTEXT        IDC_BASEPRES,81,31,82,12,ES_CENTER | ES_AUTOHSCROLL | ES_NUMBER
 END
 
-IDD_OPT_FILETYPES DIALOG  0, 20, 169, 76
+IDD_OPT_FILETYPES DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -609,7 +605,7 @@
     LTEXT           "Plugin",IDC_FILES_PLUG,8,49,154,8
 END
 
-IDD_OPT_LOGS DIALOG  0, 20, 169, 76
+IDD_OPT_LOGS DIALOG 0, 20, 169, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CONTROL | WS_CHILD
 FONT 8, "MS Sans Serif"
 BEGIN
@@ -639,7 +635,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_OPT_VIDEO, DIALOG
     BEGIN
@@ -706,7 +702,7 @@
 // Toolbar
 //
 
-IDR_PLAYLIST TOOLBAR  16, 15
+IDR_PLAYLIST TOOLBAR 16, 15
 BEGIN
     BUTTON      ID_PL_OPEN
     BUTTON      ID_PL_SAVE
@@ -849,18 +845,18 @@
 // Accelerator
 //
 
-IDR_MAINACCEL ACCELERATORS 
+IDR_MAINACCEL ACCELERATORS
 BEGIN
     "^P",           ID_FILE_PLAY,           ASCII,  NOINVERT
     "\t",           ID_FILE_PROP,           ASCII,  NOINVERT
     VK_F5,          ID_FILE_RELOAD,         VIRTKEY, NOINVERT
     "^S",           ID_FILE_STEP,           ASCII,  NOINVERT
-    "^O",           ID_FILEOPEN,            ASCII,  NOINVERT
+    "^O",           ID_OPEN_FILE,            ASCII,  NOINVERT
     "^U",           ID_OPEN_URL,            ASCII,  NOINVERT
     VK_F3,          ID_VIEW_PL,             VIRTKEY, NOINVERT
 END
 
-#endif    // Français (France) resources
+#endif    // French (France) resources
 /////////////////////////////////////////////////////////////////////////////

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_w32/resource.h -> gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_w32/resource.h Changed

gpac-0.5.0.svn4668.tar.bz2/applications/osmo4_wx/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/osmo4_wx/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/osmozilla/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/osmozilla/osmo_npapi.cpp -> gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/osmo_npapi.cpp Changed

@@ -1,841 +1,840 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
+/*
+*			GPAC - Multimedia Framework C SDK
+*
  *			Authors: Jean Le Feuvre 
  *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / Osmozilla NPAPI plugin
-*
-*  GPAC is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU Lesser General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*   
-*  GPAC is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU Lesser General Public License for more details.
-*   
-*  You should have received a copy of the GNU Lesser General Public
-*  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
-*
-*/
-
-
-////////////////////////////////////////////////////////////
-//
-// Implementation of Netscape entry points (NPN_*)
-//
-#include "osmo_npapi.h"
-#include "osmozilla.h"
-
-#if defined(XP_UNIX) && !defined(XP_MACOS) 
-#include <malloc.h>
-#include <string.h>
-#endif
-
-NPNetscapeFuncs *sBrowserFunctions = NULL;
-
-NPError Osmozilla_GetURL(NPP instance, const char *url, const char *target)
-{
-	if (!sBrowserFunctions) return NPERR_INVALID_FUNCTABLE_ERROR;
-	return sBrowserFunctions->geturl(instance, url, target);
-}
-
-void Osmozilla_SetStatus(NPP instance, const char *message)
-{
-	if (!sBrowserFunctions) return;
-	sBrowserFunctions->status(instance, message);
-}
-
-#ifndef GECKO_XPCOM
-void Osmozilla_InitScripting(Osmozilla *osmo);
-#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)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-
-	osmo = (Osmozilla *) malloc(sizeof(Osmozilla));
-	memset(osmo, 0, sizeof(Osmozilla));
-
-	osmo->np_instance = instance;
-	// associate the plugin instance object with NPP instance
-	instance->pdata = (void *)osmo;
-
-	osmo->supports_xembed = 0;
-	sBrowserFunctions->getvalue(NULL, NPNVSupportsXEmbedBool, (void *)&osmo->supports_xembed);
-
-	Osmozilla_Initialize(osmo, argc, argn, argv);
-
-#ifndef GECKO_XPCOM
-	Osmozilla_InitScripting(osmo);
-#endif
-
-	return rv;
-}
-
-// here is the place to clean up and destroy the nsPluginInstance object
-NPError NPOsmozilla_Destroy (NPP instance, NPSavedData** save)
-{
-	NPError rv = NPERR_NO_ERROR;
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla*)instance->pdata;
-	if (osmozilla != NULL) {
-		Osmozilla_Shutdown(osmozilla);
-#ifdef GECKO_XPCOM
-		NPOsmozilla_ShutdownScript(osmozilla);
-#else
-		if (osmozilla->script_obj) sBrowserFunctions->releaseobject(osmozilla->script_obj);
-		osmozilla->script_obj = NULL;
-#endif
-
-		free(osmozilla);
-	}
-	instance->pdata = NULL;
-	return rv;
-}
-
-// during this call we know when the plugin window is ready or
-// 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;
-
-	if (!instance || !instance->pdata) return NPERR_INVALID_INSTANCE_ERROR;
-	if (pNPWindow == NULL) return NPERR_GENERIC_ERROR;
-	osmozilla = (Osmozilla *)instance->pdata;
-
-	// window just created
-	if (!osmozilla->window_set) {
-		if (pNPWindow->window == NULL) return NPERR_GENERIC_ERROR;
-
-#ifdef XP_WIN
-		os_wnd_handle = pNPWindow->window;
-		os_wnd_display = NULL;
-#elif defined(XP_MAXOS)
-		os_wnd_handle = pNPWindow->window;
-		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 
-		(eg, "firefox myfile.mp4" )*/
-		os_wnd_display =((NPSetWindowCallbackStruct *)pNPWindow->ws_info)->display;
-#endif
-
-		if (! Osmozilla_SetWindow(osmozilla, os_wnd_handle, os_wnd_display, pNPWindow->width, pNPWindow->height) ) {
-			return NPERR_MODULE_LOAD_FAILED_ERROR;
-		}
-
-	}
-
-#if 0
-	// window goes away
-	if((pNPWindow->window == NULL) && plugin->isInitialized())
-		return plugin->SetWindow(pNPWindow);
-
-	// window resized?
-	if(plugin->isInitialized() && (pNPWindow->window != NULL))
-		return plugin->SetWindow(pNPWindow);
-
-	// this should not happen, nothing to do
-	if((pNPWindow->window == NULL) && !plugin->isInitialized())
-		return plugin->SetWindow(pNPWindow);
-#endif
-
-	return rv;
-}
-
-NPError NPOsmozilla_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t *stype)
-{
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL) 
-		return NPERR_GENERIC_ERROR;
-
-	Osmozilla_ConnectTo(osmozilla, stream->url);
-	*stype = NP_SEEK;
-	return NPERR_NO_ERROR;
-}
-
-NPINT32 NPOsmozilla_WriteReady (NPP instance, NPStream *stream)
-{
-	return 0x0fffffff;
-}
-
-NPINT32 NPOsmozilla_Write (NPP instance, NPStream *stream, NPINT32 offset, NPINT32 len, void *buffer)
-{   
-	return len;
-}
-
-NPError NPOsmozilla_DestroyStream (NPP instance, NPStream *stream, NPError reason)
-{
-	return NPERR_NO_ERROR;
-}
-
-void NPOsmozilla_StreamAsFile (NPP instance, NPStream* stream, const char* fname)
-{
-}
-
-void NPOsmozilla_Print (NPP instance, NPPrint* printInfo)
-{
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	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);
-}
-
-void NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData)
-{
-	return;
-}
-
-NPError	NPOsmozilla_GetValue(NPP instance, NPPVariable variable, void *value)
-{
-	NPError rv = NPERR_NO_ERROR;
-	Osmozilla *osmozilla;
-	if(instance == NULL)
-		return NPERR_INVALID_INSTANCE_ERROR;
-
-	osmozilla = (Osmozilla *)instance->pdata;
-	if(osmozilla== NULL) return NPERR_GENERIC_ERROR;
-
-	switch (variable) {
-#ifdef GECKO_XPCOM
-	case NPPVpluginScriptableInstance:
-		rv = NPOsmozilla_GetPeer(osmozilla, value);
-		break;	
-
-	case NPPVpluginScriptableIID:
-		rv = NPOsmozilla_GetPeerIID(osmozilla, value);
-		break;
-#else
-
-	case NPPVpluginScriptableNPObject:
-		sBrowserFunctions->retainobject(osmozilla->script_obj);
-		* (void **)value = osmozilla->script_obj;
-		break;
-
-#endif
-	case NPPVpluginNeedsXEmbed:
-		*((int *)value) = 1;
-		break;
-	case NPPVpluginNameString :
-		*(const char**)value = "Osmozilla/GPAC plugin for NPAPI";
-		break;
-	default:
-		break;
-	}
-
-	return rv;
-}
-
-
-
-NPError NPOsmozilla_SetValue(NPP instance, NPNVariable variable, void *value)
-{
-	return NPERR_NO_ERROR;
-}
-
-int16_t	NPOsmozilla_HandleEvent(NPP instance, void* event)
-{
-	/*we hacked the proc*/
-	return 0;
-}
-
-
-NPError OSCALL NP_Shutdown()
-{
-#ifdef GECKO_XPCOM
-	NPOsmozilla_ReleaseServiceManager();
-#endif
-	return NPERR_NO_ERROR;
-}
-
-static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
-{
-	if(aNPPFuncs == NULL)
-		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   
-	// and have a UniversalProcPointer for every function we implement.
-
-	aNPPFuncs->version       = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
-	aNPPFuncs->newp          = NPOsmozilla_New;
-	aNPPFuncs->destroy       = NPOsmozilla_Destroy;
-	aNPPFuncs->setwindow     = NPOsmozilla_SetWindow;
-	aNPPFuncs->newstream     = NPOsmozilla_NewStream;
-	aNPPFuncs->destroystream = NPOsmozilla_DestroyStream;
-	aNPPFuncs->asfile        = NPOsmozilla_StreamAsFile;
-	aNPPFuncs->writeready    = NPOsmozilla_WriteReady;
-	aNPPFuncs->write         = NPOsmozilla_Write;
-	aNPPFuncs->print         = NPOsmozilla_Print;
-	aNPPFuncs->event         = NPOsmozilla_HandleEvent;
-	aNPPFuncs->urlnotify     = NPOsmozilla_URLNotify;
-	aNPPFuncs->getvalue      = NPOsmozilla_GetValue;
-	aNPPFuncs->setvalue      = NPOsmozilla_SetValue;
-	return NPERR_NO_ERROR;
-}
-
-
-static NPError NS_PluginInitialize()
-{
-#ifdef GECKO_XPCOM
-	NPOsmozilla_GetServiceManager();
-#endif
-	return NPERR_NO_ERROR;
-}
-
-// get values per plugin
-NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
-{
-	NPError err = NPERR_NO_ERROR;
-	switch (aVariable) {
-	case NPPVpluginNameString:
-		*((char **)aValue) = (char *) "Osmozilla";
-		break;
-	case NPPVpluginDescriptionString:
-		*((char **)aValue) = Osmozilla_GetVersion();
-		break;
-	default:
-		err = NPERR_INVALID_PARAM;
-		break;
-	}
-	return err;
-}
-
-
-
-
-#define GPAC_PLUGIN_MIMETYPES \
-	"audio/mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
-	"audio/x-mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
-	"audio/amr:amr,awb:AMR Audio;" \
-	"audio/mp4:mp4,mpg4,mpeg4,m4a:MPEG-4 Audio;" \
-	"audio/aac:aac:MPEG-4 AAC Music;" \
-	"audio/aacp:aac:MPEG-4 AACPlus Music;" \
-	"audio/basic:snd,au:Basic Audio;"	\
-	"audio/x-wav:wav:WAV Audio;"	\
-	"audio/3gpp:3gp,3gpp:3GPP/MMS Music;"	\
-	"audio/3gpp2:3g2,3gp2:3GPP2/MMS Music;"	\
-	"video/mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
-	"video/x-mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
-	"video/mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
-	"video/x-mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
-	"video/avi:avi:AVI Video;" \
-	"video/quicktime:mov,qt:QuickTime Movies;" \
-	"video/x-ms-asf:asf,asx:Windows Media Video;" \
-	"video/x-ms-wmv:wmv:Windows Media;" \
-	"video/mp4:mp4,mpg4:MPEG-4 Video;" \
-	"video/3gpp:3gp,3gpp:3GPP/MMS Video;" \
-	"video/3gpp2:3g2,3gp2:3GPP2/MMS Video;" \
-	"image/jpeg:jpeg,jpg:JPEG Images;"	\
-	"image/png:png:PNG Images;"	\
-	"image/bmp:bmp:MS Bitmap Images;"	\
-	"image/svg+xml:svg,svg.gz,svgz:SVG Document;"	\
-	"image/x-svgm:svgm:SVGM Document;"	\
-	"x-subtitle/srt:srt:SRT SubTitles;"	\
-	"x-subtitle/sub:sub:SUB SubTitles;"	\
-	"x-subtitle/ttxt:ttxt:GPAC 3GPP TimedText;"	\
-	"model/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/ogg:ogg:Ogg Media;" \
-	"application/x-ogg:ogg:Ogg Media;" \
-	"application/x-bt:bt,bt.gz,btz:MPEG-4 Text (BT);"	\
-	"application/x-xmt:xmt,xmt.gz,xmtz:MPEG-4 Text (XMT);"	\
-	"application/mp4:mp4,mpg4:MPEG-4 Movies;" \
-	"application/sdp:sdp:Streaming Media Session;" \
-	/* explicit plugin call */ \
-	"application/x-gpac::GPAC plugin;" \
-
-char * NP_GetMIMEDescription(void)
-{
-	return (char *) GPAC_PLUGIN_MIMETYPES;
-}
-
-
-NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
-{
-	return NS_PluginGetValue(aVariable, aValue);
-}
-
-
-#if defined(XP_WIN) || defined(XP_MACOS) 
-
-NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs)
-{
-	sBrowserFunctions = aNPNFuncs;
-
-	return NS_PluginInitialize();
-}
-
-NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* aNPPFuncs)
-{
-	return fillPluginFunctionTable(aNPPFuncs);
-}
-
-
-#elif defined(XP_UNIX)
-
-NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs)
-{
-	NPError rv;
-	sBrowserFunctions = aNPNFuncs;
-	rv = fillPluginFunctionTable(aNPPFuncs);
-	if(rv != NPERR_NO_ERROR)
-		return rv;
-
-	return NS_PluginInitialize();
-}
-#endif
-
-
-#ifdef GECKO_XPCOM
-
-
-#include <nsIServiceManager.h>
-#include <nsIMemory.h>
-#include <nsISupportsUtils.h>
-#include <nsISupports.h>
-#include <nsMemory.h>
-
-#include "nsIOsmozilla.h"
-
-#include "osmozilla.h"
-
-
-nsIServiceManager *gServiceManager = NULL;
-
-
-// We must implement nsIClassInfo because it signals the
-// Mozilla Security Manager to allow calls from JavaScript.
-// helper class to implement all necessary nsIClassInfo method stubs
-// and to set flags used by the security system
-
-class nsClassInfoMixin : public nsIClassInfo
-{
-	// 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;}
-
-	NS_IMETHOD GetImplementationLanguage(PRUint32 *aImplementationLanguage)
-	{*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 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;}
-	NS_IMETHOD GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
-	{return NS_ERROR_NOT_IMPLEMENTED;}
-};
-
-
-class nsOsmozillaPeer : public nsIOsmozilla , public nsClassInfoMixin
-{
-public:
-	nsOsmozillaPeer(Osmozilla *osmo);
-	virtual ~nsOsmozillaPeer();
-
-	// methods from nsISupports
-	NS_IMETHOD QueryInterface(const nsIID & aIID, void **aInstancePtr);
-	NS_IMETHOD_(nsrefcnt) AddRef();
-	NS_IMETHOD_(nsrefcnt) Release();
-
-public:
-	NS_DECL_NSIOSMOZILLA
-		void SetInstance(Osmozilla *osmo);
-
-protected:
-	nsrefcnt mRefCnt; 
-	Osmozilla *mPlugin;
-};
-
-
-static NS_DEFINE_IID(kIZillaPluginIID, NS_IOSMOZILLA_IID);
-static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID);
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
-
-nsOsmozillaPeer::nsOsmozillaPeer(Osmozilla *osmo)
-{
-	mPlugin=osmo;
-	mRefCnt = 0;
-}
-
-nsOsmozillaPeer::~nsOsmozillaPeer()
-{
-}
-// Notice that we expose our claim to implement nsIClassInfo.
-//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::Play() { 
-	Osmozilla_Play(mPlugin); 
-	return NS_OK; 
-}
-NS_IMETHODIMP nsOsmozillaPeer::Stop() { 
-	Osmozilla_Stop(mPlugin); 
-	return NS_OK; 
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::Update(const char *type, const char *commands) 
-{
-	Osmozilla_Update(mPlugin, type, commands); 
-	return NS_OK; 
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::QualitySwitch(int switch_up) 
-{
-	Osmozilla_QualitySwitch(mPlugin, switch_up); 
-	return NS_OK; 
-}
-
-NS_IMETHODIMP nsOsmozillaPeer::SetURL(const char *url) 
-{
-	Osmozilla_SetURL(mPlugin, url); 
-	return NS_OK; 
-}
-
-void nsOsmozillaPeer::SetInstance(Osmozilla *osmo)
-{
-	mPlugin = osmo;
-}
-
-NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::AddRef()
-{
-	++mRefCnt;
-	return mRefCnt;
-}
-
-NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::Release()
-{
-	--mRefCnt;
-	if (mRefCnt == 0) {
-		delete this;
-		return 0;
-	}
-	return mRefCnt;
-}
-
-// 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)
-{
-	if (!aInstancePtr)
-		return NS_ERROR_NULL_POINTER;
-
-	if (aIID.Equals(kIZillaPluginIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kIClassInfoIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this);
-		AddRef();
-		return NS_OK;
-	}
-
-	if (aIID.Equals(kISupportsIID)) {
-		*aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this)));
-		AddRef();
-		return NS_OK;
-	}
-	return NS_NOINTERFACE;
-}
-
-extern NPNetscapeFuncs *sBrowserFunctions;
-
-void NPOsmozilla_GetServiceManager()
-{
-	// this is probably a good place to get the service manager
-	// note that Mozilla will add reference, so do not forget to release
-	nsISupports *sm = NULL;
-
-	if (!sBrowserFunctions) return;
-	sBrowserFunctions->getvalue(NULL, NPNVserviceManager, &sm);
-
-	// Mozilla returns nsIServiceManager so we can use it directly; doing QI on
-	// nsISupports here can still be more appropriate in case something is changed
-	// in the future so we don't need to do casting of any sort.
-	if (sm) {
-		sm->QueryInterface(NS_GET_IID(nsIServiceManager), (void **) &gServiceManager);
-		NS_RELEASE(sm);
-	}
-}
-
-void NPOsmozilla_ReleaseServiceManager()
-{
-#ifdef GECKO_XPCOM
-	// we should release the service manager
-	NS_IF_RELEASE(gServiceManager);
-	gServiceManager = NULL;
-#endif
-}
-
-void NPOsmozilla_ShutdownScript(Osmozilla *osmo)
-{
-	nsOsmozillaPeer *peer = (nsOsmozillaPeer *) osmo->scriptable_peer;
-	if (peer != NULL) {
-		peer->SetInstance(NULL);
-		NS_IF_RELEASE(peer);
-	}
-}
-
-
-NPError	NPOsmozilla_GetPeer(Osmozilla *osmo, void *value)
-{
-	if (!osmo->scriptable_peer) {
-		osmo->scriptable_peer = new nsOsmozillaPeer(osmo);
-		if (!osmo->scriptable_peer) return NPERR_OUT_OF_MEMORY_ERROR;
-		NS_ADDREF( (nsOsmozillaPeer *) osmo->scriptable_peer);
-	}
-
-	NS_ADDREF( (nsOsmozillaPeer *)osmo->scriptable_peer);
-	*(nsISupports **) value = (nsISupports *) osmo->scriptable_peer;
-	return NPERR_NO_ERROR;
-}
-
-NPError	NPOsmozilla_GetPeerIID(Osmozilla *osmo, void *value)
-{
-	static nsIID scriptableIID = NS_IOSMOZILLA_IID;
-	if (!sBrowserFunctions) return NPERR_OUT_OF_MEMORY_ERROR;
-
-	nsIID *ptr = (nsIID *) sBrowserFunctions->memalloc( sizeof(nsIID) );
-	if (! ptr) return NPERR_OUT_OF_MEMORY_ERROR;
-
-	*ptr = scriptableIID;
-	*(nsIID **) value = ptr;
-	return NPERR_NO_ERROR;
-}
-
-#else
-
-enum
-{
-	kOSMOZILLA_ID_METHOD_PLAY = 0,
-	kOSMOZILLA_ID_METHOD_PAUSE,
-	kOSMOZILLA_ID_METHOD_STOP,
-	kOSMOZILLA_ID_METHOD_UPDATE,
-	kOSMOZILLA_ID_METHOD_QUALITY_SWITCH,
-	kOSMOZILLA_ID_METHOD_SET_URL,
-	
-	kOSMOZILLA_NUM_METHODS
-};
-
-NPIdentifier    v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_NUM_METHODS];
-const NPUTF8 *  v_OSMOZILLA_MethodNames[kOSMOZILLA_NUM_METHODS] = {
-	"Play",
-	"Pause",
-	"Stop",
-	"Update",
-	"QualitySwitch",
-	"SetURL",
-};
-
-NPClass osmozilla_script_class;
-
-typedef struct {
-	NPClass *_class;
-	uint32_t referenceCount;
-	Osmozilla *osmo;
-} OsmozillaObject;
-
-NPObject *OSMOZILLA_Allocate(NPP npp, NPClass *theClass)
-{
-	OsmozillaObject *obj = NULL;
-
-	sBrowserFunctions->getstringidentifiers(v_OSMOZILLA_MethodNames, kOSMOZILLA_NUM_METHODS, v_OSMOZILLA_MethodIdentifiers);
-	obj = (OsmozillaObject *)malloc(sizeof(OsmozillaObject));
-	obj->osmo = (Osmozilla *) npp->pdata;
-	return (NPObject *)obj;
-}
-
-void OSMOZILLA_Deallocate(NPObject* obj)
-{
-	free(obj);
-	return;
-}
-
-void OSMOZILLA_Invalidate(NPObject* obj)
-{
-	return;
-}
-
-bool OSMOZILLA_HasMethod(NPObject* obj, NPIdentifier name)
-{
-	int i = 0;
-	while (i < kOSMOZILLA_NUM_METHODS) {
-		if ( name == v_OSMOZILLA_MethodIdentifiers[i] ) {
-			return 1;
-		}
-		i++;
-	}
-	return 0;
-}
-
-bool OSMOZILLA_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
-{
-	OsmozillaObject *npo = (OsmozillaObject *)obj;
-	if (!npo->osmo) return 0;
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_PLAY]) {
-		Osmozilla_Play(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_PAUSE]) {
-		Osmozilla_Pause(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_STOP]) {
-		Osmozilla_Stop(npo->osmo);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_UPDATE]) {
-		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; 
-		}
-		if (!update) return 0;
-		Osmozilla_Update(npo->osmo, mime, update);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_QUALITY_SWITCH]) {
-		int up = 1;
-		if (argCount==1) {
-			if (args[0].type==NPVariantType_Bool) up = args[0].value.boolValue ? 1 : 0;
-			else if (args[0].type==NPVariantType_Int32) up = args[0].value.intValue ? 1 : 0;
-		}
-		Osmozilla_QualitySwitch(npo->osmo, up);
-		return 1;
-	}
-	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_SET_URL]) {
-		const char *url = "";
-		if (argCount>=1) {
-			if (args[0].type==NPVariantType_String) 
-				url = args[0].value.stringValue.UTF8Characters;
-		}
-		Osmozilla_SetURL(npo->osmo, url);
-		return 1;
-	}
-	return 0;
-}
-
-bool OSMOZILLA_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
-{
-	return 1;
-}
-
-bool OSMOZILLA_HasProperty(NPObject* obj, NPIdentifier name)
-{
-	bool result = 0;
-	if ( sBrowserFunctions->identifierisstring(name) )
-	{
-		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
-
-		if ( !strcmp(val, "DownloadProgress") )
-		{
-			result = 1;
-		}
-
-		sBrowserFunctions->memfree(val);
-	}
-	/*nothing exposed yet*/
-	return result;
-}
-
-bool OSMOZILLA_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
-{
-	OsmozillaObject *npo = (OsmozillaObject *)obj;
-	if (!npo->osmo) return 0;
-	if ( sBrowserFunctions->identifierisstring(name) )
-	{
-		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
-
-		if ( !strcmp(val, "DownloadProgress") )
-		{
-			int val = Osmozilla_GetDownloadProgress(npo->osmo);
-			INT32_TO_NPVARIANT(val, *result);
-		}
-
-		sBrowserFunctions->memfree(val);
-	}
-	return 1;
-}
-
-bool OSMOZILLA_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
-{
-	return 1;
-}
-
-bool OSMOZILLA_RemoveProperty(NPObject *npobj, NPIdentifier name)
-{
-	return 1;
-}
-
-bool OSMOZILLA_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
-{
-	return 1;
-}
-
-void Osmozilla_InitScripting(Osmozilla *osmo)
-{
-	osmozilla_script_class.allocate          = OSMOZILLA_Allocate;
-	osmozilla_script_class.deallocate        = OSMOZILLA_Deallocate;
-	osmozilla_script_class.invalidate        = OSMOZILLA_Invalidate;
-	osmozilla_script_class.hasMethod         = OSMOZILLA_HasMethod;
-	osmozilla_script_class.invoke            = OSMOZILLA_Invoke;
-	osmozilla_script_class.invokeDefault     = OSMOZILLA_InvokeDefault;
-	osmozilla_script_class.hasProperty       = OSMOZILLA_HasProperty;
-	osmozilla_script_class.getProperty       = OSMOZILLA_GetProperty;
-	osmozilla_script_class.setProperty       = OSMOZILLA_SetProperty;
-	osmozilla_script_class.removeProperty    = OSMOZILLA_RemoveProperty;
-	osmozilla_script_class.enumerate         = OSMOZILLA_Enumerate;
-
-	/*create script object*/
-	osmo->script_obj = sBrowserFunctions->createobject(osmo->np_instance, &osmozilla_script_class);
-
-}
-
-#endif //GECKO_XPCOM
-
+*					All rights reserved
+*
+*  This file is part of GPAC / Osmozilla NPAPI plugin
+*
+*  GPAC is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU Lesser General Public License as published by
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*   
+*  GPAC is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU Lesser General Public License for more details.
+*   
+*  You should have received a copy of the GNU Lesser General Public
+*  License along with this library; see the file COPYING.  If not, write to
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+*
+*/
+
+
+////////////////////////////////////////////////////////////
+//
+// Implementation of Netscape entry points (NPN_*)
+//
+#include "osmo_npapi.h"
+#include "osmozilla.h"
+
+#if defined(XP_UNIX) && !defined(XP_MACOS) 
+#include <malloc.h>
+#include <string.h>
+#endif
+
+NPNetscapeFuncs *sBrowserFunctions = NULL;
+
+NPError Osmozilla_GetURL(NPP instance, const char *url, const char *target)
+{
+	if (!sBrowserFunctions) return NPERR_INVALID_FUNCTABLE_ERROR;
+	return sBrowserFunctions->geturl(instance, url, target);
+}
+
+void Osmozilla_SetStatus(NPP instance, const char *message)
+{
+	if (!sBrowserFunctions) return;
+	sBrowserFunctions->status(instance, message);
+}
+
+#ifndef GECKO_XPCOM
+void Osmozilla_InitScripting(Osmozilla *osmo);
+#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)
+		return NPERR_INVALID_INSTANCE_ERROR;
+
+	osmo = (Osmozilla *) malloc(sizeof(Osmozilla));
+	memset(osmo, 0, sizeof(Osmozilla));
+
+	osmo->np_instance = instance;
+	// associate the plugin instance object with NPP instance
+	instance->pdata = (void *)osmo;
+
+	osmo->supports_xembed = 0;
+	sBrowserFunctions->getvalue(NULL, NPNVSupportsXEmbedBool, (void *)&osmo->supports_xembed);
+
+	Osmozilla_Initialize(osmo, argc, argn, argv);
+
+#ifndef GECKO_XPCOM
+	Osmozilla_InitScripting(osmo);
+#endif
+
+	return rv;
+}
+
+// here is the place to clean up and destroy the nsPluginInstance object
+NPError NPOsmozilla_Destroy (NPP instance, NPSavedData** save)
+{
+	NPError rv = NPERR_NO_ERROR;
+	Osmozilla *osmozilla;
+	if(instance == NULL)
+		return NPERR_INVALID_INSTANCE_ERROR;
+
+	osmozilla = (Osmozilla*)instance->pdata;
+	if (osmozilla != NULL) {
+		Osmozilla_Shutdown(osmozilla);
+#ifdef GECKO_XPCOM
+		NPOsmozilla_ShutdownScript(osmozilla);
+#else
+		if (osmozilla->script_obj) sBrowserFunctions->releaseobject(osmozilla->script_obj);
+		osmozilla->script_obj = NULL;
+#endif
+
+		free(osmozilla);
+	}
+	instance->pdata = NULL;
+	return rv;
+}
+
+// during this call we know when the plugin window is ready or
+// 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;
+
+	if (!instance || !instance->pdata) return NPERR_INVALID_INSTANCE_ERROR;
+	if (pNPWindow == NULL) return NPERR_GENERIC_ERROR;
+	osmozilla = (Osmozilla *)instance->pdata;
+
+	// window just created
+	if (!osmozilla->window_set) {
+		if (pNPWindow->window == NULL) return NPERR_GENERIC_ERROR;
+
+#ifdef XP_WIN
+		os_wnd_handle = pNPWindow->window;
+		os_wnd_display = NULL;
+#elif defined(XP_MAXOS)
+		os_wnd_handle = pNPWindow->window;
+		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 
+		(eg, "firefox myfile.mp4" )*/
+		os_wnd_display =((NPSetWindowCallbackStruct *)pNPWindow->ws_info)->display;
+#endif
+
+		if (! Osmozilla_SetWindow(osmozilla, os_wnd_handle, os_wnd_display, pNPWindow->width, pNPWindow->height) ) {
+			return NPERR_MODULE_LOAD_FAILED_ERROR;
+		}
+
+	}
+
+#if 0
+	// window goes away
+	if((pNPWindow->window == NULL) && plugin->isInitialized())
+		return plugin->SetWindow(pNPWindow);
+
+	// window resized?
+	if(plugin->isInitialized() && (pNPWindow->window != NULL))
+		return plugin->SetWindow(pNPWindow);
+
+	// this should not happen, nothing to do
+	if((pNPWindow->window == NULL) && !plugin->isInitialized())
+		return plugin->SetWindow(pNPWindow);
+#endif
+
+	return rv;
+}
+
+NPError NPOsmozilla_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t *stype)
+{
+	Osmozilla *osmozilla;
+	if(instance == NULL)
+		return NPERR_INVALID_INSTANCE_ERROR;
+
+	osmozilla = (Osmozilla *)instance->pdata;
+	if(osmozilla== NULL) 
+		return NPERR_GENERIC_ERROR;
+
+	Osmozilla_ConnectTo(osmozilla, stream->url);
+	*stype = NP_SEEK;
+	return NPERR_NO_ERROR;
+}
+
+NPINT32 NPOsmozilla_WriteReady (NPP instance, NPStream *stream)
+{
+	return 0x0fffffff;
+}
+
+NPINT32 NPOsmozilla_Write (NPP instance, NPStream *stream, NPINT32 offset, NPINT32 len, void *buffer)
+{   
+	return len;
+}
+
+NPError NPOsmozilla_DestroyStream (NPP instance, NPStream *stream, NPError reason)
+{
+	return NPERR_NO_ERROR;
+}
+
+void NPOsmozilla_StreamAsFile (NPP instance, NPStream* stream, const char* fname)
+{
+}
+
+void NPOsmozilla_Print (NPP instance, NPPrint* printInfo)
+{
+	Osmozilla *osmozilla;
+	if(instance == NULL)
+		return;
+
+	osmozilla = (Osmozilla *)instance->pdata;
+	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);
+}
+
+void NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData)
+{
+	return;
+}
+
+NPError	NPOsmozilla_GetValue(NPP instance, NPPVariable variable, void *value)
+{
+	NPError rv = NPERR_NO_ERROR;
+	Osmozilla *osmozilla;
+	if(instance == NULL)
+		return NPERR_INVALID_INSTANCE_ERROR;
+
+	osmozilla = (Osmozilla *)instance->pdata;
+	if(osmozilla== NULL) return NPERR_GENERIC_ERROR;
+
+	switch (variable) {
+#ifdef GECKO_XPCOM
+	case NPPVpluginScriptableInstance:
+		rv = NPOsmozilla_GetPeer(osmozilla, value);
+		break;	
+
+	case NPPVpluginScriptableIID:
+		rv = NPOsmozilla_GetPeerIID(osmozilla, value);
+		break;
+#else
+
+	case NPPVpluginScriptableNPObject:
+		sBrowserFunctions->retainobject(osmozilla->script_obj);
+		* (void **)value = osmozilla->script_obj;
+		break;
+
+#endif
+	case NPPVpluginNeedsXEmbed:
+		*((int *)value) = 1;
+		break;
+	case NPPVpluginNameString :
+		*(const char**)value = "Osmozilla/GPAC plugin for NPAPI";
+		break;
+	default:
+		break;
+	}
+
+	return rv;
+}
+
+
+
+NPError NPOsmozilla_SetValue(NPP instance, NPNVariable variable, void *value)
+{
+	return NPERR_NO_ERROR;
+}
+
+int16_t	NPOsmozilla_HandleEvent(NPP instance, void* event)
+{
+	/*we hacked the proc*/
+	return 0;
+}
+
+
+NPError OSCALL NP_Shutdown()
+{
+#ifdef GECKO_XPCOM
+	NPOsmozilla_ReleaseServiceManager();
+#endif
+	return NPERR_NO_ERROR;
+}
+
+static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
+{
+	if(aNPPFuncs == NULL)
+		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   
+	// and have a UniversalProcPointer for every function we implement.
+
+	aNPPFuncs->version       = (NP_VERSION_MAJOR << 8) | NP_VERSION_MINOR;
+	aNPPFuncs->newp          = NPOsmozilla_New;
+	aNPPFuncs->destroy       = NPOsmozilla_Destroy;
+	aNPPFuncs->setwindow     = NPOsmozilla_SetWindow;
+	aNPPFuncs->newstream     = NPOsmozilla_NewStream;
+	aNPPFuncs->destroystream = NPOsmozilla_DestroyStream;
+	aNPPFuncs->asfile        = NPOsmozilla_StreamAsFile;
+	aNPPFuncs->writeready    = NPOsmozilla_WriteReady;
+	aNPPFuncs->write         = NPOsmozilla_Write;
+	aNPPFuncs->print         = NPOsmozilla_Print;
+	aNPPFuncs->event         = NPOsmozilla_HandleEvent;
+	aNPPFuncs->urlnotify     = NPOsmozilla_URLNotify;
+	aNPPFuncs->getvalue      = NPOsmozilla_GetValue;
+	aNPPFuncs->setvalue      = NPOsmozilla_SetValue;
+	return NPERR_NO_ERROR;
+}
+
+
+static NPError NS_PluginInitialize()
+{
+#ifdef GECKO_XPCOM
+	NPOsmozilla_GetServiceManager();
+#endif
+	return NPERR_NO_ERROR;
+}
+
+// get values per plugin
+NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
+{
+	NPError err = NPERR_NO_ERROR;
+	switch (aVariable) {
+	case NPPVpluginNameString:
+		*((char **)aValue) = (char *) "Osmozilla";
+		break;
+	case NPPVpluginDescriptionString:
+		*((char **)aValue) = Osmozilla_GetVersion();
+		break;
+	default:
+		err = NPERR_INVALID_PARAM;
+		break;
+	}
+	return err;
+}
+
+
+
+
+#define GPAC_PLUGIN_MIMETYPES \
+	"audio/mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
+	"audio/x-mpeg:mp2,mp3,mpga,mpega:MP3 Music;" \
+	"audio/amr:amr,awb:AMR Audio;" \
+	"audio/mp4:mp4,mpg4,mpeg4,m4a:MPEG-4 Audio;" \
+	"audio/aac:aac:MPEG-4 AAC Music;" \
+	"audio/aacp:aac:MPEG-4 AACPlus Music;" \
+	"audio/basic:snd,au:Basic Audio;"	\
+	"audio/x-wav:wav:WAV Audio;"	\
+	"audio/3gpp:3gp,3gpp:3GPP/MMS Music;"	\
+	"audio/3gpp2:3g2,3gp2:3GPP2/MMS Music;"	\
+	"video/mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
+	"video/x-mpeg:mpg,mpeg,mpe,mpv2:MPEG Video;" \
+	"video/mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
+	"video/x-mpeg-system:mpg,mpeg,mpe,vob,mpv2:MPEG Video;" \
+	"video/avi:avi:AVI Video;" \
+	"video/quicktime:mov,qt:QuickTime Movies;" \
+	"video/x-ms-asf:asf,asx:Windows Media Video;" \
+	"video/x-ms-wmv:wmv:Windows Media;" \
+	"video/mp4:mp4,mpg4:MPEG-4 Video;" \
+	"video/3gpp:3gp,3gpp:3GPP/MMS Video;" \
+	"video/3gpp2:3g2,3gp2:3GPP2/MMS Video;" \
+	"image/jpeg:jpeg,jpg:JPEG Images;"	\
+	"image/png:png:PNG Images;"	\
+	"image/bmp:bmp:MS Bitmap Images;"	\
+	"image/svg+xml:svg,svg.gz,svgz:SVG Document;"	\
+	"image/x-svgm:svgm:SVGM Document;"	\
+	"x-subtitle/srt:srt:SRT SubTitles;"	\
+	"x-subtitle/sub:sub:SUB SubTitles;"	\
+	"x-subtitle/ttxt:ttxt:GPAC 3GPP TimedText;"	\
+	"model/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/ogg:ogg:Ogg Media;" \
+	"application/x-ogg:ogg:Ogg Media;" \
+	"application/x-bt:bt,bt.gz,btz:MPEG-4 Text (BT);"	\
+	"application/x-xmt:xmt,xmt.gz,xmtz:MPEG-4 Text (XMT);"	\
+	"application/mp4:mp4,mpg4:MPEG-4 Movies;" \
+	"application/sdp:sdp:Streaming Media Session;" \
+	/* explicit plugin call */ \
+	"application/x-gpac::GPAC plugin;" \
+
+char * NP_GetMIMEDescription(void)
+{
+	return (char *) GPAC_PLUGIN_MIMETYPES;
+}
+
+
+NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
+{
+	return NS_PluginGetValue(aVariable, aValue);
+}
+
+
+#if defined(XP_WIN) || defined(XP_MACOS) 
+
+NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs)
+{
+	sBrowserFunctions = aNPNFuncs;
+
+	return NS_PluginInitialize();
+}
+
+NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* aNPPFuncs)
+{
+	return fillPluginFunctionTable(aNPPFuncs);
+}
+
+
+#elif defined(XP_UNIX)
+
+NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs)
+{
+	NPError rv;
+	sBrowserFunctions = aNPNFuncs;
+	rv = fillPluginFunctionTable(aNPPFuncs);
+	if(rv != NPERR_NO_ERROR)
+		return rv;
+
+	return NS_PluginInitialize();
+}
+#endif
+
+
+#ifdef GECKO_XPCOM
+
+
+#include <nsIServiceManager.h>
+#include <nsIMemory.h>
+#include <nsISupportsUtils.h>
+#include <nsISupports.h>
+#include <nsMemory.h>
+
+#include "nsIOsmozilla.h"
+
+#include "osmozilla.h"
+
+
+nsIServiceManager *gServiceManager = NULL;
+
+
+// We must implement nsIClassInfo because it signals the
+// Mozilla Security Manager to allow calls from JavaScript.
+// helper class to implement all necessary nsIClassInfo method stubs
+// and to set flags used by the security system
+
+class nsClassInfoMixin : public nsIClassInfo
+{
+	// 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;}
+
+	NS_IMETHOD GetImplementationLanguage(PRUint32 *aImplementationLanguage)
+	{*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 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;}
+	NS_IMETHOD GetClassIDNoAlloc(nsCID *aClassIDNoAlloc)
+	{return NS_ERROR_NOT_IMPLEMENTED;}
+};
+
+
+class nsOsmozillaPeer : public nsIOsmozilla , public nsClassInfoMixin
+{
+public:
+	nsOsmozillaPeer(Osmozilla *osmo);
+	virtual ~nsOsmozillaPeer();
+
+	// methods from nsISupports
+	NS_IMETHOD QueryInterface(const nsIID & aIID, void **aInstancePtr);
+	NS_IMETHOD_(nsrefcnt) AddRef();
+	NS_IMETHOD_(nsrefcnt) Release();
+
+public:
+	NS_DECL_NSIOSMOZILLA
+		void SetInstance(Osmozilla *osmo);
+
+protected:
+	nsrefcnt mRefCnt; 
+	Osmozilla *mPlugin;
+};
+
+
+static NS_DEFINE_IID(kIZillaPluginIID, NS_IOSMOZILLA_IID);
+static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID);
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+
+nsOsmozillaPeer::nsOsmozillaPeer(Osmozilla *osmo)
+{
+	mPlugin=osmo;
+	mRefCnt = 0;
+}
+
+nsOsmozillaPeer::~nsOsmozillaPeer()
+{
+}
+// Notice that we expose our claim to implement nsIClassInfo.
+//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::Play() { 
+	Osmozilla_Play(mPlugin); 
+	return NS_OK; 
+}
+NS_IMETHODIMP nsOsmozillaPeer::Stop() { 
+	Osmozilla_Stop(mPlugin); 
+	return NS_OK; 
+}
+
+NS_IMETHODIMP nsOsmozillaPeer::Update(const char *type, const char *commands) 
+{
+	Osmozilla_Update(mPlugin, type, commands); 
+	return NS_OK; 
+}
+
+NS_IMETHODIMP nsOsmozillaPeer::QualitySwitch(int switch_up) 
+{
+	Osmozilla_QualitySwitch(mPlugin, switch_up); 
+	return NS_OK; 
+}
+
+NS_IMETHODIMP nsOsmozillaPeer::SetURL(const char *url) 
+{
+	Osmozilla_SetURL(mPlugin, url); 
+	return NS_OK; 
+}
+
+void nsOsmozillaPeer::SetInstance(Osmozilla *osmo)
+{
+	mPlugin = osmo;
+}
+
+NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::AddRef()
+{
+	++mRefCnt;
+	return mRefCnt;
+}
+
+NS_IMETHODIMP_(nsrefcnt) nsOsmozillaPeer::Release()
+{
+	--mRefCnt;
+	if (mRefCnt == 0) {
+		delete this;
+		return 0;
+	}
+	return mRefCnt;
+}
+
+// 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)
+{
+	if (!aInstancePtr)
+		return NS_ERROR_NULL_POINTER;
+
+	if (aIID.Equals(kIZillaPluginIID)) {
+		*aInstancePtr = NS_STATIC_CAST(nsIOsmozilla *, this);
+		AddRef();
+		return NS_OK;
+	}
+
+	if (aIID.Equals(kIClassInfoIID)) {
+		*aInstancePtr = NS_STATIC_CAST(nsIClassInfo *, this);
+		AddRef();
+		return NS_OK;
+	}
+
+	if (aIID.Equals(kISupportsIID)) {
+		*aInstancePtr = NS_STATIC_CAST(nsISupports *, (NS_STATIC_CAST (nsIOsmozilla *, this)));
+		AddRef();
+		return NS_OK;
+	}
+	return NS_NOINTERFACE;
+}
+
+extern NPNetscapeFuncs *sBrowserFunctions;
+
+void NPOsmozilla_GetServiceManager()
+{
+	// this is probably a good place to get the service manager
+	// note that Mozilla will add reference, so do not forget to release
+	nsISupports *sm = NULL;
+
+	if (!sBrowserFunctions) return;
+	sBrowserFunctions->getvalue(NULL, NPNVserviceManager, &sm);
+
+	// Mozilla returns nsIServiceManager so we can use it directly; doing QI on
+	// nsISupports here can still be more appropriate in case something is changed
+	// in the future so we don't need to do casting of any sort.
+	if (sm) {
+		sm->QueryInterface(NS_GET_IID(nsIServiceManager), (void **) &gServiceManager);
+		NS_RELEASE(sm);
+	}
+}
+
+void NPOsmozilla_ReleaseServiceManager()
+{
+#ifdef GECKO_XPCOM
+	// we should release the service manager
+	NS_IF_RELEASE(gServiceManager);
+	gServiceManager = NULL;
+#endif
+}
+
+void NPOsmozilla_ShutdownScript(Osmozilla *osmo)
+{
+	nsOsmozillaPeer *peer = (nsOsmozillaPeer *) osmo->scriptable_peer;
+	if (peer != NULL) {
+		peer->SetInstance(NULL);
+		NS_IF_RELEASE(peer);
+	}
+}
+
+
+NPError	NPOsmozilla_GetPeer(Osmozilla *osmo, void *value)
+{
+	if (!osmo->scriptable_peer) {
+		osmo->scriptable_peer = new nsOsmozillaPeer(osmo);
+		if (!osmo->scriptable_peer) return NPERR_OUT_OF_MEMORY_ERROR;
+		NS_ADDREF( (nsOsmozillaPeer *) osmo->scriptable_peer);
+	}
+
+	NS_ADDREF( (nsOsmozillaPeer *)osmo->scriptable_peer);
+	*(nsISupports **) value = (nsISupports *) osmo->scriptable_peer;
+	return NPERR_NO_ERROR;
+}
+
+NPError	NPOsmozilla_GetPeerIID(Osmozilla *osmo, void *value)
+{
+	static nsIID scriptableIID = NS_IOSMOZILLA_IID;
+	if (!sBrowserFunctions) return NPERR_OUT_OF_MEMORY_ERROR;
+
+	nsIID *ptr = (nsIID *) sBrowserFunctions->memalloc( sizeof(nsIID) );
+	if (! ptr) return NPERR_OUT_OF_MEMORY_ERROR;
+
+	*ptr = scriptableIID;
+	*(nsIID **) value = ptr;
+	return NPERR_NO_ERROR;
+}
+
+#else
+
+enum
+{
+	kOSMOZILLA_ID_METHOD_PLAY = 0,
+	kOSMOZILLA_ID_METHOD_PAUSE,
+	kOSMOZILLA_ID_METHOD_STOP,
+	kOSMOZILLA_ID_METHOD_UPDATE,
+	kOSMOZILLA_ID_METHOD_QUALITY_SWITCH,
+	kOSMOZILLA_ID_METHOD_SET_URL,
+	
+	kOSMOZILLA_NUM_METHODS
+};
+
+NPIdentifier    v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_NUM_METHODS];
+const NPUTF8 *  v_OSMOZILLA_MethodNames[kOSMOZILLA_NUM_METHODS] = {
+	"Play",
+	"Pause",
+	"Stop",
+	"Update",
+	"QualitySwitch",
+	"SetURL",
+};
+
+NPClass osmozilla_script_class;
+
+typedef struct {
+	NPClass *_class;
+	uint32_t referenceCount;
+	Osmozilla *osmo;
+} OsmozillaObject;
+
+NPObject *OSMOZILLA_Allocate(NPP npp, NPClass *theClass)
+{
+	OsmozillaObject *obj = NULL;
+
+	sBrowserFunctions->getstringidentifiers(v_OSMOZILLA_MethodNames, kOSMOZILLA_NUM_METHODS, v_OSMOZILLA_MethodIdentifiers);
+	obj = (OsmozillaObject *)malloc(sizeof(OsmozillaObject));
+	obj->osmo = (Osmozilla *) npp->pdata;
+	return (NPObject *)obj;
+}
+
+void OSMOZILLA_Deallocate(NPObject* obj)
+{
+	free(obj);
+	return;
+}
+
+void OSMOZILLA_Invalidate(NPObject* obj)
+{
+	return;
+}
+
+bool OSMOZILLA_HasMethod(NPObject* obj, NPIdentifier name)
+{
+	int i = 0;
+	while (i < kOSMOZILLA_NUM_METHODS) {
+		if ( name == v_OSMOZILLA_MethodIdentifiers[i] ) {
+			return 1;
+		}
+		i++;
+	}
+	return 0;
+}
+
+bool OSMOZILLA_Invoke(NPObject* obj, NPIdentifier name, const NPVariant* args, uint32_t argCount, NPVariant* result)
+{
+	OsmozillaObject *npo = (OsmozillaObject *)obj;
+	if (!npo->osmo) return 0;
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_PLAY]) {
+		Osmozilla_Play(npo->osmo);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_PAUSE]) {
+		Osmozilla_Pause(npo->osmo);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_STOP]) {
+		Osmozilla_Stop(npo->osmo);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_UPDATE]) {
+		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; 
+		}
+		if (!update) return 0;
+		Osmozilla_Update(npo->osmo, mime, update);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_QUALITY_SWITCH]) {
+		int up = 1;
+		if (argCount==1) {
+			if (args[0].type==NPVariantType_Bool) up = args[0].value.boolValue ? 1 : 0;
+			else if (args[0].type==NPVariantType_Int32) up = args[0].value.intValue ? 1 : 0;
+		}
+		Osmozilla_QualitySwitch(npo->osmo, up);
+		return 1;
+	}
+	if (name == v_OSMOZILLA_MethodIdentifiers[kOSMOZILLA_ID_METHOD_SET_URL]) {
+		const char *url = "";
+		if (argCount>=1) {
+			if (args[0].type==NPVariantType_String) 
+				url = args[0].value.stringValue.UTF8Characters;
+		}
+		Osmozilla_SetURL(npo->osmo, url);
+		return 1;
+	}
+	return 0;
+}
+
+bool OSMOZILLA_InvokeDefault(NPObject *npobj, const NPVariant *args, uint32_t argCount, NPVariant *result)
+{
+	return 1;
+}
+
+bool OSMOZILLA_HasProperty(NPObject* obj, NPIdentifier name)
+{
+	bool result = 0;
+	if ( sBrowserFunctions->identifierisstring(name) )
+	{
+		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
+
+		if ( !strcmp(val, "DownloadProgress") )
+		{
+			result = 1;
+		}
+
+		sBrowserFunctions->memfree(val);
+	}
+	/*nothing exposed yet*/
+	return result;
+}
+
+bool OSMOZILLA_GetProperty(NPObject* obj, NPIdentifier name, NPVariant* result)
+{
+	OsmozillaObject *npo = (OsmozillaObject *)obj;
+	if (!npo->osmo) return 0;
+	if ( sBrowserFunctions->identifierisstring(name) )
+	{
+		NPUTF8 *val = sBrowserFunctions->utf8fromidentifier(name);
+
+		if ( !strcmp(val, "DownloadProgress") )
+		{
+			int val = Osmozilla_GetDownloadProgress(npo->osmo);
+			INT32_TO_NPVARIANT(val, *result);
+		}
+
+		sBrowserFunctions->memfree(val);
+	}
+	return 1;
+}
+
+bool OSMOZILLA_SetProperty(NPObject *obj, NPIdentifier name, const NPVariant *value)
+{
+	return 1;
+}
+
+bool OSMOZILLA_RemoveProperty(NPObject *npobj, NPIdentifier name)
+{
+	return 1;
+}
+
+bool OSMOZILLA_Enumerate(NPObject *npobj, NPIdentifier **value, uint32_t *count)
+{
+	return 1;
+}
+
+void Osmozilla_InitScripting(Osmozilla *osmo)
+{
+	osmozilla_script_class.allocate          = OSMOZILLA_Allocate;
+	osmozilla_script_class.deallocate        = OSMOZILLA_Deallocate;
+	osmozilla_script_class.invalidate        = OSMOZILLA_Invalidate;
+	osmozilla_script_class.hasMethod         = OSMOZILLA_HasMethod;
+	osmozilla_script_class.invoke            = OSMOZILLA_Invoke;
+	osmozilla_script_class.invokeDefault     = OSMOZILLA_InvokeDefault;
+	osmozilla_script_class.hasProperty       = OSMOZILLA_HasProperty;
+	osmozilla_script_class.getProperty       = OSMOZILLA_GetProperty;
+	osmozilla_script_class.setProperty       = OSMOZILLA_SetProperty;
+	osmozilla_script_class.removeProperty    = OSMOZILLA_RemoveProperty;
+	osmozilla_script_class.enumerate         = OSMOZILLA_Enumerate;
+
+	/*create script object*/
+	osmo->script_obj = sBrowserFunctions->createobject(osmo->np_instance, &osmozilla_script_class);
+
+}
+
+#endif //GECKO_XPCOM
+

gpac-0.5.0.svn4668.tar.bz2/applications/osmozilla/osmo_npapi.h -> gpac-0.5.0.svn5178.tar.bz2/applications/osmozilla/osmo_npapi.h Changed

@@ -1,136 +1,136 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2000-2012
-*					All rights reserved
-*
-*  This file is part of GPAC / Osmozilla NPAPI plugin
-*
-*  GPAC is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU Lesser General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*   
-*  GPAC is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU Lesser General Public License for more details.
-*   
-*  You should have received a copy of the GNU Lesser General Public
-*  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
-*
-*/
-
-#ifndef _OSMO_NPAPI_H_
-#define _OSMO_NPAPI_H_
-
-
-#ifdef WIN32
-#include <windows.h>
-#ifndef __cplusplus
-typedef BOOL bool;
-#endif //__cplusplus
-#endif
-
-#include "npapi.h"
-
-/*check this with gecko 1.9.2*/
-#if (NP_VERSION_MINOR < 20)
-#define GECKO_XPCOM
-#endif
-
-#ifdef GECKO_XPCOM
-#include "npupp.h"
-
-#ifndef uint16_t
-typedef uint16 uint16_t;
-#endif
-
-#ifndef int16_t
-typedef int16 int16_t;
-#endif
-
-#define NPINT32	int32
-
-#else
-
-#include "npfunctions.h"
-
-#define NPINT32	int32_t
-
-#endif
-
-#ifdef XP_UNIX
-#include <stdio.h>
-#endif //XP_UNIX
-
-
-#ifndef HIBYTE
-#define HIBYTE(i) (i >> 8)
-#endif
-
-#ifndef LOBYTE
-#define LOBYTE(i) (i & 0xff)
-#endif
-
-/*functions callbacks to browser*/
-NPError Osmozilla_GetURL(NPP instance, const char *url, const char *target);
-void Osmozilla_SetStatus(NPP instance, const char *message);
-
-
-/*
-Plugins functions exposed to browser
-*/
-NPError NPOsmozilla_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
-NPError NPOsmozilla_Destroy(NPP instance, NPSavedData** save);
-NPError NPOsmozilla_SetWindow(NPP instance, NPWindow* window);
-NPError NPOsmozilla_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype);
-NPError NPOsmozilla_DestroyStream(NPP instance, NPStream* stream, NPError reason);
-NPINT32 NPOsmozilla_WriteReady(NPP instance, NPStream* stream);
-NPINT32 NPOsmozilla_Write(NPP instance, NPStream* stream, NPINT32 offset, NPINT32 len, void* buffer);
-void    NPOsmozilla_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
-void    NPOsmozilla_Print(NPP instance, NPPrint* platformPrint);
-int16_t NPOsmozilla_HandleEvent(NPP instance, void* event);
-void    NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData);
-NPError NPOsmozilla_GetValue(NPP instance, NPPVariable variable, void *result);
-NPError NPOsmozilla_SetValue(NPP instance, NPNVariable variable, void *value);
-
-
-/*
-Functions called by browser
-*/
-
-typedef struct __tag_osmozilla Osmozilla;
-
-/*base functions*/
-int Osmozilla_Initialize(Osmozilla *osmo, signed short argc, char* argn[], char* argv[]);
-void Osmozilla_Shutdown(Osmozilla *osmo);
-int Osmozilla_SetWindow(Osmozilla *osmozilla, void *os_wnd_handle, void *os_wnd_display, unsigned int width, unsigned int height);
-void Osmozilla_ConnectTo(Osmozilla *osmozilla, const char *url);
-void Osmozilla_Print(Osmozilla *osmozilla, unsigned int is_embed, void *os_print_dc, unsigned int target_x, unsigned int target_y, unsigned int target_width, unsigned int target_height);
-char *Osmozilla_GetVersion();
-
-
-/*scripting functions*/
-void Osmozilla_Play(Osmozilla *osmo);
-void Osmozilla_Pause(Osmozilla *osmo);
-void Osmozilla_Stop(Osmozilla *osmo);
-void Osmozilla_Update(Osmozilla *osmo, const char *type, const char *commands);
-void Osmozilla_QualitySwitch(Osmozilla *osmo, int switch_up);
-void Osmozilla_SetURL(Osmozilla *osmo, const char *url);
-int Osmozilla_GetDownloadProgress(Osmozilla *osmo);
-
-
-#ifdef GECKO_XPCOM
-
-void NPOsmozilla_GetServiceManager();
-void NPOsmozilla_ReleaseServiceManager();
-void NPOsmozilla_ShutdownScript(Osmozilla *osmo);
-NPError	NPOsmozilla_GetPeer(Osmozilla *osmo, void *value);
-NPError	NPOsmozilla_GetPeerIID(Osmozilla *osmo, void *value);
-
-#endif //GECKO_XPCOM
-
-#endif //_NPPLAT_H_
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+ *			Authors: Jean Le Feuvre 
+ *			Copyright (c) Telecom ParisTech 2000-2012
+*					All rights reserved
+*
+*  This file is part of GPAC / Osmozilla NPAPI plugin
+*
+*  GPAC is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU Lesser General Public License as published by
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*   
+*  GPAC is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU Lesser General Public License for more details.
+*   
+*  You should have received a copy of the GNU Lesser General Public
+*  License along with this library; see the file COPYING.  If not, write to
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+*
+*/
+
+#ifndef _OSMO_NPAPI_H_
+#define _OSMO_NPAPI_H_
+
+
+#ifdef WIN32
+#include <windows.h>
+#ifndef __cplusplus
+typedef BOOL bool;
+#endif //__cplusplus
+#endif
+
+#include "npapi.h"
+
+/*check this with gecko 1.9.2*/
+#if (NP_VERSION_MINOR < 20)
+#define GECKO_XPCOM
+#endif
+
+#ifdef GECKO_XPCOM
+#include "npupp.h"
+
+#ifndef uint16_t
+typedef uint16 uint16_t;
+#endif
+
+#ifndef int16_t
+typedef int16 int16_t;
+#endif
+
+#define NPINT32	int32
+
+#else
+
+#include "npfunctions.h"
+
+#define NPINT32	int32_t
+
+#endif
+
+#ifdef XP_UNIX
+#include <stdio.h>
+#endif //XP_UNIX
+
+
+#ifndef HIBYTE
+#define HIBYTE(i) (i >> 8)
+#endif
+
+#ifndef LOBYTE
+#define LOBYTE(i) (i & 0xff)
+#endif
+
+/*functions callbacks to browser*/
+NPError Osmozilla_GetURL(NPP instance, const char *url, const char *target);
+void Osmozilla_SetStatus(NPP instance, const char *message);
+
+
+/*
+Plugins functions exposed to browser
+*/
+NPError NPOsmozilla_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved);
+NPError NPOsmozilla_Destroy(NPP instance, NPSavedData** save);
+NPError NPOsmozilla_SetWindow(NPP instance, NPWindow* window);
+NPError NPOsmozilla_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype);
+NPError NPOsmozilla_DestroyStream(NPP instance, NPStream* stream, NPError reason);
+NPINT32 NPOsmozilla_WriteReady(NPP instance, NPStream* stream);
+NPINT32 NPOsmozilla_Write(NPP instance, NPStream* stream, NPINT32 offset, NPINT32 len, void* buffer);
+void    NPOsmozilla_StreamAsFile(NPP instance, NPStream* stream, const char* fname);
+void    NPOsmozilla_Print(NPP instance, NPPrint* platformPrint);
+int16_t NPOsmozilla_HandleEvent(NPP instance, void* event);
+void    NPOsmozilla_URLNotify(NPP instance, const char* url, NPReason reason, void* notifyData);
+NPError NPOsmozilla_GetValue(NPP instance, NPPVariable variable, void *result);
+NPError NPOsmozilla_SetValue(NPP instance, NPNVariable variable, void *value);
+
+
+/*
+Functions called by browser
+*/
+
+typedef struct __tag_osmozilla Osmozilla;
+
+/*base functions*/
+int Osmozilla_Initialize(Osmozilla *osmo, signed short argc, char* argn[], char* argv[]);
+void Osmozilla_Shutdown(Osmozilla *osmo);
+int Osmozilla_SetWindow(Osmozilla *osmozilla, void *os_wnd_handle, void *os_wnd_display, unsigned int width, unsigned int height);
+void Osmozilla_ConnectTo(Osmozilla *osmozilla, const char *url);
+void Osmozilla_Print(Osmozilla *osmozilla, unsigned int is_embed, void *os_print_dc, unsigned int target_x, unsigned int target_y, unsigned int target_width, unsigned int target_height);
+char *Osmozilla_GetVersion();
+
+
+/*scripting functions*/
+void Osmozilla_Play(Osmozilla *osmo);
+void Osmozilla_Pause(Osmozilla *osmo);
+void Osmozilla_Stop(Osmozilla *osmo);
+void Osmozilla_Update(Osmozilla *osmo, const char *type, const char *commands);
+void Osmozilla_QualitySwitch(Osmozilla *osmo, int switch_up);
+void Osmozilla_SetURL(Osmozilla *osmo, const char *url);
+int Osmozilla_GetDownloadProgress(Osmozilla *osmo);
+
+
+#ifdef GECKO_XPCOM
+
+void NPOsmozilla_GetServiceManager();
+void NPOsmozilla_ReleaseServiceManager();
+void NPOsmozilla_ShutdownScript(Osmozilla *osmo);
+NPError	NPOsmozilla_GetPeer(Osmozilla *osmo, void *value);
+NPError	NPOsmozilla_GetPeerIID(Osmozilla *osmo, void *value);
+
+#endif //GECKO_XPCOM
+
+#endif //_NPPLAT_H_

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/Makefile Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/bmp4demux.sln Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/bmp4demux.vcxproj Added

@@ -0,0 +1,189 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_base.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_funcs.c" />
+    <ClCompile Include="..\..\..\src\isomedia\data_map.c" />
+    <ClCompile Include="..\..\..\src\isomedia\drm_sample.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_intern.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_read.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_store.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_write.c" />
+    <ClCompile Include="..\..\..\src\isomedia\media.c" />
+    <ClCompile Include="..\..\..\src\isomedia\media_odf.c" />
+    <ClCompile Include="..\..\..\src\isomedia\meta.c" />
+    <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c" />
+    <ClCompile Include="..\..\..\src\isomedia\sample_descs.c" />
+    <ClCompile Include="..\..\..\src\isomedia\stbl_read.c" />
+    <ClCompile Include="..\..\..\src\isomedia\stbl_write.c" />
+    <ClCompile Include="..\..\..\src\isomedia\track.c" />
+    <ClCompile Include="..\..\..\src\isomedia\tx3g.c" />
+    <ClCompile Include="..\..\..\src\media_tools\webvtt.c" />
+    <ClCompile Include="..\..\..\src\odf\descriptors.c" />
+    <ClCompile Include="..\..\..\src\odf\desc_private.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_code.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_codec.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_command.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_parse.c" />
+    <ClCompile Include="..\..\..\src\odf\slc.c" />
+    <ClCompile Include="..\..\..\src\utils\alloc.c" />
+    <ClCompile Include="..\..\..\src\utils\bitstream.c" />
+    <ClCompile Include="..\..\..\src\utils\configfile.c" />
+    <ClCompile Include="..\..\..\src\utils\error.c" />
+    <ClCompile Include="..\..\..\src\utils\list.c" />
+    <ClCompile Include="..\..\..\src\utils\os_divers.c" />
+    <ClCompile Include="..\..\..\src\utils\os_thread.c" />
+    <ClCompile Include="..\..\..\src\utils\url.c" />
+    <ClCompile Include="main.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{978A2D9F-E44F-4073-8032-333563BCC160}</ProjectGuid>
+    <ProjectName>bmp4demux</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/bmp4demux.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <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>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <UndefinePreprocessorDefinitions>
+      </UndefinePreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);../../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/bmp4demux.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/bmp4demux.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <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>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/bmp4demux.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../../extra_lib/lib/w32_rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\Release/bmp4demux.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/bmp4demux.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/bmp4demux.vcxproj.filters Added

@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_base.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_funcs.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\data_map.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\drm_sample.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\isom_intern.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\isom_read.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\isom_store.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\isom_write.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\media.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\media_odf.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\meta.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\sample_descs.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\stbl_read.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\stbl_write.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\track.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\tx3g.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\bitstream.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\error.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\list.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\desc_private.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\descriptors.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\odf_code.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\odf_codec.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\odf_command.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\odf_parse.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\media_tools\webvtt.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="main.c" />
+    <ClCompile Include="..\..\..\src\utils\url.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\slc.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\alloc.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\configfile.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\os_divers.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\os_thread.c">
+      <Filter>others</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="isoff">
+      <UniqueIdentifier>{c9a8f639-328c-4505-be50-4859357c2c00}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="others">
+      <UniqueIdentifier>{e5ca7285-ca00-49d8-ac81-dff3d494be9a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/build.sh Added

@@ -0,0 +1,2 @@
+#!/bin/sh
+gcc -o fmp4demux main.c ../../../src/utils/os_config_init.c ../../../src/utils/os_divers.c ../../../src/utils/os_thread.c ../../../src/utils/alloc.c ../../../src/utils/bitstream.c ../../../src/utils/configfile.c ../../../src/odf/desc_private.c ../../../src/odf/descriptors.c ../../../src/utils/error.c ../../../src/utils/list.c ../../../src/odf/odf_code.c ../../../src/odf/odf_codec.c ../../../src/odf/odf_command.c ../../../src/odf/odf_parse.c ../../../src/odf/slc.c ../../../src/utils/url.c ../../../src/media_tools/webvtt.c ../../../src/isomedia/avc_ext.c ../../../src/isomedia/box_code_3gpp.c ../../../src/isomedia/box_code_adobe.c ../../../src/isomedia/box_code_apple.c ../../../src/isomedia/box_code_base.c ../../../src/isomedia/box_code_drm.c ../../../src/isomedia/box_code_meta.c ../../../src/isomedia/box_funcs.c ../../../src/isomedia/data_map.c ../../../src/isomedia/drm_sample.c ../../../src/isomedia/isom_intern.c ../../../src/isomedia/isom_read.c ../../../src/isomedia/isom_store.c ../../../src/isomedia/isom_write.c ../../../src/isomedia/media.c ../../../src/isomedia/media_odf.c ../../../src/isomedia/meta.c ../../../src/isomedia/movie_fragments.c ../../../src/isomedia/sample_descs.c ../../../src/isomedia/stbl_read.c ../../../src/isomedia/stbl_write.c ../../../src/isomedia/track.c ../../../src/isomedia/tx3g.c -L../../../bin/gcc -lpthread -ldl -I../../../include -DGPAC_MINIMAL_ODF -DGPAC_DISABLE_AV_PARSERS -DGPAC_DISABLE_ISOM_DUMP -DGPAC_DISABLE_ZLIB

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/bmp4demux/main.c Added

@@ -0,0 +1,93 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2013-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / sample MP4 demultiplexing application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/tools.h>
+#include <gpac/isomedia.h>
+
+int main(int argc, char **argv)
+{
+	/* The ISO progressive reader */
+	GF_ISOFile *movie;
+	/* Error indicator */
+	GF_Err e;
+	/* Number of bytes required to finish the current ISO Box reading */
+	u64 missing_bytes;
+	/* Return value for the program */
+	int ret = 0;
+	u32 track_id = 1;
+	u32 track_number;
+	u32 sample_count;
+	u32 sample_index;
+
+	/* Usage */
+	if (argc < 2) {
+		fprintf(stdout, "Usage: %s filename [track_id]\n", argv[0]);
+		return 1;
+	}
+	if (argc == 3) {
+		track_id = atoi(argv[2]);
+	}
+
+	e = gf_isom_open_progressive(argv[1], 0, 0, &movie, &missing_bytes);
+	if ((e != GF_OK && e != GF_ISOM_INCOMPLETE_FILE) || movie == NULL) {
+		fprintf(stdout, "Could not open file %s for reading (%s).\n", argv[1], gf_error_to_string(e));
+		return 1;
+	}
+
+	track_number = gf_isom_get_track_by_id(movie, track_id);
+	if (track_number == 0) {
+		fprintf(stdout, "Could not find track ID=%u of file %s.\n", track_id, argv[1]);
+		ret = 1;
+		goto exit;
+	}
+
+	sample_count = gf_isom_get_sample_count(movie, track_number);
+	sample_index = 1;
+	while (sample_index <= sample_count) {
+		GF_ISOSample *iso_sample;
+		u32 sample_description_index;
+
+		iso_sample = gf_isom_get_sample(movie, track_number, sample_index, &sample_description_index);
+		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 {
+			e = gf_isom_last_error(movie);
+			if (e == GF_ISOM_INCOMPLETE_FILE) {
+				missing_bytes = gf_isom_get_missing_bytes(movie, track_number);
+				fprintf(stdout, "Missing "LLU" bytes on input file\n", missing_bytes);
+				gf_sleep(1000);
+			}
+		}
+	}
+
+exit:
+	gf_isom_close(movie);
+
+	return ret;
+}

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/Makefile Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/build.sh Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/fmp4demux.sln Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/fmp4demux.vcxproj Added

@@ -0,0 +1,188 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_base.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_funcs.c" />
+    <ClCompile Include="..\..\..\src\isomedia\data_map.c" />
+    <ClCompile Include="..\..\..\src\isomedia\drm_sample.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_intern.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_read.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_store.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_write.c" />
+    <ClCompile Include="..\..\..\src\isomedia\media.c" />
+    <ClCompile Include="..\..\..\src\isomedia\media_odf.c" />
+    <ClCompile Include="..\..\..\src\isomedia\meta.c" />
+    <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c" />
+    <ClCompile Include="..\..\..\src\isomedia\sample_descs.c" />
+    <ClCompile Include="..\..\..\src\isomedia\stbl_read.c" />
+    <ClCompile Include="..\..\..\src\isomedia\stbl_write.c" />
+    <ClCompile Include="..\..\..\src\isomedia\track.c" />
+    <ClCompile Include="..\..\..\src\isomedia\tx3g.c" />
+    <ClCompile Include="..\..\..\src\media_tools\webvtt.c" />
+    <ClCompile Include="..\..\..\src\odf\descriptors.c" />
+    <ClCompile Include="..\..\..\src\odf\desc_private.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_code.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_codec.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_command.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_parse.c" />
+    <ClCompile Include="..\..\..\src\odf\slc.c" />
+    <ClCompile Include="..\..\..\src\utils\alloc.c" />
+    <ClCompile Include="..\..\..\src\utils\bitstream.c" />
+    <ClCompile Include="..\..\..\src\utils\configfile.c" />
+    <ClCompile Include="..\..\..\src\utils\error.c" />
+    <ClCompile Include="..\..\..\src\utils\list.c" />
+    <ClCompile Include="..\..\..\src\utils\os_config_init.c" />
+    <ClCompile Include="..\..\..\src\utils\os_divers.c" />
+    <ClCompile Include="..\..\..\src\utils\os_thread.c" />
+    <ClCompile Include="..\..\..\src\utils\url.c" />
+    <ClCompile Include="main.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{978A2D9F-E44F-4073-8032-333563BCC160}</ProjectGuid>
+    <ProjectName>fmp4demux</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/fmp4demux.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <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>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);../../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/fmp4demux.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/fmp4demux.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <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>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/fmp4demux.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../../extra_lib/lib/w32_rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\Release/fmp4demux.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/fmp4demux.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/fmp4demux.vcxproj.filters Added

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_base.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_funcs.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\data_map.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\drm_sample.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\isom_intern.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\isom_read.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\isom_store.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\isom_write.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\media.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\media_odf.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\meta.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\sample_descs.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\stbl_read.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\stbl_write.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\track.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\tx3g.c">
+      <Filter>isoff</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\bitstream.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\error.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\list.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\desc_private.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\descriptors.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\odf_code.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\odf_codec.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\odf_command.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\odf_parse.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\media_tools\webvtt.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="main.c" />
+    <ClCompile Include="..\..\..\src\utils\url.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\odf\slc.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\alloc.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\configfile.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\os_config_init.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\os_thread.c">
+      <Filter>others</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\utils\os_divers.c">
+      <Filter>others</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="isoff">
+      <UniqueIdentifier>{c9a8f639-328c-4505-be50-4859357c2c00}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="others">
+      <UniqueIdentifier>{e5ca7285-ca00-49d8-ac81-dff3d494be9a}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/main.c Added

@@ -0,0 +1,315 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2013-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / sample MP4 demultiplexing application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+//#define GPAC_HAVE_CONFIG_H
+
+#include <gpac/tools.h>
+#include <gpac/isomedia.h>
+#include <gpac/thread.h>
+
+#define BUFFER_BLOC_SIZE 1000
+#define MAX_BUFFER_SIZE 200000
+
+typedef struct iso_progressive_reader {
+
+	/* data buffer to be read by the parser */
+	u8 *data;
+	/* size of the data buffer */
+	u32 data_size;
+	/* number of valid bytes in the buffer */
+	u32 valid_data_size;
+	/* URL used to pass a buffer to the parser */
+	char data_url[256];
+
+	/* The ISO file structure created for the parsing of data */
+	GF_ISOFile *movie;
+
+	/* Mutex to protect the reading from concurrent adding of media data */
+	GF_Mutex *mutex;
+
+	/* Boolean indicating if the thread should stop */
+	volatile Bool do_run;
+
+	/* Boolean state to indicate if the needs to be parsed */
+	Bool refresh_boxes;
+
+	/* id of the track in the ISO to be read */
+	u32 track_id;
+
+} ISOProgressiveReader;
+
+
+static u32 iso_progressive_read_thread(void *param)
+{
+	ISOProgressiveReader *reader = (ISOProgressiveReader *)param;
+	u32 track_number;
+	GF_ISOSample *iso_sample;
+	u32 samples_processed;
+	u32 sample_index;
+	u32 sample_count;
+
+	samples_processed = 0;
+	sample_count = 0;
+	track_number = 0;
+	/* samples are numbered starting from 1 */
+	sample_index = 1;
+
+	while (reader->do_run == GF_TRUE) {
+
+		/* we can only parse if there is a movie */
+		if (reader->movie) {
+
+			/* block the data input until we are done in the parsing */
+			gf_mx_p(reader->mutex);
+
+			/* 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) {
+				u32 new_sample_count;
+				u32 di; /*descriptor index*/
+
+				/* let's see how many samples we have since the last parsed */
+				new_sample_count = gf_isom_get_sample_count(reader->movie, track_number);
+				if (new_sample_count > sample_count) {
+					/* New samples have been added to the file */
+					fprintf(stdout, "Found %d new samples (total: %d)\n", new_sample_count - sample_count, new_sample_count);
+					if (sample_count == 0) {
+						sample_count = new_sample_count;
+					}
+				}
+				if (sample_count == 0) {
+					/* no sample yet, let the data input force a reparsing of the data */
+					reader->refresh_boxes = GF_TRUE;
+					/*let the reader push new data */
+					gf_mx_v(reader->mutex);
+					//gf_sleep(1000);
+				} else {
+					/* 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;
+
+					/* let's analyze the samples we have parsed so far one by one */
+					iso_sample = gf_isom_get_sample(reader->movie, track_number, sample_index, &di);
+					if (iso_sample) {
+						/* 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;
+							u64 missing_bytes;
+
+							fprintf(stdout, "\nReleasing unnecessary buffers\n");
+							/* release internal structures associated with the samples read so far */
+							gf_isom_reset_tables(reader->movie, GF_TRUE);
+
+#if 1
+							/* release the associated input data as well */
+							gf_isom_reset_data_offset(reader->movie, &new_buffer_start);
+							if (new_buffer_start) {
+								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
+
+							/* update the sample count and sample index */
+							sample_count = new_sample_count - sample_count;
+							assert(sample_count == 0);
+							sample_index = 1;
+						}
+					} else {
+						GF_Err e = gf_isom_last_error(reader->movie);
+						fprintf(stdout, "Could not get sample %s\r", gf_error_to_string(e));
+					}
+					/* and finally, let the data reader push more data */
+					gf_mx_v(reader->mutex);
+				}
+			}
+		} else {
+			//gf_sleep(1);
+		}
+	}
+	return 0;
+}
+
+int main(int argc, char **argv)
+{
+	/* The ISO progressive reader */
+	ISOProgressiveReader reader;
+	/* Error indicator */
+	GF_Err e;
+	/* input file to be read in the data buffer */
+	FILE *input;
+	/* number of bytes read from the file at each read operation */
+	u32 read_bytes;
+	/* number of bytes read from the file (total) */
+	u64 total_read_bytes;
+	/* size of the input file */
+	u64 file_size;
+	/* number of bytes required to finish the current ISO Box reading (not used here)*/
+	u64 missing_bytes;
+	/* Thread used to run the ISO parsing in */
+	GF_Thread *reading_thread;
+	/* Return value for the program */
+	int ret = 0;
+
+	/* Usage */
+	if (argc != 2) {
+		fprintf(stdout, "Usage: %s filename\n", argv[0]);
+		return 1;
+	}
+
+	/* Initializing GPAC framework */
+	/* Enables GPAC memory tracking in debug mode only */
+#if defined(DEBUG) || defined(_DEBUG)
+	gf_sys_init(GF_TRUE);
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+	gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
+#else
+	gf_sys_init(GF_FALSE);
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+#endif
+
+	/* This is an input file to read data from. Could be replaced by any other method to retrieve the data (e.g. JavaScript, socket, ...)*/
+	input = gf_f64_open(argv[1], "rb");
+	if (!input) {
+		fprintf(stdout, "Could not open file %s for reading.\n", argv[1]);
+		gf_sys_close();
+		return 1;
+	}
+
+	gf_f64_seek(input, 0, SEEK_END);
+	file_size = gf_f64_tell(input);
+	gf_f64_seek(input, 0, SEEK_SET);
+
+	/* Initializing the progressive reader */
+	memset(&reader, 0, sizeof(ISOProgressiveReader));
+	reading_thread = gf_th_new("ISO reading thread");
+	reader.mutex = gf_mx_new("ISO Segment");
+	reader.do_run = GF_TRUE;
+	/* we want to parse the first track */
+	reader.track_id = 1;
+	/* start the async parsing */
+	gf_th_run(reading_thread, iso_progressive_read_thread, &reader);
+
+	/* start the data reading */
+	reader.data_size = BUFFER_BLOC_SIZE;
+	reader.data = (u8 *)gf_malloc(reader.data_size);
+	reader.valid_data_size = 0;
+	total_read_bytes = 0;
+	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);
+			gf_mx_v(reader.mutex);
+			//gf_sleep(10);
+		} else {
+			/* make sure we have enough space in the buffer to read the next bloc of data */
+			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);
+			total_read_bytes += read_bytes;
+			fprintf(stdout, "Read "LLD" bytes of "LLD" bytes from input file %s (buffer status: %5d/%5d)\r", total_read_bytes, file_size, argv[1], reader.valid_data_size, reader.data_size);
+			if (read_bytes) {
+				reader.valid_data_size += read_bytes;
+				sprintf(reader.data_url, "gmem://%d@%p", reader.valid_data_size, reader.data);
+			} else {
+				/* end of file we can quit */
+				gf_mx_v(reader.mutex);
+				break;
+			}
+
+			/* if the file is not yet opened (no movie), open it in progressive mode (to update its data later on) */
+			if (!reader.movie) {
+				/* let's initialize the parser */
+				e = gf_isom_open_progressive(reader.data_url, 0, 0, &reader.movie, &missing_bytes);
+				if (reader.movie) {
+					gf_isom_set_single_moof_mode(reader.movie, GF_TRUE);
+				}
+				/* we can let parser try to work now */
+				gf_mx_v(reader.mutex);
+
+				if ((e == GF_OK || e == GF_ISOM_INCOMPLETE_FILE) && reader.movie) {
+					/* nothing to do, this is normal */
+				} else {
+					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);
+
+				/* we can let parser try to work now */
+				gf_mx_v(reader.mutex);
+
+				if (e != GF_OK && e != GF_ISOM_INCOMPLETE_FILE) {
+					fprintf(stdout, "Error refreshing fragmented mp4: %s (missing "LLD" bytes)\n", gf_error_to_string(e), missing_bytes);
+					ret = 1;
+					goto exit;
+				}
+			}
+		
+			//gf_sleep(1);
+		}
+	}
+
+exit:
+	/* stop the parser */
+	reader.do_run = GF_FALSE;
+	gf_th_stop(reading_thread);
+
+	/* clean structures */
+	gf_th_del(reading_thread);
+	gf_mx_del(reader.mutex);
+	gf_free(reader.data);
+	gf_isom_close(reader.movie);
+	fclose(input);
+	gf_sys_close();
+
+	return ret;
+}

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/objs Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/objs/isomedia Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/objs/media_tools Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/objs/odf Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/fmp4demux/objs/utils Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/hevcbench Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/hevcbench/defbench.h Added

@@ -0,0 +1,111 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC - sample DASH library usage
+ *
+ */
+
+#ifndef __DEF_BENCH_H__
+#define __DEF_BENCH_H__
+
+#include <gpac/isomedia.h>
+#include <openHevcWrapper.h>
+#include <windows.h>
+#define SDL_MAIN_HANDLED
+#include <SDL.h>
+#include <gpac/math.h>
+
+#define GL_GLEXT_PROTOTYPES
+
+#include <GL/GL.h>
+#include <gpac/isomedia.h>
+
+
+
+
+#define GL_CHECK_ERR  {s32 res = glGetError(); if (res) GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error %d file %s line %d\n", res, __FILE__, __LINE__)); }
+
+/*macros for GL proto and fun declaration*/
+#ifdef _WIN32_WCE
+#define GLAPICAST *
+#elif defined(WIN32)
+#include <windows.h>
+#define GLAPICAST APIENTRY *
+#else
+#define GLAPICAST *
+#endif
+
+#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
+//no extensions with TinyGL
+#elif defined (GPAC_USE_OGL_ES)
+//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) 
+#elif defined(CONFIG_DARWIN_GL)
+extern void (*glutGetProcAddress(const GLubyte *procname))( void );
+#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) 
+#endif
+
+
+
+#define DEL_SHADER(_a) if (_a) { glDeleteShader(_a); _a = 0; }
+#define DEL_PROGRAM(_a) if (_a) { glDeleteProgram(_a); _a = 0; }
+
+
+GLDECL(GLuint, glCreateProgram, (void) )
+GLDECL(void, glDeleteProgram, (GLuint ) )
+GLDECL(void, glLinkProgram, (GLuint program) )
+GLDECL(void, glUseProgram, (GLuint program) )
+GLDECL(GLuint, glCreateShader, (GLenum shaderType) )
+GLDECL(void, glDeleteShader, (GLuint shader) )
+GLDECL(void, glShaderSource, (GLuint shader, GLsizei count, const char **string, const GLint *length) )
+GLDECL(void, glCompileShader, (GLuint shader) )
+GLDECL(void, glAttachShader, (GLuint program, GLuint shader) )
+GLDECL(void, glDetachShader, (GLuint program, GLuint shader) )
+GLDECL(void, glGetShaderiv, (GLuint shader, GLenum type, GLint *res) )
+GLDECL(void, glGetInfoLogARB, (GLuint shader, GLint size, GLsizei *rsize, const char *logs) )
+GLDECL(GLint, glGetUniformLocation, (GLuint prog, const char *name) )
+GLDECL(void, glUniform1f, (GLint location, GLfloat v0) )
+GLDECL(void, glUniform1i, (GLint location, GLint v0) )
+GLDECL(void, glActiveTexture, (GLenum texture) )
+GLDECL(void, glClientActiveTexture, (GLenum texture) )
+GLDECL(void, glGenBuffers, (GLsizei , GLuint *) )
+GLDECL(void, glDeleteBuffers, (GLsizei , GLuint *) )
+GLDECL(void, glBindBuffer, (GLenum, GLuint ) )
+GLDECL(void, glBufferData, (GLenum, int, void *, GLenum) )
+GLDECL(void, glBufferSubData, (GLenum, int, int, void *) )
+GLDECL(void *, glMapBuffer, (GLenum, GLenum) )
+GLDECL(void *, glUnmapBuffer, (GLenum) )
+
+
+#define GL_TEXTURE_RECTANGLE_EXT 0x84F5
+
+#define GL_INFO_LOG_LENGTH 0x8B84
+#define GL_FRAGMENT_SHADER 0x8B30
+#define GL_VERTEX_SHADER 0x8B31
+#define GL_PIXEL_UNPACK_BUFFER_ARB   0x88EC
+#define GL_STREAM_DRAW_ARB   0x88E0
+#define GL_WRITE_ONLY_ARB   0x88B9
+#define GL_DYNAMIC_DRAW_ARB   0x88E8
+
+#define 	GL_TEXTURE0   0x84C0
+#define 	GL_TEXTURE1   0x84C1
+#define 	GL_TEXTURE2   0x84C2
+
+
+#endif

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/hevcbench/hevcbench.vcxproj Added

@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F728CC84-A7D1-43D2-8A28-05CE9F2FE0D0}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>
+      </TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>C:\works\software\signals\modules\extra_lib\include\SDL2\;../../../include;../../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\obj\mp42ts_deb/$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\obj\mp42ts_deb/</AssemblerListingLocation>
+      <ObjectFileName>.\obj\mp42ts_deb/</ObjectFileName>
+      <ProgramDataBaseFileName>.\obj\mp42ts_deb/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>C:\works\software\signals\modules\extra_lib\lib/$(Platform)/$(Configuration);../../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TypeLibraryName>
+      </TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>C:\works\software\signals\modules\extra_lib\include\SDL2\;../../../include;../../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>.\obj\mp42ts_deb/$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\obj\mp42ts_deb/</AssemblerListingLocation>
+      <ObjectFileName>.\obj\mp42ts_deb/</ObjectFileName>
+      <ProgramDataBaseFileName>.\obj\mp42ts_deb/</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>C:\works\software\signals\modules\extra_lib\lib/$(Platform)/$(Configuration);../../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>
+      </TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>C:\works\software\signals\modules\extra_lib\include\SDL2\;../../../include;../../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\obj\mp42ts_rel/</AssemblerListingLocation>
+      <ObjectFileName>.\obj\mp42ts_rel/</ObjectFileName>
+      <ProgramDataBaseFileName>.\obj\mp42ts_rel/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>C:\works\software\signals\modules\extra_lib\lib/$(Platform)/$(Configuration);../../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TypeLibraryName>
+      </TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../../include;../../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\obj\mp42ts_rel/$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\obj\mp42ts_rel/</AssemblerListingLocation>
+      <ObjectFileName>.\obj\mp42ts_rel/</ObjectFileName>
+      <ProgramDataBaseFileName>.\obj\mp42ts_rel/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="main.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\build\msvc10\libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/hevcbench/main.c Added

@@ -0,0 +1,837 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre
+ *			Copyright (c) Telecom ParisTech 2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC - sample DASH library usage
+ *
+ */
+
+#include "defbench.h"
+
+
+
+#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
+#  pragma comment(lib, "libLibOpenHevcWrapper")
+#pragma comment(lib, "SDL2")
+//#pragma comment(lib, "SDL2main")
+#pragma comment(lib, "opengl32")
+#endif
+
+//0: memcpy - 1: memmove - 2: u32 * cast and for loop copy of u32* - 3: memset 0 - 4: not touching the mapped buffer: 5: full memcpy, rely on stride in pixelstorei
+#define COPY_TYPE 0
+//set to 1 to disable final gltexImage in PBO mode
+#define NO_TEX	0
+
+
+SDL_Window *window = NULL;
+SDL_GLContext *glctx= NULL;
+SDL_Renderer *render= NULL;
+GLint txid[3];
+u8 *pY = NULL;
+u8 *pU = NULL;
+u8 *pV = NULL;
+u32 width = 0;
+u32 height = 0;
+u32 size=0;
+u32 bpp=8;
+u32 Bpp=1;
+GLint memory_format=GL_UNSIGNED_BYTE;
+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;
+Bool pbo_mode = GF_TRUE;
+Bool first_tx_load = GF_FALSE;
+Bool use_vsync=0;
+
+GLint glsl_program;
+GLint vertex_shader;
+GLint fragment_shader;
+
+GLint pbo_Y=0;
+GLint pbo_U=0;
+GLint pbo_V=0;
+
+GLDECL_STATIC(glActiveTexture);
+GLDECL_STATIC(glClientActiveTexture);
+GLDECL_STATIC(glCreateProgram);
+GLDECL_STATIC(glDeleteProgram);
+GLDECL_STATIC(glLinkProgram);
+GLDECL_STATIC(glUseProgram);
+GLDECL_STATIC(glCreateShader);
+GLDECL_STATIC(glDeleteShader);
+GLDECL_STATIC(glShaderSource);
+GLDECL_STATIC(glCompileShader);
+GLDECL_STATIC(glAttachShader);
+GLDECL_STATIC(glDetachShader);
+GLDECL_STATIC(glGetShaderiv);
+GLDECL_STATIC(glGetInfoLogARB);
+GLDECL_STATIC(glGetUniformLocation);
+GLDECL_STATIC(glUniform1f);
+GLDECL_STATIC(glUniform1i);
+GLDECL_STATIC(glGenBuffers);
+GLDECL_STATIC(glDeleteBuffers);
+GLDECL_STATIC(glBindBuffer);
+GLDECL_STATIC(glBufferData);
+GLDECL_STATIC(glBufferSubData);
+GLDECL_STATIC(glMapBuffer);
+GLDECL_STATIC(glUnmapBuffer);
+
+
+static char *glsl_yuv_shader = "\
+	#version 140\n\
+	#extension GL_ARB_texture_rectangle : enable\n\
+	uniform sampler2DRect y_plane;\
+	uniform sampler2DRect u_plane;\
+	uniform sampler2DRect v_plane;\
+	uniform float width;\
+	uniform float height;\
+	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\
+	const vec3 R_mul = vec3(1.164,  0.000,  1.596);\
+	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\
+	const vec3 B_mul = vec3(1.164,  2.018,  0.000);\
+	out vec4 FragColor;\
+	void main(void)  \
+	{\
+		vec2 texc;\
+		vec3 yuv, rgb;\
+		texc = gl_TexCoord[0].st;\
+		texc.y = 1.0 - texc.y;\
+		texc.x *= width;\
+		texc.y *= height;\
+		yuv.x = texture2DRect(y_plane, texc).r; \
+		texc.x /= 2.0;\
+		texc.y /= 2.0;\
+		yuv.y = texture2DRect(u_plane, texc).r; \
+		yuv.z = texture2DRect(v_plane, texc).r; \
+		yuv += offset; \
+	    rgb.r = dot(yuv, R_mul); \
+	    rgb.g = dot(yuv, G_mul); \
+	    rgb.b = dot(yuv, B_mul); \
+		FragColor = vec4(rgb, 1.0);\
+	}";
+
+static char *default_glsl_vertex = "\
+	varying vec3 gfNormal;\
+	varying vec3 gfView;\
+	void main(void)\
+	{\
+		gfView = vec3(gl_ModelViewMatrix * gl_Vertex);\
+		gfNormal = normalize(gl_NormalMatrix * gl_Normal);\
+		gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\
+		gl_TexCoord[0] = gl_MultiTexCoord0;\
+	}";
+
+
+
+Bool sdl_compile_shader(u32 shader_id, const char *name, const char *source)
+{
+	GLint blen = 0;	
+	GLsizei slen = 0;
+	u32 len;
+	if (!source || !shader_id) return 0;
+	len = (u32) strlen(source);
+	glShaderSource(shader_id, 1, &source, &len);
+	glCompileShader(shader_id);
+	
+	glGetShaderiv(shader_id, GL_INFO_LOG_LENGTH , &blen);       
+	if (blen > 1) {
+		char* compiler_log = (char*) gf_malloc(blen);
+#ifdef CONFIG_DARWIN_GL
+		glGetInfoLogARB((GLhandleARB) shader_id, blen, &slen, compiler_log);
+#else
+		glGetInfoLogARB(shader_id, blen, &slen, compiler_log);
+#endif
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[GLSL] Failed to compile shader %s: %s\n", name, compiler_log));
+		gf_free (compiler_log);
+		return 0;
+	}
+	return 1;
+}
+
+void sdl_init(u32 _width, u32 _height, u32 _bpp, u32 stride, Bool use_pbo)
+{
+	u32 i, flags;
+	Float hw, hh;
+	GLint loc;
+	GF_Matrix mx;
+	width = _width;
+	height = _height;
+	bpp = _bpp;
+
+
+	SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+	SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+	SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 0);
+	SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+	SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+
+	flags = SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE | SDL_WINDOW_BORDERLESS | SDL_WINDOW_MAXIMIZED;
+	if (use_vsync) flags |= SDL_RENDERER_PRESENTVSYNC;
+	window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, flags);
+	glctx = SDL_GL_CreateContext(window);
+	SDL_GL_MakeCurrent(window, glctx);
+
+	render = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED);
+
+
+#if (COPY_TYPE==5) 
+	size = stride*height;
+#else
+	size = width*height;
+#endif
+	if (bpp>8) {
+		size *= 2;
+		Bpp = 2;
+	}
+	pY = gf_malloc(size*sizeof(u8));
+	memset(pY, 0x80, size*sizeof(u8));
+	pU = gf_malloc(size/4*sizeof(u8));
+	memset(pU, 0, size/4*sizeof(u8));
+	pV = gf_malloc(size/4*sizeof(u8));
+	memset(pV, 0, size/4*sizeof(u8));
+
+	glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
+	glViewport(0, 0, width, height);
+
+	gf_mx_init(mx);
+	hw = ((Float)width)/2;
+	hh = ((Float)height)/2;
+	gf_mx_ortho(&mx, -hw, hw, -hh, hh, 50, -50);
+	glMatrixMode(GL_PROJECTION);
+	glLoadMatrixf(mx.m);
+
+
+	glMatrixMode(GL_TEXTURE);
+	glLoadIdentity();
+
+	glMatrixMode(GL_MODELVIEW);
+	glLoadIdentity();
+
+	glClear(GL_DEPTH_BUFFER_BIT);
+	glDisable(GL_NORMALIZE);
+	glDisable(GL_DEPTH_TEST);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+	glDisable(GL_LINE_SMOOTH);
+	glDisable(GL_LINE_SMOOTH);
+	glDisable(GL_LIGHTING);
+	glDisable(GL_BLEND);
+	glDisable(GL_TEXTURE_2D);
+	glDisable(GL_CULL_FACE);
+
+
+	GET_GLFUN(glActiveTexture);
+	GET_GLFUN(glClientActiveTexture);
+	GET_GLFUN(glCreateProgram);
+	GET_GLFUN(glDeleteProgram);
+	GET_GLFUN(glLinkProgram);
+	GET_GLFUN(glUseProgram);
+	GET_GLFUN(glCreateShader);
+	GET_GLFUN(glDeleteShader);
+	GET_GLFUN(glShaderSource);
+	GET_GLFUN(glCompileShader);
+	GET_GLFUN(glAttachShader);
+	GET_GLFUN(glDetachShader);
+	GET_GLFUN(glGetShaderiv);
+	GET_GLFUN(glGetInfoLogARB);
+	GET_GLFUN(glGetUniformLocation);
+	GET_GLFUN(glUniform1f);
+	GET_GLFUN(glUniform1i);
+	GET_GLFUN(glGenBuffers);
+	GET_GLFUN(glDeleteBuffers);
+	GET_GLFUN(glBindBuffer);
+	GET_GLFUN(glBufferData);
+	GET_GLFUN(glBufferSubData);
+	GET_GLFUN(glMapBuffer);
+	GET_GLFUN(glUnmapBuffer);
+
+	glsl_program = glCreateProgram();
+	vertex_shader = glCreateShader(GL_VERTEX_SHADER);
+	sdl_compile_shader(vertex_shader, "vertex", default_glsl_vertex);
+
+	fragment_shader = glCreateShader(GL_FRAGMENT_SHADER);
+	sdl_compile_shader(fragment_shader, "fragment", glsl_yuv_shader);
+
+	glAttachShader(glsl_program, vertex_shader);
+	glAttachShader(glsl_program, fragment_shader);
+	glLinkProgram(glsl_program);  
+
+	glGenTextures(3, txid);
+	for (i=0; i<3; i++) {
+
+		glEnable(texture_type);
+		glBindTexture(texture_type, txid[i] );
+		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		if (bpp>8) {
+			glPixelTransferi(GL_RED_SCALE, 64);
+			memory_format=GL_UNSIGNED_SHORT;
+		}
+		glTexParameteri(texture_type, GL_TEXTURE_WRAP_S, GL_CLAMP);
+		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);
+		} else {
+			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		}
+		glDisable(texture_type);
+	}
+
+	//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
+	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);
+		if (loc == -1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
+			continue;
+		}
+		glUniform1i(loc, i);
+	}
+	loc = glGetUniformLocation(glsl_program, "width");
+	if (loc>= 0) {
+		Float w = (Float) width;
+		glUniform1f(loc, w);
+	}
+	loc = glGetUniformLocation(glsl_program, "height");
+	if (loc>= 0) {
+		Float h = (Float) height;
+		glUniform1f(loc, h);
+	}
+
+	glUseProgram(0);  
+
+
+	if (glMapBuffer==NULL) use_pbo = GF_FALSE;
+
+
+	pbo_mode = use_pbo;
+	first_tx_load = use_pbo ? GF_FALSE : GF_TRUE;
+	if (use_pbo) {
+		glGenBuffers(1, &pbo_Y);
+		glGenBuffers(1, &pbo_U);
+		glGenBuffers(1, &pbo_V);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
+		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
+		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size/4, NULL, GL_DYNAMIC_DRAW_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
+		glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size/4, NULL, GL_DYNAMIC_DRAW_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+	}
+}
+
+void sdl_close()
+{
+	DEL_SHADER(vertex_shader);
+	DEL_SHADER(fragment_shader);
+	DEL_PROGRAM(glsl_program );
+
+	if (pbo_mode && pbo_Y) {
+		glDeleteBuffers(1, &pbo_Y);
+		glDeleteBuffers(1, &pbo_U);
+		glDeleteBuffers(1, &pbo_V);
+	}
+
+	if (pY) gf_free(pY);
+	if (pU) gf_free(pU);
+	if (pV) gf_free(pV);
+
+	if (glctx) SDL_GL_DeleteContext(glctx);
+	if (render) SDL_DestroyRenderer(render);
+	if (window) SDL_DestroyWindow(window);
+}
+
+void sdl_draw_quad()
+{
+	Float w = ((Float)width)/2;
+	Float h = ((Float)height)/2;
+
+	glBegin(GL_QUADS);
+
+	glVertex3f(w, h, 0);
+	glTexCoord2f(1, 0);
+
+	glVertex3f(w, -h, 0);
+	glTexCoord2f(0, 0);
+
+	glVertex3f(-w, -h, 0);
+	glTexCoord2f(0, 1);
+
+	glVertex3f(-w, h, 0);
+	glTexCoord2f(1, 1);
+
+	glEnd();
+}
+
+
+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;
+
+	if (stride != w) {
+		if (bit_depth==10) {
+			if (stride != 2*w) {
+				needs_stride = stride;
+			}
+		} else {
+			needs_stride = stride;
+		}
+	}
+
+	glEnable(texture_type);
+
+	now = gf_sys_clock();
+
+
+	if (first_tx_load) {
+		glBindTexture(texture_type, txid[0] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
+		glTexImage2D(texture_type, 0, 1, w, h, 0, pixel_format, memory_format, pY);
+
+		glBindTexture(texture_type, txid[1] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, pU);
+
+		glBindTexture(texture_type, txid[2] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, pV);
+
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+		first_tx_load = GF_FALSE;
+	} else if (pbo_mode) {
+		u32 i, linesize, count, p_stride;
+		u8 *ptr;
+#if (COPY_TYPE==2)
+		u32 *s, *d;
+		u32 j, c2;
+#endif
+
+		glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
+		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+#if (COPY_TYPE==5)
+		memcpy(ptr, pY, size);
+#elif (COPY_TYPE==3)
+		memset(ptr, 0x80, size);
+#elif (COPY_TYPE==4)
+#else
+		linesize = width*Bpp;
+		p_stride = stride*Bpp;
+		count = h;
+#if (COPY_TYPE==2)
+		c2 = linesize/4;
+		s = (u32 *)pY;
+		d = (u32 *)ptr;
+#endif
+		for (i=0; i<count; i++) {
+#if (COPY_TYPE==0) || (COPY_TYPE==1)
+#if (COPY_TYPE==0)
+			memcpy(ptr, pY, linesize);
+#else
+			memmove(ptr, pY, linesize);
+#endif
+			pY+= p_stride;
+			ptr += linesize;
+#else
+			for (j=0; j<linesize/4; j++) {
+				*d++ = *s++;;
+			}
+			s+= (p_stride-linesize)/4;
+#endif
+		}
+#endif
+		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
+		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+#if (COPY_TYPE==5)
+		memcpy(ptr, pU, size/4);
+#elif (COPY_TYPE==3)
+		memset(ptr, 0x80, size/4);
+#elif (COPY_TYPE==4)
+#else
+		linesize = width*Bpp/2;
+		p_stride = stride*Bpp/2;
+		count/=2;
+#if (COPY_TYPE==2)
+		c2 /= 2;
+		s = (u32 *)pU;
+		d = (u32 *)ptr;
+#endif
+		for (i=0; i<count; i++) {
+#if (COPY_TYPE==0) || (COPY_TYPE==1)
+#if (COPY_TYPE==0)
+			memcpy(ptr, pU, linesize);
+#else
+			memmove(ptr, pU, linesize);
+#endif
+			pU+= p_stride;
+			ptr += linesize;
+#else
+			for (j=0; j<linesize/4; j++) {
+				*d++ = *s++;;
+			}
+			s+= (p_stride-linesize)/4;
+#endif
+		}
+#endif
+		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
+		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+#if (COPY_TYPE==5)
+		memcpy(ptr, pV, size/4);
+#elif (COPY_TYPE==3)
+		memset(ptr, 0x80, size/4);
+#elif (COPY_TYPE==4)
+#else
+#if (COPY_TYPE==2)
+		s = (u32 *)pV;
+		d = (u32 *)ptr;
+#endif
+		for (i=0; i<count; i++) {
+#if (COPY_TYPE==0) || (COPY_TYPE==1)
+#if (COPY_TYPE==0)
+			memcpy(ptr, pV, linesize);
+#else
+			memmove(ptr, pV, linesize);
+#endif
+			pV+= p_stride;
+			ptr += linesize;
+#else
+			for (j=0; j<linesize/4; j++) {
+				*d++ = *s++;;
+			}
+			s+= (p_stride-linesize)/4;
+#endif
+		}
+#endif
+		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+
+#if (COPY_TYPE!=5)	
+		needs_stride=0;
+#endif
+		
+
+#if (NO_TEX==0)
+		glBindTexture(texture_type, txid[0] );
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_Y);
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
+		glTexImage2D(texture_type, 0, 1, w, h, 0, pixel_format, memory_format, NULL);
+		//glTexSubImage2D crashes with PBO and 2-bytes luminance on my FirePro W5000 ...
+//		glTexSubImage2D(texture_type, 0, 0, 0, w, h, pixel_format, memory_format, pY);
+
+		glBindTexture(texture_type, txid[1] );
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_U);
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, NULL);
+//		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pU);
+
+		glBindTexture(texture_type, txid[2] );
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_V);
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexImage2D(texture_type, 0, 1, w/2, h/2, 0, pixel_format, memory_format, NULL);
+//		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pV);
+#endif
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+	} else {
+		glBindTexture(texture_type, txid[0] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride);
+		glTexSubImage2D(texture_type, 0, 0, 0, w, h, pixel_format, memory_format, pY);
+		glBindTexture(texture_type, 0);
+
+		glBindTexture(texture_type, txid[1] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pU);
+		glBindTexture(texture_type, 0);
+
+		glBindTexture(texture_type, txid[2] );
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, needs_stride/2);
+		glTexSubImage2D(texture_type, 0, 0, 0, w/2, h/2, pixel_format, memory_format, pV);
+		glBindTexture(texture_type, 0);
+
+		if (needs_stride) glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+	}
+	end = gf_sys_clock() - now;
+
+	if (!first_tx_load) {
+		gl_nb_frames ++;
+		gl_upload_time += end;
+	}
+
+	glUseProgram(glsl_program);
+
+	glActiveTexture(GL_TEXTURE2);
+	glBindTexture(texture_type, txid[2]);
+
+	glActiveTexture(GL_TEXTURE1);
+	glBindTexture(texture_type, txid[1]);
+
+	glActiveTexture(GL_TEXTURE0 );
+	glBindTexture(texture_type, txid[0]);
+		
+	glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+	glClientActiveTexture(GL_TEXTURE0);
+
+	sdl_draw_quad();
+
+	glDisable(texture_type);
+	glUseProgram(0);
+
+	glActiveTexture(GL_TEXTURE0);
+	glBindTexture(texture_type, 0);
+
+	SDL_GL_SwapWindow(window);
+
+	gl_draw_time += gf_sys_clock() - now;
+	return;
+}
+
+
+void sdl_bench()
+{
+	Double rate;
+	u32 i, count;
+	u32 start = gf_sys_clock();
+
+	count = 600;
+	for (i=0; i<count; i++) {
+		sdl_draw_frame(pY, pU, pV, width, height, 8, width);
+	}
+	
+	start = gf_sys_clock() - start;
+	rate = 3*size/2;
+	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);
+}
+
+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"
+			);
+}
+
+int main(int argc, char **argv)
+{
+	Bool sdl_bench_yuv = GF_FALSE;
+	Bool no_display = GF_FALSE;
+	u32 start, now, check_prompt;
+	Bool sdl_is_init=GF_FALSE, run;
+	Bool paused = GF_FALSE;
+	u32 pause_time = 0;
+	GF_ISOFile *isom;
+	u32 i, count, track = 0;
+	u32 nb_frames_at_start = 0;
+	GF_ESD *esd;
+	u32 nb_threads = 6;
+	u32 mode = 1;
+	Bool use_raw_memory = GF_TRUE;
+	OpenHevc_Handle ohevc;
+	Bool use_pbo = GF_FALSE;
+	Bool enable_mem_tracker = GF_FALSE;
+	const char *src = NULL;
+
+	if (argc<2) {
+		PrintUsage();
+		return 0;
+	}
+
+	for (i=0; i<(u32)argc; i++) {
+		char *arg = argv[i];
+		if (arg[0]!='-') {
+			src = arg;
+			continue;
+		}
+		if (!strcmp(arg, "-bench-yuv")) sdl_bench_yuv=1;
+		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;
+		else if (!strcmp(arg, "-no-display")) no_display = 1;
+		else if (!strcmp(arg, "-mem-track")) enable_mem_tracker = GF_TRUE;
+		else if (!strncmp(arg, "-nb-threads=", 12)) nb_threads = atoi(arg+12);
+		else if (!strncmp(arg, "-mode=", 6)) {
+			if (!strcmp(arg+6, "wpp")) mode = 2;
+			else if (!strcmp(arg+6, "frame+wpp")) mode = 3;
+			else mode = 1;
+		}
+
+		else if (!strcmp(arg, "-h")) {
+			PrintUsage();
+			return 0;
+		}
+	}
+
+	
+
+	/*****************/
+	/*   gpac init   */
+	/*****************/
+#ifdef GPAC_MEMORY_TRACKING
+	gf_sys_init(enable_mem_tracker);
+#else
+	gf_sys_init(GF_FALSE);
+#endif
+	gf_log_set_tool_level(GF_LOG_ALL, GF_LOG_WARNING);
+
+	if (sdl_bench_yuv) {
+		sdl_init(3840, 2160, 8, 3840, use_pbo);
+		sdl_bench();
+		sdl_close();
+		gf_sys_close();
+		return 0;
+	}
+	if (!src) {
+			PrintUsage();
+			gf_sys_close();
+			return 0;
+	}
+
+
+	isom = gf_isom_open(src, GF_ISOM_OPEN_READ, NULL);
+	if (!isom) {
+		sdl_close();
+		gf_sys_close();
+		return 0;
+	}
+
+	for (i=0; i<gf_isom_get_track_count(isom); i++) {
+		if (gf_isom_get_hevc_shvc_type(isom, i+1, 1)>=GF_ISOM_HEVCTYPE_HEVC_ONLY) {
+			track = i+1;
+			break;
+		}
+	}
+
+	if (!track) {
+		gf_isom_close(isom);
+		sdl_close();
+		gf_sys_close();
+		return 0;
+	}
+
+	count = gf_isom_get_sample_count(isom, track);
+	start = gf_sys_clock();
+
+	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);
+	gf_odf_desc_del((GF_Descriptor *)esd);
+	gf_isom_set_sample_padding(isom, track, 8);
+
+	run=1;
+	check_prompt=0;
+	for (i=0; i<count && run; i++) {
+		u32 di;
+		if (!paused) {
+			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);
+				} else if (use_raw_memory) {
+					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);
+				} else {
+					memset(&HVCFrame, 0, sizeof(OpenHevc_Frame) );
+					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 ); 
+		} else {
+			gf_sleep(10);
+			i--;
+		}
+		check_prompt++;
+		if (check_prompt==50) {
+			if (gf_prompt_has_input()) {
+				switch (gf_prompt_get_char()) {
+				case 'q':
+					run = 0;
+					break;
+				case 'm':
+					use_raw_memory = !use_raw_memory;
+					break;
+				case 'p':
+					if (paused) {
+						paused=0;
+						start += gf_sys_clock()-pause_time;
+					} else {
+						paused = 1;
+						pause_time=gf_sys_clock();
+					}
+					break;
+				case 'r':
+					start = gf_sys_clock();
+					nb_frames_at_start = i+1;
+					gl_upload_time = gl_draw_time = 0;
+					gl_nb_frames=1;
+					break;
+
+				}
+			}
+			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) ); 
+
+	libOpenHevcClose(ohevc);
+	gf_isom_close(isom);
+
+	if (!no_display) 
+		sdl_close();
+		
+	gf_sys_close();
+	return 1;
+}
+

gpac-0.5.0.svn4668.tar.bz2/applications/testapps/loadcompare/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/testapps/loadcompare/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/applications/testapps/mpedemux/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/testapps/mpedemux/Makefile Changed

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/Makefile Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/build.sh Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/main.c Added

@@ -0,0 +1,139 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau - Cyril Concolato
+ *			Copyright (c) Romain Bouqueau 2013-
+ *			Copyright (c) Telecom ParisTech 2013-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / sample MP4 demultiplexing application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/tools.h>
+#include <gpac/isomedia.h>
+
+static void process_samples_from_track(GF_ISOFile *movie, u32 track_id, u32 *sample_index)
+{
+	u32 track_number;
+	u32 sample_count;
+	/* Error indicator */
+	GF_Err e;
+	/* Number of bytes required to finish the current ISO Box reading */
+	u64 missing_bytes;
+
+	track_number = gf_isom_get_track_by_id(movie, track_id);
+	if (track_number == 0) {
+		fprintf(stdout, "Could not find track ID=%u. Ignore segment.\n", track_id);
+		return;
+	}
+
+	sample_count = gf_isom_get_sample_count(movie, track_number);
+	while (*sample_index <= sample_count) {
+		GF_ISOSample *iso_sample;
+		u32 sample_description_index;
+
+		iso_sample = gf_isom_get_sample(movie, track_number, *sample_index, &sample_description_index);
+		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 {
+			e = gf_isom_last_error(movie);
+			if (e == GF_ISOM_INCOMPLETE_FILE) {
+				missing_bytes = gf_isom_get_missing_bytes(movie, track_number);
+				fprintf(stdout, "Missing "LLU" bytes on input file\n", missing_bytes);
+				gf_sleep(1000);
+			}
+		}
+	}
+}
+
+int main(int argc, char **argv)
+{
+	/* The ISO progressive reader */
+	GF_ISOFile *movie;
+	/* Error indicator */
+	GF_Err e;
+	/* Number of bytes required to finish the current ISO Box reading */
+	u64 missing_bytes;
+	/* Return value for the program */
+	int ret = 0;
+	/* Maximum index of the segments*/
+	u32 seg_max = argc-2;
+	/* Number of the segment being processed*/
+	u32 seg_curr = 0;
+	u32 track_id = 1;
+	u32 sample_index = 1;
+
+	/* Usage */
+	if (argc < 2) {
+		fprintf(stdout, "Usage: %s filename0 [filename1 filename2 ...]\n", argv[0]);
+		return 1;
+	}
+
+#if defined(DEBUG) || defined(_DEBUG)
+	/* Enables GPAC memory tracking in debug mode only */
+	gf_sys_init(GF_TRUE);
+	gf_log_set_tool_level(GF_LOG_CONTAINER, GF_LOG_INFO);
+	gf_log_set_tool_level(GF_LOG_MEMORY, GF_LOG_INFO);
+#endif
+
+	/* First or init segment */
+	fprintf(stdout, "Process segment %5d/%5d: %s\n", seg_curr, seg_max, argv[seg_curr+1]);
+	e = gf_isom_open_progressive(argv[seg_curr+1], 0, 0, &movie, &missing_bytes);
+	if ((e != GF_OK && e != GF_ISOM_INCOMPLETE_FILE) || movie == NULL) {
+		fprintf(stdout, "Could not open file %s for reading (%s).\n", argv[seg_curr+1], gf_error_to_string(e));
+		return 1;
+	}
+	process_samples_from_track(movie, track_id, &sample_index);
+	seg_curr++;
+
+	/* Process segments */
+	while (seg_curr <= seg_max) {
+		fprintf(stdout, "Process segment %5d/%5d: %s\n", seg_curr, seg_max, argv[seg_curr+1]);
+
+		/* Open the segment */
+		e = gf_isom_open_segment(movie, argv[seg_curr+1], 0, 0, GF_FALSE);
+		if (e != GF_OK) {
+			fprintf(stdout, "Could not open segment %s for reading (%s).\n", argv[seg_curr+1], gf_error_to_string(e));
+			ret = 1;
+			goto exit;
+		}
+
+		/* Process the segment */
+		process_samples_from_track(movie, track_id, &sample_index);
+
+		/* Release the segment */
+		gf_isom_release_segment(movie, 1);
+
+		seg_curr++;
+	}
+
+exit:
+	fprintf(stdout, "Total nb Samples: %d\n", gf_isom_get_sample_count(movie, gf_isom_get_track_by_id(movie, track_id) ) );
+	gf_isom_release_segment(movie, 1);
+	gf_isom_close(movie);
+#if defined(DEBUG) || defined(_DEBUG)
+	/* Closes GPAC memory tracking in debug mode only */
+	gf_sys_close();
+#endif
+
+	return ret;
+}

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/segmp4demux.sln Added

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/segmp4demux.vcxproj Added

@@ -0,0 +1,189 @@
+<?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="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\isomedia\avc_ext.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">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>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\isomedia\box_code_3gpp.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_adobe.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_apple.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_base.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_drm.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_code_meta.c" />
+    <ClCompile Include="..\..\..\src\isomedia\box_funcs.c" />
+    <ClCompile Include="..\..\..\src\isomedia\data_map.c" />
+    <ClCompile Include="..\..\..\src\isomedia\drm_sample.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_intern.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_read.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_store.c" />
+    <ClCompile Include="..\..\..\src\isomedia\isom_write.c" />
+    <ClCompile Include="..\..\..\src\isomedia\media.c" />
+    <ClCompile Include="..\..\..\src\isomedia\media_odf.c" />
+    <ClCompile Include="..\..\..\src\isomedia\meta.c" />
+    <ClCompile Include="..\..\..\src\isomedia\movie_fragments.c" />
+    <ClCompile Include="..\..\..\src\isomedia\sample_descs.c" />
+    <ClCompile Include="..\..\..\src\isomedia\stbl_read.c" />
+    <ClCompile Include="..\..\..\src\isomedia\stbl_write.c" />
+    <ClCompile Include="..\..\..\src\isomedia\track.c" />
+    <ClCompile Include="..\..\..\src\isomedia\tx3g.c" />
+    <ClCompile Include="..\..\..\src\media_tools\webvtt.c" />
+    <ClCompile Include="..\..\..\src\odf\descriptors.c" />
+    <ClCompile Include="..\..\..\src\odf\desc_private.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_code.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_codec.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_command.c" />
+    <ClCompile Include="..\..\..\src\odf\odf_parse.c" />
+    <ClCompile Include="..\..\..\src\odf\slc.c" />
+    <ClCompile Include="..\..\..\src\utils\alloc.c" />
+    <ClCompile Include="..\..\..\src\utils\bitstream.c" />
+    <ClCompile Include="..\..\..\src\utils\configfile.c" />
+    <ClCompile Include="..\..\..\src\utils\error.c" />
+    <ClCompile Include="..\..\..\src\utils\list.c" />
+    <ClCompile Include="..\..\..\src\utils\os_divers.c" />
+    <ClCompile Include="..\..\..\src\utils\os_thread.c" />
+    <ClCompile Include="..\..\..\src\utils\url.c" />
+    <ClCompile Include="main.c" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{978A2D9F-E44F-4073-8032-333563BCC160}</ProjectGuid>
+    <ProjectName>segmp4demux</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v100</PlatformToolset>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>11.0.60610.1</_ProjectFileVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>../../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRules />
+    <CodeAnalysisRuleAssemblies />
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Debug/segmp4demux.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <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>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <UndefinePreprocessorDefinitions>
+      </UndefinePreprocessorDefinitions>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(OutDir);../../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Debug/segmp4demux.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\Release/segmp4demux.tlb</TypeLibraryName>
+      <HeaderFileName />
+    </Midl>
+    <ClCompile>
+      <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>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>.\Release/segmp4demux.pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>.\Release/</AssemblerListingLocation>
+      <ObjectFileName>.\Release/</ObjectFileName>
+      <ProgramDataBaseFileName>.\Release/</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../../extra_lib/lib/w32_rel;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>.\Release/segmp4demux.pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\Release/segmp4demux.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/applications/testapps/segmp4demux/segmp4demux.vcxproj.filters Added

gpac-0.5.0.svn4668.tar.bz2/applications/ts2hds/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/Makefile Changed

@@ -1,56 +1,50 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/applications/ts2hds
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-#common obj
-OBJS= main.o f4v.o f4m.o
-
-LINKFLAGS=-L../../bin/gcc
-ifeq ($(CONFIG_WIN32),yes)
-EXE=.exe
-PROG=ts2hds$(EXE)
-else
-EXT=
-PROG=ts2hds
-endif
-LINKFLAGS+=-lgpac
-
-
-SRCS := $(OBJS:.o=.c) 
-
-all: $(PROG)
-
-$(PROG): $(OBJS)
-	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(PROG)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
-
-
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/applications/ts2hds
+
+CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+#common obj
+OBJS= main.o f4v.o f4m.o
+
+LINKFLAGS=-L../../bin/gcc
+ifeq ($(CONFIG_WIN32),yes)
+EXE=.exe
+PROG=ts2hds$(EXE)
+else
+EXT=
+PROG=ts2hds
+endif
+LINKFLAGS+=-lgpac
+
+
+SRCS := $(OBJS:.o=.c) 
+
+all: $(PROG)
+
+$(PROG): $(OBJS)
+	$(CC) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(LINKFLAGS)
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(PROG)
+
+dep: depend
+
+depend:
+	rm -f .depend	
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-0.5.0.svn4668.tar.bz2/applications/ts2hds/f4m.c -> gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/f4m.c Changed

@@ -1,173 +1,173 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Author: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau 2012-
- *				All rights reserved
- *
- *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
- *
- *  This file is part of GPAC / TS to HDS (ts2hds) application
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include "ts2hds.h"
-
-#include <gpac/base_coding.h>
-
-//#define ADOBE_INLINED_BOOTSTRAP
-
-struct __tag_adobe_stream
-{
-	FILE *f;
-	const char *id;
-	const char *base_url;
-	u32 bitrate;
-};
-
-struct __tag_adobe_multirate
-{
-	FILE *f;
-	const char *id;
-	const char *base_url;
-	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; 
-}
-
-AdobeMultirate *adobe_alloc_multirate_manifest(char *id)
-{
-	AdobeMultirate *am = gf_calloc(1, sizeof(AdobeMultirate));
-	char filename[GF_MAX_PATH];
-
-	//default init
-	am->base_url = "http://localhost/hds/tmp";
-	am->id = id;
-	sprintf(filename, "%s.f4m", am->id);
-	am->f = fopen(filename, "wt");
-	if (!am->f) {
-		fprintf(stderr, "Couldn't create Adobe multirate manifest file: %s\n", filename);
-		assert(0);
-		gf_free(am);
-		return NULL;
-	}
-	am->streams = gf_list_new();
-
-	//create a fake stream
-	{
-		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; 
-		} 
-		gf_list_add(am->streams, as);
-	}
-
-	return am;
-}
-
-void adobe_free_multirate_manifest(AdobeMultirate *am)
-{
-	u32 i;
-
-	if (am->f)
-		fclose(am->f);
-
-	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); 
-		//TODO: base_url and id may be stored as gf_strdup in the future
-		gf_list_rem(am->streams, i);
-		gf_free(as);
-	}
-	gf_list_del(am->streams);
-
-	gf_free(am);
-}
-
-GF_Err adobe_gen_multirate_manifest(AdobeMultirate* am, char *bootstrap, size_t bootstrap_size)
-{
-	GF_Err e;
-	u32 i;
-#ifdef ADOBE_INLINED_BOOTSTRAP
-	char bootstrap64[GF_MAX_PATH];
-	u32 bootstrap64_len;
-#endif
-
-	fprintf(am->f, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
-	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");
-
-	assert(am->streams);
-	for (i=0; i<gf_list_count(am->streams); i++) {
-		AdobeStream *as = gf_list_get(am->streams, i);
-		assert(as);
-#ifdef ADOBE_INLINED_BOOTSTRAP
-		fprintf(am->f, "<bootstrapInfo profile=\"named\" id=\"boot_%s_%d\">\n", as->id, as->bitrate);
-		bootstrap64_len = gf_base64_encode(bootstrap, bootstrap_size, bootstrap64, GF_MAX_PATH);
-		fwrite(bootstrap64, bootstrap64_len, 1, am->f);
-		if (bootstrap64_len >= GF_MAX_PATH) {
-			fprintf(stderr, "Bootstrap may have been truncated for stream %s_%d.\n", as->id, as->bitrate);
-			assert(0);
-		}
-		fprintf(am->f, "\n</bootstrapInfo>\n");
-#else
-		{
-			char filename[GF_MAX_PATH];
-			FILE *bstfile;
-			sprintf(filename, "%s_%d.bootstrap", as->id, as->bitrate);
-			bstfile = fopen(filename, "wb");
-			gf_fwrite(bootstrap, bootstrap_size, 1, bstfile);
-			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"); 
-
-			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");
-
-	return GF_OK;
-}
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / TS to HDS (ts2hds) application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include "ts2hds.h"
+
+#include <gpac/base_coding.h>
+
+//#define ADOBE_INLINED_BOOTSTRAP
+
+struct __tag_adobe_stream
+{
+	FILE *f;
+	const char *id;
+	const char *base_url;
+	u32 bitrate;
+};
+
+struct __tag_adobe_multirate
+{
+	FILE *f;
+	const char *id;
+	const char *base_url;
+	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; 
+}
+
+AdobeMultirate *adobe_alloc_multirate_manifest(char *id)
+{
+	AdobeMultirate *am = gf_calloc(1, sizeof(AdobeMultirate));
+	char filename[GF_MAX_PATH];
+
+	//default init
+	am->base_url = "http://localhost/hds/tmp";
+	am->id = id;
+	sprintf(filename, "%s.f4m", am->id);
+	am->f = fopen(filename, "wt");
+	if (!am->f) {
+		fprintf(stderr, "Couldn't create Adobe multirate manifest file: %s\n", filename);
+		assert(0);
+		gf_free(am);
+		return NULL;
+	}
+	am->streams = gf_list_new();
+
+	//create a fake stream
+	{
+		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; 
+		} 
+		gf_list_add(am->streams, as);
+	}
+
+	return am;
+}
+
+void adobe_free_multirate_manifest(AdobeMultirate *am)
+{
+	u32 i;
+
+	if (am->f)
+		fclose(am->f);
+
+	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); 
+		//TODO: base_url and id may be stored as gf_strdup in the future
+		gf_list_rem(am->streams, i);
+		gf_free(as);
+	}
+	gf_list_del(am->streams);
+
+	gf_free(am);
+}
+
+GF_Err adobe_gen_multirate_manifest(AdobeMultirate* am, char *bootstrap, size_t bootstrap_size)
+{
+	GF_Err e;
+	u32 i;
+#ifdef ADOBE_INLINED_BOOTSTRAP
+	char bootstrap64[GF_MAX_PATH];
+	u32 bootstrap64_len;
+#endif
+
+	fprintf(am->f, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
+	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");
+
+	assert(am->streams);
+	for (i=0; i<gf_list_count(am->streams); i++) {
+		AdobeStream *as = gf_list_get(am->streams, i);
+		assert(as);
+#ifdef ADOBE_INLINED_BOOTSTRAP
+		fprintf(am->f, "<bootstrapInfo profile=\"named\" id=\"boot_%s_%d\">\n", as->id, as->bitrate);
+		bootstrap64_len = gf_base64_encode(bootstrap, bootstrap_size, bootstrap64, GF_MAX_PATH);
+		fwrite(bootstrap64, bootstrap64_len, 1, am->f);
+		if (bootstrap64_len >= GF_MAX_PATH) {
+			fprintf(stderr, "Bootstrap may have been truncated for stream %s_%d.\n", as->id, as->bitrate);
+			assert(0);
+		}
+		fprintf(am->f, "\n</bootstrapInfo>\n");
+#else
+		{
+			char filename[GF_MAX_PATH];
+			FILE *bstfile;
+			sprintf(filename, "%s_%d.bootstrap", as->id, as->bitrate);
+			bstfile = fopen(filename, "wb");
+			gf_fwrite(bootstrap, bootstrap_size, 1, bstfile);
+			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"); 
+
+			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");
+
+	return GF_OK;
+}

gpac-0.5.0.svn4668.tar.bz2/applications/ts2hds/f4v.c -> gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/f4v.c Changed

@@ -1,185 +1,185 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Author: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau 2012-
- *				All rights reserved
- *
- *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
- *
- *  This file is part of GPAC / TS to HDS (ts2hds) application
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include "ts2hds.h"
-
-//we need to write Adobe custom boxes
-#include <gpac/internal/isomedia_dev.h>
-
-GF_Err adobize_segment(GF_ISOFile *isom_file, AdobeHDSCtx *ctx)
-{
-	GF_Err e;
-	GF_BitStream *bs;
-
-	GF_AdobeFragRandomAccessBox *afra = (GF_AdobeFragRandomAccessBox*)	afra_New();
-	GF_AfraEntry *ae                  = (GF_AfraEntry*)					gf_calloc(1, sizeof(GF_AfraEntry));
-	GF_AdobeBootstrapInfoBox *abst    = (GF_AdobeBootstrapInfoBox*)		abst_New();
-	GF_AdobeSegmentRunTableBox *asrt  = (GF_AdobeSegmentRunTableBox*)	asrt_New();
-	GF_AdobeSegmentRunEntry *asre     = (GF_AdobeSegmentRunEntry*)		gf_calloc(1, sizeof(GF_AdobeSegmentRunEntry));
-	GF_AdobeFragmentRunTableBox *afrt = (GF_AdobeFragmentRunTableBox*)	afrt_New();
-	GF_AdobeFragmentRunEntry *afre    = (GF_AdobeFragmentRunEntry*)		gf_calloc(1, sizeof(GF_AdobeFragmentRunEntry));
-
-	u64 init_seg_time = ctx->curr_time;
-	u32 seg_duration = (u32)gf_isom_get_duration(isom_file);
-
-	//update context
-	ctx->curr_time += seg_duration;
-
-	//Adobe specific boxes
-	//Random Access
-	afra->type = GF_4CC('a', 'f', 'r', 'a');
-	afra->version = 0;
-	afra->flags = 0;
-	afra->long_ids = 1;
-	afra->long_offsets = 1;
-	afra->global_entries = 0;
-	afra->time_scale = gf_isom_get_timescale(isom_file);
-
-	afra->entry_count = 1;
-	ae->time = init_seg_time;
-	ae->offset = 3999;
-	gf_list_add(afra->local_access_entries, ae);
-
-	afra->global_entries = 0;
-	afra->global_entry_count = 0;
-
-	e = gf_list_add(isom_file->TopBoxes, afra);
-	if (e) {
-		fprintf(stderr, "Impossible to write AFRA box: %s\n", gf_error_to_string(e));
-		assert(0);
-		return e;
-	}
-
-	//Bootstrap Info
-	abst->type = GF_4CC('a', 'b', 's', 't');
-	abst->version = 0;
-	abst->flags = 0;
-	abst->bootstrapinfo_version = 1;
-	abst->profile = 0;
-	abst->live = 1;
-	abst->update = 0;
-	abst->time_scale = gf_isom_get_timescale(isom_file);
-	abst->current_media_time = init_seg_time+seg_duration;
-	abst->smpte_time_code_offset = 0;
-
-	abst->movie_identifier = NULL;
-	abst->drm_data = NULL;
-	abst->meta_data = NULL;
-
-	abst->server_entry_count = 0;
-	abst->quality_entry_count = 0;
-
-	abst->segment_run_table_count = 1;
-	{
-		//Segment Run
-		asrt->type = GF_4CC('a', 's', 'r', 't');
-		asrt->version = 0;
-		asrt->flags = 0;
-		asrt->segment_run_entry_count = 1;
-		{
-			asre->first_segment = ctx->segnum;
-			asre->fragment_per_segment = 1;
-		}
-		e = gf_list_add(asrt->segment_run_entry_table, asre);
-		if (e) {
-			fprintf(stderr, "Impossible to write ASR Entry: %s\n", gf_error_to_string(e));
-			assert(0);
-			return e;
-		}
-	}
-	e = gf_list_add(abst->segment_run_table_entries, asrt);
-	if (e) {
-		fprintf(stderr, "Impossible to write ASRT box: %s\n", gf_error_to_string(e));
-		assert(0);
-		return e;
-	}
-
-	abst->fragment_run_table_count = 1;
-	{
-		//Fragment Run
-		afrt->type = GF_4CC('a', 'f', 'r', 't');
-		afrt->version = 0;
-		afrt->flags = 0;
-		afrt->timescale = gf_isom_get_timescale(isom_file);
-		afrt->fragment_run_entry_count = 1;
-		{
-			afre->first_fragment = 1;
-			afre->first_fragment_timestamp = 0;
-			afre->fragment_duration = seg_duration;
-		}
-		e = gf_list_add(afrt->fragment_run_entry_table, afre);
-		if (e) {
-			fprintf(stderr, "Impossible to write AFR Entry: %s\n", gf_error_to_string(e));
-			assert(0);
-			return e;
-		}
-	}
-	e = gf_list_add(abst->fragment_run_table_entries, afrt);
-	if (e) {
-		fprintf(stderr, "Impossible to write AFRT box: %s\n", gf_error_to_string(e));
-		assert(0);
-		return e;
-	}
-
-	e = gf_list_add(isom_file->TopBoxes, abst);
-	if (e) {
-		fprintf(stderr, "Impossible to write ABST box: %s\n", gf_error_to_string(e));
-		assert(0);
-		return e;
-	}
-
-	e = abst_Size((GF_Box*)abst);
-	if (e) {
-		fprintf(stderr, "Impossible to compute ABST box size: %s\n", gf_error_to_string(e));
-		assert(0);
-		return e;
-	}
-	ctx->bootstrap_size = (size_t)abst->size;
-	ctx->bootstrap = gf_malloc(ctx->bootstrap_size);
-	bs = gf_bs_new(ctx->bootstrap, ctx->bootstrap_size, GF_BITSTREAM_WRITE);
-	e = abst_Write((GF_Box*)abst, bs);
-	if (e) {
-		fprintf(stderr, "Impossible to code the ABST box: %s\n", gf_error_to_string(e));
-		assert(0);
-		gf_bs_del(bs);
-		return e;
-	}
-	gf_bs_del(bs);
-
-	//set brands as reversed engineered from f4v files
-	/*e = gf_isom_reset_alt_brands(isom_file);
-	if (e) {
-		fprintf(stderr, "Warning: couldn't reset ISOM brands: %s\n", gf_error_to_string(e));
-		assert(0);
-	}*/
-	gf_isom_set_brand_info(isom_file, GF_4CC('f','4','v',' '), 1);
-	gf_isom_modify_alternate_brand(isom_file, GF_4CC('i','s','o','m'), 1);
-	gf_isom_modify_alternate_brand(isom_file, GF_4CC('m','p','4','2'), 1);
-	gf_isom_modify_alternate_brand(isom_file, GF_4CC('m','4','v',' '), 1);
-
-	return GF_OK;
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / TS to HDS (ts2hds) application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include "ts2hds.h"
+
+//we need to write Adobe custom boxes
+#include <gpac/internal/isomedia_dev.h>
+
+GF_Err adobize_segment(GF_ISOFile *isom_file, AdobeHDSCtx *ctx)
+{
+	GF_Err e;
+	GF_BitStream *bs;
+
+	GF_AdobeFragRandomAccessBox *afra = (GF_AdobeFragRandomAccessBox*)	afra_New();
+	GF_AfraEntry *ae                  = (GF_AfraEntry*)					gf_calloc(1, sizeof(GF_AfraEntry));
+	GF_AdobeBootstrapInfoBox *abst    = (GF_AdobeBootstrapInfoBox*)		abst_New();
+	GF_AdobeSegmentRunTableBox *asrt  = (GF_AdobeSegmentRunTableBox*)	asrt_New();
+	GF_AdobeSegmentRunEntry *asre     = (GF_AdobeSegmentRunEntry*)		gf_calloc(1, sizeof(GF_AdobeSegmentRunEntry));
+	GF_AdobeFragmentRunTableBox *afrt = (GF_AdobeFragmentRunTableBox*)	afrt_New();
+	GF_AdobeFragmentRunEntry *afre    = (GF_AdobeFragmentRunEntry*)		gf_calloc(1, sizeof(GF_AdobeFragmentRunEntry));
+
+	u64 init_seg_time = ctx->curr_time;
+	u32 seg_duration = (u32)gf_isom_get_duration(isom_file);
+
+	//update context
+	ctx->curr_time += seg_duration;
+
+	//Adobe specific boxes
+	//Random Access
+	afra->type = GF_4CC('a', 'f', 'r', 'a');
+	afra->version = 0;
+	afra->flags = 0;
+	afra->long_ids = 1;
+	afra->long_offsets = 1;
+	afra->global_entries = 0;
+	afra->time_scale = gf_isom_get_timescale(isom_file);
+
+	afra->entry_count = 1;
+	ae->time = init_seg_time;
+	ae->offset = 3999;
+	gf_list_add(afra->local_access_entries, ae);
+
+	afra->global_entries = 0;
+	afra->global_entry_count = 0;
+
+	e = gf_list_add(isom_file->TopBoxes, afra);
+	if (e) {
+		fprintf(stderr, "Impossible to write AFRA box: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+
+	//Bootstrap Info
+	abst->type = GF_4CC('a', 'b', 's', 't');
+	abst->version = 0;
+	abst->flags = 0;
+	abst->bootstrapinfo_version = 1;
+	abst->profile = 0;
+	abst->live = 1;
+	abst->update = 0;
+	abst->time_scale = gf_isom_get_timescale(isom_file);
+	abst->current_media_time = init_seg_time+seg_duration;
+	abst->smpte_time_code_offset = 0;
+
+	abst->movie_identifier = NULL;
+	abst->drm_data = NULL;
+	abst->meta_data = NULL;
+
+	abst->server_entry_count = 0;
+	abst->quality_entry_count = 0;
+
+	abst->segment_run_table_count = 1;
+	{
+		//Segment Run
+		asrt->type = GF_4CC('a', 's', 'r', 't');
+		asrt->version = 0;
+		asrt->flags = 0;
+		asrt->segment_run_entry_count = 1;
+		{
+			asre->first_segment = ctx->segnum;
+			asre->fragment_per_segment = 1;
+		}
+		e = gf_list_add(asrt->segment_run_entry_table, asre);
+		if (e) {
+			fprintf(stderr, "Impossible to write ASR Entry: %s\n", gf_error_to_string(e));
+			assert(0);
+			return e;
+		}
+	}
+	e = gf_list_add(abst->segment_run_table_entries, asrt);
+	if (e) {
+		fprintf(stderr, "Impossible to write ASRT box: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+
+	abst->fragment_run_table_count = 1;
+	{
+		//Fragment Run
+		afrt->type = GF_4CC('a', 'f', 'r', 't');
+		afrt->version = 0;
+		afrt->flags = 0;
+		afrt->timescale = gf_isom_get_timescale(isom_file);
+		afrt->fragment_run_entry_count = 1;
+		{
+			afre->first_fragment = 1;
+			afre->first_fragment_timestamp = 0;
+			afre->fragment_duration = seg_duration;
+		}
+		e = gf_list_add(afrt->fragment_run_entry_table, afre);
+		if (e) {
+			fprintf(stderr, "Impossible to write AFR Entry: %s\n", gf_error_to_string(e));
+			assert(0);
+			return e;
+		}
+	}
+	e = gf_list_add(abst->fragment_run_table_entries, afrt);
+	if (e) {
+		fprintf(stderr, "Impossible to write AFRT box: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+
+	e = gf_list_add(isom_file->TopBoxes, abst);
+	if (e) {
+		fprintf(stderr, "Impossible to write ABST box: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+
+	e = abst_Size((GF_Box*)abst);
+	if (e) {
+		fprintf(stderr, "Impossible to compute ABST box size: %s\n", gf_error_to_string(e));
+		assert(0);
+		return e;
+	}
+	ctx->bootstrap_size = (size_t)abst->size;
+	ctx->bootstrap = gf_malloc(ctx->bootstrap_size);
+	bs = gf_bs_new(ctx->bootstrap, ctx->bootstrap_size, GF_BITSTREAM_WRITE);
+	e = abst_Write((GF_Box*)abst, bs);
+	if (e) {
+		fprintf(stderr, "Impossible to code the ABST box: %s\n", gf_error_to_string(e));
+		assert(0);
+		gf_bs_del(bs);
+		return e;
+	}
+	gf_bs_del(bs);
+
+	//set brands as reversed engineered from f4v files
+	/*e = gf_isom_reset_alt_brands(isom_file);
+	if (e) {
+		fprintf(stderr, "Warning: couldn't reset ISOM brands: %s\n", gf_error_to_string(e));
+		assert(0);
+	}*/
+	gf_isom_set_brand_info(isom_file, GF_4CC('f','4','v',' '), 1);
+	gf_isom_modify_alternate_brand(isom_file, GF_4CC('i','s','o','m'), 1);
+	gf_isom_modify_alternate_brand(isom_file, GF_4CC('m','p','4','2'), 1);
+	gf_isom_modify_alternate_brand(isom_file, GF_4CC('m','4','v',' '), 1);
+
+	return GF_OK;
 }
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/applications/ts2hds/main.c -> gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/main.c Changed

@@ -1,305 +1,305 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Author: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau 2012-
- *				All rights reserved
- *
- *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
- *
- *  This file is part of GPAC / TS to HDS (ts2hds) application
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include "ts2hds.h"
-
-//FIXME: test only
-//#include <gpac/internal/isomedia_dev.h>
-//#include <gpac/base_coding.h>
-
-#ifdef WIN32
-#define strnicmp _strnicmp
-#endif
-
-#define CHECK_NEXT_ARG	if (i+1==(u32)argc) { fprintf(stderr, "Missing arg - please check usage\n"); exit(1); }
-
-#ifdef GPAC_DISABLE_ISOM
-
-#error "Cannot compile TS2HDS if GPAC is not built with ISO File Format support"
-
-#endif
-
-
-static GFINLINE void usage(const char * progname) 
-{
-	fprintf(stderr, "USAGE: %s -i input -o output\n"
-					"\n"
-#ifdef GPAC_MEMORY_TRACKING
-					"\t-mem-track:  enables memory tracker\n"
-#endif
-		);
-}
-
-
-/*parse TS2HDS arguments*/
-static GFINLINE GF_Err parse_args(int argc, char **argv, char **input, char **output, u64 *curr_time, u32 *segnum)
-{
-	Bool input_found=0, output_found=0;
-	char *arg = NULL, *error_msg = "no argument found";
-	s32 i;
-
-	for (i=1; i<argc; i++) {
-		arg = argv[i];
-		if (!strnicmp(arg, "-h", 2) || strstr(arg, "-help")) {
-			usage(argv[0]);
-			return GF_EOS;
-		} else if (!strnicmp(arg, "-input", 6)) {
-			CHECK_NEXT_ARG
-			*input = argv[++i];
-			input_found = 1;
-		} else if (!strnicmp(arg, "-output", 6)) {
-			CHECK_NEXT_ARG
-			*output = argv[++i];
-			output_found = 1;
-		} else if (!strnicmp(arg, "-segnum", 6)) {
-			CHECK_NEXT_ARG
-			*segnum = atoi(argv[++i]);
-		} else if (!strnicmp(arg, "-mem-track", 10)) {
-#ifdef GPAC_MEMORY_TRACKING
-			gf_sys_close();
-			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"); 
-#endif
-		} else {
-			error_msg = "unknown option \"%s\"";
-			goto error;
-		}
-	}
-
-	/*syntax is correct; now testing the presence of mandatory arguments*/
-	if (input_found && output_found) {
-		return GF_OK;
-	} else {
-		if (!input_found)
-			fprintf(stderr, "Error: input argument not found\n\n");
-		if (!output_found)
-			fprintf(stderr, "Error: output argument not found\n\n");
-		return GF_BAD_PARAM;
-	}
-
-error:	
-	if (!arg) {
-		fprintf(stderr, "Error: %s\n\n", error_msg);
-	} else {
-		fprintf(stderr, "Error: %s \"%s\"\n\n", error_msg, arg);
-	}
-	return GF_BAD_PARAM;
-}
-
-int main(int argc, char **argv)
-{
-	/********************/
-	/*   declarations   */
-	/********************/
-	char *input, *output, tmpstr[GF_MAX_PATH];
-	GF_ISOFile *isom_file_in, *isom_file_out;
-	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;
-
-	/*********************************************/
-	/*   parse arguments and build HDS context   */
-	/*********************************************/
-	if (GF_OK != parse_args(argc, argv, &input, &output, &ctx.curr_time, &ctx.segnum)) {
-		usage(argv[0]);
-		goto exit;
-	}
-
-	ctx.multirate_manifest = adobe_alloc_multirate_manifest(output);
-
-#if 0 /*'moov' conversion tests*/
-	{
-		char metamoov64[GF_MAX_PATH];
-		u32 metamoov64_len;
-		unsigned char metamoov[GF_MAX_PATH];
-		u32 metamoov_len=GF_MAX_PATH;
-		FILE *f = fopen("metamoov64"/*input*/, "rt");
-		gf_f64_seek(f, 0, SEEK_END);
-		metamoov64_len = (u32)gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
-		fread(metamoov64, metamoov64_len, 1, f);
-		metamoov_len = gf_base64_decode(metamoov64, metamoov64_len, metamoov, metamoov_len);
-		fclose(f);
-		f = fopen("metamoov", "wb");
-		fwrite(metamoov, metamoov_len, 1, f);
-		fclose(f);
-		return 0;
-	}
-#endif
-
-#if 0 /*'abst'conversion tests*/
-	{
-		char bootstrap64[GF_MAX_PATH];
-		u32 bootstrap64_len;
-		unsigned char bootstrap[GF_MAX_PATH];
-		u32 bootstrap_len=GF_MAX_PATH;
-		GF_AdobeBootstrapInfoBox *abst = (GF_AdobeBootstrapInfoBox *)abst_New();
-		GF_BitStream *bs;
-#if 1 //64
-		FILE *f = fopen("bootstrap64"/*input*/, "rt");
-		gf_f64_seek(f, 0, SEEK_END);
-		bootstrap64_len = (u32)gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
-		fread(bootstrap64, bootstrap64_len, 1, f);
-		bootstrap_len = gf_base64_decode(bootstrap64, bootstrap64_len, bootstrap, bootstrap_len);
-#else //binary bootstrap
-		FILE *f = fopen("bootstrap.bin"/*input*/, "rb");
-		gf_f64_seek(f, 0, SEEK_END);
-		bootstrap_len = (u32)gf_f64_tell(f);
-		gf_f64_seek(f, 0, SEEK_SET);
-		fread(bootstrap, bootstrap_len, 1, f);
-#endif
-		bs = gf_bs_new(bootstrap+8, bootstrap_len-8, GF_BITSTREAM_READ);
-		abst->size = bootstrap[2]*256+bootstrap[3];
-		assert(abst->size<GF_MAX_PATH);
-		abst_Read((GF_Box*)abst, bs);
-		gf_bs_del(bs);
-		//then rewrite with just one 'afrt'
-		memset(bootstrap, 0, bootstrap_len);
-		bs = gf_bs_new(bootstrap, bootstrap_len, GF_BITSTREAM_WRITE);
-		abst_Write((GF_Box*)abst, bs);
-		bootstrap_len = (u32)gf_bs_get_position(bs);
-		gf_bs_del(bs);
-		fclose(f);
-		f = fopen("bootstrap", "wt");
-		bootstrap64_len = gf_base64_encode(bootstrap, bootstrap_len, bootstrap64, GF_MAX_PATH);
-		fwrite(bootstrap64, bootstrap64_len, 1, f);
-		fprintf(f, "\n\n");
-		abst_dump((GF_Box*)abst, f);
-		fclose(f);
-		abst_del((GF_Box*)abst);
-		return 0;
-	}
-#endif
-
-	/*****************/
-	/*   main loop   */
-	/*****************/
-	import.trackID = 0;
-	import.in_name = input;
-	import.flags = GF_IMPORT_PROBE_ONLY;
-
-	//create output or open when recovering from a saved state
-	sprintf(tmpstr, "%s_import.mp4", input);
-	isom_file_in = gf_isom_open(tmpstr, GF_ISOM_WRITE_EDIT, NULL);
-	if (!isom_file_in) {
-		fprintf(stderr, "Error opening output file %s: %s\n", tmpstr, gf_error_to_string(e));
-		assert(0);
-		goto exit;
-	}
-	import.dest = isom_file_in;
-
-	//probe input
-	e = gf_media_import(&import);
-	if (e) {
-		fprintf(stderr, "Error while importing input file %s: %s\n", input, gf_error_to_string(e));
-		assert(0);
-		goto exit;
-	}
-
-	//import input data
-	import.flags = 0;
-	for (i=0; i<import.nb_tracks; i++) {
-		import.trackID = import.tk_info[i].track_num;
-		e = gf_media_import(&import);
-		if (e) {
-			fprintf(stderr, "Error while importing track number %u, input file %s: %s\n", import.trackID, input, gf_error_to_string(e));
-			assert(0);
-			goto exit;
-		}
-	}
-
-	//Adobe specific stuff
-	e = adobize_segment(isom_file_in, &ctx);
-	if (e) {
-		fprintf(stderr, "Couldn't turn the ISOM fragmented file into an Adobe f4v segment: %s\n", gf_error_to_string(e));
-		assert(0);
-		goto exit;
-	}
-
-	//interleave data and remove imported file
-	//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));
-	if (e) {
-		fprintf(stderr, "Error while fragmenting file to output %s: %s\n", output, gf_error_to_string(e));
-		assert(0);
-		goto exit;
-	}
-	gf_isom_delete(isom_file_in);
-	isom_file_in = NULL;
-
-	e = adobe_gen_multirate_manifest(ctx.multirate_manifest, ctx.bootstrap, ctx.bootstrap_size);
-	if (e) {
-		fprintf(stderr, "Couldn't generate Adobe f4m manifest: %s\n", gf_error_to_string(e));
-		assert(0);
-		goto exit;
-	}
-
-exit:
-	//delete intermediate mp4 file
-	if (isom_file_in)
-		gf_isom_delete(isom_file_in);
-
-	if (ctx.multirate_manifest)
-		adobe_free_multirate_manifest(ctx.multirate_manifest);
-
-	if (ctx.bootstrap) {
-		gf_free(ctx.bootstrap);
-		//ctx.bootstrap = NULL;
-		//ctx.bootstrap_size = 0;
-	}
-
-	gf_sys_close();
-	
-	return !e ? 0 : 1;
-}
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / TS to HDS (ts2hds) application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include "ts2hds.h"
+
+//FIXME: test only
+//#include <gpac/internal/isomedia_dev.h>
+//#include <gpac/base_coding.h>
+
+#ifdef WIN32
+#define strnicmp _strnicmp
+#endif
+
+#define CHECK_NEXT_ARG	if (i+1==(u32)argc) { fprintf(stderr, "Missing arg - please check usage\n"); exit(1); }
+
+#ifdef GPAC_DISABLE_ISOM
+
+#error "Cannot compile TS2HDS if GPAC is not built with ISO File Format support"
+
+#endif
+
+
+static GFINLINE void usage(const char * progname) 
+{
+	fprintf(stderr, "USAGE: %s -i input -o output\n"
+					"\n"
+#ifdef GPAC_MEMORY_TRACKING
+					"\t-mem-track:  enables memory tracker\n"
+#endif
+		);
+}
+
+
+/*parse TS2HDS arguments*/
+static GFINLINE GF_Err parse_args(int argc, char **argv, char **input, char **output, u64 *curr_time, u32 *segnum)
+{
+	Bool input_found=0, output_found=0;
+	char *arg = NULL, *error_msg = "no argument found";
+	s32 i;
+
+	for (i=1; i<argc; i++) {
+		arg = argv[i];
+		if (!strnicmp(arg, "-h", 2) || strstr(arg, "-help")) {
+			usage(argv[0]);
+			return GF_EOS;
+		} else if (!strnicmp(arg, "-input", 6)) {
+			CHECK_NEXT_ARG
+			*input = argv[++i];
+			input_found = 1;
+		} else if (!strnicmp(arg, "-output", 6)) {
+			CHECK_NEXT_ARG
+			*output = argv[++i];
+			output_found = 1;
+		} else if (!strnicmp(arg, "-segnum", 6)) {
+			CHECK_NEXT_ARG
+			*segnum = atoi(argv[++i]);
+		} else if (!strnicmp(arg, "-mem-track", 10)) {
+#ifdef GPAC_MEMORY_TRACKING
+			gf_sys_close();
+			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"); 
+#endif
+		} else {
+			error_msg = "unknown option \"%s\"";
+			goto error;
+		}
+	}
+
+	/*syntax is correct; now testing the presence of mandatory arguments*/
+	if (input_found && output_found) {
+		return GF_OK;
+	} else {
+		if (!input_found)
+			fprintf(stderr, "Error: input argument not found\n\n");
+		if (!output_found)
+			fprintf(stderr, "Error: output argument not found\n\n");
+		return GF_BAD_PARAM;
+	}
+
+error:	
+	if (!arg) {
+		fprintf(stderr, "Error: %s\n\n", error_msg);
+	} else {
+		fprintf(stderr, "Error: %s \"%s\"\n\n", error_msg, arg);
+	}
+	return GF_BAD_PARAM;
+}
+
+int main(int argc, char **argv)
+{
+	/********************/
+	/*   declarations   */
+	/********************/
+	char *input, *output, tmpstr[GF_MAX_PATH];
+	GF_ISOFile *isom_file_in, *isom_file_out;
+	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;
+
+	/*********************************************/
+	/*   parse arguments and build HDS context   */
+	/*********************************************/
+	if (GF_OK != parse_args(argc, argv, &input, &output, &ctx.curr_time, &ctx.segnum)) {
+		usage(argv[0]);
+		goto exit;
+	}
+
+	ctx.multirate_manifest = adobe_alloc_multirate_manifest(output);
+
+#if 0 /*'moov' conversion tests*/
+	{
+		char metamoov64[GF_MAX_PATH];
+		u32 metamoov64_len;
+		unsigned char metamoov[GF_MAX_PATH];
+		u32 metamoov_len=GF_MAX_PATH;
+		FILE *f = fopen("metamoov64"/*input*/, "rt");
+		gf_f64_seek(f, 0, SEEK_END);
+		metamoov64_len = (u32)gf_f64_tell(f);
+		gf_f64_seek(f, 0, SEEK_SET);
+		fread(metamoov64, metamoov64_len, 1, f);
+		metamoov_len = gf_base64_decode(metamoov64, metamoov64_len, metamoov, metamoov_len);
+		fclose(f);
+		f = fopen("metamoov", "wb");
+		fwrite(metamoov, metamoov_len, 1, f);
+		fclose(f);
+		return 0;
+	}
+#endif
+
+#if 0 /*'abst'conversion tests*/
+	{
+		char bootstrap64[GF_MAX_PATH];
+		u32 bootstrap64_len;
+		unsigned char bootstrap[GF_MAX_PATH];
+		u32 bootstrap_len=GF_MAX_PATH;
+		GF_AdobeBootstrapInfoBox *abst = (GF_AdobeBootstrapInfoBox *)abst_New();
+		GF_BitStream *bs;
+#if 1 //64
+		FILE *f = fopen("bootstrap64"/*input*/, "rt");
+		gf_f64_seek(f, 0, SEEK_END);
+		bootstrap64_len = (u32)gf_f64_tell(f);
+		gf_f64_seek(f, 0, SEEK_SET);
+		fread(bootstrap64, bootstrap64_len, 1, f);
+		bootstrap_len = gf_base64_decode(bootstrap64, bootstrap64_len, bootstrap, bootstrap_len);
+#else //binary bootstrap
+		FILE *f = fopen("bootstrap.bin"/*input*/, "rb");
+		gf_f64_seek(f, 0, SEEK_END);
+		bootstrap_len = (u32)gf_f64_tell(f);
+		gf_f64_seek(f, 0, SEEK_SET);
+		fread(bootstrap, bootstrap_len, 1, f);
+#endif
+		bs = gf_bs_new(bootstrap+8, bootstrap_len-8, GF_BITSTREAM_READ);
+		abst->size = bootstrap[2]*256+bootstrap[3];
+		assert(abst->size<GF_MAX_PATH);
+		abst_Read((GF_Box*)abst, bs);
+		gf_bs_del(bs);
+		//then rewrite with just one 'afrt'
+		memset(bootstrap, 0, bootstrap_len);
+		bs = gf_bs_new(bootstrap, bootstrap_len, GF_BITSTREAM_WRITE);
+		abst_Write((GF_Box*)abst, bs);
+		bootstrap_len = (u32)gf_bs_get_position(bs);
+		gf_bs_del(bs);
+		fclose(f);
+		f = fopen("bootstrap", "wt");
+		bootstrap64_len = gf_base64_encode(bootstrap, bootstrap_len, bootstrap64, GF_MAX_PATH);
+		fwrite(bootstrap64, bootstrap64_len, 1, f);
+		fprintf(f, "\n\n");
+		abst_dump((GF_Box*)abst, f);
+		fclose(f);
+		abst_del((GF_Box*)abst);
+		return 0;
+	}
+#endif
+
+	/*****************/
+	/*   main loop   */
+	/*****************/
+	import.trackID = 0;
+	import.in_name = input;
+	import.flags = GF_IMPORT_PROBE_ONLY;
+
+	//create output or open when recovering from a saved state
+	sprintf(tmpstr, "%s_import.mp4", input);
+	isom_file_in = gf_isom_open(tmpstr, GF_ISOM_WRITE_EDIT, NULL);
+	if (!isom_file_in) {
+		fprintf(stderr, "Error opening output file %s: %s\n", tmpstr, gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+	import.dest = isom_file_in;
+
+	//probe input
+	e = gf_media_import(&import);
+	if (e) {
+		fprintf(stderr, "Error while importing input file %s: %s\n", input, gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+
+	//import input data
+	import.flags = 0;
+	for (i=0; i<import.nb_tracks; i++) {
+		import.trackID = import.tk_info[i].track_num;
+		e = gf_media_import(&import);
+		if (e) {
+			fprintf(stderr, "Error while importing track number %u, input file %s: %s\n", import.trackID, input, gf_error_to_string(e));
+			assert(0);
+			goto exit;
+		}
+	}
+
+	//Adobe specific stuff
+	e = adobize_segment(isom_file_in, &ctx);
+	if (e) {
+		fprintf(stderr, "Couldn't turn the ISOM fragmented file into an Adobe f4v segment: %s\n", gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+
+	//interleave data and remove imported file
+	//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));
+	if (e) {
+		fprintf(stderr, "Error while fragmenting file to output %s: %s\n", output, gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+	gf_isom_delete(isom_file_in);
+	isom_file_in = NULL;
+
+	e = adobe_gen_multirate_manifest(ctx.multirate_manifest, ctx.bootstrap, ctx.bootstrap_size);
+	if (e) {
+		fprintf(stderr, "Couldn't generate Adobe f4m manifest: %s\n", gf_error_to_string(e));
+		assert(0);
+		goto exit;
+	}
+
+exit:
+	//delete intermediate mp4 file
+	if (isom_file_in)
+		gf_isom_delete(isom_file_in);
+
+	if (ctx.multirate_manifest)
+		adobe_free_multirate_manifest(ctx.multirate_manifest);
+
+	if (ctx.bootstrap) {
+		gf_free(ctx.bootstrap);
+		//ctx.bootstrap = NULL;
+		//ctx.bootstrap_size = 0;
+	}
+
+	gf_sys_close();
+	
+	return !e ? 0 : 1;
+}
+

gpac-0.5.0.svn4668.tar.bz2/applications/ts2hds/ts2hds.h -> gpac-0.5.0.svn5178.tar.bz2/applications/ts2hds/ts2hds.h Changed

@@ -1,48 +1,48 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Author: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau 2012-
- *				All rights reserved
- *
- *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
- *
- *  This file is part of GPAC / TS to HDS (ts2hds) application
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <gpac/media_tools.h>
-
-//f4m
-typedef struct __tag_adobe_stream AdobeStream;
-typedef struct __tag_adobe_multirate AdobeMultirate;
-AdobeMultirate *adobe_alloc_multirate_manifest(char *id);
-void adobe_free_multirate_manifest(AdobeMultirate *am);
-GF_Err adobe_gen_multirate_manifest(AdobeMultirate* am, char *bootstrap, size_t bootstrap_size);
-
-//context
-typedef struct
-{
-	u64 curr_time;
-	u32 segnum;
-	char *bootstrap;
-	size_t bootstrap_size;
-	AdobeMultirate *multirate_manifest;
-} AdobeHDSCtx;
-
-//f4v
-GF_Err adobize_segment(GF_ISOFile *isom_file, AdobeHDSCtx *ctx);
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / TS to HDS (ts2hds) application
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/media_tools.h>
+
+//f4m
+typedef struct __tag_adobe_stream AdobeStream;
+typedef struct __tag_adobe_multirate AdobeMultirate;
+AdobeMultirate *adobe_alloc_multirate_manifest(char *id);
+void adobe_free_multirate_manifest(AdobeMultirate *am);
+GF_Err adobe_gen_multirate_manifest(AdobeMultirate* am, char *bootstrap, size_t bootstrap_size);
+
+//context
+typedef struct
+{
+	u64 curr_time;
+	u32 segnum;
+	char *bootstrap;
+	size_t bootstrap_size;
+	AdobeMultirate *multirate_manifest;
+} AdobeHDSCtx;
+
+//f4v
+GF_Err adobize_segment(GF_ISOFile *isom_file, AdobeHDSCtx *ctx);

gpac-0.5.0.svn4668.tar.bz2/applications/udptsseg/Makefile -> gpac-0.5.0.svn5178.tar.bz2/applications/udptsseg/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/build/android/jni/libgpac/Android.mk -> gpac-0.5.0.svn5178.tar.bz2/build/android/jni/libgpac/Android.mk Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/GPAX.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/GPAX.vcxproj Changed

@@ -259,7 +259,7 @@
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
       <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
@@ -269,6 +269,7 @@
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/Osmo4.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/Osmo4.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/aac_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/aac_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/ac3_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/ac3_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/amr_dec.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/amr_dec.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/amr_float_dec.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/amr_float_dec.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/audio_filter.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/audio_filter.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/avcap.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/avcap.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/bifs_dec.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/bifs_dec.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/ctx_load.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/ctx_load.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/dashcast.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/dashcast.vcxproj Changed

@@ -75,8 +75,8 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
   </PropertyGroup>
@@ -103,7 +103,7 @@
     </ResourceCompile>
     <Link>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>avcodec-54.lib;avformat-54.lib;avutil-51.lib;swscale-2.lib;Ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -142,7 +142,7 @@
     </ResourceCompile>
     <Link>
       <RegisterOutput>false</RegisterOutput>
-      <AdditionalDependencies>avcodec-54.lib;avformat-54.lib;avutil-51.lib;swscale-2.lib;Ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -179,7 +179,7 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>avcodec-54.lib;avformat-54.lib;avutil-51.lib;swscale-2.lib;Ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -198,8 +198,8 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <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>
       <StringPooling>true</StringPooling>
@@ -217,10 +217,10 @@
       <Culture>0x040c</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>avcodec-54.lib;avformat-54.lib;avutil-51.lib;swscale-2.lib;Ws2_32.lib</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
       <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
       <SubSystem>Console</SubSystem>
     </Link>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/dummy_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/dummy_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/dx_hw.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/dx_hw.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/ffmpeg_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/ffmpeg_in.vcxproj Changed

@@ -75,7 +75,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
@@ -221,8 +221,8 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/ft_font.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/ft_font.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/gdip_raster.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/gdip_raster.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/gpac.sln -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/gpac.sln Changed

@@ -1,14 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4client", "mp4client.vcxproj", "{A35D99BF-D72D-4F56-99A1-97249B22BCE2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72486240-A124-496E-A67A-E76FEC7E99BE} = {72486240-A124-496E-A67A-E76FEC7E99BE}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Osmo4", "Osmo4.vcxproj", "{C79C2D73-06E9-4622-92CE-F166B1B51792}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72486240-A124-496E-A67A-E76FEC7E99BE} = {72486240-A124-496E-A67A-E76FEC7E99BE}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aac_in", "aac_in.vcxproj", "{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}"
 EndProject
@@ -21,9 +15,6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dx_hw", "dx_hw.vcxproj", "{B64736BD-9245-4F40-961D-EB9822265764}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ffmpeg_in", "ffmpeg_in.vcxproj", "{9FECAB79-BC70-4EEA-A23B-B64159F904B3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72486240-A124-496E-A67A-E76FEC7E99BE} = {72486240-A124-496E-A67A-E76FEC7E99BE}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ft_font", "ft_font.vcxproj", "{042D3628-67F3-4B5C-8BC0-CD9AFA416974}"
 EndProject
@@ -42,14 +33,8 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp3_in", "mp3_in.vcxproj", "{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp42ts", "mp42ts.vcxproj", "{F728CC74-A7D0-43D2-8A28-05CE9F2EF0D0}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72486240-A124-496E-A67A-E76FEC7E99BE} = {72486240-A124-496E-A67A-E76FEC7E99BE}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mp4box", "mp4box.vcxproj", "{48E2C7C6-52EB-46FB-8722-00A62F46F497}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72486240-A124-496E-A67A-E76FEC7E99BE} = {72486240-A124-496E-A67A-E76FEC7E99BE}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mpegts_in", "mpegts_in.vcxproj", "{B38E812D-9823-48E7-BE5F-BF09B0AD4165}"
 EndProject
@@ -58,9 +43,6 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogg", "ogg.vcxproj", "{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmozilla", "osmozilla.vcxproj", "{A0288B75-0D95-4106-A3A7-779A891E8FEF}"
-	ProjectSection(ProjectDependencies) = postProject
-		{72486240-A124-496E-A67A-E76FEC7E99BE} = {72486240-A124-496E-A67A-E76FEC7E99BE}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raw_out", "raw_out.vcxproj", "{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}"
 EndProject
@@ -122,6 +104,8 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dashcast", "dashcast.vcxproj", "{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vtt_in", "vtt_in.vcxproj", "{E578716F-6663-4D83-AC79-57EA00D2F406}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -513,6 +497,14 @@
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|Win32.Build.0 = Release|Win32
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.ActiveCfg = Release|x64
 		{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}.Release|x64.Build.0 = Release|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.ActiveCfg = Debug|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|Win32.Build.0 = Debug|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.ActiveCfg = Debug|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Debug|x64.Build.0 = Debug|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.ActiveCfg = Release|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|Win32.Build.0 = Release|Win32
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.ActiveCfg = Release|x64
+		{E578716F-6663-4D83-AC79-57EA00D2F406}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -565,6 +557,7 @@
 		{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{1F7CD37F-DC9A-4AC7-881B-36B263A644C7} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{073E2381-4FDE-4C4D-B217-C489EF17C48B} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
+		{E578716F-6663-4D83-AC79-57EA00D2F406} = {6274F5D2-A9CB-4DF9-BF9E-818416ACD347}
 		{D3540754-E0CF-4604-AC11-82DE9BD4D814} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
 		{233014D5-F6E5-419D-8757-FA9CE7337088} = {BC1A9F4D-C716-467F-8B11-6F58FB74FF3B}
 	EndGlobalSection

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/gpac_js.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/gpac_js.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/img_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/img_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/ismacryp.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/ismacryp.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/isom_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/isom_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/laser_dec.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/laser_dec.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/libgpac.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/libgpac.vcxproj Changed

@@ -234,7 +234,7 @@
     <ClCompile Include="..\..\src\isomedia\box_funcs.c" />
     <ClCompile Include="..\..\src\isomedia\data_map.c" />
     <ClCompile Include="..\..\src\isomedia\drm_sample.c" />
-    <ClCompile Include="..\..\src\isomedia\generic_subtitle.c" />
+    <ClCompile Include="..\..\src\isomedia\ttml.c" />
     <ClCompile Include="..\..\src\isomedia\hinting.c" />
     <ClCompile Include="..\..\src\isomedia\hint_track.c" />
     <ClCompile Include="..\..\src\isomedia\isom_intern.c" />
@@ -328,6 +328,7 @@
     <ClCompile Include="..\..\src\scenegraph\vrml_script.c" />
     <ClCompile Include="..\..\src\scenegraph\vrml_smjs.c" />
     <ClCompile Include="..\..\src\scenegraph\vrml_tools.c" />
+    <ClCompile Include="..\..\src\scenegraph\webvtt_smjs.c" />
     <ClCompile Include="..\..\src\scenegraph\x3d_nodes.c" />
     <ClCompile Include="..\..\src\scenegraph\xbl_process.c" />
     <ClCompile Include="..\..\src\scenegraph\xml_ns.c" />
@@ -566,8 +567,8 @@
     </PreBuildEvent>
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;../../extra_lib/include/js;../../extra_lib/include/jpeg;../../extra_lib/include/png;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_WIN64;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/libgpac.vcxproj.filters -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/libgpac.vcxproj.filters Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/libgpac_dll.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/libgpac_dll.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/mp3_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mp3_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/mp42ts.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mp42ts.vcxproj Changed

@@ -90,10 +90,11 @@
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\obj\mp42ts_deb/$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj\mp42ts_deb/</AssemblerListingLocation>
-      <ObjectFileName>.\obj\mp42ts_deb/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj\mp42ts_deb/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -129,14 +130,16 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\obj\mp42ts_deb/$(ProjectName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\obj\mp42ts_deb/</AssemblerListingLocation>
-      <ObjectFileName>.\obj\mp42ts_deb/</ObjectFileName>
-      <ProgramDataBaseFileName>.\obj\mp42ts_deb/</ProgramDataBaseFileName>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
       <BrowseInformation>true</BrowseInformation>
       <WarningLevel>Level3</WarningLevel>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <MinimalRebuild>true</MinimalRebuild>
     </ClCompile>
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -200,8 +203,8 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
@@ -245,7 +248,11 @@
   <ItemGroup>
     <ProjectReference Include="libgpac_dll.vcxproj">
       <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+      <Private>true</Private>
+      <ReferenceOutputAssembly>true</ReferenceOutputAssembly>
+      <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/mp4box.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mp4box.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/mp4client.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mp4client.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/mpd_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mpd_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/mpegts_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mpegts_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/mse_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/mse_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/odf_dec.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/odf_dec.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/ogg.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/ogg.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/openhevc.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/openhevc.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/opensvc.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/opensvc.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/osmozilla.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/osmozilla.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/platinum.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/platinum.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/raw_out.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/raw_out.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/redirect_av.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/redirect_av.vcxproj Changed

@@ -75,7 +75,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
@@ -221,8 +221,8 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
@@ -269,7 +269,6 @@
   <ItemGroup>
     <ProjectReference Include="libgpac_dll.vcxproj">
       <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/rtp_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/rtp_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/saf_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/saf_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/sdl_out.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/sdl_out.vcxproj Changed

@@ -77,11 +77,14 @@
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\DEVTOOLS\SDL\include;$(IncludePath)</IncludePath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\DEVTOOLS\include;$(IncludePath)</IncludePath>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;;C:\devtools\lib\x64</LibraryPath>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\devtools\include;$(IncludePath)</IncludePath>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">C:\devtools\lib\x64;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Midl>
@@ -225,8 +228,8 @@
       </HeaderFileName>
     </Midl>
     <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <Optimization>Full</Optimization>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/soft_raster.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/soft_raster.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/svg_in.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/svg_in.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/timedtext.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/timedtext.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/ui_rec.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/ui_rec.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/validator.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/validator.vcxproj Changed

gpac-0.5.0.svn5178.tar.bz2/build/msvc10/vtt_in.vcxproj Added

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

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/wav_out.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/wav_out.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/widgetman.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/widgetman.vcxproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc10/xvid_dec.vcxproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc10/xvid_dec.vcxproj Changed

gpac-0.5.0.svn5178.tar.bz2/build/msvc11 Added

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/GPAX.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/Osmo4.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/aac_in.vcxproj Added

@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{1F7CD37F-DC9A-4AC7-881B-36B263A644C7}</ProjectGuid>
+    <RootNamespace>aac_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/aac_in_deb/aac_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/aac_in_deb/aac_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/aac_in_rel/aac_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/aac_in_rel/aac_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_FAAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libfaad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\aac_in\aac_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\aac_in\faad_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/ac3_in.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/amr_dec.vcxproj Added

@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5ED5A1C8-DB34-4089-8E53-EFB225754D02}</ProjectGuid>
+    <RootNamespace>amr_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <StackReserveSize>8388608</StackReserveSize>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/amr_dec_rel/amr_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <StackReserveSize>8388608</StackReserveSize>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/amr_dec_deb/amr_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;__MSDOS__;MMS_IO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\amr_dec\amr_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/amr_float_dec.vcxproj Added

@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5D3983BF-143F-49C3-9284-89778282AEFE}</ProjectGuid>
+    <RootNamespace>amr_float_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/amr_float_dec_deb/amr_float_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/amr_float_dec_rel/amr_float_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_AMR_FT;GPAC_HAS_AMR_FT_WB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\amr_float_dec\amr_float_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\amr_dec\amr_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/audio_filter.vcxproj Added

@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{C993119B-29B1-49C8-8EA3-A9ABF633164E}</ProjectGuid>
+    <RootNamespace>audio_filter</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/audio_filter_rel/audio_filter.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/audio_filter_deb/audio_filter.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\audio_filter\audio_filter.c" />
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/avcap.vcxproj Added

@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{109C4F31-781F-4C9E-B160-E788A83F9387}</ProjectGuid>
+    <RootNamespace>avcap</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_deb/avcap.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_deb/avcap.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CallingConvention>Cdecl</CallingConvention>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_rel/avcap.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_rel/avcap.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\avcap\avcap.cpp" />
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/bifs_dec.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{73CF10D0-DEC8-4D4B-AAB8-45864694CB8B}</ProjectGuid>
+    <RootNamespace>bifs_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/bifs_dec_rel/bifs_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/bifs_dec_deb/bifs_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\bifs_dec\bifs_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/ctx_load.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{BAE0C03A-56E0-4D37-89F5-62DD03BFC013}</ProjectGuid>
+    <RootNamespace>ctx_load</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ctx_load_rel/ctx_load.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ctx_load_deb/ctx_load.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\ctx_load\ctx_load.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/dashcast.vcxproj Added

@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E10DBBE8-2A40-4CC8-8B72-B2A2854A1EE1}</ProjectGuid>
+    <RootNamespace>dashcast</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <RegisterOutput>false</RegisterOutput>
+      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <RegisterOutput>false</RegisterOutput>
+      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>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>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>ws2_32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\applications\dashcast\audio_data.c" />
+    <ClCompile Include="..\..\applications\dashcast\audio_decoder.c" />
+    <ClCompile Include="..\..\applications\dashcast\audio_encoder.c" />
+    <ClCompile Include="..\..\applications\dashcast\audio_muxer.c" />
+    <ClCompile Include="..\..\applications\dashcast\circular_buffer.c" />
+    <ClCompile Include="..\..\applications\dashcast\cmd_data.c" />
+    <ClCompile Include="..\..\applications\dashcast\controler.c" />
+    <ClCompile Include="..\..\applications\dashcast\dashcast.c" />
+    <ClCompile Include="..\..\applications\dashcast\message_queue.c" />
+    <ClCompile Include="..\..\applications\dashcast\register.c" />
+    <ClCompile Include="..\..\applications\dashcast\task.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_data.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_decoder.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_encoder.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_muxer.c" />
+    <ClCompile Include="..\..\applications\dashcast\video_scaler.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\applications\dashcast\audio_data.h" />
+    <ClInclude Include="..\..\applications\dashcast\audio_decoder.h" />
+    <ClInclude Include="..\..\applications\dashcast\audio_encoder.h" />
+    <ClInclude Include="..\..\applications\dashcast\audio_muxer.h" />
+    <ClInclude Include="..\..\applications\dashcast\circular_buffer.h" />
+    <ClInclude Include="..\..\applications\dashcast\cmd_data.h" />
+    <ClInclude Include="..\..\applications\dashcast\controler.h" />
+    <ClInclude Include="..\..\applications\dashcast\libav_compat.h" />
+    <ClInclude Include="..\..\applications\dashcast\message_queue.h" />
+    <ClInclude Include="..\..\applications\dashcast\register.h" />
+    <ClInclude Include="..\..\applications\dashcast\task.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_data.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_decoder.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_encoder.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_muxer.h" />
+    <ClInclude Include="..\..\applications\dashcast\video_scaler.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/dummy_in.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{073E2381-4FDE-4C4D-A117-C489EB17C48B}</ProjectGuid>
+    <RootNamespace>dummy_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_deb/dummy_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_rel/dummy_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\dummy_in\dummy_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/dx_hw.vcxproj Added

@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B64736BD-9245-4F40-961D-EB9822265764}</ProjectGuid>
+    <RootNamespace>dx_hw</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dx_hw_rel/dx_hw.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dx_hw_rel/dx_hw.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;DX_HW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dx_hw_deb/dx_hw.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dx_hw_deb/dx_hw.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;$(DXSDK_DIR)Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>opengl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>$(DXSDK_DIR)Lib\x86;..\..\extra_lib\lib\$(Platform)\$(Configuration);$(DXSDK_DIR)Lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="..\..\modules\dx_hw\collide.cur" />
+    <None Include="..\..\modules\dx_hw\hand.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\dx_hw\copy_pixels.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\dx_hw\dx_2d.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\dx_hw\dx_audio.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\dx_hw\dx_video.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\dx_hw\dx_window.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\dx_hw\dx_hw.h" />
+    <ClInclude Include="..\..\modules\dx_hw\resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\modules\dx_hw\dx_hw.rc">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\gpac\modules\dx_hw;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/ffmpeg_in.vcxproj Added

@@ -0,0 +1,308 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9FECAB79-BC70-4EEA-A23B-B64159F904B3}</ProjectGuid>
+    <RootNamespace>ffmpeg_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>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>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ffmpeg_in_deb/ffmpeg_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ffmpeg_in_rel/ffmpeg_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_decode.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_demux.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ffmpeg_in\ffmpeg_load.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\ffmpeg_in\ffmpeg_in.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/ft_font.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/gdip_raster.vcxproj Added

@@ -0,0 +1,317 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{CAA5A551-006A-4119-8115-FB14692E719F}</ProjectGuid>
+    <RootNamespace>gdip_raster</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/gdip_rel/gdip_raster.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/gdip_deb/gdip_raster.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/gdip_deb/gdip_raster.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_WIN64;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>gdiplus.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\gdip_raster\gdip_font.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\gdip_raster\gdip_grad.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\gdip_raster\gdip_rend.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\gdip_raster\gdip_texture.cpp">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\gdip_raster\gdip_priv.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/gpac.sln Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/gpac_js.vcxproj Added

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{27F7FDF4-479B-47B5-BFEA-12E9EA41F663}</ProjectGuid>
+    <RootNamespace>gpac_js</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/gpac_js_deb/gpac_js.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/gpac_js_rel/gpac_js.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\gpac_js\gpac_js.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/hyb_in.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/img_in.vcxproj Added

@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{9F0660BC-4582-4D4E-BA83-E2BE5F6BDD45}</ProjectGuid>
+    <RootNamespace>img_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/img_in_deb/img_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/img_in_deb/img_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/jpeg;../../extra_lib/include/zlib;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libjpeg.lib;libpng.lib;zlib.lib;LibOpenJPEGd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/img_in_rel/img_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/img_in_rel/img_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/png;../../extra_lib/include/zlib;../../extra_lib/include/jpeg;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_JP2;OPJ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libpng.lib;zlib.lib;libjpeg.lib;LibOpenJPEG.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\img_in\bmp_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\img_in\img_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\img_in\img_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\img_in\jp2_dec.c" />
+    <ClCompile Include="..\..\modules\img_in\jpeg_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\img_in\png_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\img_in\img_in.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/ismacryp.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E08DA5C2-9D97-4CD3-BB13-6FD6BA4458D6}</ProjectGuid>
+    <RootNamespace>ismacryp</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ismacryp_rel/ismacryp.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ismacryp_deb/ismacryp.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\ismacryp\isma_ea.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/isom_in.vcxproj Added

@@ -0,0 +1,313 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{FC8F1F56-078E-470D-B252-68EDDE88AA9D}</ProjectGuid>
+    <RootNamespace>isom_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/isom_in_deb/isom_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/isom_in_deb/isom_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/isom_in_rel/isom_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/isom_in_rel/isom_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\isom_in\isom_cache.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\isom_in\load.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\isom_in\read.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\isom_in\read_ch.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\isom_in\isom_in.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/laser_dec.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{879E26B2-48DB-47B3-B82F-893696286E6F}</ProjectGuid>
+    <RootNamespace>laser_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/laser_dec_deb/laser_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/laser_dec_rel/laser_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\laser_dec\laser_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/libgpac.vcxproj Added

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

@@ -0,0 +1,294 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{D3540754-E0CF-4604-AC11-82DE9BD4D814}</ProjectGuid>
+    <RootNamespace>libgpac_dll</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">libgpac</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">libgpac</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">libgpac</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">libgpac</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/libgpac_dll_deb/libgpac_dll.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>..\..\extra_lib\lib\w32_deb;../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
+      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/libgpac_dll_deb/libgpac_dll.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <ProjectReference>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac.pdb</ProgramDatabaseFile>
+      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\obj/$(Platform)/$(Configuration)/libgpac_dll/libgpac_dll.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/libgpac_dll_rel/libgpac_dll.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;winmm.lib;ws2_32.lib;opengl32.lib;glu32.lib;ssleay32.lib;libeay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/libgpac_dll_rel/libgpac_dll.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)$(ProjectName)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)$(ProjectName)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)$(ProjectName)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <CompileAs>CompileAsC</CompileAs>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>../../bin/$(Platform)/$(Configuration)/libgpac.lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\export.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac.vcxproj">
+      <Project>{233014d5-f6e5-419d-8757-fa9ce7337088}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/mp3_in.vcxproj Added

@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4AC7F65D-0DC0-49F9-8B96-AD05F11FF38E}</ProjectGuid>
+    <RootNamespace>mp3_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/mp3_in_deb/mp3_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/mp3_in_deb/mp3_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;FPM_64BIT;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/mp3_in_rel/mp3_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libmad.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/mp3_in_rel/mp3_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;FPM_64BIT;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_MAD;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\mp3_in\mad_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\mp3_in\mp3_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/mp42ts.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/mp4box.vcxproj Added

@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{48E2C7C6-52EB-46FB-8722-00A62F46F497}</ProjectGuid>
+    <RootNamespace>mp4box</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <RegisterOutput>false</RegisterOutput>
+      <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <TypeLibraryName>.\obj/mp4box_deb/mp4box.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <BrowseInformation>true</BrowseInformation>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <RegisterOutput>false</RegisterOutput>
+      <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <ProjectReference>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
+    </ProjectReference>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <TypeLibraryName>.\obj/mp4box_rel/mp4box.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MinSpace</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <SubSystem>Console</SubSystem>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+    <PostBuildEvent>
+      <Command>
+      </Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\applications\mp4box\filedump.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\mp4box\fileimport.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\applications\mp4box\live.c" />
+    <ClCompile Include="..\..\applications\mp4box\main.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </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/msvc11/mp4client.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/mpd_in.vcxproj Added

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B1AEFA90-318F-459C-96EE-B4DFF3318B7B}</ProjectGuid>
+    <RootNamespace>dash</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\mpd_in\mpd_in.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/mpegts_in.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{B38E812D-9823-48E7-BE5F-BF09B0AD4165}</ProjectGuid>
+    <RootNamespace>mpegts_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/mpegts_in_deb/mpegts_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/mpegts_in_rel/mpegts_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\mpegts_in\mpegts_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/mse_in.vcxproj Added

@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5016FA2B-2F78-43DA-AEC4-1A7F455E99FE}</ProjectGuid>
+    <RootNamespace>dash</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\mse_in\mse_in.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/odf_dec.vcxproj Added

@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{A86E6EF8-3683-4AD0-8878-7A0D51326088}</ProjectGuid>
+    <RootNamespace>odf_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/odf_dec_rel/odf_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/odf_dec_deb/odf_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\odf_dec\odf_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/ogg.vcxproj Added

@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{3B4108E4-C8FD-4D82-AF4A-F928CCF36A60}</ProjectGuid>
+    <RootNamespace>ogg</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ogg_rel/ogg.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ogg_rel/ogg.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ogg_deb/ogg.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ogg_deb/ogg.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;GPAC_HAS_VORBIS;GPAC_HAS_THEORA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\ogg\ogg_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ogg\ogg_load.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ogg\theora_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ogg\vorbis_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\ogg\ogg_in.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/openhevc.vcxproj Added

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>openhevc_dec</ProjectName>
+    <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EF17C48B}</ProjectGuid>
+    <RootNamespace>openhevc_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_deb/openhevc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_deb/openhevc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_rel/openhevc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_rel/openhevc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\openhevc_dec\openhevc_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/opensvc.vcxproj Added

@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>opensvc_dec</ProjectName>
+    <ProjectGuid>{073E2381-4FDE-4C4D-B217-C489EB17C48B}</ProjectGuid>
+    <RootNamespace>opensvc_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_deb/opensvc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_deb/opensvc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_rel/opensvc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_rel/opensvc_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\opensvc_dec\opensvc_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/osmophone.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/osmozilla.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/platinum.vcxproj Added

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

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/raw_out.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{8162BADA-2FB6-4A71-B998-ABAFAF28E5A8}</ProjectGuid>
+    <RootNamespace>raw_out</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/raw_out_rel/raw_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/raw_out_deb/raw_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/raw_out_deb/raw_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\raw_out\raw_video.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/redirect_av.vcxproj Added

@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{073E2281-4FDE-4C4D-A217-C489DB17C48C}</ProjectGuid>
+    <RootNamespace>redirect_av</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>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>
+      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_deb/redirect_av.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_rel/redirect_av.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;../../include/win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\redirect_av\redirect_av.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/rtp_in.vcxproj Added

@@ -0,0 +1,331 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E2DBD151-9523-4E1A-9478-F3F825668F6E}</ProjectGuid>
+    <RootNamespace>rtp_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/rtp_in_rel/rtp_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/rtp_in_deb/rtp_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\rtp_in\rtp_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\rtp_in\rtp_session.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\rtp_in\rtp_signaling.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\rtp_in\rtp_stream.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\rtp_in\sdp_fetch.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\rtp_in\sdp_load.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\rtp_in\rtp_in.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/saf_in.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{2B6AB6CD-E7D0-4706-BB4A-DDD7AE1A510D}</ProjectGuid>
+    <RootNamespace>saf_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\Release/saf_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\Debug/saf_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SAF_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\saf_in\saf_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/sdl_out.vcxproj Added

@@ -0,0 +1,321 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{F346A9A7-CF8D-4409-8776-1D4244F96EF8}</ProjectGuid>
+    <RootNamespace>sdl_out</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">C:\DEVTOOLS\include;$(IncludePath)</IncludePath>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64;;C:\devtools\lib\x64</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/sdl_out_deb/sdl_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/sdl_out_deb/sdl_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/sdl_out_rel/sdl_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/sdl_out_rel/sdl_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/SDL;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\sdl_out\audio.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\sdl_out\cursors.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\sdl_out\sdl_out.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\sdl_out\video.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\sdl_out\sdl_out.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/soft_raster.vcxproj Added

@@ -0,0 +1,341 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{71071F01-C813-4384-BE38-0F4020BCC0EE}</ProjectGuid>
+    <RootNamespace>soft_raster</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/soft_raster_rel/soft_raster.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/soft_raster_deb/soft_raster.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\soft_raster\ftgrays.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\soft_raster\raster_565.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\soft_raster\raster_argb.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\soft_raster\raster_load.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\soft_raster\raster_rgb.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\soft_raster\stencil.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\soft_raster\surface.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\soft_raster\rast_soft.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/svg_in.vcxproj Added

@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{402A8794-B724-44A3-B608-84B600ECA387}</ProjectGuid>
+    <RootNamespace>svg_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/svg_in_rel/svg_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/svg_in_deb/svg_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/svg_in_deb/svg_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;SVG_IN_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\svg_in\svg_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/timedtext.vcxproj Added

@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{464697D2-BA44-446F-8223-1EB3969ED1A8}</ProjectGuid>
+    <RootNamespace>timedtext</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ttxt_rel/timedtext.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/ttxt_deb/timedtext.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/ttxt_deb/timedtext.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\timedtext\timedtext_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\timedtext\timedtext_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/ui_rec.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{073E2381-4FDE-4C4D-A117-C489DB17C48C}</ProjectGuid>
+    <RootNamespace>ui_rec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_deb/ui_rec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/dymmy_in_rel/ui_rec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\ui_rec\ui_rec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/validator.vcxproj Added

@@ -0,0 +1,278 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{75CD44BD-BE6F-407F-84CA-D0F60264EB4B}</ProjectGuid>
+    <RootNamespace>validator</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/validator_deb/validator.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/validator_deb/validator.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/validator_rel/validator.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/validator_rel/validator.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\validator\validator.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/vtt_in.vcxproj Added

@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{E578716F-6663-4D83-AC79-57EA00D2F406}</ProjectGuid>
+    <RootNamespace>vtt_in</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/vtt_in_rel/vtt_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/vtt_in_deb/vtt_in.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;vtt_in_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\vtt_in\vtt_in.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\vtt_in\vtt_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/wav_out.vcxproj Added

@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{01183543-B182-4E32-9FD6-FC15C847316C}</ProjectGuid>
+    <RootNamespace>wav_out</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/wav_out_rel/wav_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/wav_out_rel/wav_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/wav_out_deb/wav_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/wav_out_deb/wav_out.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\wav_out\wav_out.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/widgetman.vcxproj Added

@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{07D6FB42-0F4F-487A-BCBA-EC4BBF5CB160}</ProjectGuid>
+    <RootNamespace>widgetman</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/widgetman_rel/widgetman.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include/js;../../extra_lib/include/zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\obj/widgetman_rel/widgetman.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/widgetman_deb/widgetman.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../extra_lib/include/zlib;../../include;../../extra_lib/include/js;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>$(IntDir)gm_$(ProjectName).bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\widgetman\unzip.c" />
+    <ClCompile Include="..\..\modules\widgetman\wgt_load.c" />
+    <ClCompile Include="..\..\modules\widgetman\widget.c" />
+    <ClCompile Include="..\..\modules\widgetman\widgetman.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\modules\widgetman\unzip.h" />
+    <ClInclude Include="..\..\modules\widgetman\widgetman.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/build/msvc11/xvid_dec.vcxproj Added

@@ -0,0 +1,522 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4258687D-4905-46A6-9407-08F4F8A81CC0}</ProjectGuid>
+    <RootNamespace>xvid_dec</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">../../bin/$(Platform)\$(Configuration)/</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\obj\$(Platform)\$(Configuration)\$(ProjectName)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</EmbedManifest>
+    <EmbedManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</EmbedManifest>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gm_$(ProjectName)</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gm_$(ProjectName)</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Midl>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/xvid_dec_rel/xvid_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <ProgramDatabaseFile>$(IntDir)gm_$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <OutputFile>.\obj/xvid_dec_rel/xvid_dec.bsc</OutputFile>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TargetEnvironment>Win32</TargetEnvironment>
+      <TypeLibraryName>.\obj/xvid_dec_deb/xvid_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Midl>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <TypeLibraryName>.\obj/xvid_dec_deb/xvid_dec.tlb</TypeLibraryName>
+      <HeaderFileName>
+      </HeaderFileName>
+    </Midl>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>../../include;../../extra_lib/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <PrecompiledHeaderOutputFile>$(IntDir)$(ProjectName).pch</PrecompiledHeaderOutputFile>
+      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
+      <ObjectFileName>$(IntDir)</ObjectFileName>
+      <ProgramDataBaseFileName>$(IntDir)</ProgramDataBaseFileName>
+      <WarningLevel>Level3</WarningLevel>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+    </ClCompile>
+    <ResourceCompile>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <Culture>0x040c</Culture>
+    </ResourceCompile>
+    <Link>
+      <AdditionalDependencies>libxvidcore.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <AdditionalLibraryDirectories>../../extra_lib/lib/$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <ModuleDefinitionFile>
+      </ModuleDefinitionFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
+      <ImportLibrary>$(IntDir)gm_$(ProjectName).lib</ImportLibrary>
+      <IgnoreSpecificDefaultLibraries>LIBCMT</IgnoreSpecificDefaultLibraries>
+    </Link>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\bitstream.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\CodecAPI.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\decoder.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\font.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\gmc.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\idct.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\image.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbcoding.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_align.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\qpel_tab.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_h263.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\quant_mpeg.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\reduced.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_wce\xvid.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\modules_export.cpp" />
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_dec.c">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\xvid_dec\xvid_dec_wce.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\bitstream.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\decoder.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\global.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\gmc.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\image.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\interpolate8x8.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mbprediction.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_align.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\mem_transfer.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\portab.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\quant_matrix.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\reduced.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\Rules.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\vlc_codes.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\xvid.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuildStep Include="..\..\modules\xvid_dec\xvid_wce\qpel.inl">
+      <FileType>Document</FileType>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </CustomBuildStep>
+  </ItemGroup>
+  <ItemGroup>
+    <MASM Include="..\..\modules\xvid_dec\xvid_wce\xvid_ppc.asm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </MASM>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="libgpac_dll.vcxproj">
+      <Project>{d3540754-e0cf-4604-ac11-82de9bd4d814}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
+  </ImportGroup>
+</Project>
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/build/msvc8/libgpac.vcproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc8/libgpac.vcproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/msvc9/libgpac.vcproj -> gpac-0.5.0.svn5178.tar.bz2/build/msvc9/libgpac.vcproj Changed

gpac-0.5.0.svn4668.tar.bz2/build/xcode/gpac.xcodeproj/project.pbxproj -> gpac-0.5.0.svn5178.tar.bz2/build/xcode/gpac.xcodeproj/project.pbxproj Changed

@@ -3,522 +3,4365 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 45;
+	objectVersion = 46;
 	objects = {
 
-/* Begin PBXAggregateTarget section */
-		717BB3A71152558600A39D3D /* modules */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 717BB3B0115255B900A39D3D /* Build configuration list for PBXAggregateTarget "modules" */;
-			buildPhases = (
-			);
-			dependencies = (
-			);
-			name = modules;
-			productName = modules;
-		};
-		717BB66C11525AA200A39D3D /* all */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 717BB67511525AD100A39D3D /* Build configuration list for PBXAggregateTarget "all" */;
-			buildPhases = (
-			);
-			dependencies = (
-				71D7E31411577931003DF497 /* PBXTargetDependency */,
-				71D7E30811525E2E003DF497 /* PBXTargetDependency */,
-				717BB67011525AAA00A39D3D /* PBXTargetDependency */,
-				717BB67411525AB200A39D3D /* PBXTargetDependency */,
-			);
-			name = all;
-			productName = all;
-		};
-		71D7E310115778E1003DF497 /* configure */ = {
-			isa = PBXAggregateTarget;
-			buildConfigurationList = 71D7E312115778FF003DF497 /* Build configuration list for PBXAggregateTarget "configure" */;
-			buildPhases = (
-			);
-			dependencies = (
+/* Begin PBXBuildFile section */
+		920100B018D5A444003D1ACA /* arith_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8A18D5A444003D1ACA /* arith_decoder.c */; };
+		920100B118D5A444003D1ACA /* bifs_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8B18D5A444003D1ACA /* bifs_codec.c */; };
+		920100B218D5A444003D1ACA /* bifs_node_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8C18D5A444003D1ACA /* bifs_node_tables.c */; };
+		920100B318D5A444003D1ACA /* com_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8D18D5A444003D1ACA /* com_dec.c */; };
+		920100B418D5A444003D1ACA /* com_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8E18D5A444003D1ACA /* com_enc.c */; };
+		920100B518D5A444003D1ACA /* conditional.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF8F18D5A444003D1ACA /* conditional.c */; };
+		920100B618D5A444003D1ACA /* field_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9018D5A444003D1ACA /* field_decode.c */; };
+		920100B718D5A444003D1ACA /* field_encode.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9118D5A444003D1ACA /* field_encode.c */; };
+		920100B818D5A444003D1ACA /* memory_decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9218D5A444003D1ACA /* memory_decoder.c */; };
+		920100B918D5A444003D1ACA /* predictive_mffield.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9318D5A444003D1ACA /* predictive_mffield.c */; };
+		920100BA18D5A444003D1ACA /* quant.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FF9418D5A444003D1ACA /* quant.h */; };
+		920100BB18D5A444003D1ACA /* quantize.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9518D5A444003D1ACA /* quantize.c */; };
+		920100BC18D5A444003D1ACA /* script.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FF9618D5A444003D1ACA /* script.h */; };
+		920100BD18D5A444003D1ACA /* script_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9718D5A444003D1ACA /* script_dec.c */; };
+		920100BE18D5A444003D1ACA /* script_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9818D5A444003D1ACA /* script_enc.c */; };
+		920100BF18D5A444003D1ACA /* unquantize.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9918D5A444003D1ACA /* unquantize.c */; };
+		920100C018D5A444003D1ACA /* audio_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9B18D5A444003D1ACA /* audio_input.c */; };
+		920100C118D5A444003D1ACA /* audio_mixer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9C18D5A444003D1ACA /* audio_mixer.c */; };
+		920100C218D5A444003D1ACA /* audio_render.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9D18D5A444003D1ACA /* audio_render.c */; };
+		920100C318D5A444003D1ACA /* bindable.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9E18D5A444003D1ACA /* bindable.c */; };
+		920100C418D5A444003D1ACA /* camera.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FF9F18D5A444003D1ACA /* camera.c */; };
+		920100C518D5A444003D1ACA /* compositor.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA018D5A444003D1ACA /* compositor.c */; };
+		920100C618D5A444003D1ACA /* compositor_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA118D5A444003D1ACA /* compositor_2d.c */; };
+		920100C718D5A444003D1ACA /* compositor_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA218D5A444003D1ACA /* compositor_3d.c */; };
+		920100C818D5A444003D1ACA /* compositor_node_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA318D5A444003D1ACA /* compositor_node_init.c */; };
+		920100C918D5A444003D1ACA /* drawable.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA418D5A444003D1ACA /* drawable.c */; };
+		920100CA18D5A444003D1ACA /* drawable.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFA518D5A444003D1ACA /* drawable.h */; };
+		920100CB18D5A444003D1ACA /* events.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA618D5A444003D1ACA /* events.c */; };
+		920100CC18D5A444003D1ACA /* font_engine.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA718D5A444003D1ACA /* font_engine.c */; };
+		920100CD18D5A444003D1ACA /* gl_inc.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFA818D5A444003D1ACA /* gl_inc.h */; };
+		920100CE18D5A444003D1ACA /* hardcoded_protos.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFA918D5A444003D1ACA /* hardcoded_protos.c */; };
+		920100CF18D5A444003D1ACA /* hc_flash_shape.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAA18D5A444003D1ACA /* hc_flash_shape.c */; };
+		920100D018D5A444003D1ACA /* mesh.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAB18D5A444003D1ACA /* mesh.c */; };
+		920100D118D5A444003D1ACA /* mesh_collide.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAC18D5A444003D1ACA /* mesh_collide.c */; };
+		920100D218D5A444003D1ACA /* mesh_tesselate.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAD18D5A444003D1ACA /* mesh_tesselate.c */; };
+		920100D318D5A444003D1ACA /* mpeg4_animstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAE18D5A444003D1ACA /* mpeg4_animstream.c */; };
+		920100D418D5A444003D1ACA /* mpeg4_audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFAF18D5A444003D1ACA /* mpeg4_audio.c */; };
+		920100D518D5A444003D1ACA /* mpeg4_background.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB018D5A444003D1ACA /* mpeg4_background.c */; };
+		920100D618D5A444003D1ACA /* mpeg4_background2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB118D5A444003D1ACA /* mpeg4_background2d.c */; };
+		920100D718D5A444003D1ACA /* mpeg4_bitmap.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB218D5A444003D1ACA /* mpeg4_bitmap.c */; };
+		920100D818D5A444003D1ACA /* mpeg4_composite.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB318D5A444003D1ACA /* mpeg4_composite.c */; };
+		920100D918D5A444003D1ACA /* mpeg4_form.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB418D5A444003D1ACA /* mpeg4_form.c */; };
+		920100DA18D5A444003D1ACA /* mpeg4_geometry_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB518D5A444003D1ACA /* mpeg4_geometry_2d.c */; };
+		920100DB18D5A444003D1ACA /* mpeg4_geometry_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB618D5A444003D1ACA /* mpeg4_geometry_3d.c */; };
+		920100DC18D5A444003D1ACA /* mpeg4_geometry_ifs2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB718D5A444003D1ACA /* mpeg4_geometry_ifs2d.c */; };
+		920100DD18D5A444003D1ACA /* mpeg4_geometry_ils2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB818D5A444003D1ACA /* mpeg4_geometry_ils2d.c */; };
+		920100DE18D5A444003D1ACA /* mpeg4_gradients.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFB918D5A444003D1ACA /* mpeg4_gradients.c */; };
+		920100DF18D5A444003D1ACA /* mpeg4_grouping.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBA18D5A444003D1ACA /* mpeg4_grouping.c */; };
+		920100E018D5A444003D1ACA /* mpeg4_grouping.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFBB18D5A444003D1ACA /* mpeg4_grouping.h */; };
+		920100E118D5A444003D1ACA /* mpeg4_grouping_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBC18D5A444003D1ACA /* mpeg4_grouping_2d.c */; };
+		920100E218D5A444003D1ACA /* mpeg4_grouping_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBD18D5A444003D1ACA /* mpeg4_grouping_3d.c */; };
+		920100E318D5A444003D1ACA /* mpeg4_layer_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBE18D5A444003D1ACA /* mpeg4_layer_2d.c */; };
+		920100E418D5A444003D1ACA /* mpeg4_layer_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFBF18D5A444003D1ACA /* mpeg4_layer_3d.c */; };
+		920100E518D5A444003D1ACA /* mpeg4_layout.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC018D5A444003D1ACA /* mpeg4_layout.c */; };
+		920100E618D5A444003D1ACA /* mpeg4_lighting.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC118D5A444003D1ACA /* mpeg4_lighting.c */; };
+		920100E718D5A444003D1ACA /* mpeg4_path_layout.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC218D5A444003D1ACA /* mpeg4_path_layout.c */; };
+		920100E818D5A444003D1ACA /* mpeg4_sensors.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC318D5A444003D1ACA /* mpeg4_sensors.c */; };
+		920100E918D5A444003D1ACA /* mpeg4_sound.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC418D5A444003D1ACA /* mpeg4_sound.c */; };
+		920100EA18D5A444003D1ACA /* mpeg4_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC518D5A444003D1ACA /* mpeg4_text.c */; };
+		920100EB18D5A444003D1ACA /* mpeg4_textures.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC618D5A444003D1ACA /* mpeg4_textures.c */; };
+		920100EC18D5A444003D1ACA /* mpeg4_timesensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC718D5A444003D1ACA /* mpeg4_timesensor.c */; };
+		920100ED18D5A444003D1ACA /* mpeg4_viewport.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC818D5A444003D1ACA /* mpeg4_viewport.c */; };
+		920100EE18D5A444003D1ACA /* navigate.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFC918D5A444003D1ACA /* navigate.c */; };
+		920100EF18D5A444003D1ACA /* nodes_stacks.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFCA18D5A444003D1ACA /* nodes_stacks.h */; };
+		920100F018D5A444003D1ACA /* offscreen_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFCB18D5A444003D1ACA /* offscreen_cache.c */; };
+		920100F118D5A444003D1ACA /* offscreen_cache.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFCC18D5A444003D1ACA /* offscreen_cache.h */; };
+		920100F218D5A444003D1ACA /* svg_base.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFCD18D5A444003D1ACA /* svg_base.c */; };
+		920100F318D5A444003D1ACA /* svg_filters.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFCE18D5A444003D1ACA /* svg_filters.c */; };
+		920100F418D5A444003D1ACA /* svg_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFCF18D5A444003D1ACA /* svg_font.c */; };
+		920100F518D5A444003D1ACA /* svg_geometry.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD018D5A444003D1ACA /* svg_geometry.c */; };
+		920100F618D5A444003D1ACA /* svg_grouping.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD118D5A444003D1ACA /* svg_grouping.c */; };
+		920100F718D5A444003D1ACA /* svg_media.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD218D5A444003D1ACA /* svg_media.c */; };
+		920100F818D5A444003D1ACA /* svg_paint_servers.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD318D5A444003D1ACA /* svg_paint_servers.c */; };
+		920100F918D5A444003D1ACA /* svg_text.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD418D5A444003D1ACA /* svg_text.c */; };
+		920100FA18D5A444003D1ACA /* texturing.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD518D5A444003D1ACA /* texturing.c */; };
+		920100FB18D5A444003D1ACA /* texturing.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFD618D5A444003D1ACA /* texturing.h */; };
+		920100FC18D5A444003D1ACA /* texturing_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD718D5A444003D1ACA /* texturing_gl.c */; };
+		920100FD18D5A444003D1ACA /* visual_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFD818D5A444003D1ACA /* visual_manager.c */; };
+		920100FE18D5A444003D1ACA /* visual_manager.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFD918D5A444003D1ACA /* visual_manager.h */; };
+		920100FF18D5A444003D1ACA /* visual_manager_2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFDA18D5A444003D1ACA /* visual_manager_2d.c */; };
+		9201010018D5A444003D1ACA /* visual_manager_2d.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFDB18D5A444003D1ACA /* visual_manager_2d.h */; };
+		9201010118D5A444003D1ACA /* visual_manager_2d_draw.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFDC18D5A444003D1ACA /* visual_manager_2d_draw.c */; };
+		9201010218D5A444003D1ACA /* visual_manager_3d.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFDD18D5A444003D1ACA /* visual_manager_3d.c */; };
+		9201010318D5A444003D1ACA /* visual_manager_3d.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201FFDE18D5A444003D1ACA /* visual_manager_3d.h */; };
+		9201010418D5A444003D1ACA /* visual_manager_3d_gl.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFDF18D5A444003D1ACA /* visual_manager_3d_gl.c */; };
+		9201010518D5A444003D1ACA /* x3d_geometry.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE018D5A444003D1ACA /* x3d_geometry.c */; };
+		9201010718D5A444003D1ACA /* rtcp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE418D5A444003D1ACA /* rtcp.c */; };
+		9201010818D5A444003D1ACA /* rtp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE518D5A444003D1ACA /* rtp.c */; };
+		9201010918D5A444003D1ACA /* rtp_depacketizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE618D5A444003D1ACA /* rtp_depacketizer.c */; };
+		9201010A18D5A444003D1ACA /* rtp_packetizer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE718D5A444003D1ACA /* rtp_packetizer.c */; };
+		9201010B18D5A444003D1ACA /* rtp_pck_3gpp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE818D5A444003D1ACA /* rtp_pck_3gpp.c */; };
+		9201010C18D5A444003D1ACA /* rtp_pck_mpeg12.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFE918D5A444003D1ACA /* rtp_pck_mpeg12.c */; };
+		9201010D18D5A444003D1ACA /* rtp_pck_mpeg4.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFEA18D5A444003D1ACA /* rtp_pck_mpeg4.c */; };
+		9201010E18D5A444003D1ACA /* rtp_streamer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFEB18D5A444003D1ACA /* rtp_streamer.c */; };
+		9201010F18D5A444003D1ACA /* rtsp_command.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFEC18D5A444003D1ACA /* rtsp_command.c */; };
+		9201011018D5A444003D1ACA /* rtsp_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFED18D5A444003D1ACA /* rtsp_common.c */; };
+		9201011118D5A444003D1ACA /* rtsp_response.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFEE18D5A444003D1ACA /* rtsp_response.c */; };
+		9201011218D5A444003D1ACA /* rtsp_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFEF18D5A444003D1ACA /* rtsp_session.c */; };
+		9201011318D5A444003D1ACA /* sdp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF018D5A444003D1ACA /* sdp.c */; };
+		9201011418D5A444003D1ACA /* avc_ext.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF218D5A444003D1ACA /* avc_ext.c */; };
+		9201011518D5A444003D1ACA /* box_code_3gpp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF318D5A444003D1ACA /* box_code_3gpp.c */; };
+		9201011618D5A444003D1ACA /* box_code_adobe.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF418D5A444003D1ACA /* box_code_adobe.c */; };
+		9201011718D5A444003D1ACA /* box_code_apple.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF518D5A444003D1ACA /* box_code_apple.c */; };
+		9201011818D5A444003D1ACA /* box_code_base.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF618D5A444003D1ACA /* box_code_base.c */; };
+		9201011918D5A444003D1ACA /* box_code_drm.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF718D5A444003D1ACA /* box_code_drm.c */; };
+		9201011A18D5A444003D1ACA /* box_code_meta.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF818D5A444003D1ACA /* box_code_meta.c */; };
+		9201011B18D5A444003D1ACA /* box_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFF918D5A444003D1ACA /* box_dump.c */; };
+		9201011C18D5A444003D1ACA /* box_funcs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFFA18D5A444003D1ACA /* box_funcs.c */; };
+		9201011D18D5A444003D1ACA /* data_map.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFFB18D5A444003D1ACA /* data_map.c */; };
+		9201011E18D5A444003D1ACA /* drm_sample.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFFC18D5A444003D1ACA /* drm_sample.c */; };
+		9201012018D5A444003D1ACA /* hint_track.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFFE18D5A444003D1ACA /* hint_track.c */; };
+		9201012118D5A444003D1ACA /* hinting.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201FFFF18D5A444003D1ACA /* hinting.c */; };
+		9201012218D5A444003D1ACA /* isom_intern.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000018D5A444003D1ACA /* isom_intern.c */; };
+		9201012318D5A444003D1ACA /* isom_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000118D5A444003D1ACA /* isom_read.c */; };
+		9201012418D5A444003D1ACA /* isom_store.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000218D5A444003D1ACA /* isom_store.c */; };
+		9201012518D5A444003D1ACA /* isom_write.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000318D5A444003D1ACA /* isom_write.c */; };
+		9201012618D5A444003D1ACA /* media.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000418D5A444003D1ACA /* media.c */; };
+		9201012718D5A444003D1ACA /* media_odf.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000518D5A444003D1ACA /* media_odf.c */; };
+		9201012818D5A444003D1ACA /* meta.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000618D5A444003D1ACA /* meta.c */; };
+		9201012918D5A444003D1ACA /* movie_fragments.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000718D5A444003D1ACA /* movie_fragments.c */; };
+		9201012A18D5A444003D1ACA /* sample_descs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000818D5A444003D1ACA /* sample_descs.c */; };
+		9201012B18D5A444003D1ACA /* stbl_read.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000918D5A444003D1ACA /* stbl_read.c */; };
+		9201012C18D5A444003D1ACA /* stbl_write.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000A18D5A444003D1ACA /* stbl_write.c */; };
+		9201012D18D5A444003D1ACA /* track.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000B18D5A444003D1ACA /* track.c */; };
+		9201012E18D5A444003D1ACA /* ttml.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000C18D5A444003D1ACA /* ttml.c */; };
+		9201012F18D5A444003D1ACA /* tx3g.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000D18D5A444003D1ACA /* tx3g.c */; };
+		9201013018D5A444003D1ACA /* lsr_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201000F18D5A444003D1ACA /* lsr_dec.c */; };
+		9201013118D5A444003D1ACA /* lsr_enc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001018D5A444003D1ACA /* lsr_enc.c */; };
+		9201013218D5A445003D1ACA /* lsr_tables.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001118D5A444003D1ACA /* lsr_tables.c */; };
+		9201013418D5A445003D1ACA /* cbc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001418D5A444003D1ACA /* cbc.c */; };
+		9201013518D5A445003D1ACA /* cfb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001518D5A444003D1ACA /* cfb.c */; };
+		9201013618D5A445003D1ACA /* ctr.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001618D5A444003D1ACA /* ctr.c */; };
+		9201013718D5A445003D1ACA /* des.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001718D5A444003D1ACA /* des.c */; };
+		9201013818D5A445003D1ACA /* ecb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001818D5A444003D1ACA /* ecb.c */; };
+		9201013918D5A445003D1ACA /* g_crypt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001918D5A444003D1ACA /* g_crypt.c */; };
+		9201013A18D5A445003D1ACA /* ncfb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001A18D5A444003D1ACA /* ncfb.c */; };
+		9201013B18D5A445003D1ACA /* nofb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001B18D5A444003D1ACA /* nofb.c */; };
+		9201013C18D5A445003D1ACA /* ofb.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001C18D5A444003D1ACA /* ofb.c */; };
+		9201013D18D5A445003D1ACA /* rijndael-128.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001D18D5A444003D1ACA /* rijndael-128.c */; };
+		9201013E18D5A445003D1ACA /* rijndael-192.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001E18D5A444003D1ACA /* rijndael-192.c */; };
+		9201013F18D5A445003D1ACA /* rijndael-256.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201001F18D5A444003D1ACA /* rijndael-256.c */; };
+		9201014018D5A445003D1ACA /* stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002018D5A444003D1ACA /* stream.c */; };
+		9201014118D5A445003D1ACA /* tripledes.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002118D5A444003D1ACA /* tripledes.c */; };
+		9201014218D5A445003D1ACA /* ait.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002318D5A444003D1ACA /* ait.c */; };
+		9201014318D5A445003D1ACA /* av_parsers.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002418D5A444003D1ACA /* av_parsers.c */; };
+		9201014418D5A445003D1ACA /* avilib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002518D5A444003D1ACA /* avilib.c */; };
+		9201014518D5A445003D1ACA /* dash_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002618D5A444003D1ACA /* dash_client.c */; };
+		9201014618D5A445003D1ACA /* dash_segmenter.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002818D5A444003D1ACA /* dash_segmenter.c */; };
+		9201014718D5A445003D1ACA /* dsmcc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002918D5A444003D1ACA /* dsmcc.c */; };
+		9201014818D5A445003D1ACA /* dvb_mpe.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002A18D5A444003D1ACA /* dvb_mpe.c */; };
+		9201014918D5A445003D1ACA /* filestreamer.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002B18D5A444003D1ACA /* filestreamer.c */; };
+		9201014A18D5A445003D1ACA /* gpac_ogg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002C18D5A444003D1ACA /* gpac_ogg.c */; };
+		9201014B18D5A445003D1ACA /* html5_media.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002D18D5A444003D1ACA /* html5_media.c */; };
+		9201014C18D5A445003D1ACA /* html5_mse.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002E18D5A444003D1ACA /* html5_mse.c */; };
+		9201014D18D5A445003D1ACA /* img.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201002F18D5A444003D1ACA /* img.c */; };
+		9201014E18D5A445003D1ACA /* ismacryp.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003018D5A444003D1ACA /* ismacryp.c */; };
+		9201014F18D5A445003D1ACA /* isom_hinter.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003118D5A444003D1ACA /* isom_hinter.c */; };
+		9201015018D5A445003D1ACA /* isom_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003218D5A444003D1ACA /* isom_tools.c */; };
+		9201015118D5A445003D1ACA /* m2ts_mux.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003318D5A444003D1ACA /* m2ts_mux.c */; };
+		9201015218D5A445003D1ACA /* m3u8.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003418D5A444003D1ACA /* m3u8.c */; };
+		9201015318D5A445003D1ACA /* media_export.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003518D5A444003D1ACA /* media_export.c */; };
+		9201015418D5A445003D1ACA /* media_import.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003618D5A444003D1ACA /* media_import.c */; };
+		9201015518D5A445003D1ACA /* mpd.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003718D5A444003D1ACA /* mpd.c */; };
+		9201015618D5A445003D1ACA /* mpeg2_ps.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003818D5A444003D1ACA /* mpeg2_ps.c */; };
+		9201015718D5A445003D1ACA /* mpeg2_ps.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201003918D5A444003D1ACA /* mpeg2_ps.h */; };
+		9201015818D5A445003D1ACA /* mpegts.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003A18D5A444003D1ACA /* mpegts.c */; };
+		9201015918D5A445003D1ACA /* reedsolomon.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003B18D5A444003D1ACA /* reedsolomon.c */; };
+		9201015A18D5A445003D1ACA /* saf.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003C18D5A444003D1ACA /* saf.c */; };
+		9201015B18D5A445003D1ACA /* text_import.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003D18D5A444003D1ACA /* text_import.c */; };
+		9201015C18D5A445003D1ACA /* vobsub.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003E18D5A444003D1ACA /* vobsub.c */; };
+		9201015D18D5A445003D1ACA /* webvtt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201003F18D5A444003D1ACA /* webvtt.c */; };
+		9201015E18D5A445003D1ACA /* desc_private.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004118D5A444003D1ACA /* desc_private.c */; };
+		9201015F18D5A445003D1ACA /* descriptors.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004218D5A444003D1ACA /* descriptors.c */; };
+		9201016018D5A445003D1ACA /* ipmpx_code.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004318D5A444003D1ACA /* ipmpx_code.c */; };
+		9201016118D5A445003D1ACA /* ipmpx_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004418D5A444003D1ACA /* ipmpx_dump.c */; };
+		9201016218D5A445003D1ACA /* ipmpx_parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004518D5A444003D1ACA /* ipmpx_parse.c */; };
+		9201016318D5A445003D1ACA /* oci_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004618D5A444003D1ACA /* oci_codec.c */; };
+		9201016418D5A445003D1ACA /* odf_code.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004718D5A444003D1ACA /* odf_code.c */; };
+		9201016518D5A445003D1ACA /* odf_codec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004818D5A444003D1ACA /* odf_codec.c */; };
+		9201016618D5A445003D1ACA /* odf_command.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004918D5A444003D1ACA /* odf_command.c */; };
+		9201016718D5A445003D1ACA /* odf_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004A18D5A444003D1ACA /* odf_dump.c */; };
+		9201016818D5A445003D1ACA /* odf_parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004B18D5A444003D1ACA /* odf_parse.c */; };
+		9201016918D5A445003D1ACA /* qos.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004C18D5A444003D1ACA /* qos.c */; };
+		9201016A18D5A445003D1ACA /* slc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004D18D5A444003D1ACA /* slc.c */; };
+		9201016B18D5A445003D1ACA /* encode_isom.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201004F18D5A444003D1ACA /* encode_isom.c */; };
+		9201016C18D5A445003D1ACA /* loader_bt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005018D5A444003D1ACA /* loader_bt.c */; };
+		9201016D18D5A445003D1ACA /* loader_isom.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005118D5A444003D1ACA /* loader_isom.c */; };
+		9201016E18D5A445003D1ACA /* loader_qt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005218D5A444003D1ACA /* loader_qt.c */; };
+		9201016F18D5A445003D1ACA /* loader_svg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005318D5A444003D1ACA /* loader_svg.c */; };
+		9201017018D5A445003D1ACA /* loader_xmt.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005418D5A444003D1ACA /* loader_xmt.c */; };
+		9201017118D5A445003D1ACA /* scene_dump.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005518D5A444003D1ACA /* scene_dump.c */; };
+		9201017218D5A445003D1ACA /* scene_engine.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005618D5A444003D1ACA /* scene_engine.c */; };
+		9201017318D5A445003D1ACA /* scene_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005718D5A444003D1ACA /* scene_manager.c */; };
+		9201017418D5A445003D1ACA /* scene_stats.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005818D5A444003D1ACA /* scene_stats.c */; };
+		9201017518D5A445003D1ACA /* swf_bifs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005918D5A444003D1ACA /* swf_bifs.c */; };
+		9201017618D5A445003D1ACA /* swf_parse.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005A18D5A444003D1ACA /* swf_parse.c */; };
+		9201017718D5A445003D1ACA /* swf_svg.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005B18D5A444003D1ACA /* swf_svg.c */; };
+		9201017818D5A445003D1ACA /* text_to_bifs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005C18D5A444003D1ACA /* text_to_bifs.c */; };
+		9201017918D5A445003D1ACA /* base_scenegraph.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005E18D5A444003D1ACA /* base_scenegraph.c */; };
+		9201017A18D5A445003D1ACA /* commands.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201005F18D5A444003D1ACA /* commands.c */; };
+		9201017B18D5A445003D1ACA /* dom_events.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006018D5A444003D1ACA /* dom_events.c */; };
+		9201017C18D5A445003D1ACA /* dom_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006118D5A444003D1ACA /* dom_smjs.c */; };
+		9201017D18D5A445003D1ACA /* html5_media_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006218D5A444003D1ACA /* html5_media_smjs.c */; };
+		9201017E18D5A445003D1ACA /* html5_mse_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006318D5A444003D1ACA /* html5_mse_smjs.c */; };
+		9201017F18D5A445003D1ACA /* mpeg4_animators.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006418D5A444003D1ACA /* mpeg4_animators.c */; };
+		9201018018D5A445003D1ACA /* mpeg4_nodes.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006518D5A444003D1ACA /* mpeg4_nodes.c */; };
+		9201018118D5A445003D1ACA /* mpeg4_valuator.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006618D5A444003D1ACA /* mpeg4_valuator.c */; };
+		9201018218D5A445003D1ACA /* smil_anim.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006718D5A444003D1ACA /* smil_anim.c */; };
+		9201018318D5A445003D1ACA /* smil_timing.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006818D5A444003D1ACA /* smil_timing.c */; };
+		9201018418D5A445003D1ACA /* svg_attributes.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006918D5A444003D1ACA /* svg_attributes.c */; };
+		9201018518D5A445003D1ACA /* svg_properties.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006A18D5A444003D1ACA /* svg_properties.c */; };
+		9201018618D5A445003D1ACA /* svg_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006B18D5A444003D1ACA /* svg_smjs.c */; };
+		9201018718D5A445003D1ACA /* svg_types.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006C18D5A444003D1ACA /* svg_types.c */; };
+		9201018818D5A445003D1ACA /* vrml_interpolators.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006D18D5A444003D1ACA /* vrml_interpolators.c */; };
+		9201018918D5A445003D1ACA /* vrml_proto.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006E18D5A444003D1ACA /* vrml_proto.c */; };
+		9201018A18D5A445003D1ACA /* vrml_route.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201006F18D5A444003D1ACA /* vrml_route.c */; };
+		9201018B18D5A445003D1ACA /* vrml_script.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007018D5A444003D1ACA /* vrml_script.c */; };
+		9201018C18D5A445003D1ACA /* vrml_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007118D5A444003D1ACA /* vrml_smjs.c */; };
+		9201018D18D5A445003D1ACA /* vrml_tools.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007218D5A444003D1ACA /* vrml_tools.c */; };
+		9201018E18D5A445003D1ACA /* webvtt_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007318D5A444003D1ACA /* webvtt_smjs.c */; };
+		9201018F18D5A445003D1ACA /* x3d_nodes.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007418D5A444003D1ACA /* x3d_nodes.c */; };
+		9201019018D5A445003D1ACA /* xbl_process.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007518D5A444003D1ACA /* xbl_process.c */; };
+		9201019118D5A445003D1ACA /* xml_ns.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007618D5A444003D1ACA /* xml_ns.c */; };
+		9201019218D5A445003D1ACA /* channel.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007818D5A444003D1ACA /* channel.c */; };
+		9201019318D5A445003D1ACA /* clock.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007918D5A444003D1ACA /* clock.c */; };
+		9201019418D5A445003D1ACA /* decoder.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007A18D5A444003D1ACA /* decoder.c */; };
+		9201019518D5A445003D1ACA /* input_sensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007B18D5A444003D1ACA /* input_sensor.c */; };
+		9201019618D5A445003D1ACA /* input_sensor.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201007C18D5A444003D1ACA /* input_sensor.h */; };
+		9201019718D5A445003D1ACA /* media_control.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007D18D5A444003D1ACA /* media_control.c */; };
+		9201019818D5A445003D1ACA /* media_control.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201007E18D5A444003D1ACA /* media_control.h */; };
+		9201019918D5A445003D1ACA /* media_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201007F18D5A444003D1ACA /* media_manager.c */; };
+		9201019A18D5A445003D1ACA /* media_memory.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008018D5A444003D1ACA /* media_memory.c */; };
+		9201019B18D5A445003D1ACA /* media_memory.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201008118D5A444003D1ACA /* media_memory.h */; };
+		9201019C18D5A445003D1ACA /* media_object.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008218D5A444003D1ACA /* media_object.c */; };
+		9201019D18D5A445003D1ACA /* media_sensor.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008318D5A444003D1ACA /* media_sensor.c */; };
+		9201019E18D5A445003D1ACA /* mpeg4_inline.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008418D5A444003D1ACA /* mpeg4_inline.c */; };
+		9201019F18D5A445003D1ACA /* network_service.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008518D5A444003D1ACA /* network_service.c */; };
+		920101A018D5A445003D1ACA /* object_browser.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008618D5A444003D1ACA /* object_browser.c */; };
+		920101A118D5A445003D1ACA /* object_manager.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008718D5A444003D1ACA /* object_manager.c */; };
+		920101A218D5A445003D1ACA /* scene.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008818D5A444003D1ACA /* scene.c */; };
+		920101A318D5A445003D1ACA /* svg_external.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008918D5A444003D1ACA /* svg_external.c */; };
+		920101A418D5A445003D1ACA /* term_node_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008A18D5A444003D1ACA /* term_node_init.c */; };
+		920101A518D5A445003D1ACA /* terminal.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008B18D5A444003D1ACA /* terminal.c */; };
+		920101A618D5A445003D1ACA /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008D18D5A444003D1ACA /* alloc.c */; };
+		920101A718D5A445003D1ACA /* base_encoding.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008E18D5A444003D1ACA /* base_encoding.c */; };
+		920101A818D5A445003D1ACA /* bitstream.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201008F18D5A444003D1ACA /* bitstream.c */; };
+		920101A918D5A445003D1ACA /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009018D5A444003D1ACA /* cache.c */; };
+		920101AA18D5A445003D1ACA /* color.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009118D5A444003D1ACA /* color.c */; };
+		920101AB18D5A445003D1ACA /* configfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009218D5A444003D1ACA /* configfile.c */; };
+		920101AC18D5A445003D1ACA /* dlmalloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009318D5A444003D1ACA /* dlmalloc.c */; };
+		920101AD18D5A445003D1ACA /* downloader.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009418D5A444003D1ACA /* downloader.c */; };
+		920101AE18D5A445003D1ACA /* error.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009518D5A444003D1ACA /* error.c */; };
+		920101B018D5A445003D1ACA /* list.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009718D5A444003D1ACA /* list.c */; };
+		920101B118D5A445003D1ACA /* map.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009818D5A444003D1ACA /* map.c */; };
+		920101B218D5A445003D1ACA /* math.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009918D5A444003D1ACA /* math.c */; };
+		920101B318D5A445003D1ACA /* module.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009A18D5A444003D1ACA /* module.c */; };
+		920101B418D5A445003D1ACA /* module_wrap.h in Headers */ = {isa = PBXBuildFile; fileRef = 9201009B18D5A444003D1ACA /* module_wrap.h */; };
+		920101B518D5A445003D1ACA /* os_config_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009C18D5A444003D1ACA /* os_config_init.c */; };
+		920101B618D5A445003D1ACA /* os_divers.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009D18D5A444003D1ACA /* os_divers.c */; };
+		920101B718D5A445003D1ACA /* os_module.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009E18D5A444003D1ACA /* os_module.c */; };
+		920101B818D5A445003D1ACA /* os_net.c in Sources */ = {isa = PBXBuildFile; fileRef = 9201009F18D5A444003D1ACA /* os_net.c */; };
+		920101B918D5A445003D1ACA /* os_thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A018D5A444003D1ACA /* os_thread.c */; };
+		920101BA18D5A445003D1ACA /* path2d.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A118D5A444003D1ACA /* path2d.c */; };
+		920101BB18D5A445003D1ACA /* path2d_stroker.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A218D5A444003D1ACA /* path2d_stroker.c */; };
+		920101BC18D5A445003D1ACA /* ringbuffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A318D5A444003D1ACA /* ringbuffer.c */; };
+		920101BD18D5A445003D1ACA /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A418D5A444003D1ACA /* sha1.c */; };
+		920101C018D5A445003D1ACA /* token.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A718D5A444003D1ACA /* token.c */; };
+		920101C118D5A445003D1ACA /* uni_bidi.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A818D5A444003D1ACA /* uni_bidi.c */; };
+		920101C218D5A445003D1ACA /* unicode.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100A918D5A444003D1ACA /* unicode.c */; };
+		920101C318D5A445003D1ACA /* url.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100AA18D5A444003D1ACA /* url.c */; };
+		920101C418D5A445003D1ACA /* utf.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100AB18D5A444003D1ACA /* utf.c */; };
+		920101C518D5A445003D1ACA /* xml_parser.c in Sources */ = {isa = PBXBuildFile; fileRef = 920100AC18D5A444003D1ACA /* xml_parser.c */; };
+		920101CF18D5AC67003D1ACA /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 920101CE18D5AC67003D1ACA /* OpenGL.framework */; };
+		920101D118D5ACA7003D1ACA /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 920101D018D5ACA7003D1ACA /* libz.dylib */; };
+		9225732F18D7269700D6FD98 /* ogg_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732A18D7269700D6FD98 /* ogg_in.c */; };
+		9225733018D7269700D6FD98 /* ogg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 9225732B18D7269700D6FD98 /* ogg_in.h */; };
+		9225733118D7269700D6FD98 /* ogg_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732C18D7269700D6FD98 /* ogg_load.c */; };
+		9225733218D7269700D6FD98 /* theora_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732D18D7269700D6FD98 /* theora_dec.c */; };
+		9225733318D7269700D6FD98 /* vorbis_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 9225732E18D7269700D6FD98 /* vorbis_dec.c */; };
+		9225733418D726D800D6FD98 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF0E418D6DB8600E2FF12 /* audio.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0D818D6DB5500E2FF12 /* audio.c */; };
+		92AAF0E518D6DB8600E2FF12 /* sdl_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */; };
+		92AAF0E618D6DB8600E2FF12 /* sdl_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */; };
+		92AAF0E718D6DB8600E2FF12 /* video.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0DC18D6DB5500E2FF12 /* video.c */; };
+		92AAF0E818D6DB9300E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF0EA18D6E3A300E2FF12 /* raw_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50FD18D6D9EE00AA59D8 /* raw_video.c */; };
+		92AAF0EB18D6E5AA00E2FF12 /* ftgrays.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510918D6DA6300AA59D8 /* ftgrays.c */; };
+		92AAF0EC18D6E5AA00E2FF12 /* rast_soft.h in Headers */ = {isa = PBXBuildFile; fileRef = 92BE510A18D6DA6300AA59D8 /* rast_soft.h */; };
+		92AAF0ED18D6E5AA00E2FF12 /* raster_565.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510B18D6DA6300AA59D8 /* raster_565.c */; };
+		92AAF0EE18D6E5AA00E2FF12 /* raster_argb.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510C18D6DA6300AA59D8 /* raster_argb.c */; };
+		92AAF0EF18D6E5AA00E2FF12 /* raster_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510D18D6DA6300AA59D8 /* raster_load.c */; };
+		92AAF0F018D6E5AA00E2FF12 /* raster_rgb.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510E18D6DA6300AA59D8 /* raster_rgb.c */; };
+		92AAF0F118D6E5AA00E2FF12 /* stencil.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE510F18D6DA6300AA59D8 /* stencil.c */; };
+		92AAF0F218D6E5AA00E2FF12 /* surface.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE511018D6DA6300AA59D8 /* surface.c */; };
+		92AAF0F518D6E5D400E2FF12 /* audio_filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0F418D6E5D400E2FF12 /* audio_filter.c */; };
+		92AAF0F818D6E5FD00E2FF12 /* bifs_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0F718D6E5FD00E2FF12 /* bifs_dec.c */; };
+		92AAF0FB18D6E62600E2FF12 /* ctx_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0FA18D6E62600E2FF12 /* ctx_load.c */; };
+		92AAF0FE18D6E64800E2FF12 /* dummy_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF0FD18D6E64800E2FF12 /* dummy_in.c */; };
+		92AAF10118D6E66D00E2FF12 /* gpac_js.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10018D6E66D00E2FF12 /* gpac_js.c */; };
+		92AAF10A18D6E69500E2FF12 /* bmp_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10318D6E69500E2FF12 /* bmp_dec.c */; };
+		92AAF10B18D6E69500E2FF12 /* img_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10418D6E69500E2FF12 /* img_dec.c */; };
+		92AAF10C18D6E69500E2FF12 /* img_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10518D6E69500E2FF12 /* img_in.c */; };
+		92AAF10D18D6E69500E2FF12 /* img_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF10618D6E69500E2FF12 /* img_in.h */; };
+		92AAF10E18D6E69500E2FF12 /* jp2_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10718D6E69500E2FF12 /* jp2_dec.c */; };
+		92AAF10F18D6E69500E2FF12 /* jpeg_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10818D6E69500E2FF12 /* jpeg_dec.c */; };
+		92AAF11018D6E69500E2FF12 /* png_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF10918D6E69500E2FF12 /* png_dec.c */; };
+		92AAF11318D6E6B700E2FF12 /* isma_ea.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11218D6E6B700E2FF12 /* isma_ea.c */; };
+		92AAF11A18D6E6D300E2FF12 /* isom_cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11518D6E6D300E2FF12 /* isom_cache.c */; };
+		92AAF11B18D6E6D300E2FF12 /* isom_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF11618D6E6D300E2FF12 /* isom_in.h */; };
+		92AAF11C18D6E6D300E2FF12 /* load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11718D6E6D300E2FF12 /* load.c */; };
+		92AAF11D18D6E6D300E2FF12 /* read_ch.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11818D6E6D300E2FF12 /* read_ch.c */; };
+		92AAF11E18D6E6D300E2FF12 /* read.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF11918D6E6D300E2FF12 /* read.c */; };
+		92AAF12118D6E6F300E2FF12 /* laser_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12018D6E6F300E2FF12 /* laser_dec.c */; };
+		92AAF12418D6E70D00E2FF12 /* mpd_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12318D6E70D00E2FF12 /* mpd_in.c */; };
+		92AAF12718D6E72800E2FF12 /* mpegts_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12618D6E72800E2FF12 /* mpegts_in.c */; };
+		92AAF12A18D6E74200E2FF12 /* mse_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12918D6E74200E2FF12 /* mse_in.c */; };
+		92AAF12D18D6E75800E2FF12 /* odf_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12C18D6E75800E2FF12 /* odf_dec.c */; };
+		92AAF13018D6E77900E2FF12 /* osd.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF12F18D6E77900E2FF12 /* osd.c */; };
+		92AAF13918D6E7BC00E2FF12 /* rtp_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13218D6E7BC00E2FF12 /* rtp_in.c */; };
+		92AAF13A18D6E7BC00E2FF12 /* rtp_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF13318D6E7BC00E2FF12 /* rtp_in.h */; };
+		92AAF13B18D6E7BC00E2FF12 /* rtp_session.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13418D6E7BC00E2FF12 /* rtp_session.c */; };
+		92AAF13C18D6E7BC00E2FF12 /* rtp_signaling.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13518D6E7BC00E2FF12 /* rtp_signaling.c */; };
+		92AAF13D18D6E7BC00E2FF12 /* rtp_stream.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13618D6E7BC00E2FF12 /* rtp_stream.c */; };
+		92AAF13E18D6E7BC00E2FF12 /* sdp_fetch.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13718D6E7BC00E2FF12 /* sdp_fetch.c */; };
+		92AAF13F18D6E7BC00E2FF12 /* sdp_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF13818D6E7BC00E2FF12 /* sdp_load.c */; };
+		92AAF14218D6E7D800E2FF12 /* saf_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14118D6E7D800E2FF12 /* saf_in.c */; };
+		92AAF14518D6E7F500E2FF12 /* svg_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14418D6E7F500E2FF12 /* svg_in.c */; };
+		92AAF14918D6E82500E2FF12 /* timedtext_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14718D6E82500E2FF12 /* timedtext_dec.c */; };
+		92AAF14A18D6E82500E2FF12 /* timedtext_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14818D6E82500E2FF12 /* timedtext_in.c */; };
+		92AAF14D18D6E83B00E2FF12 /* validator.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14C18D6E83B00E2FF12 /* validator.c */; };
+		92AAF15518D6E87500E2FF12 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF14F18D6E87500E2FF12 /* unzip.c */; };
+		92AAF15618D6E87500E2FF12 /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF15018D6E87500E2FF12 /* unzip.h */; };
+		92AAF15718D6E87500E2FF12 /* wgt_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF15118D6E87500E2FF12 /* wgt_load.c */; };
+		92AAF15818D6E87500E2FF12 /* widget.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF15218D6E87500E2FF12 /* widget.c */; };
+		92AAF15918D6E87500E2FF12 /* widgetman.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF15318D6E87500E2FF12 /* widgetman.c */; };
+		92AAF15A18D6E87500E2FF12 /* widgetman.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF15418D6E87500E2FF12 /* widgetman.h */; };
+		92AAF16D18D6F5EB00E2FF12 /* ft_font.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF16B18D6F5EA00E2FF12 /* ft_font.c */; };
+		92AAF16E18D6F5EB00E2FF12 /* ft_font.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF16C18D6F5EA00E2FF12 /* ft_font.h */; };
+		92AAF16F18D6F66300E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF17C18D6F8C700E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF18018D6F8EF00E2FF12 /* aac_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF17E18D6F8EF00E2FF12 /* aac_in.c */; };
+		92AAF18118D6F8EF00E2FF12 /* faad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF17F18D6F8EF00E2FF12 /* faad_dec.c */; };
+		92AAF19118D6FA3300E2FF12 /* ac3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF18D18D6FA2C00E2FF12 /* ac3_in.c */; };
+		92AAF19218D6FA3300E2FF12 /* liba52_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF18E18D6FA2C00E2FF12 /* liba52_dec.c */; };
+		92AAF19318D6FB7B00E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF19C18D6FDD900E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF1A618D6FDFA00E2FF12 /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF19E18D6FDF300E2FF12 /* ffmpeg_decode.c */; };
+		92AAF1A718D6FDFA00E2FF12 /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF19F18D6FDF300E2FF12 /* ffmpeg_demux.c */; };
+		92AAF1A818D6FDFA00E2FF12 /* ffmpeg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF1A018D6FDF300E2FF12 /* ffmpeg_in.h */; };
+		92AAF1A918D6FDFA00E2FF12 /* ffmpeg_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1A118D6FDF300E2FF12 /* ffmpeg_load.c */; };
+		92AAF1B718D70A1000E2FF12 /* mad_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1B318D70A0A00E2FF12 /* mad_dec.c */; };
+		92AAF1B818D70A1000E2FF12 /* mp3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1B418D70A0A00E2FF12 /* mp3_in.c */; };
+		92AAF1B918D70A5200E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF1C518D70B4600E2FF12 /* openhevc_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1C318D70B4100E2FF12 /* openhevc_dec.c */; };
+		92AAF1C618D70BAE00E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF1D218D70D5100E2FF12 /* opensvc_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */; };
+		92AAF1D318D70DE500E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF1D918D710A000E2FF12 /* vtt_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D518D7109A00E2FF12 /* vtt_dec.c */; };
+		92AAF1DA18D710A000E2FF12 /* vtt_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1D618D7109A00E2FF12 /* vtt_in.c */; };
+		92AAF1E318D7129A00E2FF12 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92AAF1EA18D712C500E2FF12 /* x11_out.c in Sources */ = {isa = PBXBuildFile; fileRef = 92AAF1E718D712C500E2FF12 /* x11_out.c */; };
+		92AAF1EB18D712C500E2FF12 /* x11_out.h in Headers */ = {isa = PBXBuildFile; fileRef = 92AAF1E818D712C500E2FF12 /* x11_out.h */; };
+		92BE50A318D632DA00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92BE50A818D6348A00AA59D8 /* filedump.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A418D6348A00AA59D8 /* filedump.c */; };
+		92BE50A918D6348A00AA59D8 /* fileimport.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A518D6348A00AA59D8 /* fileimport.c */; };
+		92BE50AA18D6348A00AA59D8 /* live.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A618D6348A00AA59D8 /* live.c */; };
+		92BE50AB18D6348A00AA59D8 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50A718D6348A00AA59D8 /* main.c */; };
+		92BE50C218D6D5DC00AA59D8 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50C118D6D5DC00AA59D8 /* main.c */; };
+		92BE50D318D6D62600AA59D8 /* extract.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50D118D6D62600AA59D8 /* extract.c */; };
+		92BE50D418D6D62600AA59D8 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 92BE50D218D6D62600AA59D8 /* main.c */; };
+		92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+		92BE50D618D6D6C100AA59D8 /* libgpac.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9201F93718D5A38A003D1ACA /* libgpac.dylib */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXBuildRule section */
+		920101C918D5A605003D1ACA /* PBXBuildRule */ = {
+			isa = PBXBuildRule;
+			compilerSpec = com.apple.compilers.proxy.script;
+			fileType = sourcecode.opencl;
+			isEditable = 1;
+			outputFiles = (
 			);
-			name = configure;
-			productName = configure;
+			script = "";
 		};
-/* End PBXAggregateTarget section */
+/* End PBXBuildRule section */
 
 /* Begin PBXContainerItemProxy section */
-		717BB66F11525AAA00A39D3D /* PBXContainerItemProxy */ = {
+		9225730E18D717AB00D6FD98 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 92AAF18718D6FA1100E2FF12;
+			remoteInfo = ac3_in;
+		};
+		9225731018D717AE00D6FD98 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 92AAF19718D6FDC300E2FF12;
+			remoteInfo = ffmpeg_in;
+		};
+		9225731218D717B100D6FD98 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 92AAF1AD18D709D900E2FF12;
+			remoteInfo = mp3_in;
+		};
+		9225731418D717B400D6FD98 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 92AAF1BD18D70B1C00E2FF12;
+			remoteInfo = openhevc_dec;
+		};
+		9225731618D717BA00D6FD98 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 92AAF1CA18D70C3100E2FF12;
+			remoteInfo = opensvc_dec;
+		};
+		9225731818D717BD00D6FD98 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 92AAF1DE18D7126900E2FF12;
+			remoteInfo = x11_out;
+		};
+		9225733518D727B500D6FD98 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 717BAE39115238D100A39D3D;
-			remoteInfo = libgpac;
+			remoteGlobalIDString = 9225732318D7267900D6FD98;
+			remoteInfo = ogg_in;
 		};
-		717BB67311525AB200A39D3D /* PBXContainerItemProxy */ = {
+		92AAF17018D6F87100E2FF12 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 717BB3A71152558600A39D3D;
-			remoteInfo = modules;
+			remoteGlobalIDString = 92AAF0D218D6DB2D00E2FF12;
+			remoteInfo = sdl_out;
 		};
-		71D7E30711525E2E003DF497 /* PBXContainerItemProxy */ = {
+		92AAF17218D6F87A00E2FF12 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 71D7E30411525E11003DF497;
-			remoteInfo = applications;
+			remoteGlobalIDString = 92AAF16418D6F40400E2FF12;
+			remoteInfo = ft_font;
 		};
-		71D7E31311577931003DF497 /* PBXContainerItemProxy */ = {
+		92AAF18218D6F9E700E2FF12 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
-			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
+			containerPortal = 9201F92918D5A359003D1ACA /* Project object */;
 			proxyType = 1;
-			remoteGlobalIDString = 71D7E310115778E1003DF497;
-			remoteInfo = configure;
+			remoteGlobalIDString = 92AAF17718D6F89B00E2FF12;
+			remoteInfo = aac_in;
 		};
 /* End PBXContainerItemProxy section */
 
+/* Begin PBXCopyFilesBuildPhase section */
+		92BE508E18D6325E00AA59D8 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		92BE50B118D6D53000AA59D8 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+		92BE50C518D6D60100AA59D8 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
-		717BB27B1152533800A39D3D /* bifs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = bifs; path = ../../src/bifs; sourceTree = SOURCE_ROOT; };
-		717BB27C1152533800A39D3D /* compositor */ = {isa = PBXFileReference; lastKnownFileType = folder; name = compositor; path = ../../src/compositor; sourceTree = SOURCE_ROOT; };
-		717BB2831152533800A39D3D /* dir_info */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = dir_info; path = ../../src/dir_info; sourceTree = SOURCE_ROOT; };
-		717BB2841152533800A39D3D /* export.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = export.cpp; path = ../../src/export.cpp; sourceTree = SOURCE_ROOT; };
-		717BB2851152533800A39D3D /* ietf */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ietf; path = ../../src/ietf; sourceTree = SOURCE_ROOT; };
-		717BB2861152533800A39D3D /* isomedia */ = {isa = PBXFileReference; lastKnownFileType = folder; name = isomedia; path = ../../src/isomedia; sourceTree = SOURCE_ROOT; };
-		717BB2871152533800A39D3D /* laser */ = {isa = PBXFileReference; lastKnownFileType = folder; name = laser; path = ../../src/laser; sourceTree = SOURCE_ROOT; };
-		717BB2881152533800A39D3D /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../src/Makefile; sourceTree = SOURCE_ROOT; };
-		717BB2891152533800A39D3D /* mcrypt */ = {isa = PBXFileReference; lastKnownFileType = folder; name = mcrypt; path = ../../src/mcrypt; sourceTree = SOURCE_ROOT; };
-		717BB28A1152533800A39D3D /* media_tools */ = {isa = PBXFileReference; lastKnownFileType = folder; name = media_tools; path = ../../src/media_tools; sourceTree = SOURCE_ROOT; };
-		717BB28B1152533800A39D3D /* odf */ = {isa = PBXFileReference; lastKnownFileType = folder; name = odf; path = ../../src/odf; sourceTree = SOURCE_ROOT; };
-		717BB28C1152533800A39D3D /* scene_manager */ = {isa = PBXFileReference; lastKnownFileType = folder; name = scene_manager; path = ../../src/scene_manager; sourceTree = SOURCE_ROOT; };
-		717BB28D1152533800A39D3D /* scenegraph */ = {isa = PBXFileReference; lastKnownFileType = folder; name = scenegraph; path = ../../src/scenegraph; sourceTree = SOURCE_ROOT; };
-		717BB28E1152533800A39D3D /* terminal */ = {isa = PBXFileReference; lastKnownFileType = folder; name = terminal; path = ../../src/terminal; sourceTree = SOURCE_ROOT; };
-		717BB28F1152533800A39D3D /* utils */ = {isa = PBXFileReference; lastKnownFileType = folder; name = utils; path = ../../src/utils; sourceTree = SOURCE_ROOT; };
-		717BB3B3115256CD00A39D3D /* aac_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = aac_in; path = ../../modules/aac_in; sourceTree = SOURCE_ROOT; };
-		717BB3B8115256CD00A39D3D /* ac3_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ac3_in; path = ../../modules/ac3_in; sourceTree = SOURCE_ROOT; };
-		717BB3BD115256CD00A39D3D /* alsa */ = {isa = PBXFileReference; lastKnownFileType = folder; name = alsa; path = ../../modules/alsa; sourceTree = SOURCE_ROOT; };
-		717BB3C1115256CD00A39D3D /* amr_dec */ = {isa = PBXFileReference; lastKnownFileType = folder; name = amr_dec; path = ../../modules/amr_dec; sourceTree = SOURCE_ROOT; };
-		717BB3C9115256CD00A39D3D /* amr_float_dec */ = {isa = PBXFileReference; lastKnownFileType = folder; name = amr_float_dec; path = ../../modules/amr_float_dec; sourceTree = SOURCE_ROOT; };
-		717BB3D3115256CD00A39D3D /* audio_filter */ = {isa = PBXFileReference; lastKnownFileType = folder; name = audio_filter; path = ../../modules/audio_filter; sourceTree = SOURCE_ROOT; };
-		717BB3D7115256CD00A39D3D /* bifs_dec */ = {isa = PBXFileReference; lastKnownFileType = folder; name = bifs_dec; path = ../../modules/bifs_dec; sourceTree = SOURCE_ROOT; };
-		717BB3DB115256CD00A39D3D /* ctx_load */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ctx_load; path = ../../modules/ctx_load; sourceTree = SOURCE_ROOT; };
-		717BB3E5115256CD00A39D3D /* demo_is */ = {isa = PBXFileReference; lastKnownFileType = folder; name = demo_is; path = ../../modules/demo_is; sourceTree = SOURCE_ROOT; };
-		717BB3EA115256CD00A39D3D /* dummy_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dummy_in; path = ../../modules/dummy_in; sourceTree = SOURCE_ROOT; };
-		717BB3EE115256CD00A39D3D /* dx_hw */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dx_hw; path = ../../modules/dx_hw; sourceTree = SOURCE_ROOT; };
-		717BB3FB115256CD00A39D3D /* epoc_hw */ = {isa = PBXFileReference; lastKnownFileType = folder; name = epoc_hw; path = ../../modules/epoc_hw; sourceTree = SOURCE_ROOT; };
-		717BB400115256CD00A39D3D /* ffmpeg_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ffmpeg_in; path = ../../modules/ffmpeg_in; sourceTree = SOURCE_ROOT; };
-		717BB407115256CD00A39D3D /* ft_font */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ft_font; path = ../../modules/ft_font; sourceTree = SOURCE_ROOT; };
-		717BB40C115256CD00A39D3D /* gapi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gapi; path = ../../modules/gapi; sourceTree = SOURCE_ROOT; };
-		717BB410115256CD00A39D3D /* gdip_raster */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gdip_raster; path = ../../modules/gdip_raster; sourceTree = SOURCE_ROOT; };
-		717BB417115256CD00A39D3D /* gpac_js */ = {isa = PBXFileReference; lastKnownFileType = folder; name = gpac_js; path = ../../modules/gpac_js; sourceTree = SOURCE_ROOT; };
-		717BB41B115256CD00A39D3D /* img_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = img_in; path = ../../modules/img_in; sourceTree = SOURCE_ROOT; };
-		717BB425115256CD00A39D3D /* ismacryp */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ismacryp; path = ../../modules/ismacryp; sourceTree = SOURCE_ROOT; };
-		717BB429115256CD00A39D3D /* isom_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = isom_in; path = ../../modules/isom_in; sourceTree = SOURCE_ROOT; };
-		717BB431115256CD00A39D3D /* jack */ = {isa = PBXFileReference; lastKnownFileType = folder; name = jack; path = ../../modules/jack; sourceTree = SOURCE_ROOT; };
-		717BB435115256CD00A39D3D /* laser_dec */ = {isa = PBXFileReference; lastKnownFileType = folder; name = laser_dec; path = ../../modules/laser_dec; sourceTree = SOURCE_ROOT; };
-		717BB439115256CD00A39D3D /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../modules/Makefile; sourceTree = SOURCE_ROOT; };
-		717BB43A115256CD00A39D3D /* modules_export.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = modules_export.cpp; path = ../../modules/modules_export.cpp; sourceTree = SOURCE_ROOT; };
-		717BB43B115256CD00A39D3D /* mp3_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = mp3_in; path = ../../modules/mp3_in; sourceTree = SOURCE_ROOT; };
-		717BB440115256CD00A39D3D /* mpegts_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = mpegts_in; path = ../../modules/mpegts_in; sourceTree = SOURCE_ROOT; };
-		717BB444115256CD00A39D3D /* odf_dec */ = {isa = PBXFileReference; lastKnownFileType = folder; name = odf_dec; path = ../../modules/odf_dec; sourceTree = SOURCE_ROOT; };
-		717BB448115256CD00A39D3D /* ogg */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ogg; path = ../../modules/ogg; sourceTree = SOURCE_ROOT; };
-		717BB450115256CD00A39D3D /* opencv_is */ = {isa = PBXFileReference; lastKnownFileType = folder; name = opencv_is; path = ../../modules/opencv_is; sourceTree = SOURCE_ROOT; };
-		717BB456115256CD00A39D3D /* oss_audio */ = {isa = PBXFileReference; lastKnownFileType = folder; name = oss_audio; path = ../../modules/oss_audio; sourceTree = SOURCE_ROOT; };
-		717BB45A115256CD00A39D3D /* pulseaudio */ = {isa = PBXFileReference; lastKnownFileType = folder; name = pulseaudio; path = ../../modules/pulseaudio; sourceTree = SOURCE_ROOT; };
-		717BB45E115256CD00A39D3D /* raw_out */ = {isa = PBXFileReference; lastKnownFileType = folder; name = raw_out; path = ../../modules/raw_out; sourceTree = SOURCE_ROOT; };
-		717BB462115256CD00A39D3D /* rtp_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rtp_in; path = ../../modules/rtp_in; sourceTree = SOURCE_ROOT; };
-		717BB46C115256CD00A39D3D /* saf_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = saf_in; path = ../../modules/saf_in; sourceTree = SOURCE_ROOT; };
-		717BB470115256CD00A39D3D /* sdl_out */ = {isa = PBXFileReference; lastKnownFileType = folder; name = sdl_out; path = ../../modules/sdl_out; sourceTree = SOURCE_ROOT; };
-		717BB479115256CD00A39D3D /* soft_raster */ = {isa = PBXFileReference; lastKnownFileType = folder; name = soft_raster; path = ../../modules/soft_raster; sourceTree = SOURCE_ROOT; };
-		717BB484115256CD00A39D3D /* svg_in */ = {isa = PBXFileReference; lastKnownFileType = folder; name = svg_in; path = ../../modules/svg_in; sourceTree = SOURCE_ROOT; };
-		717BB488115256CD00A39D3D /* timedtext */ = {isa = PBXFileReference; lastKnownFileType = folder; name = timedtext; path = ../../modules/timedtext; sourceTree = SOURCE_ROOT; };
-		717BB48D115256CD00A39D3D /* ui_rec */ = {isa = PBXFileReference; lastKnownFileType = folder; name = ui_rec; path = ../../modules/ui_rec; sourceTree = SOURCE_ROOT; };
-		717BB492115256CD00A39D3D /* wav_out */ = {isa = PBXFileReference; lastKnownFileType = folder; name = wav_out; path = ../../modules/wav_out; sourceTree = SOURCE_ROOT; };
-		717BB496115256CD00A39D3D /* wiiis */ = {isa = PBXFileReference; lastKnownFileType = folder; name = wiiis; path = ../../modules/wiiis; sourceTree = SOURCE_ROOT; };
-		717BB49B115256CD00A39D3D /* x11_out */ = {isa = PBXFileReference; lastKnownFileType = folder; name = x11_out; path = ../../modules/x11_out; sourceTree = SOURCE_ROOT; };
-		717BB4A0115256CD00A39D3D /* xvid_dec */ = {isa = PBXFileReference; lastKnownFileType = folder; name = xvid_dec; path = ../../modules/xvid_dec; sourceTree = SOURCE_ROOT; };
-		717BB4DA115259C000A39D3D /* generators */ = {isa = PBXFileReference; lastKnownFileType = folder; name = generators; path = ../../applications/generators; sourceTree = SOURCE_ROOT; };
-		717BB527115259C000A39D3D /* GPAX */ = {isa = PBXFileReference; lastKnownFileType = folder; name = GPAX; path = ../../applications/GPAX; sourceTree = SOURCE_ROOT; };
-		717BB53B115259C000A39D3D /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; name = Makefile; path = ../../applications/Makefile; sourceTree = SOURCE_ROOT; };
-		717BB53C115259C000A39D3D /* mp4box */ = {isa = PBXFileReference; lastKnownFileType = folder; name = mp4box; path = ../../applications/mp4box; sourceTree = SOURCE_ROOT; };
-		717BB543115259C000A39D3D /* mp4client */ = {isa = PBXFileReference; lastKnownFileType = folder; name = mp4client; path = ../../applications/mp4client; sourceTree = SOURCE_ROOT; };
-		717BB548115259C000A39D3D /* mp42avi */ = {isa = PBXFileReference; lastKnownFileType = folder; name = mp42avi; path = ../../applications/mp42avi; sourceTree = SOURCE_ROOT; };
-		717BB54C115259C000A39D3D /* osmo4_sym */ = {isa = PBXFileReference; lastKnownFileType = folder; name = osmo4_sym; path = ../../applications/osmo4_sym; sourceTree = SOURCE_ROOT; };
-		717BB564115259C000A39D3D /* osmo4_w32 */ = {isa = PBXFileReference; lastKnownFileType = folder; name = osmo4_w32; path = ../../applications/osmo4_w32; sourceTree = SOURCE_ROOT; };
-		717BB585115259C000A39D3D /* osmo4_wce */ = {isa = PBXFileReference; lastKnownFileType = folder; name = osmo4_wce; path = ../../applications/osmo4_wce; sourceTree = SOURCE_ROOT; };
-		717BB59B115259C000A39D3D /* osmo4_wx */ = {isa = PBXFileReference; lastKnownFileType = folder; name = osmo4_wx; path = ../../applications/osmo4_wx; sourceTree = SOURCE_ROOT; };
-		717BB5B1115259C000A39D3D /* osmophone */ = {isa = PBXFileReference; lastKnownFileType = folder; name = osmophone; path = ../../applications/osmophone; sourceTree = SOURCE_ROOT; };
-		717BB5B9115259C000A39D3D /* osmozilla */ = {isa = PBXFileReference; lastKnownFileType = folder; name = osmozilla; path = ../../applications/osmozilla; sourceTree = SOURCE_ROOT; };
-		717BB5CB115259C000A39D3D /* testapps */ = {isa = PBXFileReference; lastKnownFileType = folder; name = testapps; path = ../../applications/testapps; sourceTree = SOURCE_ROOT; };
-		717BB60F115259C000A39D3D /* v4studio */ = {isa = PBXFileReference; lastKnownFileType = folder; name = v4studio; path = ../../applications/v4studio; sourceTree = SOURCE_ROOT; };
+		9201000018D5A444003D1ACA /* isom_intern.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_intern.c; sourceTree = "<group>"; };
+		9201000118D5A444003D1ACA /* isom_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_read.c; sourceTree = "<group>"; };
+		9201000218D5A444003D1ACA /* isom_store.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_store.c; sourceTree = "<group>"; };
+		9201000318D5A444003D1ACA /* isom_write.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_write.c; sourceTree = "<group>"; };
+		9201000418D5A444003D1ACA /* media.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media.c; sourceTree = "<group>"; };
+		9201000518D5A444003D1ACA /* media_odf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_odf.c; sourceTree = "<group>"; };
+		9201000618D5A444003D1ACA /* meta.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = meta.c; sourceTree = "<group>"; };
+		9201000718D5A444003D1ACA /* movie_fragments.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = movie_fragments.c; sourceTree = "<group>"; };
+		9201000818D5A444003D1ACA /* sample_descs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sample_descs.c; sourceTree = "<group>"; };
+		9201000918D5A444003D1ACA /* stbl_read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stbl_read.c; sourceTree = "<group>"; };
+		9201000A18D5A444003D1ACA /* stbl_write.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stbl_write.c; sourceTree = "<group>"; };
+		9201000B18D5A444003D1ACA /* track.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = track.c; sourceTree = "<group>"; };
+		9201000C18D5A444003D1ACA /* ttml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ttml.c; sourceTree = "<group>"; };
+		9201000D18D5A444003D1ACA /* tx3g.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tx3g.c; sourceTree = "<group>"; };
+		9201000F18D5A444003D1ACA /* lsr_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_dec.c; sourceTree = "<group>"; };
+		9201001018D5A444003D1ACA /* lsr_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_enc.c; sourceTree = "<group>"; };
+		9201001118D5A444003D1ACA /* lsr_tables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = lsr_tables.c; sourceTree = "<group>"; };
+		9201001418D5A444003D1ACA /* cbc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cbc.c; sourceTree = "<group>"; };
+		9201001518D5A444003D1ACA /* cfb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cfb.c; sourceTree = "<group>"; };
+		9201001618D5A444003D1ACA /* ctr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ctr.c; sourceTree = "<group>"; };
+		9201001718D5A444003D1ACA /* des.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = des.c; sourceTree = "<group>"; };
+		9201001818D5A444003D1ACA /* ecb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ecb.c; sourceTree = "<group>"; };
+		9201001918D5A444003D1ACA /* g_crypt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = g_crypt.c; sourceTree = "<group>"; };
+		9201001A18D5A444003D1ACA /* ncfb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ncfb.c; sourceTree = "<group>"; };
+		9201001B18D5A444003D1ACA /* nofb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nofb.c; sourceTree = "<group>"; };
+		9201001C18D5A444003D1ACA /* ofb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ofb.c; sourceTree = "<group>"; };
+		9201001D18D5A444003D1ACA /* rijndael-128.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-128.c"; sourceTree = "<group>"; };
+		9201001E18D5A444003D1ACA /* rijndael-192.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-192.c"; sourceTree = "<group>"; };
+		9201001F18D5A444003D1ACA /* rijndael-256.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = "rijndael-256.c"; sourceTree = "<group>"; };
+		9201002018D5A444003D1ACA /* stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stream.c; sourceTree = "<group>"; };
+		9201002118D5A444003D1ACA /* tripledes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tripledes.c; sourceTree = "<group>"; };
+		9201002318D5A444003D1ACA /* ait.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ait.c; sourceTree = "<group>"; };
+		9201002418D5A444003D1ACA /* av_parsers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = av_parsers.c; sourceTree = "<group>"; };
+		9201002518D5A444003D1ACA /* avilib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = avilib.c; sourceTree = "<group>"; };
+		9201002618D5A444003D1ACA /* dash_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_client.c; sourceTree = "<group>"; };
+		9201002718D5A444003D1ACA /* dash_client.c alias */ = {isa = PBXFileReference; lastKnownFileType = file; path = "dash_client.c alias"; sourceTree = "<group>"; };
+		9201002818D5A444003D1ACA /* dash_segmenter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_segmenter.c; sourceTree = "<group>"; };
+		9201002918D5A444003D1ACA /* dsmcc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsmcc.c; sourceTree = "<group>"; };
+		9201002A18D5A444003D1ACA /* dvb_mpe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dvb_mpe.c; sourceTree = "<group>"; };
+		9201002B18D5A444003D1ACA /* filestreamer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filestreamer.c; sourceTree = "<group>"; };
+		9201002C18D5A444003D1ACA /* gpac_ogg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gpac_ogg.c; sourceTree = "<group>"; };
+		9201002D18D5A444003D1ACA /* html5_media.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media.c; sourceTree = "<group>"; };
+		9201002E18D5A444003D1ACA /* html5_mse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse.c; sourceTree = "<group>"; };
+		9201002F18D5A444003D1ACA /* img.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = img.c; sourceTree = "<group>"; };
+		9201003018D5A444003D1ACA /* ismacryp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ismacryp.c; sourceTree = "<group>"; };
+		9201003118D5A444003D1ACA /* isom_hinter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_hinter.c; sourceTree = "<group>"; };
+		9201003218D5A444003D1ACA /* isom_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = isom_tools.c; sourceTree = "<group>"; };
+		9201003318D5A444003D1ACA /* m2ts_mux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = m2ts_mux.c; sourceTree = "<group>"; };
+		9201003418D5A444003D1ACA /* m3u8.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = m3u8.c; sourceTree = "<group>"; };
+		9201003518D5A444003D1ACA /* media_export.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_export.c; sourceTree = "<group>"; };
+		9201003618D5A444003D1ACA /* media_import.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_import.c; sourceTree = "<group>"; };
+		9201003718D5A444003D1ACA /* mpd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpd.c; sourceTree = "<group>"; };
+		9201003818D5A444003D1ACA /* mpeg2_ps.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg2_ps.c; sourceTree = "<group>"; };
+		9201003918D5A444003D1ACA /* mpeg2_ps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpeg2_ps.h; sourceTree = "<group>"; };
+		9201003A18D5A444003D1ACA /* mpegts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpegts.c; sourceTree = "<group>"; };
+		9201003B18D5A444003D1ACA /* reedsolomon.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = reedsolomon.c; sourceTree = "<group>"; };
+		9201003C18D5A444003D1ACA /* saf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = saf.c; sourceTree = "<group>"; };
+		9201003D18D5A444003D1ACA /* text_import.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = text_import.c; sourceTree = "<group>"; };
+		9201003E18D5A444003D1ACA /* vobsub.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vobsub.c; sourceTree = "<group>"; };
+		9201003F18D5A444003D1ACA /* webvtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt.c; sourceTree = "<group>"; };
+		9201004118D5A444003D1ACA /* desc_private.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = desc_private.c; sourceTree = "<group>"; };
+		9201004218D5A444003D1ACA /* descriptors.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = descriptors.c; sourceTree = "<group>"; };
+		9201004318D5A444003D1ACA /* ipmpx_code.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ipmpx_code.c; sourceTree = "<group>"; };
+		9201004418D5A444003D1ACA /* ipmpx_dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ipmpx_dump.c; sourceTree = "<group>"; };
+		9201004518D5A444003D1ACA /* ipmpx_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ipmpx_parse.c; sourceTree = "<group>"; };
+		9201004618D5A444003D1ACA /* oci_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = oci_codec.c; sourceTree = "<group>"; };
+		9201004718D5A444003D1ACA /* odf_code.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = odf_code.c; sourceTree = "<group>"; };
+		9201004818D5A444003D1ACA /* odf_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = odf_codec.c; sourceTree = "<group>"; };
+		9201004918D5A444003D1ACA /* odf_command.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = odf_command.c; sourceTree = "<group>"; };
+		9201004A18D5A444003D1ACA /* odf_dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = odf_dump.c; sourceTree = "<group>"; };
+		9201004B18D5A444003D1ACA /* odf_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = odf_parse.c; sourceTree = "<group>"; };
+		9201004C18D5A444003D1ACA /* qos.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = qos.c; sourceTree = "<group>"; };
+		9201004D18D5A444003D1ACA /* slc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = slc.c; sourceTree = "<group>"; };
+		9201004F18D5A444003D1ACA /* encode_isom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = encode_isom.c; sourceTree = "<group>"; };
+		9201005018D5A444003D1ACA /* loader_bt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = loader_bt.c; sourceTree = "<group>"; };
+		9201005118D5A444003D1ACA /* loader_isom.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = loader_isom.c; sourceTree = "<group>"; };
+		9201005218D5A444003D1ACA /* loader_qt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = loader_qt.c; sourceTree = "<group>"; };
+		9201005318D5A444003D1ACA /* loader_svg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = loader_svg.c; sourceTree = "<group>"; };
+		9201005418D5A444003D1ACA /* loader_xmt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = loader_xmt.c; sourceTree = "<group>"; };
+		9201005518D5A444003D1ACA /* scene_dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene_dump.c; sourceTree = "<group>"; };
+		9201005618D5A444003D1ACA /* scene_engine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene_engine.c; sourceTree = "<group>"; };
+		9201005718D5A444003D1ACA /* scene_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene_manager.c; sourceTree = "<group>"; };
+		9201005818D5A444003D1ACA /* scene_stats.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene_stats.c; sourceTree = "<group>"; };
+		9201005918D5A444003D1ACA /* swf_bifs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = swf_bifs.c; sourceTree = "<group>"; };
+		9201005A18D5A444003D1ACA /* swf_parse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = swf_parse.c; sourceTree = "<group>"; };
+		9201005B18D5A444003D1ACA /* swf_svg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = swf_svg.c; sourceTree = "<group>"; };
+		9201005C18D5A444003D1ACA /* text_to_bifs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = text_to_bifs.c; sourceTree = "<group>"; };
+		9201005E18D5A444003D1ACA /* base_scenegraph.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base_scenegraph.c; sourceTree = "<group>"; };
+		9201005F18D5A444003D1ACA /* commands.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = commands.c; sourceTree = "<group>"; };
+		9201006018D5A444003D1ACA /* dom_events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dom_events.c; sourceTree = "<group>"; };
+		9201006118D5A444003D1ACA /* dom_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dom_smjs.c; sourceTree = "<group>"; };
+		9201006218D5A444003D1ACA /* html5_media_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media_smjs.c; sourceTree = "<group>"; };
+		9201006318D5A444003D1ACA /* html5_mse_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse_smjs.c; sourceTree = "<group>"; };
+		9201006418D5A444003D1ACA /* mpeg4_animators.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_animators.c; sourceTree = "<group>"; };
+		9201006518D5A444003D1ACA /* mpeg4_nodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_nodes.c; sourceTree = "<group>"; };
+		9201006618D5A444003D1ACA /* mpeg4_valuator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_valuator.c; sourceTree = "<group>"; };
+		9201006718D5A444003D1ACA /* smil_anim.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smil_anim.c; sourceTree = "<group>"; };
+		9201006818D5A444003D1ACA /* smil_timing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = smil_timing.c; sourceTree = "<group>"; };
+		9201006918D5A444003D1ACA /* svg_attributes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_attributes.c; sourceTree = "<group>"; };
+		9201006A18D5A444003D1ACA /* svg_properties.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_properties.c; sourceTree = "<group>"; };
+		9201006B18D5A444003D1ACA /* svg_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_smjs.c; sourceTree = "<group>"; };
+		9201006C18D5A444003D1ACA /* svg_types.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_types.c; sourceTree = "<group>"; };
+		9201006D18D5A444003D1ACA /* vrml_interpolators.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_interpolators.c; sourceTree = "<group>"; };
+		9201006E18D5A444003D1ACA /* vrml_proto.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_proto.c; sourceTree = "<group>"; };
+		9201006F18D5A444003D1ACA /* vrml_route.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_route.c; sourceTree = "<group>"; };
+		9201007018D5A444003D1ACA /* vrml_script.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_script.c; sourceTree = "<group>"; };
+		9201007118D5A444003D1ACA /* vrml_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_smjs.c; sourceTree = "<group>"; };
+		9201007218D5A444003D1ACA /* vrml_tools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vrml_tools.c; sourceTree = "<group>"; };
+		9201007318D5A444003D1ACA /* webvtt_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt_smjs.c; sourceTree = "<group>"; };
+		9201007418D5A444003D1ACA /* x3d_nodes.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x3d_nodes.c; sourceTree = "<group>"; };
+		9201007518D5A444003D1ACA /* xbl_process.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xbl_process.c; sourceTree = "<group>"; };
+		9201007618D5A444003D1ACA /* xml_ns.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml_ns.c; sourceTree = "<group>"; };
+		9201007818D5A444003D1ACA /* channel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = channel.c; sourceTree = "<group>"; };
+		9201007918D5A444003D1ACA /* clock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = clock.c; sourceTree = "<group>"; };
+		9201007A18D5A444003D1ACA /* decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = decoder.c; sourceTree = "<group>"; };
+		9201007B18D5A444003D1ACA /* input_sensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = input_sensor.c; sourceTree = "<group>"; };
+		9201007C18D5A444003D1ACA /* input_sensor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input_sensor.h; sourceTree = "<group>"; };
+		9201007D18D5A444003D1ACA /* media_control.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_control.c; sourceTree = "<group>"; };
+		9201007E18D5A444003D1ACA /* media_control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_control.h; sourceTree = "<group>"; };
+		9201007F18D5A444003D1ACA /* media_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_manager.c; sourceTree = "<group>"; };
+		9201008018D5A444003D1ACA /* media_memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_memory.c; sourceTree = "<group>"; };
+		9201008118D5A444003D1ACA /* media_memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = media_memory.h; sourceTree = "<group>"; };
+		9201008218D5A444003D1ACA /* media_object.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_object.c; sourceTree = "<group>"; };
+		9201008318D5A444003D1ACA /* media_sensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = media_sensor.c; sourceTree = "<group>"; };
+		9201008418D5A444003D1ACA /* mpeg4_inline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_inline.c; sourceTree = "<group>"; };
+		9201008518D5A444003D1ACA /* network_service.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = network_service.c; sourceTree = "<group>"; };
+		9201008618D5A444003D1ACA /* object_browser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = object_browser.c; sourceTree = "<group>"; };
+		9201008718D5A444003D1ACA /* object_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = object_manager.c; sourceTree = "<group>"; };
+		9201008818D5A444003D1ACA /* scene.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scene.c; sourceTree = "<group>"; };
+		9201008918D5A444003D1ACA /* svg_external.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_external.c; sourceTree = "<group>"; };
+		9201008A18D5A444003D1ACA /* term_node_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = term_node_init.c; sourceTree = "<group>"; };
+		9201008B18D5A444003D1ACA /* terminal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = terminal.c; sourceTree = "<group>"; };
+		9201008D18D5A444003D1ACA /* alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alloc.c; sourceTree = "<group>"; };
+		9201008E18D5A444003D1ACA /* base_encoding.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = base_encoding.c; sourceTree = "<group>"; };
+		9201008F18D5A444003D1ACA /* bitstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitstream.c; sourceTree = "<group>"; };
+		9201009018D5A444003D1ACA /* cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cache.c; sourceTree = "<group>"; };
+		9201009118D5A444003D1ACA /* color.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = color.c; sourceTree = "<group>"; };
+		9201009218D5A444003D1ACA /* configfile.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = configfile.c; sourceTree = "<group>"; };
+		9201009318D5A444003D1ACA /* dlmalloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dlmalloc.c; sourceTree = "<group>"; };
+		9201009418D5A444003D1ACA /* downloader.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = downloader.c; sourceTree = "<group>"; };
+		9201009518D5A444003D1ACA /* error.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = error.c; sourceTree = "<group>"; };
+		9201009718D5A444003D1ACA /* list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = list.c; sourceTree = "<group>"; };
+		9201009818D5A444003D1ACA /* map.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = map.c; sourceTree = "<group>"; };
+		9201009918D5A444003D1ACA /* math.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = math.c; sourceTree = "<group>"; };
+		9201009A18D5A444003D1ACA /* module.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = module.c; sourceTree = "<group>"; };
+		9201009B18D5A444003D1ACA /* module_wrap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = module_wrap.h; sourceTree = "<group>"; };
+		9201009C18D5A444003D1ACA /* os_config_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_config_init.c; sourceTree = "<group>"; };
+		9201009D18D5A444003D1ACA /* os_divers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_divers.c; sourceTree = "<group>"; };
+		9201009E18D5A444003D1ACA /* os_module.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_module.c; sourceTree = "<group>"; };
+		9201009F18D5A444003D1ACA /* os_net.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_net.c; sourceTree = "<group>"; };
+		920100A018D5A444003D1ACA /* os_thread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_thread.c; sourceTree = "<group>"; };
+		920100A118D5A444003D1ACA /* path2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = path2d.c; sourceTree = "<group>"; };
+		920100A218D5A444003D1ACA /* path2d_stroker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = path2d_stroker.c; sourceTree = "<group>"; };
+		920100A318D5A444003D1ACA /* ringbuffer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ringbuffer.c; sourceTree = "<group>"; };
+		920100A418D5A444003D1ACA /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
+		920100A718D5A444003D1ACA /* token.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = token.c; sourceTree = "<group>"; };
+		920100A818D5A444003D1ACA /* uni_bidi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = uni_bidi.c; sourceTree = "<group>"; };
+		920100A918D5A444003D1ACA /* unicode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unicode.c; sourceTree = "<group>"; };
+		920100AA18D5A444003D1ACA /* url.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = url.c; sourceTree = "<group>"; };
+		920100AB18D5A444003D1ACA /* utf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utf.c; sourceTree = "<group>"; };
+		920100AC18D5A444003D1ACA /* xml_parser.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml_parser.c; sourceTree = "<group>"; };
+		920101CE18D5AC67003D1ACA /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = SDKs/MacOSX10.6.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; };
+		920101D018D5ACA7003D1ACA /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = SDKs/MacOSX10.6.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
+		9201F93718D5A38A003D1ACA /* libgpac.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libgpac.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		9201FE8218D5A444003D1ACA /* arith_decoder.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = arith_decoder.dep; sourceTree = "<group>"; };
+		9201FE8318D5A444003D1ACA /* bifs_codec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bifs_codec.dep; sourceTree = "<group>"; };
+		9201FE8418D5A444003D1ACA /* bifs_node_tables.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bifs_node_tables.dep; sourceTree = "<group>"; };
+		9201FE8518D5A444003D1ACA /* com_dec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com_dec.dep; sourceTree = "<group>"; };
+		9201FE8618D5A444003D1ACA /* com_enc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = com_enc.dep; sourceTree = "<group>"; };
+		9201FE8718D5A444003D1ACA /* conditional.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = conditional.dep; sourceTree = "<group>"; };
+		9201FE8818D5A444003D1ACA /* field_decode.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = field_decode.dep; sourceTree = "<group>"; };
+		9201FE8918D5A444003D1ACA /* field_encode.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = field_encode.dep; sourceTree = "<group>"; };
+		9201FE8A18D5A444003D1ACA /* memory_decoder.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = memory_decoder.dep; sourceTree = "<group>"; };
+		9201FE8B18D5A444003D1ACA /* predictive_mffield.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = predictive_mffield.dep; sourceTree = "<group>"; };
+		9201FE8C18D5A444003D1ACA /* quantize.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = quantize.dep; sourceTree = "<group>"; };
+		9201FE8D18D5A444003D1ACA /* script_dec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = script_dec.dep; sourceTree = "<group>"; };
+		9201FE8E18D5A444003D1ACA /* script_enc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = script_enc.dep; sourceTree = "<group>"; };
+		9201FE8F18D5A444003D1ACA /* unquantize.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = unquantize.dep; sourceTree = "<group>"; };
+		9201FE9118D5A444003D1ACA /* audio_input.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = audio_input.dep; sourceTree = "<group>"; };
+		9201FE9218D5A444003D1ACA /* audio_mixer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = audio_mixer.dep; sourceTree = "<group>"; };
+		9201FE9318D5A444003D1ACA /* audio_render.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = audio_render.dep; sourceTree = "<group>"; };
+		9201FE9418D5A444003D1ACA /* bindable.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bindable.dep; sourceTree = "<group>"; };
+		9201FE9518D5A444003D1ACA /* camera.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = camera.dep; sourceTree = "<group>"; };
+		9201FE9618D5A444003D1ACA /* compositor.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compositor.dep; sourceTree = "<group>"; };
+		9201FE9718D5A444003D1ACA /* compositor_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compositor_2d.dep; sourceTree = "<group>"; };
+		9201FE9818D5A444003D1ACA /* compositor_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compositor_3d.dep; sourceTree = "<group>"; };
+		9201FE9918D5A444003D1ACA /* compositor_node_init.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = compositor_node_init.dep; sourceTree = "<group>"; };
+		9201FE9A18D5A444003D1ACA /* drawable.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = drawable.dep; sourceTree = "<group>"; };
+		9201FE9B18D5A444003D1ACA /* events.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = events.dep; sourceTree = "<group>"; };
+		9201FE9C18D5A444003D1ACA /* font_engine.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = font_engine.dep; sourceTree = "<group>"; };
+		9201FE9D18D5A444003D1ACA /* hardcoded_protos.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hardcoded_protos.dep; sourceTree = "<group>"; };
+		9201FE9E18D5A444003D1ACA /* hc_flash_shape.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hc_flash_shape.dep; sourceTree = "<group>"; };
+		9201FE9F18D5A444003D1ACA /* mesh.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mesh.dep; sourceTree = "<group>"; };
+		9201FEA018D5A444003D1ACA /* mesh_collide.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mesh_collide.dep; sourceTree = "<group>"; };
+		9201FEA118D5A444003D1ACA /* mesh_tesselate.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mesh_tesselate.dep; sourceTree = "<group>"; };
+		9201FEA218D5A444003D1ACA /* mpeg4_animstream.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_animstream.dep; sourceTree = "<group>"; };
+		9201FEA318D5A444003D1ACA /* mpeg4_audio.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_audio.dep; sourceTree = "<group>"; };
+		9201FEA418D5A444003D1ACA /* mpeg4_background.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_background.dep; sourceTree = "<group>"; };
+		9201FEA518D5A444003D1ACA /* mpeg4_background2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_background2d.dep; sourceTree = "<group>"; };
+		9201FEA618D5A444003D1ACA /* mpeg4_bitmap.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_bitmap.dep; sourceTree = "<group>"; };
+		9201FEA718D5A444003D1ACA /* mpeg4_composite.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_composite.dep; sourceTree = "<group>"; };
+		9201FEA818D5A444003D1ACA /* mpeg4_form.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_form.dep; sourceTree = "<group>"; };
+		9201FEA918D5A444003D1ACA /* mpeg4_geometry_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_geometry_2d.dep; sourceTree = "<group>"; };
+		9201FEAA18D5A444003D1ACA /* mpeg4_geometry_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_geometry_3d.dep; sourceTree = "<group>"; };
+		9201FEAB18D5A444003D1ACA /* mpeg4_geometry_ifs2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_geometry_ifs2d.dep; sourceTree = "<group>"; };
+		9201FEAC18D5A444003D1ACA /* mpeg4_geometry_ils2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_geometry_ils2d.dep; sourceTree = "<group>"; };
+		9201FEAD18D5A444003D1ACA /* mpeg4_gradients.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_gradients.dep; sourceTree = "<group>"; };
+		9201FEAE18D5A444003D1ACA /* mpeg4_grouping.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_grouping.dep; sourceTree = "<group>"; };
+		9201FEAF18D5A444003D1ACA /* mpeg4_grouping_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_grouping_2d.dep; sourceTree = "<group>"; };
+		9201FEB018D5A444003D1ACA /* mpeg4_grouping_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_grouping_3d.dep; sourceTree = "<group>"; };
+		9201FEB118D5A444003D1ACA /* mpeg4_layer_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_layer_2d.dep; sourceTree = "<group>"; };
+		9201FEB218D5A444003D1ACA /* mpeg4_layer_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_layer_3d.dep; sourceTree = "<group>"; };
+		9201FEB318D5A444003D1ACA /* mpeg4_layout.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_layout.dep; sourceTree = "<group>"; };
+		9201FEB418D5A444003D1ACA /* mpeg4_lighting.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_lighting.dep; sourceTree = "<group>"; };
+		9201FEB518D5A444003D1ACA /* mpeg4_path_layout.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_path_layout.dep; sourceTree = "<group>"; };
+		9201FEB618D5A444003D1ACA /* mpeg4_sensors.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_sensors.dep; sourceTree = "<group>"; };
+		9201FEB718D5A444003D1ACA /* mpeg4_sound.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_sound.dep; sourceTree = "<group>"; };
+		9201FEB818D5A444003D1ACA /* mpeg4_text.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_text.dep; sourceTree = "<group>"; };
+		9201FEB918D5A444003D1ACA /* mpeg4_textures.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_textures.dep; sourceTree = "<group>"; };
+		9201FEBA18D5A444003D1ACA /* mpeg4_timesensor.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_timesensor.dep; sourceTree = "<group>"; };
+		9201FEBB18D5A444003D1ACA /* mpeg4_viewport.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_viewport.dep; sourceTree = "<group>"; };
+		9201FEBC18D5A444003D1ACA /* navigate.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = navigate.dep; sourceTree = "<group>"; };
+		9201FEBD18D5A444003D1ACA /* offscreen_cache.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = offscreen_cache.dep; sourceTree = "<group>"; };
+		9201FEBE18D5A444003D1ACA /* svg_base.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_base.dep; sourceTree = "<group>"; };
+		9201FEBF18D5A444003D1ACA /* svg_filters.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_filters.dep; sourceTree = "<group>"; };
+		9201FEC018D5A444003D1ACA /* svg_font.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_font.dep; sourceTree = "<group>"; };
+		9201FEC118D5A444003D1ACA /* svg_geometry.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_geometry.dep; sourceTree = "<group>"; };
+		9201FEC218D5A444003D1ACA /* svg_grouping.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_grouping.dep; sourceTree = "<group>"; };
+		9201FEC318D5A444003D1ACA /* svg_media.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_media.dep; sourceTree = "<group>"; };
+		9201FEC418D5A444003D1ACA /* svg_paint_servers.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_paint_servers.dep; sourceTree = "<group>"; };
+		9201FEC518D5A444003D1ACA /* svg_text.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_text.dep; sourceTree = "<group>"; };
+		9201FEC618D5A444003D1ACA /* texturing.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = texturing.dep; sourceTree = "<group>"; };
+		9201FEC718D5A444003D1ACA /* texturing_gl.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = texturing_gl.dep; sourceTree = "<group>"; };
+		9201FEC818D5A444003D1ACA /* visual_manager.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager.dep; sourceTree = "<group>"; };
+		9201FEC918D5A444003D1ACA /* visual_manager_2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager_2d.dep; sourceTree = "<group>"; };
+		9201FECA18D5A444003D1ACA /* visual_manager_2d_draw.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager_2d_draw.dep; sourceTree = "<group>"; };
+		9201FECB18D5A444003D1ACA /* visual_manager_3d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager_3d.dep; sourceTree = "<group>"; };
+		9201FECC18D5A444003D1ACA /* visual_manager_3d_gl.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = visual_manager_3d_gl.dep; sourceTree = "<group>"; };
+		9201FECD18D5A444003D1ACA /* x3d_geometry.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = x3d_geometry.dep; sourceTree = "<group>"; };
+		9201FECF18D5A444003D1ACA /* rtcp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtcp.dep; sourceTree = "<group>"; };
+		9201FED018D5A444003D1ACA /* rtp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp.dep; sourceTree = "<group>"; };
+		9201FED118D5A444003D1ACA /* rtp_depacketizer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_depacketizer.dep; sourceTree = "<group>"; };
+		9201FED218D5A444003D1ACA /* rtp_packetizer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_packetizer.dep; sourceTree = "<group>"; };
+		9201FED318D5A444003D1ACA /* rtp_pck_3gpp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_pck_3gpp.dep; sourceTree = "<group>"; };
+		9201FED418D5A444003D1ACA /* rtp_pck_mpeg12.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_pck_mpeg12.dep; sourceTree = "<group>"; };
+		9201FED518D5A444003D1ACA /* rtp_pck_mpeg4.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_pck_mpeg4.dep; sourceTree = "<group>"; };
+		9201FED618D5A444003D1ACA /* rtp_streamer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtp_streamer.dep; sourceTree = "<group>"; };
+		9201FED718D5A444003D1ACA /* rtsp_command.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtsp_command.dep; sourceTree = "<group>"; };
+		9201FED818D5A444003D1ACA /* rtsp_common.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtsp_common.dep; sourceTree = "<group>"; };
+		9201FED918D5A444003D1ACA /* rtsp_response.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtsp_response.dep; sourceTree = "<group>"; };
+		9201FEDA18D5A444003D1ACA /* rtsp_session.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rtsp_session.dep; sourceTree = "<group>"; };
+		9201FEDB18D5A444003D1ACA /* sdp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sdp.dep; sourceTree = "<group>"; };
+		9201FEDD18D5A444003D1ACA /* avc_ext.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = avc_ext.dep; sourceTree = "<group>"; };
+		9201FEDE18D5A444003D1ACA /* box_code_3gpp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_3gpp.dep; sourceTree = "<group>"; };
+		9201FEDF18D5A444003D1ACA /* box_code_adobe.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_adobe.dep; sourceTree = "<group>"; };
+		9201FEE018D5A444003D1ACA /* box_code_apple.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_apple.dep; sourceTree = "<group>"; };
+		9201FEE118D5A444003D1ACA /* box_code_base.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_base.dep; sourceTree = "<group>"; };
+		9201FEE218D5A444003D1ACA /* box_code_drm.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_drm.dep; sourceTree = "<group>"; };
+		9201FEE318D5A444003D1ACA /* box_code_meta.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_code_meta.dep; sourceTree = "<group>"; };
+		9201FEE418D5A444003D1ACA /* box_dump.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_dump.dep; sourceTree = "<group>"; };
+		9201FEE518D5A444003D1ACA /* box_funcs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = box_funcs.dep; sourceTree = "<group>"; };
+		9201FEE618D5A444003D1ACA /* data_map.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = data_map.dep; sourceTree = "<group>"; };
+		9201FEE718D5A444003D1ACA /* drm_sample.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = drm_sample.dep; sourceTree = "<group>"; };
+		9201FEE818D5A444003D1ACA /* generic_subtitle.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = generic_subtitle.dep; sourceTree = "<group>"; };
+		9201FEE918D5A444003D1ACA /* hint_track.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hint_track.dep; sourceTree = "<group>"; };
+		9201FEEA18D5A444003D1ACA /* hinting.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hinting.dep; sourceTree = "<group>"; };
+		9201FEEB18D5A444003D1ACA /* isom_intern.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_intern.dep; sourceTree = "<group>"; };
+		9201FEEC18D5A444003D1ACA /* isom_read.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_read.dep; sourceTree = "<group>"; };
+		9201FEED18D5A444003D1ACA /* isom_store.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_store.dep; sourceTree = "<group>"; };
+		9201FEEE18D5A444003D1ACA /* isom_write.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_write.dep; sourceTree = "<group>"; };
+		9201FEEF18D5A444003D1ACA /* media.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media.dep; sourceTree = "<group>"; };
+		9201FEF018D5A444003D1ACA /* media_odf.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_odf.dep; sourceTree = "<group>"; };
+		9201FEF118D5A444003D1ACA /* meta.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = meta.dep; sourceTree = "<group>"; };
+		9201FEF218D5A444003D1ACA /* movie_fragments.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = movie_fragments.dep; sourceTree = "<group>"; };
+		9201FEF318D5A444003D1ACA /* sample_descs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sample_descs.dep; sourceTree = "<group>"; };
+		9201FEF418D5A444003D1ACA /* stbl_read.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stbl_read.dep; sourceTree = "<group>"; };
+		9201FEF518D5A444003D1ACA /* stbl_write.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stbl_write.dep; sourceTree = "<group>"; };
+		9201FEF618D5A444003D1ACA /* track.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = track.dep; sourceTree = "<group>"; };
+		9201FEF718D5A444003D1ACA /* ttml.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ttml.dep; sourceTree = "<group>"; };
+		9201FEF818D5A444003D1ACA /* tx3g.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tx3g.dep; sourceTree = "<group>"; };
+		9201FEFA18D5A444003D1ACA /* lsr_dec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_dec.dep; sourceTree = "<group>"; };
+		9201FEFB18D5A444003D1ACA /* lsr_enc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_enc.dep; sourceTree = "<group>"; };
+		9201FEFC18D5A444003D1ACA /* lsr_tables.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = lsr_tables.dep; sourceTree = "<group>"; };
+		9201FEFE18D5A444003D1ACA /* cbc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cbc.dep; sourceTree = "<group>"; };
+		9201FEFF18D5A444003D1ACA /* cfb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cfb.dep; sourceTree = "<group>"; };
+		9201FF0018D5A444003D1ACA /* ctr.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ctr.dep; sourceTree = "<group>"; };
+		9201FF0118D5A444003D1ACA /* des.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = des.dep; sourceTree = "<group>"; };
+		9201FF0218D5A444003D1ACA /* ecb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ecb.dep; sourceTree = "<group>"; };
+		9201FF0318D5A444003D1ACA /* g_crypt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = g_crypt.dep; sourceTree = "<group>"; };
+		9201FF0418D5A444003D1ACA /* ncfb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ncfb.dep; sourceTree = "<group>"; };
+		9201FF0518D5A444003D1ACA /* nofb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = nofb.dep; sourceTree = "<group>"; };
+		9201FF0618D5A444003D1ACA /* ofb.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ofb.dep; sourceTree = "<group>"; };
+		9201FF0718D5A444003D1ACA /* rijndael-128.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "rijndael-128.dep"; sourceTree = "<group>"; };
+		9201FF0818D5A444003D1ACA /* rijndael-192.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "rijndael-192.dep"; sourceTree = "<group>"; };
+		9201FF0918D5A444003D1ACA /* rijndael-256.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "rijndael-256.dep"; sourceTree = "<group>"; };
+		9201FF0A18D5A444003D1ACA /* stream.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = stream.dep; sourceTree = "<group>"; };
+		9201FF0B18D5A444003D1ACA /* tripledes.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tripledes.dep; sourceTree = "<group>"; };
+		9201FF0D18D5A444003D1ACA /* av_parsers.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = av_parsers.dep; sourceTree = "<group>"; };
+		9201FF0E18D5A444003D1ACA /* avilib.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = avilib.dep; sourceTree = "<group>"; };
+		9201FF0F18D5A444003D1ACA /* dash_client.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dash_client.dep; sourceTree = "<group>"; };
+		9201FF1018D5A444003D1ACA /* dash_segmenter.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dash_segmenter.dep; sourceTree = "<group>"; };
+		9201FF1118D5A444003D1ACA /* filestreamer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = filestreamer.dep; sourceTree = "<group>"; };
+		9201FF1218D5A444003D1ACA /* gpac_ogg.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gpac_ogg.dep; sourceTree = "<group>"; };
+		9201FF1318D5A444003D1ACA /* html5_media.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html5_media.dep; sourceTree = "<group>"; };
+		9201FF1418D5A444003D1ACA /* html5_mse.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html5_mse.dep; sourceTree = "<group>"; };
+		9201FF1518D5A444003D1ACA /* img.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = img.dep; sourceTree = "<group>"; };
+		9201FF1618D5A444003D1ACA /* ismacryp.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ismacryp.dep; sourceTree = "<group>"; };
+		9201FF1718D5A444003D1ACA /* isom_hinter.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_hinter.dep; sourceTree = "<group>"; };
+		9201FF1818D5A444003D1ACA /* isom_tools.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = isom_tools.dep; sourceTree = "<group>"; };
+		9201FF1918D5A444003D1ACA /* m2ts_mux.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = m2ts_mux.dep; sourceTree = "<group>"; };
+		9201FF1A18D5A444003D1ACA /* m3u8.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = m3u8.dep; sourceTree = "<group>"; };
+		9201FF1B18D5A444003D1ACA /* media_export.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_export.dep; sourceTree = "<group>"; };
+		9201FF1C18D5A444003D1ACA /* media_import.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_import.dep; sourceTree = "<group>"; };
+		9201FF1D18D5A444003D1ACA /* mpd.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpd.dep; sourceTree = "<group>"; };
+		9201FF1E18D5A444003D1ACA /* mpeg2_ps.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg2_ps.dep; sourceTree = "<group>"; };
+		9201FF1F18D5A444003D1ACA /* mpegts.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpegts.dep; sourceTree = "<group>"; };
+		9201FF2018D5A444003D1ACA /* saf.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = saf.dep; sourceTree = "<group>"; };
+		9201FF2118D5A444003D1ACA /* text_import.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_import.dep; sourceTree = "<group>"; };
+		9201FF2218D5A444003D1ACA /* vobsub.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vobsub.dep; sourceTree = "<group>"; };
+		9201FF2318D5A444003D1ACA /* webvtt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = webvtt.dep; sourceTree = "<group>"; };
+		9201FF2518D5A444003D1ACA /* desc_private.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = desc_private.dep; sourceTree = "<group>"; };
+		9201FF2618D5A444003D1ACA /* descriptors.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = descriptors.dep; sourceTree = "<group>"; };
+		9201FF2718D5A444003D1ACA /* ipmpx_code.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipmpx_code.dep; sourceTree = "<group>"; };
+		9201FF2818D5A444003D1ACA /* ipmpx_dump.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipmpx_dump.dep; sourceTree = "<group>"; };
+		9201FF2918D5A444003D1ACA /* ipmpx_parse.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ipmpx_parse.dep; sourceTree = "<group>"; };
+		9201FF2A18D5A444003D1ACA /* oci_codec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = oci_codec.dep; sourceTree = "<group>"; };
+		9201FF2B18D5A444003D1ACA /* odf_code.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_code.dep; sourceTree = "<group>"; };
+		9201FF2C18D5A444003D1ACA /* odf_codec.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_codec.dep; sourceTree = "<group>"; };
+		9201FF2D18D5A444003D1ACA /* odf_command.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_command.dep; sourceTree = "<group>"; };
+		9201FF2E18D5A444003D1ACA /* odf_dump.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_dump.dep; sourceTree = "<group>"; };
+		9201FF2F18D5A444003D1ACA /* odf_parse.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = odf_parse.dep; sourceTree = "<group>"; };
+		9201FF3018D5A444003D1ACA /* qos.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = qos.dep; sourceTree = "<group>"; };
+		9201FF3118D5A444003D1ACA /* slc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = slc.dep; sourceTree = "<group>"; };
+		9201FF3318D5A444003D1ACA /* encode_isom.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = encode_isom.dep; sourceTree = "<group>"; };
+		9201FF3418D5A444003D1ACA /* loader_bt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_bt.dep; sourceTree = "<group>"; };
+		9201FF3518D5A444003D1ACA /* loader_isom.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_isom.dep; sourceTree = "<group>"; };
+		9201FF3618D5A444003D1ACA /* loader_qt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_qt.dep; sourceTree = "<group>"; };
+		9201FF3718D5A444003D1ACA /* loader_svg.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_svg.dep; sourceTree = "<group>"; };
+		9201FF3818D5A444003D1ACA /* loader_xmt.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = loader_xmt.dep; sourceTree = "<group>"; };
+		9201FF3918D5A444003D1ACA /* scene_dump.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene_dump.dep; sourceTree = "<group>"; };
+		9201FF3A18D5A444003D1ACA /* scene_engine.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene_engine.dep; sourceTree = "<group>"; };
+		9201FF3B18D5A444003D1ACA /* scene_manager.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene_manager.dep; sourceTree = "<group>"; };
+		9201FF3C18D5A444003D1ACA /* scene_stats.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene_stats.dep; sourceTree = "<group>"; };
+		9201FF3D18D5A444003D1ACA /* swf_bifs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = swf_bifs.dep; sourceTree = "<group>"; };
+		9201FF3E18D5A444003D1ACA /* swf_parse.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = swf_parse.dep; sourceTree = "<group>"; };
+		9201FF3F18D5A444003D1ACA /* swf_svg.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = swf_svg.dep; sourceTree = "<group>"; };
+		9201FF4018D5A444003D1ACA /* text_to_bifs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = text_to_bifs.dep; sourceTree = "<group>"; };
+		9201FF4218D5A444003D1ACA /* base_scenegraph.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = base_scenegraph.dep; sourceTree = "<group>"; };
+		9201FF4318D5A444003D1ACA /* commands.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = commands.dep; sourceTree = "<group>"; };
+		9201FF4418D5A444003D1ACA /* dom_events.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dom_events.dep; sourceTree = "<group>"; };
+		9201FF4518D5A444003D1ACA /* dom_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = dom_smjs.dep; sourceTree = "<group>"; };
+		9201FF4618D5A444003D1ACA /* html5_media_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html5_media_smjs.dep; sourceTree = "<group>"; };
+		9201FF4718D5A444003D1ACA /* html5_mse_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = html5_mse_smjs.dep; sourceTree = "<group>"; };
+		9201FF4818D5A444003D1ACA /* mpeg4_animators.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_animators.dep; sourceTree = "<group>"; };
+		9201FF4918D5A444003D1ACA /* mpeg4_nodes.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_nodes.dep; sourceTree = "<group>"; };
+		9201FF4A18D5A444003D1ACA /* mpeg4_valuator.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_valuator.dep; sourceTree = "<group>"; };
+		9201FF4B18D5A444003D1ACA /* smil_anim.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = smil_anim.dep; sourceTree = "<group>"; };
+		9201FF4C18D5A444003D1ACA /* smil_timing.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = smil_timing.dep; sourceTree = "<group>"; };
+		9201FF4D18D5A444003D1ACA /* svg_attributes.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_attributes.dep; sourceTree = "<group>"; };
+		9201FF4E18D5A444003D1ACA /* svg_properties.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_properties.dep; sourceTree = "<group>"; };
+		9201FF4F18D5A444003D1ACA /* svg_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_smjs.dep; sourceTree = "<group>"; };
+		9201FF5018D5A444003D1ACA /* svg_types.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_types.dep; sourceTree = "<group>"; };
+		9201FF5118D5A444003D1ACA /* vrml_interpolators.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_interpolators.dep; sourceTree = "<group>"; };
+		9201FF5218D5A444003D1ACA /* vrml_proto.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_proto.dep; sourceTree = "<group>"; };
+		9201FF5318D5A444003D1ACA /* vrml_route.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_route.dep; sourceTree = "<group>"; };
+		9201FF5418D5A444003D1ACA /* vrml_script.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_script.dep; sourceTree = "<group>"; };
+		9201FF5518D5A444003D1ACA /* vrml_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_smjs.dep; sourceTree = "<group>"; };
+		9201FF5618D5A444003D1ACA /* vrml_tools.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = vrml_tools.dep; sourceTree = "<group>"; };
+		9201FF5718D5A444003D1ACA /* webvtt_smjs.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = webvtt_smjs.dep; sourceTree = "<group>"; };
+		9201FF5818D5A444003D1ACA /* x3d_nodes.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = x3d_nodes.dep; sourceTree = "<group>"; };
+		9201FF5918D5A444003D1ACA /* xbl_process.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xbl_process.dep; sourceTree = "<group>"; };
+		9201FF5A18D5A444003D1ACA /* xml_ns.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xml_ns.dep; sourceTree = "<group>"; };
+		9201FF5C18D5A444003D1ACA /* channel.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = channel.dep; sourceTree = "<group>"; };
+		9201FF5D18D5A444003D1ACA /* clock.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = clock.dep; sourceTree = "<group>"; };
+		9201FF5E18D5A444003D1ACA /* decoder.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = decoder.dep; sourceTree = "<group>"; };
+		9201FF5F18D5A444003D1ACA /* input_sensor.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = input_sensor.dep; sourceTree = "<group>"; };
+		9201FF6018D5A444003D1ACA /* media_control.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_control.dep; sourceTree = "<group>"; };
+		9201FF6118D5A444003D1ACA /* media_manager.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_manager.dep; sourceTree = "<group>"; };
+		9201FF6218D5A444003D1ACA /* media_memory.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_memory.dep; sourceTree = "<group>"; };
+		9201FF6318D5A444003D1ACA /* media_object.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_object.dep; sourceTree = "<group>"; };
+		9201FF6418D5A444003D1ACA /* media_sensor.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = media_sensor.dep; sourceTree = "<group>"; };
+		9201FF6518D5A444003D1ACA /* mpeg4_inline.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mpeg4_inline.dep; sourceTree = "<group>"; };
+		9201FF6618D5A444003D1ACA /* network_service.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = network_service.dep; sourceTree = "<group>"; };
+		9201FF6718D5A444003D1ACA /* object_browser.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = object_browser.dep; sourceTree = "<group>"; };
+		9201FF6818D5A444003D1ACA /* object_manager.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = object_manager.dep; sourceTree = "<group>"; };
+		9201FF6918D5A444003D1ACA /* scene.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = scene.dep; sourceTree = "<group>"; };
+		9201FF6A18D5A444003D1ACA /* svg_external.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = svg_external.dep; sourceTree = "<group>"; };
+		9201FF6B18D5A444003D1ACA /* term_node_init.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = term_node_init.dep; sourceTree = "<group>"; };
+		9201FF6C18D5A444003D1ACA /* terminal.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = terminal.dep; sourceTree = "<group>"; };
+		9201FF6E18D5A444003D1ACA /* alloc.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = alloc.dep; sourceTree = "<group>"; };
+		9201FF6F18D5A444003D1ACA /* base_encoding.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = base_encoding.dep; sourceTree = "<group>"; };
+		9201FF7018D5A444003D1ACA /* bitstream.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = bitstream.dep; sourceTree = "<group>"; };
+		9201FF7118D5A444003D1ACA /* cache.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = cache.dep; sourceTree = "<group>"; };
+		9201FF7218D5A444003D1ACA /* color.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = color.dep; sourceTree = "<group>"; };
+		9201FF7318D5A444003D1ACA /* configfile.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = configfile.dep; sourceTree = "<group>"; };
+		9201FF7418D5A444003D1ACA /* downloader.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = downloader.dep; sourceTree = "<group>"; };
+		9201FF7518D5A444003D1ACA /* error.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = error.dep; sourceTree = "<group>"; };
+		9201FF7618D5A444003D1ACA /* list.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = list.dep; sourceTree = "<group>"; };
+		9201FF7718D5A444003D1ACA /* map.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = map.dep; sourceTree = "<group>"; };
+		9201FF7818D5A444003D1ACA /* math.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = math.dep; sourceTree = "<group>"; };
+		9201FF7918D5A444003D1ACA /* module.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = module.dep; sourceTree = "<group>"; };
+		9201FF7A18D5A444003D1ACA /* os_config_init.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_config_init.dep; sourceTree = "<group>"; };
+		9201FF7B18D5A444003D1ACA /* os_divers.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_divers.dep; sourceTree = "<group>"; };
+		9201FF7C18D5A444003D1ACA /* os_module.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_module.dep; sourceTree = "<group>"; };
+		9201FF7D18D5A444003D1ACA /* os_net.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_net.dep; sourceTree = "<group>"; };
+		9201FF7E18D5A444003D1ACA /* os_thread.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = os_thread.dep; sourceTree = "<group>"; };
+		9201FF7F18D5A444003D1ACA /* path2d.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = path2d.dep; sourceTree = "<group>"; };
+		9201FF8018D5A444003D1ACA /* path2d_stroker.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = path2d_stroker.dep; sourceTree = "<group>"; };
+		9201FF8118D5A444003D1ACA /* ringbuffer.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ringbuffer.dep; sourceTree = "<group>"; };
+		9201FF8218D5A444003D1ACA /* sha1.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = sha1.dep; sourceTree = "<group>"; };
+		9201FF8318D5A444003D1ACA /* token.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = token.dep; sourceTree = "<group>"; };
+		9201FF8418D5A444003D1ACA /* uni_bidi.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = uni_bidi.dep; sourceTree = "<group>"; };
+		9201FF8518D5A444003D1ACA /* unicode.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = unicode.dep; sourceTree = "<group>"; };
+		9201FF8618D5A444003D1ACA /* url.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = url.dep; sourceTree = "<group>"; };
+		9201FF8718D5A444003D1ACA /* utf.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = utf.dep; sourceTree = "<group>"; };
+		9201FF8818D5A444003D1ACA /* xml_parser.dep */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = xml_parser.dep; sourceTree = "<group>"; };
+		9201FF8A18D5A444003D1ACA /* arith_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = arith_decoder.c; sourceTree = "<group>"; };
+		9201FF8B18D5A444003D1ACA /* bifs_codec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bifs_codec.c; sourceTree = "<group>"; };
+		9201FF8C18D5A444003D1ACA /* bifs_node_tables.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bifs_node_tables.c; sourceTree = "<group>"; };
+		9201FF8D18D5A444003D1ACA /* com_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = com_dec.c; sourceTree = "<group>"; };
+		9201FF8E18D5A444003D1ACA /* com_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = com_enc.c; sourceTree = "<group>"; };
+		9201FF8F18D5A444003D1ACA /* conditional.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = conditional.c; sourceTree = "<group>"; };
+		9201FF9018D5A444003D1ACA /* field_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = field_decode.c; sourceTree = "<group>"; };
+		9201FF9118D5A444003D1ACA /* field_encode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = field_encode.c; sourceTree = "<group>"; };
+		9201FF9218D5A444003D1ACA /* memory_decoder.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memory_decoder.c; sourceTree = "<group>"; };
+		9201FF9318D5A444003D1ACA /* predictive_mffield.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = predictive_mffield.c; sourceTree = "<group>"; };
+		9201FF9418D5A444003D1ACA /* quant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = quant.h; sourceTree = "<group>"; };
+		9201FF9518D5A444003D1ACA /* quantize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = quantize.c; sourceTree = "<group>"; };
+		9201FF9618D5A444003D1ACA /* script.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = script.h; sourceTree = "<group>"; };
+		9201FF9718D5A444003D1ACA /* script_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = script_dec.c; sourceTree = "<group>"; };
+		9201FF9818D5A444003D1ACA /* script_enc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = script_enc.c; sourceTree = "<group>"; };
+		9201FF9918D5A444003D1ACA /* unquantize.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = unquantize.c; sourceTree = "<group>"; };
+		9201FF9B18D5A444003D1ACA /* audio_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_input.c; sourceTree = "<group>"; };
+		9201FF9C18D5A444003D1ACA /* audio_mixer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_mixer.c; sourceTree = "<group>"; };
+		9201FF9D18D5A444003D1ACA /* audio_render.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = audio_render.c; sourceTree = "<group>"; };
+		9201FF9E18D5A444003D1ACA /* bindable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bindable.c; sourceTree = "<group>"; };
+		9201FF9F18D5A444003D1ACA /* camera.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = camera.c; sourceTree = "<group>"; };
+		9201FFA018D5A444003D1ACA /* compositor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor.c; sourceTree = "<group>"; };
+		9201FFA118D5A444003D1ACA /* compositor_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_2d.c; sourceTree = "<group>"; };
+		9201FFA218D5A444003D1ACA /* compositor_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_3d.c; sourceTree = "<group>"; };
+		9201FFA318D5A444003D1ACA /* compositor_node_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compositor_node_init.c; sourceTree = "<group>"; };
+		9201FFA418D5A444003D1ACA /* drawable.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = drawable.c; sourceTree = "<group>"; };
+		9201FFA518D5A444003D1ACA /* drawable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = drawable.h; sourceTree = "<group>"; };
+		9201FFA618D5A444003D1ACA /* events.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = events.c; sourceTree = "<group>"; };
+		9201FFA718D5A444003D1ACA /* font_engine.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = font_engine.c; sourceTree = "<group>"; };
+		9201FFA818D5A444003D1ACA /* gl_inc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gl_inc.h; sourceTree = "<group>"; };
+		9201FFA918D5A444003D1ACA /* hardcoded_protos.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hardcoded_protos.c; sourceTree = "<group>"; };
+		9201FFAA18D5A444003D1ACA /* hc_flash_shape.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hc_flash_shape.c; sourceTree = "<group>"; };
+		9201FFAB18D5A444003D1ACA /* mesh.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh.c; sourceTree = "<group>"; };
+		9201FFAC18D5A444003D1ACA /* mesh_collide.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh_collide.c; sourceTree = "<group>"; };
+		9201FFAD18D5A444003D1ACA /* mesh_tesselate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mesh_tesselate.c; sourceTree = "<group>"; };
+		9201FFAE18D5A444003D1ACA /* mpeg4_animstream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_animstream.c; sourceTree = "<group>"; };
+		9201FFAF18D5A444003D1ACA /* mpeg4_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_audio.c; sourceTree = "<group>"; };
+		9201FFB018D5A444003D1ACA /* mpeg4_background.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_background.c; sourceTree = "<group>"; };
+		9201FFB118D5A444003D1ACA /* mpeg4_background2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_background2d.c; sourceTree = "<group>"; };
+		9201FFB218D5A444003D1ACA /* mpeg4_bitmap.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_bitmap.c; sourceTree = "<group>"; };
+		9201FFB318D5A444003D1ACA /* mpeg4_composite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_composite.c; sourceTree = "<group>"; };
+		9201FFB418D5A444003D1ACA /* mpeg4_form.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_form.c; sourceTree = "<group>"; };
+		9201FFB518D5A444003D1ACA /* mpeg4_geometry_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_2d.c; sourceTree = "<group>"; };
+		9201FFB618D5A444003D1ACA /* mpeg4_geometry_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_3d.c; sourceTree = "<group>"; };
+		9201FFB718D5A444003D1ACA /* mpeg4_geometry_ifs2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_ifs2d.c; sourceTree = "<group>"; };
+		9201FFB818D5A444003D1ACA /* mpeg4_geometry_ils2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_geometry_ils2d.c; sourceTree = "<group>"; };
+		9201FFB918D5A444003D1ACA /* mpeg4_gradients.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_gradients.c; sourceTree = "<group>"; };
+		9201FFBA18D5A444003D1ACA /* mpeg4_grouping.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping.c; sourceTree = "<group>"; };
+		9201FFBB18D5A444003D1ACA /* mpeg4_grouping.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mpeg4_grouping.h; sourceTree = "<group>"; };
+		9201FFBC18D5A444003D1ACA /* mpeg4_grouping_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping_2d.c; sourceTree = "<group>"; };
+		9201FFBD18D5A444003D1ACA /* mpeg4_grouping_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_grouping_3d.c; sourceTree = "<group>"; };
+		9201FFBE18D5A444003D1ACA /* mpeg4_layer_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layer_2d.c; sourceTree = "<group>"; };
+		9201FFBF18D5A444003D1ACA /* mpeg4_layer_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layer_3d.c; sourceTree = "<group>"; };
+		9201FFC018D5A444003D1ACA /* mpeg4_layout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_layout.c; sourceTree = "<group>"; };
+		9201FFC118D5A444003D1ACA /* mpeg4_lighting.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_lighting.c; sourceTree = "<group>"; };
+		9201FFC218D5A444003D1ACA /* mpeg4_path_layout.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_path_layout.c; sourceTree = "<group>"; };
+		9201FFC318D5A444003D1ACA /* mpeg4_sensors.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_sensors.c; sourceTree = "<group>"; };
+		9201FFC418D5A444003D1ACA /* mpeg4_sound.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_sound.c; sourceTree = "<group>"; };
+		9201FFC518D5A444003D1ACA /* mpeg4_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_text.c; sourceTree = "<group>"; };
+		9201FFC618D5A444003D1ACA /* mpeg4_textures.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_textures.c; sourceTree = "<group>"; };
+		9201FFC718D5A444003D1ACA /* mpeg4_timesensor.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_timesensor.c; sourceTree = "<group>"; };
+		9201FFC818D5A444003D1ACA /* mpeg4_viewport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpeg4_viewport.c; sourceTree = "<group>"; };
+		9201FFC918D5A444003D1ACA /* navigate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = navigate.c; sourceTree = "<group>"; };
+		9201FFCA18D5A444003D1ACA /* nodes_stacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nodes_stacks.h; sourceTree = "<group>"; };
+		9201FFCB18D5A444003D1ACA /* offscreen_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = offscreen_cache.c; sourceTree = "<group>"; };
+		9201FFCC18D5A444003D1ACA /* offscreen_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = offscreen_cache.h; sourceTree = "<group>"; };
+		9201FFCD18D5A444003D1ACA /* svg_base.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_base.c; sourceTree = "<group>"; };
+		9201FFCE18D5A444003D1ACA /* svg_filters.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_filters.c; sourceTree = "<group>"; };
+		9201FFCF18D5A444003D1ACA /* svg_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_font.c; sourceTree = "<group>"; };
+		9201FFD018D5A444003D1ACA /* svg_geometry.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_geometry.c; sourceTree = "<group>"; };
+		9201FFD118D5A444003D1ACA /* svg_grouping.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_grouping.c; sourceTree = "<group>"; };
+		9201FFD218D5A444003D1ACA /* svg_media.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_media.c; sourceTree = "<group>"; };
+		9201FFD318D5A444003D1ACA /* svg_paint_servers.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_paint_servers.c; sourceTree = "<group>"; };
+		9201FFD418D5A444003D1ACA /* svg_text.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = svg_text.c; sourceTree = "<group>"; };
+		9201FFD518D5A444003D1ACA /* texturing.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = texturing.c; sourceTree = "<group>"; };
+		9201FFD618D5A444003D1ACA /* texturing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = texturing.h; sourceTree = "<group>"; };
+		9201FFD718D5A444003D1ACA /* texturing_gl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = texturing_gl.c; sourceTree = "<group>"; };
+		9201FFD818D5A444003D1ACA /* visual_manager.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager.c; sourceTree = "<group>"; };
+		9201FFD918D5A444003D1ACA /* visual_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager.h; sourceTree = "<group>"; };
+		9201FFDA18D5A444003D1ACA /* visual_manager_2d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_2d.c; sourceTree = "<group>"; };
+		9201FFDB18D5A444003D1ACA /* visual_manager_2d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager_2d.h; sourceTree = "<group>"; };
+		9201FFDC18D5A444003D1ACA /* visual_manager_2d_draw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_2d_draw.c; sourceTree = "<group>"; };
+		9201FFDD18D5A444003D1ACA /* visual_manager_3d.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_3d.c; sourceTree = "<group>"; };
+		9201FFDE18D5A444003D1ACA /* visual_manager_3d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = visual_manager_3d.h; sourceTree = "<group>"; };
+		9201FFDF18D5A444003D1ACA /* visual_manager_3d_gl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = visual_manager_3d_gl.c; sourceTree = "<group>"; };
+		9201FFE018D5A444003D1ACA /* x3d_geometry.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x3d_geometry.c; sourceTree = "<group>"; };
+		9201FFE418D5A444003D1ACA /* rtcp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtcp.c; sourceTree = "<group>"; };
+		9201FFE518D5A444003D1ACA /* rtp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp.c; sourceTree = "<group>"; };
+		9201FFE618D5A444003D1ACA /* rtp_depacketizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_depacketizer.c; sourceTree = "<group>"; };
+		9201FFE718D5A444003D1ACA /* rtp_packetizer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_packetizer.c; sourceTree = "<group>"; };
+		9201FFE818D5A444003D1ACA /* rtp_pck_3gpp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_pck_3gpp.c; sourceTree = "<group>"; };
+		9201FFE918D5A444003D1ACA /* rtp_pck_mpeg12.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_pck_mpeg12.c; sourceTree = "<group>"; };
+		9201FFEA18D5A444003D1ACA /* rtp_pck_mpeg4.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_pck_mpeg4.c; sourceTree = "<group>"; };
+		9201FFEB18D5A444003D1ACA /* rtp_streamer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtp_streamer.c; sourceTree = "<group>"; };
+		9201FFEC18D5A444003D1ACA /* rtsp_command.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtsp_command.c; sourceTree = "<group>"; };
+		9201FFED18D5A444003D1ACA /* rtsp_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtsp_common.c; sourceTree = "<group>"; };
+		9201FFEE18D5A444003D1ACA /* rtsp_response.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtsp_response.c; sourceTree = "<group>"; };
+		9201FFEF18D5A444003D1ACA /* rtsp_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rtsp_session.c; sourceTree = "<group>"; };
+		9201FFF018D5A444003D1ACA /* sdp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdp.c; sourceTree = "<group>"; };
+		9201FFF218D5A444003D1ACA /* avc_ext.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = avc_ext.c; sourceTree = "<group>"; };
+		9201FFF318D5A444003D1ACA /* box_code_3gpp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_3gpp.c; sourceTree = "<group>"; };
+		9201FFF418D5A444003D1ACA /* box_code_adobe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_adobe.c; sourceTree = "<group>"; };
+		9201FFF518D5A444003D1ACA /* box_code_apple.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_apple.c; sourceTree = "<group>"; };
+		9201FFF618D5A444003D1ACA /* box_code_base.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_base.c; sourceTree = "<group>"; };
+		9201FFF718D5A444003D1ACA /* box_code_drm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_drm.c; sourceTree = "<group>"; };
+		9201FFF818D5A444003D1ACA /* box_code_meta.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_meta.c; sourceTree = "<group>"; };
+		9201FFF918D5A444003D1ACA /* box_dump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_dump.c; sourceTree = "<group>"; };
+		9201FFFA18D5A444003D1ACA /* box_funcs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_funcs.c; sourceTree = "<group>"; };
+		9201FFFB18D5A444003D1ACA /* data_map.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = data_map.c; sourceTree = "<group>"; };
+		9201FFFC18D5A444003D1ACA /* drm_sample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = drm_sample.c; sourceTree = "<group>"; };
+		9201FFFD18D5A444003D1ACA /* generic_subtitle.o */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.objfile"; path = generic_subtitle.o; sourceTree = "<group>"; };
+		9201FFFE18D5A444003D1ACA /* hint_track.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hint_track.c; sourceTree = "<group>"; };
+		9201FFFF18D5A444003D1ACA /* hinting.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hinting.c; sourceTree = "<group>"; };
+		9225732418D7267900D6FD98 /* gm_ogg_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ogg_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		9225732A18D7269700D6FD98 /* ogg_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_in.c; path = ../../modules/ogg/ogg_in.c; sourceTree = "<group>"; };
+		9225732B18D7269700D6FD98 /* ogg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ogg_in.h; path = ../../modules/ogg/ogg_in.h; sourceTree = "<group>"; };
+		9225732C18D7269700D6FD98 /* ogg_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ogg_load.c; path = ../../modules/ogg/ogg_load.c; sourceTree = "<group>"; };
+		9225732D18D7269700D6FD98 /* theora_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = theora_dec.c; path = ../../modules/ogg/theora_dec.c; sourceTree = "<group>"; };
+		9225732E18D7269700D6FD98 /* vorbis_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vorbis_dec.c; path = ../../modules/ogg/vorbis_dec.c; sourceTree = "<group>"; };
+		92AAF0D318D6DB2D00E2FF12 /* gm_sdl_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_sdl_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF0D818D6DB5500E2FF12 /* audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio.c; path = ../../modules/sdl_out/audio.c; sourceTree = "<group>"; };
+		92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdl_out.c; path = ../../modules/sdl_out/sdl_out.c; sourceTree = "<group>"; };
+		92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sdl_out.h; path = ../../modules/sdl_out/sdl_out.h; sourceTree = "<group>"; };
+		92AAF0DC18D6DB5500E2FF12 /* video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = video.c; path = ../../modules/sdl_out/video.c; sourceTree = "<group>"; };
+		92AAF0F418D6E5D400E2FF12 /* audio_filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = audio_filter.c; path = ../../modules/audio_filter/audio_filter.c; sourceTree = "<group>"; };
+		92AAF0F718D6E5FD00E2FF12 /* bifs_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bifs_dec.c; path = ../../modules/bifs_dec/bifs_dec.c; sourceTree = "<group>"; };
+		92AAF0FA18D6E62600E2FF12 /* ctx_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ctx_load.c; path = ../../modules/ctx_load/ctx_load.c; sourceTree = "<group>"; };
+		92AAF0FD18D6E64800E2FF12 /* dummy_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = dummy_in.c; path = ../../modules/dummy_in/dummy_in.c; sourceTree = "<group>"; };
+		92AAF10018D6E66D00E2FF12 /* gpac_js.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = gpac_js.c; path = ../../modules/gpac_js/gpac_js.c; sourceTree = "<group>"; };
+		92AAF10318D6E69500E2FF12 /* bmp_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = bmp_dec.c; path = ../../modules/img_in/bmp_dec.c; sourceTree = "<group>"; };
+		92AAF10418D6E69500E2FF12 /* img_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = img_dec.c; path = ../../modules/img_in/img_dec.c; sourceTree = "<group>"; };
+		92AAF10518D6E69500E2FF12 /* img_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = img_in.c; path = ../../modules/img_in/img_in.c; sourceTree = "<group>"; };
+		92AAF10618D6E69500E2FF12 /* img_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = img_in.h; path = ../../modules/img_in/img_in.h; sourceTree = "<group>"; };
+		92AAF10718D6E69500E2FF12 /* jp2_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jp2_dec.c; path = ../../modules/img_in/jp2_dec.c; sourceTree = "<group>"; };
+		92AAF10818D6E69500E2FF12 /* jpeg_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = jpeg_dec.c; path = ../../modules/img_in/jpeg_dec.c; sourceTree = "<group>"; };
+		92AAF10918D6E69500E2FF12 /* png_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = png_dec.c; path = ../../modules/img_in/png_dec.c; sourceTree = "<group>"; };
+		92AAF11218D6E6B700E2FF12 /* isma_ea.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isma_ea.c; path = ../../modules/ismacryp/isma_ea.c; sourceTree = "<group>"; };
+		92AAF11518D6E6D300E2FF12 /* isom_cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = isom_cache.c; path = ../../modules/isom_in/isom_cache.c; sourceTree = "<group>"; };
+		92AAF11618D6E6D300E2FF12 /* isom_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isom_in.h; path = ../../modules/isom_in/isom_in.h; sourceTree = "<group>"; };
+		92AAF11718D6E6D300E2FF12 /* load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = load.c; path = ../../modules/isom_in/load.c; sourceTree = "<group>"; };
+		92AAF11818D6E6D300E2FF12 /* read_ch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = read_ch.c; path = ../../modules/isom_in/read_ch.c; sourceTree = "<group>"; };
+		92AAF11918D6E6D300E2FF12 /* read.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = read.c; path = ../../modules/isom_in/read.c; sourceTree = "<group>"; };
+		92AAF12018D6E6F300E2FF12 /* laser_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = laser_dec.c; path = ../../modules/laser_dec/laser_dec.c; sourceTree = "<group>"; };
+		92AAF12318D6E70D00E2FF12 /* mpd_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpd_in.c; path = ../../modules/mpd_in/mpd_in.c; sourceTree = "<group>"; };
+		92AAF12618D6E72800E2FF12 /* mpegts_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpegts_in.c; path = ../../modules/mpegts_in/mpegts_in.c; sourceTree = "<group>"; };
+		92AAF12918D6E74200E2FF12 /* mse_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mse_in.c; path = ../../modules/mse_in/mse_in.c; sourceTree = "<group>"; };
+		92AAF12C18D6E75800E2FF12 /* odf_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = odf_dec.c; path = ../../modules/odf_dec/odf_dec.c; sourceTree = "<group>"; };
+		92AAF12F18D6E77900E2FF12 /* osd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = osd.c; path = ../../modules/osd/osd.c; sourceTree = "<group>"; };
+		92AAF13218D6E7BC00E2FF12 /* rtp_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rtp_in.c; path = ../../modules/rtp_in/rtp_in.c; sourceTree = "<group>"; };
+		92AAF13318D6E7BC00E2FF12 /* rtp_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rtp_in.h; path = ../../modules/rtp_in/rtp_in.h; sourceTree = "<group>"; };
+		92AAF13418D6E7BC00E2FF12 /* rtp_session.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rtp_session.c; path = ../../modules/rtp_in/rtp_session.c; sourceTree = "<group>"; };
+		92AAF13518D6E7BC00E2FF12 /* rtp_signaling.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rtp_signaling.c; path = ../../modules/rtp_in/rtp_signaling.c; sourceTree = "<group>"; };
+		92AAF13618D6E7BC00E2FF12 /* rtp_stream.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rtp_stream.c; path = ../../modules/rtp_in/rtp_stream.c; sourceTree = "<group>"; };
+		92AAF13718D6E7BC00E2FF12 /* sdp_fetch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdp_fetch.c; path = ../../modules/rtp_in/sdp_fetch.c; sourceTree = "<group>"; };
+		92AAF13818D6E7BC00E2FF12 /* sdp_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sdp_load.c; path = ../../modules/rtp_in/sdp_load.c; sourceTree = "<group>"; };
+		92AAF14118D6E7D800E2FF12 /* saf_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = saf_in.c; path = ../../modules/saf_in/saf_in.c; sourceTree = "<group>"; };
+		92AAF14418D6E7F500E2FF12 /* svg_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = svg_in.c; path = ../../modules/svg_in/svg_in.c; sourceTree = "<group>"; };
+		92AAF14718D6E82500E2FF12 /* timedtext_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timedtext_dec.c; path = ../../modules/timedtext/timedtext_dec.c; sourceTree = "<group>"; };
+		92AAF14818D6E82500E2FF12 /* timedtext_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = timedtext_in.c; path = ../../modules/timedtext/timedtext_in.c; sourceTree = "<group>"; };
+		92AAF14C18D6E83B00E2FF12 /* validator.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = validator.c; path = ../../modules/validator/validator.c; sourceTree = "<group>"; };
+		92AAF14F18D6E87500E2FF12 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = ../../modules/widgetman/unzip.c; sourceTree = "<group>"; };
+		92AAF15018D6E87500E2FF12 /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unzip.h; path = ../../modules/widgetman/unzip.h; sourceTree = "<group>"; };
+		92AAF15118D6E87500E2FF12 /* wgt_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = wgt_load.c; path = ../../modules/widgetman/wgt_load.c; sourceTree = "<group>"; };
+		92AAF15218D6E87500E2FF12 /* widget.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = widget.c; path = ../../modules/widgetman/widget.c; sourceTree = "<group>"; };
+		92AAF15318D6E87500E2FF12 /* widgetman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = widgetman.c; path = ../../modules/widgetman/widgetman.c; sourceTree = "<group>"; };
+		92AAF15418D6E87500E2FF12 /* widgetman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = widgetman.h; path = ../../modules/widgetman/widgetman.h; sourceTree = "<group>"; };
+		92AAF16518D6F40400E2FF12 /* gm_ft_font.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ft_font.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF16B18D6F5EA00E2FF12 /* ft_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ft_font.c; path = ../../modules/ft_font/ft_font.c; sourceTree = "<group>"; };
+		92AAF16C18D6F5EA00E2FF12 /* ft_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ft_font.h; path = ../../modules/ft_font/ft_font.h; sourceTree = "<group>"; };
+		92AAF17818D6F89B00E2FF12 /* gm_aac_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_aac_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF17E18D6F8EF00E2FF12 /* aac_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = aac_in.c; path = ../../modules/aac_in/aac_in.c; sourceTree = "<group>"; };
+		92AAF17F18D6F8EF00E2FF12 /* faad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = faad_dec.c; path = ../../modules/aac_in/faad_dec.c; sourceTree = "<group>"; };
+		92AAF18818D6FA1100E2FF12 /* gm_ac3_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ac3_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF18D18D6FA2C00E2FF12 /* ac3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ac3_in.c; path = ../../modules/ac3_in/ac3_in.c; sourceTree = "<group>"; };
+		92AAF18E18D6FA2C00E2FF12 /* liba52_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liba52_dec.c; path = ../../modules/ac3_in/liba52_dec.c; sourceTree = "<group>"; };
+		92AAF19818D6FDC300E2FF12 /* gm_ffmpeg_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_ffmpeg_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF19E18D6FDF300E2FF12 /* ffmpeg_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_decode.c; path = ../../modules/ffmpeg_in/ffmpeg_decode.c; sourceTree = "<group>"; };
+		92AAF19F18D6FDF300E2FF12 /* ffmpeg_demux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_demux.c; path = ../../modules/ffmpeg_in/ffmpeg_demux.c; sourceTree = "<group>"; };
+		92AAF1A018D6FDF300E2FF12 /* ffmpeg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffmpeg_in.h; path = ../../modules/ffmpeg_in/ffmpeg_in.h; sourceTree = "<group>"; };
+		92AAF1A118D6FDF300E2FF12 /* ffmpeg_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_load.c; path = ../../modules/ffmpeg_in/ffmpeg_load.c; sourceTree = "<group>"; };
+		92AAF1AE18D709D900E2FF12 /* gm_mp3_in.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_mp3_in.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF1B318D70A0A00E2FF12 /* mad_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mad_dec.c; path = ../../modules/mp3_in/mad_dec.c; sourceTree = "<group>"; };
+		92AAF1B418D70A0A00E2FF12 /* mp3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mp3_in.c; path = ../../modules/mp3_in/mp3_in.c; sourceTree = "<group>"; };
+		92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_openhevc_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF1C318D70B4100E2FF12 /* openhevc_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = openhevc_dec.c; path = ../../modules/openhevc_dec/openhevc_dec.c; sourceTree = "<group>"; };
+		92AAF1CB18D70C3100E2FF12 /* gm_opensvc_dec.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_opensvc_dec.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = opensvc_dec.c; path = ../../modules/opensvc_dec/opensvc_dec.c; sourceTree = "<group>"; };
+		92AAF1D518D7109A00E2FF12 /* vtt_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_dec.c; path = ../../modules/vtt_in/vtt_dec.c; sourceTree = "<group>"; };
+		92AAF1D618D7109A00E2FF12 /* vtt_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = vtt_in.c; path = ../../modules/vtt_in/vtt_in.c; sourceTree = "<group>"; };
+		92AAF1DF18D7126900E2FF12 /* gm_x11_out.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = gm_x11_out.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
+		92AAF1E718D712C500E2FF12 /* x11_out.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = x11_out.c; path = ../../modules/x11_out/x11_out.c; sourceTree = "<group>"; };
+		92AAF1E818D712C500E2FF12 /* x11_out.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = x11_out.h; path = ../../modules/x11_out/x11_out.h; sourceTree = "<group>"; };
+		92BE509018D6325E00AA59D8 /* MP4Box */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP4Box; sourceTree = BUILT_PRODUCTS_DIR; };
+		92BE50A418D6348A00AA59D8 /* filedump.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = filedump.c; path = ../../applications/mp4box/filedump.c; sourceTree = SOURCE_ROOT; };
+		92BE50A518D6348A00AA59D8 /* fileimport.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fileimport.c; path = ../../applications/mp4box/fileimport.c; sourceTree = SOURCE_ROOT; };
+		92BE50A618D6348A00AA59D8 /* live.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = live.c; path = ../../applications/mp4box/live.c; sourceTree = SOURCE_ROOT; };
+		92BE50A718D6348A00AA59D8 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp4box/main.c; sourceTree = SOURCE_ROOT; };
+		92BE50B318D6D53000AA59D8 /* MP42TS */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP42TS; sourceTree = BUILT_PRODUCTS_DIR; };
+		92BE50C118D6D5DC00AA59D8 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp42ts/main.c; sourceTree = SOURCE_ROOT; };
+		92BE50C718D6D60100AA59D8 /* MP4Client */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = MP4Client; sourceTree = BUILT_PRODUCTS_DIR; };
+		92BE50D118D6D62600AA59D8 /* extract.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = extract.c; path = ../../applications/mp4client/extract.c; sourceTree = SOURCE_ROOT; };
+		92BE50D218D6D62600AA59D8 /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = main.c; path = ../../applications/mp4client/main.c; sourceTree = SOURCE_ROOT; };
+		92BE50FD18D6D9EE00AA59D8 /* raw_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raw_video.c; path = ../../modules/raw_out/raw_video.c; sourceTree = "<group>"; };
+		92BE510918D6DA6300AA59D8 /* ftgrays.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ftgrays.c; path = ../../modules/soft_raster/ftgrays.c; sourceTree = "<group>"; };
+		92BE510A18D6DA6300AA59D8 /* rast_soft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = rast_soft.h; path = ../../modules/soft_raster/rast_soft.h; sourceTree = "<group>"; };
+		92BE510B18D6DA6300AA59D8 /* raster_565.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_565.c; path = ../../modules/soft_raster/raster_565.c; sourceTree = "<group>"; };
+		92BE510C18D6DA6300AA59D8 /* raster_argb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_argb.c; path = ../../modules/soft_raster/raster_argb.c; sourceTree = "<group>"; };
+		92BE510D18D6DA6300AA59D8 /* raster_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_load.c; path = ../../modules/soft_raster/raster_load.c; sourceTree = "<group>"; };
+		92BE510E18D6DA6300AA59D8 /* raster_rgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raster_rgb.c; path = ../../modules/soft_raster/raster_rgb.c; sourceTree = "<group>"; };
+		92BE510F18D6DA6300AA59D8 /* stencil.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = stencil.c; path = ../../modules/soft_raster/stencil.c; sourceTree = "<group>"; };
+		92BE511018D6DA6300AA59D8 /* surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = surface.c; path = ../../modules/soft_raster/surface.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
+/* Begin PBXFrameworksBuildPhase section */
+		9201F93418D5A38A003D1ACA /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				920101D118D5ACA7003D1ACA /* libz.dylib in Frameworks */,
+				920101CF18D5AC67003D1ACA /* OpenGL.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		9225732118D7267900D6FD98 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				9225733418D726D800D6FD98 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF0D018D6DB2D00E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF0E818D6DB9300E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF16218D6F40400E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF16F18D6F66300E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF17518D6F89B00E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF17C18D6F8C700E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF18518D6FA1100E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF19318D6FB7B00E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF19518D6FDC300E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF19C18D6FDD900E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1AB18D709D900E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1B918D70A5200E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1BB18D70B1C00E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1C618D70BAE00E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1C818D70C3100E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1D318D70DE500E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1DC18D7126900E2FF12 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1E318D7129A00E2FF12 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92BE508D18D6325E00AA59D8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92BE50A318D632DA00AA59D8 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92BE50B018D6D53000AA59D8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92BE50D618D6D6C100AA59D8 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92BE50C418D6D60100AA59D8 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92BE50D518D6D66C00AA59D8 /* libgpac.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
 /* Begin PBXGroup section */
-		08FB7794FE84155DC02AAC07 /* gpac */ = {
+		9201000E18D5A444003D1ACA /* laser */ = {
 			isa = PBXGroup;
 			children = (
-				717BB4D9115259A000A39D3D /* applications */,
-				717BB3B2115256A600A39D3D /* modules */,
-				717BB27A1152530E00A39D3D /* libgpac */,
-			);
-			name = gpac;
-			sourceTree = "<group>";
-		};
-		717BB27A1152530E00A39D3D /* libgpac */ = {
-			isa = PBXGroup;
-			children = (
-				717BB27B1152533800A39D3D /* bifs */,
-				717BB27C1152533800A39D3D /* compositor */,
-				717BB2831152533800A39D3D /* dir_info */,
-				717BB2841152533800A39D3D /* export.cpp */,
-				717BB2851152533800A39D3D /* ietf */,
-				717BB2861152533800A39D3D /* isomedia */,
-				717BB2871152533800A39D3D /* laser */,
-				717BB2881152533800A39D3D /* Makefile */,
-				717BB2891152533800A39D3D /* mcrypt */,
-				717BB28A1152533800A39D3D /* media_tools */,
-				717BB28B1152533800A39D3D /* odf */,
-				717BB28C1152533800A39D3D /* scene_manager */,
-				717BB28D1152533800A39D3D /* scenegraph */,
-				717BB28E1152533800A39D3D /* terminal */,
-				717BB28F1152533800A39D3D /* utils */,
+				9201000F18D5A444003D1ACA /* lsr_dec.c */,
+				9201001018D5A444003D1ACA /* lsr_enc.c */,
+				9201001118D5A444003D1ACA /* lsr_tables.c */,
+			);
+			path = laser;
+			sourceTree = "<group>";
+		};
+		9201001318D5A444003D1ACA /* mcrypt */ = {
+			isa = PBXGroup;
+			children = (
+				9201001418D5A444003D1ACA /* cbc.c */,
+				9201001518D5A444003D1ACA /* cfb.c */,
+				9201001618D5A444003D1ACA /* ctr.c */,
+				9201001718D5A444003D1ACA /* des.c */,
+				9201001818D5A444003D1ACA /* ecb.c */,
+				9201001918D5A444003D1ACA /* g_crypt.c */,
+				9201001A18D5A444003D1ACA /* ncfb.c */,
+				9201001B18D5A444003D1ACA /* nofb.c */,
+				9201001C18D5A444003D1ACA /* ofb.c */,
+				9201001D18D5A444003D1ACA /* rijndael-128.c */,
+				9201001E18D5A444003D1ACA /* rijndael-192.c */,
+				9201001F18D5A444003D1ACA /* rijndael-256.c */,
+				9201002018D5A444003D1ACA /* stream.c */,
+				9201002118D5A444003D1ACA /* tripledes.c */,
+			);
+			path = mcrypt;
+			sourceTree = "<group>";
+		};
+		9201002218D5A444003D1ACA /* media_tools */ = {
+			isa = PBXGroup;
+			children = (
+				9201002318D5A444003D1ACA /* ait.c */,
+				9201002418D5A444003D1ACA /* av_parsers.c */,
+				9201002518D5A444003D1ACA /* avilib.c */,
+				9201002618D5A444003D1ACA /* dash_client.c */,
+				9201002718D5A444003D1ACA /* dash_client.c alias */,
+				9201002818D5A444003D1ACA /* dash_segmenter.c */,
+				9201002918D5A444003D1ACA /* dsmcc.c */,
+				9201002A18D5A444003D1ACA /* dvb_mpe.c */,
+				9201002B18D5A444003D1ACA /* filestreamer.c */,
+				9201002C18D5A444003D1ACA /* gpac_ogg.c */,
+				9201002D18D5A444003D1ACA /* html5_media.c */,
+				9201002E18D5A444003D1ACA /* html5_mse.c */,
+				9201002F18D5A444003D1ACA /* img.c */,
+				9201003018D5A444003D1ACA /* ismacryp.c */,
+				9201003118D5A444003D1ACA /* isom_hinter.c */,
+				9201003218D5A444003D1ACA /* isom_tools.c */,
+				9201003318D5A444003D1ACA /* m2ts_mux.c */,
+				9201003418D5A444003D1ACA /* m3u8.c */,
+				9201003518D5A444003D1ACA /* media_export.c */,
+				9201003618D5A444003D1ACA /* media_import.c */,
+				9201003718D5A444003D1ACA /* mpd.c */,
+				9201003818D5A444003D1ACA /* mpeg2_ps.c */,
+				9201003918D5A444003D1ACA /* mpeg2_ps.h */,
+				9201003A18D5A444003D1ACA /* mpegts.c */,
+				9201003B18D5A444003D1ACA /* reedsolomon.c */,
+				9201003C18D5A444003D1ACA /* saf.c */,
+				9201003D18D5A444003D1ACA /* text_import.c */,
+				9201003E18D5A444003D1ACA /* vobsub.c */,
+				9201003F18D5A444003D1ACA /* webvtt.c */,
+			);
+			path = media_tools;
+			sourceTree = "<group>";
+		};
+		9201004018D5A444003D1ACA /* odf */ = {
+			isa = PBXGroup;
+			children = (
+				9201004118D5A444003D1ACA /* desc_private.c */,
+				9201004218D5A444003D1ACA /* descriptors.c */,
+				9201004318D5A444003D1ACA /* ipmpx_code.c */,
+				9201004418D5A444003D1ACA /* ipmpx_dump.c */,
+				9201004518D5A444003D1ACA /* ipmpx_parse.c */,
+				9201004618D5A444003D1ACA /* oci_codec.c */,
+				9201004718D5A444003D1ACA /* odf_code.c */,
+				9201004818D5A444003D1ACA /* odf_codec.c */,
+				9201004918D5A444003D1ACA /* odf_command.c */,
+				9201004A18D5A444003D1ACA /* odf_dump.c */,
+				9201004B18D5A444003D1ACA /* odf_parse.c */,
+				9201004C18D5A444003D1ACA /* qos.c */,
+				9201004D18D5A444003D1ACA /* slc.c */,
+			);
+			path = odf;
+			sourceTree = "<group>";
+		};
+		9201004E18D5A444003D1ACA /* scene_manager */ = {
+			isa = PBXGroup;
+			children = (
+				9201004F18D5A444003D1ACA /* encode_isom.c */,
+				9201005018D5A444003D1ACA /* loader_bt.c */,
+				9201005118D5A444003D1ACA /* loader_isom.c */,
+				9201005218D5A444003D1ACA /* loader_qt.c */,
+				9201005318D5A444003D1ACA /* loader_svg.c */,
+				9201005418D5A444003D1ACA /* loader_xmt.c */,
+				9201005518D5A444003D1ACA /* scene_dump.c */,
+				9201005618D5A444003D1ACA /* scene_engine.c */,
+				9201005718D5A444003D1ACA /* scene_manager.c */,
+				9201005818D5A444003D1ACA /* scene_stats.c */,
+				9201005918D5A444003D1ACA /* swf_bifs.c */,
+				9201005A18D5A444003D1ACA /* swf_parse.c */,
+				9201005B18D5A444003D1ACA /* swf_svg.c */,
+				9201005C18D5A444003D1ACA /* text_to_bifs.c */,
+			);
+			path = scene_manager;
+			sourceTree = "<group>";
+		};
+		9201005D18D5A444003D1ACA /* scenegraph */ = {
+			isa = PBXGroup;
+			children = (
+				9201005E18D5A444003D1ACA /* base_scenegraph.c */,
+				9201005F18D5A444003D1ACA /* commands.c */,
+				9201006018D5A444003D1ACA /* dom_events.c */,
+				9201006118D5A444003D1ACA /* dom_smjs.c */,
+				9201006218D5A444003D1ACA /* html5_media_smjs.c */,
+				9201006318D5A444003D1ACA /* html5_mse_smjs.c */,
+				9201006418D5A444003D1ACA /* mpeg4_animators.c */,
+				9201006518D5A444003D1ACA /* mpeg4_nodes.c */,
+				9201006618D5A444003D1ACA /* mpeg4_valuator.c */,
+				9201006718D5A444003D1ACA /* smil_anim.c */,
+				9201006818D5A444003D1ACA /* smil_timing.c */,
+				9201006918D5A444003D1ACA /* svg_attributes.c */,
+				9201006A18D5A444003D1ACA /* svg_properties.c */,
+				9201006B18D5A444003D1ACA /* svg_smjs.c */,
+				9201006C18D5A444003D1ACA /* svg_types.c */,
+				9201006D18D5A444003D1ACA /* vrml_interpolators.c */,
+				9201006E18D5A444003D1ACA /* vrml_proto.c */,
+				9201006F18D5A444003D1ACA /* vrml_route.c */,
+				9201007018D5A444003D1ACA /* vrml_script.c */,
+				9201007118D5A444003D1ACA /* vrml_smjs.c */,
+				9201007218D5A444003D1ACA /* vrml_tools.c */,
+				9201007318D5A444003D1ACA /* webvtt_smjs.c */,
+				9201007418D5A444003D1ACA /* x3d_nodes.c */,
+				9201007518D5A444003D1ACA /* xbl_process.c */,
+				9201007618D5A444003D1ACA /* xml_ns.c */,
+			);
+			path = scenegraph;
+			sourceTree = "<group>";
+		};
+		9201007718D5A444003D1ACA /* terminal */ = {
+			isa = PBXGroup;
+			children = (
+				9201007818D5A444003D1ACA /* channel.c */,
+				9201007918D5A444003D1ACA /* clock.c */,
+				9201007A18D5A444003D1ACA /* decoder.c */,
+				9201007B18D5A444003D1ACA /* input_sensor.c */,
+				9201007C18D5A444003D1ACA /* input_sensor.h */,
+				9201007D18D5A444003D1ACA /* media_control.c */,
+				9201007E18D5A444003D1ACA /* media_control.h */,
+				9201007F18D5A444003D1ACA /* media_manager.c */,
+				9201008018D5A444003D1ACA /* media_memory.c */,
+				9201008118D5A444003D1ACA /* media_memory.h */,
+				9201008218D5A444003D1ACA /* media_object.c */,
+				9201008318D5A444003D1ACA /* media_sensor.c */,
+				9201008418D5A444003D1ACA /* mpeg4_inline.c */,
+				9201008518D5A444003D1ACA /* network_service.c */,
+				9201008618D5A444003D1ACA /* object_browser.c */,
+				9201008718D5A444003D1ACA /* object_manager.c */,
+				9201008818D5A444003D1ACA /* scene.c */,
+				9201008918D5A444003D1ACA /* svg_external.c */,
+				9201008A18D5A444003D1ACA /* term_node_init.c */,
+				9201008B18D5A444003D1ACA /* terminal.c */,
+			);
+			path = terminal;
+			sourceTree = "<group>";
+		};
+		9201008C18D5A444003D1ACA /* utils */ = {
+			isa = PBXGroup;
+			children = (
+				9201008D18D5A444003D1ACA /* alloc.c */,
+				9201008E18D5A444003D1ACA /* base_encoding.c */,
+				9201008F18D5A444003D1ACA /* bitstream.c */,
+				9201009018D5A444003D1ACA /* cache.c */,
+				9201009118D5A444003D1ACA /* color.c */,
+				9201009218D5A444003D1ACA /* configfile.c */,
+				9201009318D5A444003D1ACA /* dlmalloc.c */,
+				9201009418D5A444003D1ACA /* downloader.c */,
+				9201009518D5A444003D1ACA /* error.c */,
+				9201009718D5A444003D1ACA /* list.c */,
+				9201009818D5A444003D1ACA /* map.c */,
+				9201009918D5A444003D1ACA /* math.c */,
+				9201009A18D5A444003D1ACA /* module.c */,
+				9201009B18D5A444003D1ACA /* module_wrap.h */,
+				9201009C18D5A444003D1ACA /* os_config_init.c */,
+				9201009D18D5A444003D1ACA /* os_divers.c */,
+				9201009E18D5A444003D1ACA /* os_module.c */,
+				9201009F18D5A444003D1ACA /* os_net.c */,
+				920100A018D5A444003D1ACA /* os_thread.c */,
+				920100A118D5A444003D1ACA /* path2d.c */,
+				920100A218D5A444003D1ACA /* path2d_stroker.c */,
+				920100A318D5A444003D1ACA /* ringbuffer.c */,
+				920100A418D5A444003D1ACA /* sha1.c */,
+				920100A718D5A444003D1ACA /* token.c */,
+				920100A818D5A444003D1ACA /* uni_bidi.c */,
+				920100A918D5A444003D1ACA /* unicode.c */,
+				920100AA18D5A444003D1ACA /* url.c */,
+				920100AB18D5A444003D1ACA /* utf.c */,
+				920100AC18D5A444003D1ACA /* xml_parser.c */,
+			);
+			path = utils;
+			sourceTree = "<group>";
+		};
+		9201F92718D5A359003D1ACA = {
+			isa = PBXGroup;
+			children = (
+				92BE50AE18D6378C00AA59D8 /* xcode */,
+				92BE50AC18D6375100AA59D8 /* applications */,
+				92BE50AD18D6376A00AA59D8 /* modules */,
+				9201FE7E18D5A444003D1ACA /* libgpac */,
+			);
+			sourceTree = "<group>";
+		};
+		9201F93818D5A38A003D1ACA /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				9201F93718D5A38A003D1ACA /* libgpac.dylib */,
+				92BE509018D6325E00AA59D8 /* MP4Box */,
+				92BE50B318D6D53000AA59D8 /* MP42TS */,
+				92BE50C718D6D60100AA59D8 /* MP4Client */,
+				92AAF0D318D6DB2D00E2FF12 /* gm_sdl_out.dylib */,
+				92AAF16518D6F40400E2FF12 /* gm_ft_font.dylib */,
+				92AAF17818D6F89B00E2FF12 /* gm_aac_in.dylib */,
+				92AAF18818D6FA1100E2FF12 /* gm_ac3_in.dylib */,
+				92AAF19818D6FDC300E2FF12 /* gm_ffmpeg_in.dylib */,
+				92AAF1AE18D709D900E2FF12 /* gm_mp3_in.dylib */,
+				92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */,
+				92AAF1CB18D70C3100E2FF12 /* gm_opensvc_dec.dylib */,
+				92AAF1DF18D7126900E2FF12 /* gm_x11_out.dylib */,
+				9225732418D7267900D6FD98 /* gm_ogg_in.dylib */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		9201FE7E18D5A444003D1ACA /* libgpac */ = {
+			isa = PBXGroup;
+			children = (
+				9201FE8018D5A444003D1ACA /* .deps */,
+				9201FF8918D5A444003D1ACA /* bifs */,
+				9201FF9A18D5A444003D1ACA /* compositor */,
+				9201FFE318D5A444003D1ACA /* ietf */,
+				9201FFF118D5A444003D1ACA /* isomedia */,
+				9201000E18D5A444003D1ACA /* laser */,
+				9201001318D5A444003D1ACA /* mcrypt */,
+				9201002218D5A444003D1ACA /* media_tools */,
+				9201004018D5A444003D1ACA /* odf */,
+				9201004E18D5A444003D1ACA /* scene_manager */,
+				9201005D18D5A444003D1ACA /* scenegraph */,
+				9201007718D5A444003D1ACA /* terminal */,
+				9201008C18D5A444003D1ACA /* utils */,
+				92AAF0E918D6E35200E2FF12 /* builtin_modules */,
 			);
 			name = libgpac;
+			path = ../../src;
 			sourceTree = "<group>";
 		};
-		717BB3B2115256A600A39D3D /* modules */ = {
+		9201FE8018D5A444003D1ACA /* .deps */ = {
 			isa = PBXGroup;
 			children = (
-				717BB3B3115256CD00A39D3D /* aac_in */,
-				717BB3B8115256CD00A39D3D /* ac3_in */,
-				717BB3BD115256CD00A39D3D /* alsa */,
-				717BB3C1115256CD00A39D3D /* amr_dec */,
-				717BB3C9115256CD00A39D3D /* amr_float_dec */,
-				717BB3D3115256CD00A39D3D /* audio_filter */,
-				717BB3D7115256CD00A39D3D /* bifs_dec */,
-				717BB3DB115256CD00A39D3D /* ctx_load */,
-				717BB3E5115256CD00A39D3D /* demo_is */,
-				717BB3EA115256CD00A39D3D /* dummy_in */,
-				717BB3EE115256CD00A39D3D /* dx_hw */,
-				717BB3FB115256CD00A39D3D /* epoc_hw */,
-				717BB400115256CD00A39D3D /* ffmpeg_in */,
-				717BB407115256CD00A39D3D /* ft_font */,
-				717BB40C115256CD00A39D3D /* gapi */,
-				717BB410115256CD00A39D3D /* gdip_raster */,
-				717BB417115256CD00A39D3D /* gpac_js */,
-				717BB41B115256CD00A39D3D /* img_in */,
-				717BB425115256CD00A39D3D /* ismacryp */,
-				717BB429115256CD00A39D3D /* isom_in */,
-				717BB431115256CD00A39D3D /* jack */,
-				717BB435115256CD00A39D3D /* laser_dec */,
-				717BB439115256CD00A39D3D /* Makefile */,
-				717BB43A115256CD00A39D3D /* modules_export.cpp */,
-				717BB43B115256CD00A39D3D /* mp3_in */,
-				717BB440115256CD00A39D3D /* mpegts_in */,
-				717BB444115256CD00A39D3D /* odf_dec */,
-				717BB448115256CD00A39D3D /* ogg */,
-				717BB450115256CD00A39D3D /* opencv_is */,
-				717BB456115256CD00A39D3D /* oss_audio */,
-				717BB45A115256CD00A39D3D /* pulseaudio */,
-				717BB45E115256CD00A39D3D /* raw_out */,
-				717BB462115256CD00A39D3D /* rtp_in */,
-				717BB46C115256CD00A39D3D /* saf_in */,
-				717BB470115256CD00A39D3D /* sdl_out */,
-				717BB479115256CD00A39D3D /* soft_raster */,
-				717BB484115256CD00A39D3D /* svg_in */,
-				717BB488115256CD00A39D3D /* timedtext */,
-				717BB48D115256CD00A39D3D /* ui_rec */,
-				717BB492115256CD00A39D3D /* wav_out */,
-				717BB496115256CD00A39D3D /* wiiis */,
-				717BB49B115256CD00A39D3D /* x11_out */,
-				717BB4A0115256CD00A39D3D /* xvid_dec */,
+				9201FE8118D5A444003D1ACA /* bifs */,
+				9201FE9018D5A444003D1ACA /* compositor */,
+				9201FECE18D5A444003D1ACA /* ietf */,
+				9201FEDC18D5A444003D1ACA /* isomedia */,
+				9201FEF918D5A444003D1ACA /* laser */,
+				9201FEFD18D5A444003D1ACA /* mcrypt */,
+				9201FF0C18D5A444003D1ACA /* media_tools */,
+				9201FF2418D5A444003D1ACA /* odf */,
+				9201FF3218D5A444003D1ACA /* scene_manager */,
+				9201FF4118D5A444003D1ACA /* scenegraph */,
+				9201FF5B18D5A444003D1ACA /* terminal */,
+				9201FF6D18D5A444003D1ACA /* utils */,
 			);
-			name = modules;
+			path = .deps;
+			sourceTree = "<group>";
+		};
+		9201FE8118D5A444003D1ACA /* bifs */ = {
+			isa = PBXGroup;
+			children = (
+				9201FE8218D5A444003D1ACA /* arith_decoder.dep */,
+				9201FE8318D5A444003D1ACA /* bifs_codec.dep */,
+				9201FE8418D5A444003D1ACA /* bifs_node_tables.dep */,
+				9201FE8518D5A444003D1ACA /* com_dec.dep */,
+				9201FE8618D5A444003D1ACA /* com_enc.dep */,
+				9201FE8718D5A444003D1ACA /* conditional.dep */,
+				9201FE8818D5A444003D1ACA /* field_decode.dep */,
+				9201FE8918D5A444003D1ACA /* field_encode.dep */,
+				9201FE8A18D5A444003D1ACA /* memory_decoder.dep */,
+				9201FE8B18D5A444003D1ACA /* predictive_mffield.dep */,
+				9201FE8C18D5A444003D1ACA /* quantize.dep */,
+				9201FE8D18D5A444003D1ACA /* script_dec.dep */,
+				9201FE8E18D5A444003D1ACA /* script_enc.dep */,
+				9201FE8F18D5A444003D1ACA /* unquantize.dep */,
+			);
+			path = bifs;
+			sourceTree = "<group>";
+		};
+		9201FE9018D5A444003D1ACA /* compositor */ = {
+			isa = PBXGroup;
+			children = (
+				9201FE9118D5A444003D1ACA /* audio_input.dep */,
+				9201FE9218D5A444003D1ACA /* audio_mixer.dep */,
+				9201FE9318D5A444003D1ACA /* audio_render.dep */,
+				9201FE9418D5A444003D1ACA /* bindable.dep */,
+				9201FE9518D5A444003D1ACA /* camera.dep */,
+				9201FE9618D5A444003D1ACA /* compositor.dep */,
+				9201FE9718D5A444003D1ACA /* compositor_2d.dep */,
+				9201FE9818D5A444003D1ACA /* compositor_3d.dep */,
+				9201FE9918D5A444003D1ACA /* compositor_node_init.dep */,
+				9201FE9A18D5A444003D1ACA /* drawable.dep */,
+				9201FE9B18D5A444003D1ACA /* events.dep */,
+				9201FE9C18D5A444003D1ACA /* font_engine.dep */,
+				9201FE9D18D5A444003D1ACA /* hardcoded_protos.dep */,
+				9201FE9E18D5A444003D1ACA /* hc_flash_shape.dep */,
+				9201FE9F18D5A444003D1ACA /* mesh.dep */,
+				9201FEA018D5A444003D1ACA /* mesh_collide.dep */,
+				9201FEA118D5A444003D1ACA /* mesh_tesselate.dep */,
+				9201FEA218D5A444003D1ACA /* mpeg4_animstream.dep */,
+				9201FEA318D5A444003D1ACA /* mpeg4_audio.dep */,
+				9201FEA418D5A444003D1ACA /* mpeg4_background.dep */,
+				9201FEA518D5A444003D1ACA /* mpeg4_background2d.dep */,
+				9201FEA618D5A444003D1ACA /* mpeg4_bitmap.dep */,
+				9201FEA718D5A444003D1ACA /* mpeg4_composite.dep */,
+				9201FEA818D5A444003D1ACA /* mpeg4_form.dep */,
+				9201FEA918D5A444003D1ACA /* mpeg4_geometry_2d.dep */,
+				9201FEAA18D5A444003D1ACA /* mpeg4_geometry_3d.dep */,
+				9201FEAB18D5A444003D1ACA /* mpeg4_geometry_ifs2d.dep */,
+				9201FEAC18D5A444003D1ACA /* mpeg4_geometry_ils2d.dep */,
+				9201FEAD18D5A444003D1ACA /* mpeg4_gradients.dep */,
+				9201FEAE18D5A444003D1ACA /* mpeg4_grouping.dep */,
+				9201FEAF18D5A444003D1ACA /* mpeg4_grouping_2d.dep */,
+				9201FEB018D5A444003D1ACA /* mpeg4_grouping_3d.dep */,
+				9201FEB118D5A444003D1ACA /* mpeg4_layer_2d.dep */,
+				9201FEB218D5A444003D1ACA /* mpeg4_layer_3d.dep */,
+				9201FEB318D5A444003D1ACA /* mpeg4_layout.dep */,
+				9201FEB418D5A444003D1ACA /* mpeg4_lighting.dep */,
+				9201FEB518D5A444003D1ACA /* mpeg4_path_layout.dep */,
+				9201FEB618D5A444003D1ACA /* mpeg4_sensors.dep */,
+				9201FEB718D5A444003D1ACA /* mpeg4_sound.dep */,
+				9201FEB818D5A444003D1ACA /* mpeg4_text.dep */,
+				9201FEB918D5A444003D1ACA /* mpeg4_textures.dep */,
+				9201FEBA18D5A444003D1ACA /* mpeg4_timesensor.dep */,
+				9201FEBB18D5A444003D1ACA /* mpeg4_viewport.dep */,
+				9201FEBC18D5A444003D1ACA /* navigate.dep */,
+				9201FEBD18D5A444003D1ACA /* offscreen_cache.dep */,
+				9201FEBE18D5A444003D1ACA /* svg_base.dep */,
+				9201FEBF18D5A444003D1ACA /* svg_filters.dep */,
+				9201FEC018D5A444003D1ACA /* svg_font.dep */,
+				9201FEC118D5A444003D1ACA /* svg_geometry.dep */,
+				9201FEC218D5A444003D1ACA /* svg_grouping.dep */,
+				9201FEC318D5A444003D1ACA /* svg_media.dep */,
+				9201FEC418D5A444003D1ACA /* svg_paint_servers.dep */,
+				9201FEC518D5A444003D1ACA /* svg_text.dep */,
+				9201FEC618D5A444003D1ACA /* texturing.dep */,
+				9201FEC718D5A444003D1ACA /* texturing_gl.dep */,
+				9201FEC818D5A444003D1ACA /* visual_manager.dep */,
+				9201FEC918D5A444003D1ACA /* visual_manager_2d.dep */,
+				9201FECA18D5A444003D1ACA /* visual_manager_2d_draw.dep */,
+				9201FECB18D5A444003D1ACA /* visual_manager_3d.dep */,
+				9201FECC18D5A444003D1ACA /* visual_manager_3d_gl.dep */,
+				9201FECD18D5A444003D1ACA /* x3d_geometry.dep */,
+			);
+			path = compositor;
+			sourceTree = "<group>";
+		};
+		9201FECE18D5A444003D1ACA /* ietf */ = {
+			isa = PBXGroup;
+			children = (
+				9201FECF18D5A444003D1ACA /* rtcp.dep */,
+				9201FED018D5A444003D1ACA /* rtp.dep */,
+				9201FED118D5A444003D1ACA /* rtp_depacketizer.dep */,
+				9201FED218D5A444003D1ACA /* rtp_packetizer.dep */,
+				9201FED318D5A444003D1ACA /* rtp_pck_3gpp.dep */,
+				9201FED418D5A444003D1ACA /* rtp_pck_mpeg12.dep */,
+				9201FED518D5A444003D1ACA /* rtp_pck_mpeg4.dep */,
+				9201FED618D5A444003D1ACA /* rtp_streamer.dep */,
+				9201FED718D5A444003D1ACA /* rtsp_command.dep */,
+				9201FED818D5A444003D1ACA /* rtsp_common.dep */,
+				9201FED918D5A444003D1ACA /* rtsp_response.dep */,
+				9201FEDA18D5A444003D1ACA /* rtsp_session.dep */,
+				9201FEDB18D5A444003D1ACA /* sdp.dep */,
+			);
+			path = ietf;
+			sourceTree = "<group>";
+		};
+		9201FEDC18D5A444003D1ACA /* isomedia */ = {
+			isa = PBXGroup;
+			children = (
+				9201FEDD18D5A444003D1ACA /* avc_ext.dep */,
+				9201FEDE18D5A444003D1ACA /* box_code_3gpp.dep */,
+				9201FEDF18D5A444003D1ACA /* box_code_adobe.dep */,
+				9201FEE018D5A444003D1ACA /* box_code_apple.dep */,
+				9201FEE118D5A444003D1ACA /* box_code_base.dep */,
+				9201FEE218D5A444003D1ACA /* box_code_drm.dep */,
+				9201FEE318D5A444003D1ACA /* box_code_meta.dep */,
+				9201FEE418D5A444003D1ACA /* box_dump.dep */,
+				9201FEE518D5A444003D1ACA /* box_funcs.dep */,
+				9201FEE618D5A444003D1ACA /* data_map.dep */,
+				9201FEE718D5A444003D1ACA /* drm_sample.dep */,
+				9201FEE818D5A444003D1ACA /* generic_subtitle.dep */,
+				9201FEE918D5A444003D1ACA /* hint_track.dep */,
+				9201FEEA18D5A444003D1ACA /* hinting.dep */,
+				9201FEEB18D5A444003D1ACA /* isom_intern.dep */,
+				9201FEEC18D5A444003D1ACA /* isom_read.dep */,
+				9201FEED18D5A444003D1ACA /* isom_store.dep */,
+				9201FEEE18D5A444003D1ACA /* isom_write.dep */,
+				9201FEEF18D5A444003D1ACA /* media.dep */,
+				9201FEF018D5A444003D1ACA /* media_odf.dep */,
+				9201FEF118D5A444003D1ACA /* meta.dep */,
+				9201FEF218D5A444003D1ACA /* movie_fragments.dep */,
+				9201FEF318D5A444003D1ACA /* sample_descs.dep */,
+				9201FEF418D5A444003D1ACA /* stbl_read.dep */,
+				9201FEF518D5A444003D1ACA /* stbl_write.dep */,
+				9201FEF618D5A444003D1ACA /* track.dep */,
+				9201FEF718D5A444003D1ACA /* ttml.dep */,
+				9201FEF818D5A444003D1ACA /* tx3g.dep */,
+			);
+			path = isomedia;
+			sourceTree = "<group>";
+		};
+		9201FEF918D5A444003D1ACA /* laser */ = {
+			isa = PBXGroup;
+			children = (
+				9201FEFA18D5A444003D1ACA /* lsr_dec.dep */,
+				9201FEFB18D5A444003D1ACA /* lsr_enc.dep */,
+				9201FEFC18D5A444003D1ACA /* lsr_tables.dep */,
+			);
+			path = laser;
+			sourceTree = "<group>";
+		};
+		9201FEFD18D5A444003D1ACA /* mcrypt */ = {
+			isa = PBXGroup;
+			children = (
+				9201FEFE18D5A444003D1ACA /* cbc.dep */,
+				9201FEFF18D5A444003D1ACA /* cfb.dep */,
+				9201FF0018D5A444003D1ACA /* ctr.dep */,
+				9201FF0118D5A444003D1ACA /* des.dep */,
+				9201FF0218D5A444003D1ACA /* ecb.dep */,
+				9201FF0318D5A444003D1ACA /* g_crypt.dep */,
+				9201FF0418D5A444003D1ACA /* ncfb.dep */,
+				9201FF0518D5A444003D1ACA /* nofb.dep */,
+				9201FF0618D5A444003D1ACA /* ofb.dep */,
+				9201FF0718D5A444003D1ACA /* rijndael-128.dep */,
+				9201FF0818D5A444003D1ACA /* rijndael-192.dep */,
+				9201FF0918D5A444003D1ACA /* rijndael-256.dep */,
+				9201FF0A18D5A444003D1ACA /* stream.dep */,
+				9201FF0B18D5A444003D1ACA /* tripledes.dep */,
+			);
+			path = mcrypt;
+			sourceTree = "<group>";
+		};
+		9201FF0C18D5A444003D1ACA /* media_tools */ = {
+			isa = PBXGroup;
+			children = (
+				9201FF0D18D5A444003D1ACA /* av_parsers.dep */,
+				9201FF0E18D5A444003D1ACA /* avilib.dep */,
+				9201FF0F18D5A444003D1ACA /* dash_client.dep */,
+				9201FF1018D5A444003D1ACA /* dash_segmenter.dep */,
+				9201FF1118D5A444003D1ACA /* filestreamer.dep */,
+				9201FF1218D5A444003D1ACA /* gpac_ogg.dep */,
+				9201FF1318D5A444003D1ACA /* html5_media.dep */,
+				9201FF1418D5A444003D1ACA /* html5_mse.dep */,
+				9201FF1518D5A444003D1ACA /* img.dep */,
+				9201FF1618D5A444003D1ACA /* ismacryp.dep */,
+				9201FF1718D5A444003D1ACA /* isom_hinter.dep */,
+				9201FF1818D5A444003D1ACA /* isom_tools.dep */,
+				9201FF1918D5A444003D1ACA /* m2ts_mux.dep */,
+				9201FF1A18D5A444003D1ACA /* m3u8.dep */,
+				9201FF1B18D5A444003D1ACA /* media_export.dep */,
+				9201FF1C18D5A444003D1ACA /* media_import.dep */,
+				9201FF1D18D5A444003D1ACA /* mpd.dep */,
+				9201FF1E18D5A444003D1ACA /* mpeg2_ps.dep */,
+				9201FF1F18D5A444003D1ACA /* mpegts.dep */,
+				9201FF2018D5A444003D1ACA /* saf.dep */,
+				9201FF2118D5A444003D1ACA /* text_import.dep */,
+				9201FF2218D5A444003D1ACA /* vobsub.dep */,
+				9201FF2318D5A444003D1ACA /* webvtt.dep */,
+			);
+			path = media_tools;
+			sourceTree = "<group>";
+		};
+		9201FF2418D5A444003D1ACA /* odf */ = {
+			isa = PBXGroup;
+			children = (
+				9201FF2518D5A444003D1ACA /* desc_private.dep */,
+				9201FF2618D5A444003D1ACA /* descriptors.dep */,
+				9201FF2718D5A444003D1ACA /* ipmpx_code.dep */,
+				9201FF2818D5A444003D1ACA /* ipmpx_dump.dep */,
+				9201FF2918D5A444003D1ACA /* ipmpx_parse.dep */,
+				9201FF2A18D5A444003D1ACA /* oci_codec.dep */,
+				9201FF2B18D5A444003D1ACA /* odf_code.dep */,
+				9201FF2C18D5A444003D1ACA /* odf_codec.dep */,
+				9201FF2D18D5A444003D1ACA /* odf_command.dep */,
+				9201FF2E18D5A444003D1ACA /* odf_dump.dep */,
+				9201FF2F18D5A444003D1ACA /* odf_parse.dep */,
+				9201FF3018D5A444003D1ACA /* qos.dep */,
+				9201FF3118D5A444003D1ACA /* slc.dep */,
+			);
+			path = odf;
+			sourceTree = "<group>";
+		};
+		9201FF3218D5A444003D1ACA /* scene_manager */ = {
+			isa = PBXGroup;
+			children = (
+				9201FF3318D5A444003D1ACA /* encode_isom.dep */,
+				9201FF3418D5A444003D1ACA /* loader_bt.dep */,
+				9201FF3518D5A444003D1ACA /* loader_isom.dep */,
+				9201FF3618D5A444003D1ACA /* loader_qt.dep */,
+				9201FF3718D5A444003D1ACA /* loader_svg.dep */,
+				9201FF3818D5A444003D1ACA /* loader_xmt.dep */,
+				9201FF3918D5A444003D1ACA /* scene_dump.dep */,
+				9201FF3A18D5A444003D1ACA /* scene_engine.dep */,
+				9201FF3B18D5A444003D1ACA /* scene_manager.dep */,
+				9201FF3C18D5A444003D1ACA /* scene_stats.dep */,
+				9201FF3D18D5A444003D1ACA /* swf_bifs.dep */,
+				9201FF3E18D5A444003D1ACA /* swf_parse.dep */,
+				9201FF3F18D5A444003D1ACA /* swf_svg.dep */,
+				9201FF4018D5A444003D1ACA /* text_to_bifs.dep */,
+			);
+			path = scene_manager;
+			sourceTree = "<group>";
+		};
+		9201FF4118D5A444003D1ACA /* scenegraph */ = {
+			isa = PBXGroup;
+			children = (
+				9201FF4218D5A444003D1ACA /* base_scenegraph.dep */,
+				9201FF4318D5A444003D1ACA /* commands.dep */,
+				9201FF4418D5A444003D1ACA /* dom_events.dep */,
+				9201FF4518D5A444003D1ACA /* dom_smjs.dep */,
+				9201FF4618D5A444003D1ACA /* html5_media_smjs.dep */,
+				9201FF4718D5A444003D1ACA /* html5_mse_smjs.dep */,
+				9201FF4818D5A444003D1ACA /* mpeg4_animators.dep */,
+				9201FF4918D5A444003D1ACA /* mpeg4_nodes.dep */,
+				9201FF4A18D5A444003D1ACA /* mpeg4_valuator.dep */,
+				9201FF4B18D5A444003D1ACA /* smil_anim.dep */,
+				9201FF4C18D5A444003D1ACA /* smil_timing.dep */,
+				9201FF4D18D5A444003D1ACA /* svg_attributes.dep */,
+				9201FF4E18D5A444003D1ACA /* svg_properties.dep */,
+				9201FF4F18D5A444003D1ACA /* svg_smjs.dep */,
+				9201FF5018D5A444003D1ACA /* svg_types.dep */,
+				9201FF5118D5A444003D1ACA /* vrml_interpolators.dep */,
+				9201FF5218D5A444003D1ACA /* vrml_proto.dep */,
+				9201FF5318D5A444003D1ACA /* vrml_route.dep */,
+				9201FF5418D5A444003D1ACA /* vrml_script.dep */,
+				9201FF5518D5A444003D1ACA /* vrml_smjs.dep */,
+				9201FF5618D5A444003D1ACA /* vrml_tools.dep */,
+				9201FF5718D5A444003D1ACA /* webvtt_smjs.dep */,
+				9201FF5818D5A444003D1ACA /* x3d_nodes.dep */,
+				9201FF5918D5A444003D1ACA /* xbl_process.dep */,
+				9201FF5A18D5A444003D1ACA /* xml_ns.dep */,
+			);
+			path = scenegraph;
+			sourceTree = "<group>";
+		};
+		9201FF5B18D5A444003D1ACA /* terminal */ = {
+			isa = PBXGroup;
+			children = (
+				9201FF5C18D5A444003D1ACA /* channel.dep */,
+				9201FF5D18D5A444003D1ACA /* clock.dep */,
+				9201FF5E18D5A444003D1ACA /* decoder.dep */,
+				9201FF5F18D5A444003D1ACA /* input_sensor.dep */,
+				9201FF6018D5A444003D1ACA /* media_control.dep */,
+				9201FF6118D5A444003D1ACA /* media_manager.dep */,
+				9201FF6218D5A444003D1ACA /* media_memory.dep */,
+				9201FF6318D5A444003D1ACA /* media_object.dep */,
+				9201FF6418D5A444003D1ACA /* media_sensor.dep */,
+				9201FF6518D5A444003D1ACA /* mpeg4_inline.dep */,
+				9201FF6618D5A444003D1ACA /* network_service.dep */,
+				9201FF6718D5A444003D1ACA /* object_browser.dep */,
+				9201FF6818D5A444003D1ACA /* object_manager.dep */,
+				9201FF6918D5A444003D1ACA /* scene.dep */,
+				9201FF6A18D5A444003D1ACA /* svg_external.dep */,
+				9201FF6B18D5A444003D1ACA /* term_node_init.dep */,
+				9201FF6C18D5A444003D1ACA /* terminal.dep */,
+			);
+			path = terminal;
+			sourceTree = "<group>";
+		};
+		9201FF6D18D5A444003D1ACA /* utils */ = {
+			isa = PBXGroup;
+			children = (
+				9201FF6E18D5A444003D1ACA /* alloc.dep */,
+				9201FF6F18D5A444003D1ACA /* base_encoding.dep */,
+				9201FF7018D5A444003D1ACA /* bitstream.dep */,
+				9201FF7118D5A444003D1ACA /* cache.dep */,
+				9201FF7218D5A444003D1ACA /* color.dep */,
+				9201FF7318D5A444003D1ACA /* configfile.dep */,
+				9201FF7418D5A444003D1ACA /* downloader.dep */,
+				9201FF7518D5A444003D1ACA /* error.dep */,
+				9201FF7618D5A444003D1ACA /* list.dep */,
+				9201FF7718D5A444003D1ACA /* map.dep */,
+				9201FF7818D5A444003D1ACA /* math.dep */,
+				9201FF7918D5A444003D1ACA /* module.dep */,
+				9201FF7A18D5A444003D1ACA /* os_config_init.dep */,
+				9201FF7B18D5A444003D1ACA /* os_divers.dep */,
+				9201FF7C18D5A444003D1ACA /* os_module.dep */,
+				9201FF7D18D5A444003D1ACA /* os_net.dep */,
+				9201FF7E18D5A444003D1ACA /* os_thread.dep */,
+				9201FF7F18D5A444003D1ACA /* path2d.dep */,
+				9201FF8018D5A444003D1ACA /* path2d_stroker.dep */,
+				9201FF8118D5A444003D1ACA /* ringbuffer.dep */,
+				9201FF8218D5A444003D1ACA /* sha1.dep */,
+				9201FF8318D5A444003D1ACA /* token.dep */,
+				9201FF8418D5A444003D1ACA /* uni_bidi.dep */,
+				9201FF8518D5A444003D1ACA /* unicode.dep */,
+				9201FF8618D5A444003D1ACA /* url.dep */,
+				9201FF8718D5A444003D1ACA /* utf.dep */,
+				9201FF8818D5A444003D1ACA /* xml_parser.dep */,
+			);
+			path = utils;
+			sourceTree = "<group>";
+		};
+		9201FF8918D5A444003D1ACA /* bifs */ = {
+			isa = PBXGroup;
+			children = (
+				9201FF8A18D5A444003D1ACA /* arith_decoder.c */,
+				9201FF8B18D5A444003D1ACA /* bifs_codec.c */,
+				9201FF8C18D5A444003D1ACA /* bifs_node_tables.c */,
+				9201FF8D18D5A444003D1ACA /* com_dec.c */,
+				9201FF8E18D5A444003D1ACA /* com_enc.c */,
+				9201FF8F18D5A444003D1ACA /* conditional.c */,
+				9201FF9018D5A444003D1ACA /* field_decode.c */,
+				9201FF9118D5A444003D1ACA /* field_encode.c */,
+				9201FF9218D5A444003D1ACA /* memory_decoder.c */,
+				9201FF9318D5A444003D1ACA /* predictive_mffield.c */,
+				9201FF9418D5A444003D1ACA /* quant.h */,
+				9201FF9518D5A444003D1ACA /* quantize.c */,
+				9201FF9618D5A444003D1ACA /* script.h */,
+				9201FF9718D5A444003D1ACA /* script_dec.c */,
+				9201FF9818D5A444003D1ACA /* script_enc.c */,
+				9201FF9918D5A444003D1ACA /* unquantize.c */,
+			);
+			path = bifs;
+			sourceTree = "<group>";
+		};
+		9201FF9A18D5A444003D1ACA /* compositor */ = {
+			isa = PBXGroup;
+			children = (
+				9201FF9B18D5A444003D1ACA /* audio_input.c */,
+				9201FF9C18D5A444003D1ACA /* audio_mixer.c */,
+				9201FF9D18D5A444003D1ACA /* audio_render.c */,
+				9201FF9E18D5A444003D1ACA /* bindable.c */,
+				9201FF9F18D5A444003D1ACA /* camera.c */,
+				9201FFA018D5A444003D1ACA /* compositor.c */,
+				9201FFA118D5A444003D1ACA /* compositor_2d.c */,
+				9201FFA218D5A444003D1ACA /* compositor_3d.c */,
+				9201FFA318D5A444003D1ACA /* compositor_node_init.c */,
+				9201FFA418D5A444003D1ACA /* drawable.c */,
+				9201FFA518D5A444003D1ACA /* drawable.h */,
+				9201FFA618D5A444003D1ACA /* events.c */,
+				9201FFA718D5A444003D1ACA /* font_engine.c */,
+				9201FFA818D5A444003D1ACA /* gl_inc.h */,
+				9201FFA918D5A444003D1ACA /* hardcoded_protos.c */,
+				9201FFAA18D5A444003D1ACA /* hc_flash_shape.c */,
+				9201FFAB18D5A444003D1ACA /* mesh.c */,
+				9201FFAC18D5A444003D1ACA /* mesh_collide.c */,
+				9201FFAD18D5A444003D1ACA /* mesh_tesselate.c */,
+				9201FFAE18D5A444003D1ACA /* mpeg4_animstream.c */,
+				9201FFAF18D5A444003D1ACA /* mpeg4_audio.c */,
+				9201FFB018D5A444003D1ACA /* mpeg4_background.c */,
+				9201FFB118D5A444003D1ACA /* mpeg4_background2d.c */,
+				9201FFB218D5A444003D1ACA /* mpeg4_bitmap.c */,
+				9201FFB318D5A444003D1ACA /* mpeg4_composite.c */,
+				9201FFB418D5A444003D1ACA /* mpeg4_form.c */,
+				9201FFB518D5A444003D1ACA /* mpeg4_geometry_2d.c */,
+				9201FFB618D5A444003D1ACA /* mpeg4_geometry_3d.c */,
+				9201FFB718D5A444003D1ACA /* mpeg4_geometry_ifs2d.c */,
+				9201FFB818D5A444003D1ACA /* mpeg4_geometry_ils2d.c */,
+				9201FFB918D5A444003D1ACA /* mpeg4_gradients.c */,
+				9201FFBA18D5A444003D1ACA /* mpeg4_grouping.c */,
+				9201FFBB18D5A444003D1ACA /* mpeg4_grouping.h */,
+				9201FFBC18D5A444003D1ACA /* mpeg4_grouping_2d.c */,
+				9201FFBD18D5A444003D1ACA /* mpeg4_grouping_3d.c */,
+				9201FFBE18D5A444003D1ACA /* mpeg4_layer_2d.c */,
+				9201FFBF18D5A444003D1ACA /* mpeg4_layer_3d.c */,
+				9201FFC018D5A444003D1ACA /* mpeg4_layout.c */,
+				9201FFC118D5A444003D1ACA /* mpeg4_lighting.c */,
+				9201FFC218D5A444003D1ACA /* mpeg4_path_layout.c */,
+				9201FFC318D5A444003D1ACA /* mpeg4_sensors.c */,
+				9201FFC418D5A444003D1ACA /* mpeg4_sound.c */,
+				9201FFC518D5A444003D1ACA /* mpeg4_text.c */,
+				9201FFC618D5A444003D1ACA /* mpeg4_textures.c */,
+				9201FFC718D5A444003D1ACA /* mpeg4_timesensor.c */,
+				9201FFC818D5A444003D1ACA /* mpeg4_viewport.c */,
+				9201FFC918D5A444003D1ACA /* navigate.c */,
+				9201FFCA18D5A444003D1ACA /* nodes_stacks.h */,
+				9201FFCB18D5A444003D1ACA /* offscreen_cache.c */,
+				9201FFCC18D5A444003D1ACA /* offscreen_cache.h */,
+				9201FFCD18D5A444003D1ACA /* svg_base.c */,
+				9201FFCE18D5A444003D1ACA /* svg_filters.c */,
+				9201FFCF18D5A444003D1ACA /* svg_font.c */,
+				9201FFD018D5A444003D1ACA /* svg_geometry.c */,
+				9201FFD118D5A444003D1ACA /* svg_grouping.c */,
+				9201FFD218D5A444003D1ACA /* svg_media.c */,
+				9201FFD318D5A444003D1ACA /* svg_paint_servers.c */,
+				9201FFD418D5A444003D1ACA /* svg_text.c */,
+				9201FFD518D5A444003D1ACA /* texturing.c */,
+				9201FFD618D5A444003D1ACA /* texturing.h */,
+				9201FFD718D5A444003D1ACA /* texturing_gl.c */,
+				9201FFD818D5A444003D1ACA /* visual_manager.c */,
+				9201FFD918D5A444003D1ACA /* visual_manager.h */,
+				9201FFDA18D5A444003D1ACA /* visual_manager_2d.c */,
+				9201FFDB18D5A444003D1ACA /* visual_manager_2d.h */,
+				9201FFDC18D5A444003D1ACA /* visual_manager_2d_draw.c */,
+				9201FFDD18D5A444003D1ACA /* visual_manager_3d.c */,
+				9201FFDE18D5A444003D1ACA /* visual_manager_3d.h */,
+				9201FFDF18D5A444003D1ACA /* visual_manager_3d_gl.c */,
+				9201FFE018D5A444003D1ACA /* x3d_geometry.c */,
+			);
+			path = compositor;
+			sourceTree = "<group>";
+		};
+		9201FFE318D5A444003D1ACA /* ietf */ = {
+			isa = PBXGroup;
+			children = (
+				9201FFE418D5A444003D1ACA /* rtcp.c */,
+				9201FFE518D5A444003D1ACA /* rtp.c */,
+				9201FFE618D5A444003D1ACA /* rtp_depacketizer.c */,
+				9201FFE718D5A444003D1ACA /* rtp_packetizer.c */,
+				9201FFE818D5A444003D1ACA /* rtp_pck_3gpp.c */,
+				9201FFE918D5A444003D1ACA /* rtp_pck_mpeg12.c */,
+				9201FFEA18D5A444003D1ACA /* rtp_pck_mpeg4.c */,
+				9201FFEB18D5A444003D1ACA /* rtp_streamer.c */,
+				9201FFEC18D5A444003D1ACA /* rtsp_command.c */,
+				9201FFED18D5A444003D1ACA /* rtsp_common.c */,
+				9201FFEE18D5A444003D1ACA /* rtsp_response.c */,
+				9201FFEF18D5A444003D1ACA /* rtsp_session.c */,
+				9201FFF018D5A444003D1ACA /* sdp.c */,
+			);
+			path = ietf;
+			sourceTree = "<group>";
+		};
+		9201FFF118D5A444003D1ACA /* isomedia */ = {
+			isa = PBXGroup;
+			children = (
+				9201FFF218D5A444003D1ACA /* avc_ext.c */,
+				9201FFF318D5A444003D1ACA /* box_code_3gpp.c */,
+				9201FFF418D5A444003D1ACA /* box_code_adobe.c */,
+				9201FFF518D5A444003D1ACA /* box_code_apple.c */,
+				9201FFF618D5A444003D1ACA /* box_code_base.c */,
+				9201FFF718D5A444003D1ACA /* box_code_drm.c */,
+				9201FFF818D5A444003D1ACA /* box_code_meta.c */,
+				9201FFF918D5A444003D1ACA /* box_dump.c */,
+				9201FFFA18D5A444003D1ACA /* box_funcs.c */,
+				9201FFFB18D5A444003D1ACA /* data_map.c */,
+				9201FFFC18D5A444003D1ACA /* drm_sample.c */,
+				9201FFFD18D5A444003D1ACA /* generic_subtitle.o */,
+				9201FFFE18D5A444003D1ACA /* hint_track.c */,
+				9201FFFF18D5A444003D1ACA /* hinting.c */,
+				9201000018D5A444003D1ACA /* isom_intern.c */,
+				9201000118D5A444003D1ACA /* isom_read.c */,
+				9201000218D5A444003D1ACA /* isom_store.c */,
+				9201000318D5A444003D1ACA /* isom_write.c */,
+				9201000418D5A444003D1ACA /* media.c */,
+				9201000518D5A444003D1ACA /* media_odf.c */,
+				9201000618D5A444003D1ACA /* meta.c */,
+				9201000718D5A444003D1ACA /* movie_fragments.c */,
+				9201000818D5A444003D1ACA /* sample_descs.c */,
+				9201000918D5A444003D1ACA /* stbl_read.c */,
+				9201000A18D5A444003D1ACA /* stbl_write.c */,
+				9201000B18D5A444003D1ACA /* track.c */,
+				9201000C18D5A444003D1ACA /* ttml.c */,
+				9201000D18D5A444003D1ACA /* tx3g.c */,
+			);
+			path = isomedia;
+			sourceTree = "<group>";
+		};
+		9225732918D7267D00D6FD98 /* ogg_in */ = {
+			isa = PBXGroup;
+			children = (
+				9225732A18D7269700D6FD98 /* ogg_in.c */,
+				9225732B18D7269700D6FD98 /* ogg_in.h */,
+				9225732C18D7269700D6FD98 /* ogg_load.c */,
+				9225732D18D7269700D6FD98 /* theora_dec.c */,
+				9225732E18D7269700D6FD98 /* vorbis_dec.c */,
+			);
+			name = ogg_in;
+			sourceTree = "<group>";
+		};
+		92AAF0D718D6DB3400E2FF12 /* sdl_out */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF0D818D6DB5500E2FF12 /* audio.c */,
+				92AAF0DA18D6DB5500E2FF12 /* sdl_out.c */,
+				92AAF0DB18D6DB5500E2FF12 /* sdl_out.h */,
+				92AAF0DC18D6DB5500E2FF12 /* video.c */,
+			);
+			name = sdl_out;
 			sourceTree = "<group>";
 		};
-		717BB4D9115259A000A39D3D /* applications */ = {
+		92AAF0E918D6E35200E2FF12 /* builtin_modules */ = {
 			isa = PBXGroup;
 			children = (
-				717BB4DA115259C000A39D3D /* generators */,
-				717BB527115259C000A39D3D /* GPAX */,
-				717BB53B115259C000A39D3D /* Makefile */,
-				717BB53C115259C000A39D3D /* mp4box */,
-				717BB543115259C000A39D3D /* mp4client */,
-				717BB548115259C000A39D3D /* mp42avi */,
-				717BB54C115259C000A39D3D /* osmo4_sym */,
-				717BB564115259C000A39D3D /* osmo4_w32 */,
-				717BB585115259C000A39D3D /* osmo4_wce */,
-				717BB59B115259C000A39D3D /* osmo4_wx */,
-				717BB5B1115259C000A39D3D /* osmophone */,
-				717BB5B9115259C000A39D3D /* osmozilla */,
-				717BB5CB115259C000A39D3D /* testapps */,
-				717BB60F115259C000A39D3D /* v4studio */,
+				92AAF0F318D6E5BB00E2FF12 /* audio_filter */,
+				92AAF0F618D6E5EA00E2FF12 /* bifs_dec */,
+				92AAF0F918D6E60B00E2FF12 /* ctx_load */,
+				92AAF0FC18D6E63400E2FF12 /* dummy_in */,
+				92AAF0FF18D6E66000E2FF12 /* gpac_js */,
+				92AAF10218D6E67A00E2FF12 /* img_in */,
+				92AAF11118D6E6A300E2FF12 /* isma_cenc */,
+				92AAF11418D6E6C400E2FF12 /* isom_in */,
+				92AAF11F18D6E6E300E2FF12 /* laser_dec */,
+				92AAF12218D6E6FE00E2FF12 /* mpd_in */,
+				92AAF12518D6E71C00E2FF12 /* mpegts_in */,
+				92AAF12818D6E73700E2FF12 /* mse_in */,
+				92AAF12B18D6E74F00E2FF12 /* odf_dec */,
+				92AAF12E18D6E76400E2FF12 /* osd */,
+				92BE50DF18D6D7F800AA59D8 /* raw_out */,
+				92AAF13118D6E7AB00E2FF12 /* rtp_in */,
+				92AAF14018D6E7CA00E2FF12 /* saf_in */,
+				92BE511918D6DA7100AA59D8 /* soft_raster */,
+				92AAF14318D6E7E400E2FF12 /* svg_dec */,
+				92AAF14618D6E81700E2FF12 /* timed_text */,
+				92AAF14B18D6E82A00E2FF12 /* validator */,
+				92AAF1D418D7108600E2FF12 /* vtt_in */,
+				92AAF14E18D6E85D00E2FF12 /* widget_man */,
+			);
+			name = builtin_modules;
+			path = ../build/xcode;
+			sourceTree = "<group>";
+		};
+		92AAF0F318D6E5BB00E2FF12 /* audio_filter */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF0F418D6E5D400E2FF12 /* audio_filter.c */,
+			);
+			name = audio_filter;
+			sourceTree = "<group>";
+		};
+		92AAF0F618D6E5EA00E2FF12 /* bifs_dec */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF0F718D6E5FD00E2FF12 /* bifs_dec.c */,
+			);
+			name = bifs_dec;
+			sourceTree = "<group>";
+		};
+		92AAF0F918D6E60B00E2FF12 /* ctx_load */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF0FA18D6E62600E2FF12 /* ctx_load.c */,
+			);
+			name = ctx_load;
+			sourceTree = "<group>";
+		};
+		92AAF0FC18D6E63400E2FF12 /* dummy_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF0FD18D6E64800E2FF12 /* dummy_in.c */,
+			);
+			name = dummy_in;
+			sourceTree = "<group>";
+		};
+		92AAF0FF18D6E66000E2FF12 /* gpac_js */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF10018D6E66D00E2FF12 /* gpac_js.c */,
+			);
+			name = gpac_js;
+			sourceTree = "<group>";
+		};
+		92AAF10218D6E67A00E2FF12 /* img_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF10318D6E69500E2FF12 /* bmp_dec.c */,
+				92AAF10418D6E69500E2FF12 /* img_dec.c */,
+				92AAF10518D6E69500E2FF12 /* img_in.c */,
+				92AAF10618D6E69500E2FF12 /* img_in.h */,
+				92AAF10718D6E69500E2FF12 /* jp2_dec.c */,
+				92AAF10818D6E69500E2FF12 /* jpeg_dec.c */,
+				92AAF10918D6E69500E2FF12 /* png_dec.c */,
+			);
+			name = img_in;
+			sourceTree = "<group>";
+		};
+		92AAF11118D6E6A300E2FF12 /* isma_cenc */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF11218D6E6B700E2FF12 /* isma_ea.c */,
+			);
+			name = isma_cenc;
+			sourceTree = "<group>";
+		};
+		92AAF11418D6E6C400E2FF12 /* isom_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF11518D6E6D300E2FF12 /* isom_cache.c */,
+				92AAF11618D6E6D300E2FF12 /* isom_in.h */,
+				92AAF11718D6E6D300E2FF12 /* load.c */,
+				92AAF11818D6E6D300E2FF12 /* read_ch.c */,
+				92AAF11918D6E6D300E2FF12 /* read.c */,
+			);
+			name = isom_in;
+			sourceTree = "<group>";
+		};
+		92AAF11F18D6E6E300E2FF12 /* laser_dec */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF12018D6E6F300E2FF12 /* laser_dec.c */,
+			);
+			name = laser_dec;
+			sourceTree = "<group>";
+		};
+		92AAF12218D6E6FE00E2FF12 /* mpd_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF12318D6E70D00E2FF12 /* mpd_in.c */,
+			);
+			name = mpd_in;
+			sourceTree = "<group>";
+		};
+		92AAF12518D6E71C00E2FF12 /* mpegts_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF12618D6E72800E2FF12 /* mpegts_in.c */,
+			);
+			name = mpegts_in;
+			sourceTree = "<group>";
+		};
+		92AAF12818D6E73700E2FF12 /* mse_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF12918D6E74200E2FF12 /* mse_in.c */,
+			);
+			name = mse_in;
+			sourceTree = "<group>";
+		};
+		92AAF12B18D6E74F00E2FF12 /* odf_dec */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF12C18D6E75800E2FF12 /* odf_dec.c */,
+			);
+			name = odf_dec;
+			sourceTree = "<group>";
+		};
+		92AAF12E18D6E76400E2FF12 /* osd */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF12F18D6E77900E2FF12 /* osd.c */,
+			);
+			name = osd;
+			sourceTree = "<group>";
+		};
+		92AAF13118D6E7AB00E2FF12 /* rtp_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF13218D6E7BC00E2FF12 /* rtp_in.c */,
+				92AAF13318D6E7BC00E2FF12 /* rtp_in.h */,
+				92AAF13418D6E7BC00E2FF12 /* rtp_session.c */,
+				92AAF13518D6E7BC00E2FF12 /* rtp_signaling.c */,
+				92AAF13618D6E7BC00E2FF12 /* rtp_stream.c */,
+				92AAF13718D6E7BC00E2FF12 /* sdp_fetch.c */,
+				92AAF13818D6E7BC00E2FF12 /* sdp_load.c */,
+			);
+			name = rtp_in;
+			sourceTree = "<group>";
+		};
+		92AAF14018D6E7CA00E2FF12 /* saf_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF14118D6E7D800E2FF12 /* saf_in.c */,
+			);
+			name = saf_in;
+			sourceTree = "<group>";
+		};
+		92AAF14318D6E7E400E2FF12 /* svg_dec */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF14418D6E7F500E2FF12 /* svg_in.c */,
+			);
+			name = svg_dec;
+			sourceTree = "<group>";
+		};
+		92AAF14618D6E81700E2FF12 /* timed_text */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF14718D6E82500E2FF12 /* timedtext_dec.c */,
+				92AAF14818D6E82500E2FF12 /* timedtext_in.c */,
+			);
+			name = timed_text;
+			sourceTree = "<group>";
+		};
+		92AAF14B18D6E82A00E2FF12 /* validator */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF14C18D6E83B00E2FF12 /* validator.c */,
+			);
+			name = validator;
+			sourceTree = "<group>";
+		};
+		92AAF14E18D6E85D00E2FF12 /* widget_man */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF14F18D6E87500E2FF12 /* unzip.c */,
+				92AAF15018D6E87500E2FF12 /* unzip.h */,
+				92AAF15118D6E87500E2FF12 /* wgt_load.c */,
+				92AAF15218D6E87500E2FF12 /* widget.c */,
+				92AAF15318D6E87500E2FF12 /* widgetman.c */,
+				92AAF15418D6E87500E2FF12 /* widgetman.h */,
+			);
+			name = widget_man;
+			sourceTree = "<group>";
+		};
+		92AAF16A18D6F49D00E2FF12 /* ft_font */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF16B18D6F5EA00E2FF12 /* ft_font.c */,
+				92AAF16C18D6F5EA00E2FF12 /* ft_font.h */,
+			);
+			name = ft_font;
+			sourceTree = "<group>";
+		};
+		92AAF17D18D6F8DB00E2FF12 /* aac_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF17E18D6F8EF00E2FF12 /* aac_in.c */,
+				92AAF17F18D6F8EF00E2FF12 /* faad_dec.c */,
+			);
+			name = aac_in;
+			sourceTree = "<group>";
+		};
+		92AAF18C18D6FA1A00E2FF12 /* ac3_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF18D18D6FA2C00E2FF12 /* ac3_in.c */,
+				92AAF18E18D6FA2C00E2FF12 /* liba52_dec.c */,
+			);
+			name = ac3_in;
+			sourceTree = "<group>";
+		};
+		92AAF19D18D6FDE000E2FF12 /* ffmpeg_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF19E18D6FDF300E2FF12 /* ffmpeg_decode.c */,
+				92AAF19F18D6FDF300E2FF12 /* ffmpeg_demux.c */,
+				92AAF1A018D6FDF300E2FF12 /* ffmpeg_in.h */,
+				92AAF1A118D6FDF300E2FF12 /* ffmpeg_load.c */,
+			);
+			name = ffmpeg_in;
+			sourceTree = "<group>";
+		};
+		92AAF1B218D709E700E2FF12 /* mp3_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF1B318D70A0A00E2FF12 /* mad_dec.c */,
+				92AAF1B418D70A0A00E2FF12 /* mp3_in.c */,
+			);
+			name = mp3_in;
+			sourceTree = "<group>";
+		};
+		92AAF1C218D70B3000E2FF12 /* openhevc_dec */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF1C318D70B4100E2FF12 /* openhevc_dec.c */,
+			);
+			name = openhevc_dec;
+			sourceTree = "<group>";
+		};
+		92AAF1CF18D70D3E00E2FF12 /* opensvc_dec */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF1D018D70D4B00E2FF12 /* opensvc_dec.c */,
+			);
+			name = opensvc_dec;
+			sourceTree = "<group>";
+		};
+		92AAF1D418D7108600E2FF12 /* vtt_in */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF1D518D7109A00E2FF12 /* vtt_dec.c */,
+				92AAF1D618D7109A00E2FF12 /* vtt_in.c */,
+			);
+			name = vtt_in;
+			sourceTree = "<group>";
+		};
+		92AAF1E418D712A300E2FF12 /* x11_out */ = {
+			isa = PBXGroup;
+			children = (
+				92AAF1E718D712C500E2FF12 /* x11_out.c */,
+				92AAF1E818D712C500E2FF12 /* x11_out.h */,
+			);
+			name = x11_out;
+			sourceTree = "<group>";
+		};
+		92BE509218D6325E00AA59D8 /* MP4Box */ = {
+			isa = PBXGroup;
+			children = (
+				92BE50A418D6348A00AA59D8 /* filedump.c */,
+				92BE50A518D6348A00AA59D8 /* fileimport.c */,
+				92BE50A618D6348A00AA59D8 /* live.c */,
+				92BE50A718D6348A00AA59D8 /* main.c */,
+			);
+			path = MP4Box;
+			sourceTree = "<group>";
+		};
+		92BE50AC18D6375100AA59D8 /* applications */ = {
+			isa = PBXGroup;
+			children = (
+				92BE50C918D6D60100AA59D8 /* MP4Client */,
+				92BE50B518D6D53000AA59D8 /* MP42TS */,
+				92BE509218D6325E00AA59D8 /* MP4Box */,
 			);
 			name = applications;
 			sourceTree = "<group>";
 		};
+		92BE50AD18D6376A00AA59D8 /* modules */ = {
+			isa = PBXGroup;
+			children = (
+				9225732918D7267D00D6FD98 /* ogg_in */,
+				92AAF17D18D6F8DB00E2FF12 /* aac_in */,
+				92AAF18C18D6FA1A00E2FF12 /* ac3_in */,
+				92AAF19D18D6FDE000E2FF12 /* ffmpeg_in */,
+				92AAF16A18D6F49D00E2FF12 /* ft_font */,
+				92AAF1B218D709E700E2FF12 /* mp3_in */,
+				92AAF1C218D70B3000E2FF12 /* openhevc_dec */,
+				92AAF1CF18D70D3E00E2FF12 /* opensvc_dec */,
+				92AAF0D718D6DB3400E2FF12 /* sdl_out */,
+				92AAF1E418D712A300E2FF12 /* x11_out */,
+			);
+			name = modules;
+			sourceTree = "<group>";
+		};
+		92BE50AE18D6378C00AA59D8 /* xcode */ = {
+			isa = PBXGroup;
+			children = (
+				9201F93818D5A38A003D1ACA /* Products */,
+				920101CE18D5AC67003D1ACA /* OpenGL.framework */,
+				920101D018D5ACA7003D1ACA /* libz.dylib */,
+			);
+			name = xcode;
+			sourceTree = "<group>";
+		};
+		92BE50B518D6D53000AA59D8 /* MP42TS */ = {
+			isa = PBXGroup;
+			children = (
+				92BE50C118D6D5DC00AA59D8 /* main.c */,
+			);
+			path = MP42TS;
+			sourceTree = "<group>";
+		};
+		92BE50C918D6D60100AA59D8 /* MP4Client */ = {
+			isa = PBXGroup;
+			children = (
+				92BE50D118D6D62600AA59D8 /* extract.c */,
+				92BE50D218D6D62600AA59D8 /* main.c */,
+			);
+			path = MP4Client;
+			sourceTree = "<group>";
+		};
+		92BE50DF18D6D7F800AA59D8 /* raw_out */ = {
+			isa = PBXGroup;
+			children = (
+				92BE50FD18D6D9EE00AA59D8 /* raw_video.c */,
+			);
+			name = raw_out;
+			sourceTree = "<group>";
+		};
+		92BE511918D6DA7100AA59D8 /* soft_raster */ = {
+			isa = PBXGroup;
+			children = (
+				92BE510918D6DA6300AA59D8 /* ftgrays.c */,
+				92BE510A18D6DA6300AA59D8 /* rast_soft.h */,
+				92BE510B18D6DA6300AA59D8 /* raster_565.c */,
+				92BE510C18D6DA6300AA59D8 /* raster_argb.c */,
+				92BE510D18D6DA6300AA59D8 /* raster_load.c */,
+				92BE510E18D6DA6300AA59D8 /* raster_rgb.c */,
+				92BE510F18D6DA6300AA59D8 /* stencil.c */,
+				92BE511018D6DA6300AA59D8 /* surface.c */,
+			);
+			name = soft_raster;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
-/* Begin PBXLegacyTarget section */
-		717BAE39115238D100A39D3D /* libgpac */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = 717BAE3E115238D800A39D3D /* Build configuration list for PBXLegacyTarget "libgpac" */;
+/* Begin PBXHeadersBuildPhase section */
+		9201F93518D5A38A003D1ACA /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				920100BA18D5A444003D1ACA /* quant.h in Headers */,
+				920100BC18D5A444003D1ACA /* script.h in Headers */,
+				920100CA18D5A444003D1ACA /* drawable.h in Headers */,
+				920100CD18D5A444003D1ACA /* gl_inc.h in Headers */,
+				920100E018D5A444003D1ACA /* mpeg4_grouping.h in Headers */,
+				920100EF18D5A444003D1ACA /* nodes_stacks.h in Headers */,
+				920100F118D5A444003D1ACA /* offscreen_cache.h in Headers */,
+				920100FB18D5A444003D1ACA /* texturing.h in Headers */,
+				920100FE18D5A444003D1ACA /* visual_manager.h in Headers */,
+				9201010018D5A444003D1ACA /* visual_manager_2d.h in Headers */,
+				9201010318D5A444003D1ACA /* visual_manager_3d.h in Headers */,
+				9201015718D5A445003D1ACA /* mpeg2_ps.h in Headers */,
+				9201019618D5A445003D1ACA /* input_sensor.h in Headers */,
+				9201019818D5A445003D1ACA /* media_control.h in Headers */,
+				9201019B18D5A445003D1ACA /* media_memory.h in Headers */,
+				920101B418D5A445003D1ACA /* module_wrap.h in Headers */,
+				92AAF0EC18D6E5AA00E2FF12 /* rast_soft.h in Headers */,
+				92AAF10D18D6E69500E2FF12 /* img_in.h in Headers */,
+				92AAF11B18D6E6D300E2FF12 /* isom_in.h in Headers */,
+				92AAF13A18D6E7BC00E2FF12 /* rtp_in.h in Headers */,
+				92AAF15618D6E87500E2FF12 /* unzip.h in Headers */,
+				92AAF15A18D6E87500E2FF12 /* widgetman.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		9225732218D7267900D6FD98 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				9225733018D7269700D6FD98 /* ogg_in.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF0D118D6DB2D00E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF0E618D6DB8600E2FF12 /* sdl_out.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF16318D6F40400E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF16E18D6F5EB00E2FF12 /* ft_font.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF17618D6F89B00E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF18618D6FA1100E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF19618D6FDC300E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1A818D6FDFA00E2FF12 /* ffmpeg_in.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1AC18D709D900E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1BC18D70B1C00E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1C918D70C3100E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1DD18D7126900E2FF12 /* Headers */ = {
+			isa = PBXHeadersBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1EB18D712C500E2FF12 /* x11_out.h in Headers */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXHeadersBuildPhase section */
+
+/* Begin PBXNativeTarget section */
+		9201F93618D5A38A003D1ACA /* libgpac */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 9201F93B18D5A38A003D1ACA /* Build configuration list for PBXNativeTarget "libgpac" */;
 			buildPhases = (
+				9201F93318D5A38A003D1ACA /* Sources */,
+				9201F93418D5A38A003D1ACA /* Frameworks */,
+				9201F93518D5A38A003D1ACA /* Headers */,
+			);
+			buildRules = (
+				920101C918D5A605003D1ACA /* PBXBuildRule */,
 			);
-			buildToolPath = /usr/bin/make;
-			buildWorkingDirectory = $SOURCE_ROOT/../../src;
 			dependencies = (
 			);
 			name = libgpac;
-			passBuildSettingsInEnvironment = 1;
 			productName = libgpac;
+			productReference = 9201F93718D5A38A003D1ACA /* libgpac.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
 		};
-		717BB4D11152588A00A39D3D /* MP4Client */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = 717BB4D6115258CE00A39D3D /* Build configuration list for PBXLegacyTarget "MP4Client" */;
+		9225732318D7267900D6FD98 /* ogg_in */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 9225732718D7267900D6FD98 /* Build configuration list for PBXNativeTarget "ogg_in" */;
 			buildPhases = (
+				9225732018D7267900D6FD98 /* Sources */,
+				9225732118D7267900D6FD98 /* Frameworks */,
+				9225732218D7267900D6FD98 /* Headers */,
+			);
+			buildRules = (
 			);
-			buildToolPath = /usr/bin/make;
-			buildWorkingDirectory = $SOURCE_ROOT/../../applications/mp4client;
 			dependencies = (
 			);
-			name = MP4Client;
-			passBuildSettingsInEnvironment = 1;
-			productName = MP4Client;
+			name = ogg_in;
+			productName = ogg_in;
+			productReference = 9225732418D7267900D6FD98 /* gm_ogg_in.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
 		};
-		717BB66611525A4D00A39D3D /* MP4Box */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = "$(ACTION)";
-			buildConfigurationList = 717BB66B11525A8700A39D3D /* Build configuration list for PBXLegacyTarget "MP4Box" */;
+		92AAF0D218D6DB2D00E2FF12 /* sdl_out */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF0D418D6DB2D00E2FF12 /* Build configuration list for PBXNativeTarget "sdl_out" */;
 			buildPhases = (
+				92AAF0CF18D6DB2D00E2FF12 /* Sources */,
+				92AAF0D018D6DB2D00E2FF12 /* Frameworks */,
+				92AAF0D118D6DB2D00E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = sdl_out;
+			productName = sdl_out;
+			productReference = 92AAF0D318D6DB2D00E2FF12 /* gm_sdl_out.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92AAF16418D6F40400E2FF12 /* ft_font */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF16818D6F40400E2FF12 /* Build configuration list for PBXNativeTarget "ft_font" */;
+			buildPhases = (
+				92AAF16118D6F40400E2FF12 /* Sources */,
+				92AAF16218D6F40400E2FF12 /* Frameworks */,
+				92AAF16318D6F40400E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ft_font;
+			productName = ft_font;
+			productReference = 92AAF16518D6F40400E2FF12 /* gm_ft_font.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92AAF17718D6F89B00E2FF12 /* aac_in */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF17918D6F89B00E2FF12 /* Build configuration list for PBXNativeTarget "aac_in" */;
+			buildPhases = (
+				92AAF17418D6F89B00E2FF12 /* Sources */,
+				92AAF17518D6F89B00E2FF12 /* Frameworks */,
+				92AAF17618D6F89B00E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = aac_in;
+			productName = aac_in;
+			productReference = 92AAF17818D6F89B00E2FF12 /* gm_aac_in.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92AAF18718D6FA1100E2FF12 /* ac3_in */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF18918D6FA1200E2FF12 /* Build configuration list for PBXNativeTarget "ac3_in" */;
+			buildPhases = (
+				92AAF18418D6FA1100E2FF12 /* Sources */,
+				92AAF18518D6FA1100E2FF12 /* Frameworks */,
+				92AAF18618D6FA1100E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ac3_in;
+			productName = ac3_in;
+			productReference = 92AAF18818D6FA1100E2FF12 /* gm_ac3_in.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92AAF19718D6FDC300E2FF12 /* ffmpeg_in */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF19918D6FDC300E2FF12 /* Build configuration list for PBXNativeTarget "ffmpeg_in" */;
+			buildPhases = (
+				92AAF19418D6FDC300E2FF12 /* Sources */,
+				92AAF19518D6FDC300E2FF12 /* Frameworks */,
+				92AAF19618D6FDC300E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = ffmpeg_in;
+			productName = ffmpeg_in;
+			productReference = 92AAF19818D6FDC300E2FF12 /* gm_ffmpeg_in.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92AAF1AD18D709D900E2FF12 /* mp3_in */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF1AF18D709D900E2FF12 /* Build configuration list for PBXNativeTarget "mp3_in" */;
+			buildPhases = (
+				92AAF1AA18D709D900E2FF12 /* Sources */,
+				92AAF1AB18D709D900E2FF12 /* Frameworks */,
+				92AAF1AC18D709D900E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = mp3_in;
+			productName = mp3_in;
+			productReference = 92AAF1AE18D709D900E2FF12 /* gm_mp3_in.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92AAF1BD18D70B1C00E2FF12 /* openhevc_dec */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF1BF18D70B1C00E2FF12 /* Build configuration list for PBXNativeTarget "openhevc_dec" */;
+			buildPhases = (
+				92AAF1BA18D70B1C00E2FF12 /* Sources */,
+				92AAF1BB18D70B1C00E2FF12 /* Frameworks */,
+				92AAF1BC18D70B1C00E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = openhevc_dec;
+			productName = openhevc_dec;
+			productReference = 92AAF1BE18D70B1C00E2FF12 /* gm_openhevc_dec.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92AAF1CA18D70C3100E2FF12 /* opensvc_dec */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF1CC18D70C3100E2FF12 /* Build configuration list for PBXNativeTarget "opensvc_dec" */;
+			buildPhases = (
+				92AAF1C718D70C3100E2FF12 /* Sources */,
+				92AAF1C818D70C3100E2FF12 /* Frameworks */,
+				92AAF1C918D70C3100E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = opensvc_dec;
+			productName = opensvc_dec;
+			productReference = 92AAF1CB18D70C3100E2FF12 /* gm_opensvc_dec.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92AAF1DE18D7126900E2FF12 /* x11_out */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92AAF1E018D7126900E2FF12 /* Build configuration list for PBXNativeTarget "x11_out" */;
+			buildPhases = (
+				92AAF1DB18D7126900E2FF12 /* Sources */,
+				92AAF1DC18D7126900E2FF12 /* Frameworks */,
+				92AAF1DD18D7126900E2FF12 /* Headers */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = x11_out;
+			productName = x11_out;
+			productReference = 92AAF1DF18D7126900E2FF12 /* gm_x11_out.dylib */;
+			productType = "com.apple.product-type.library.dynamic";
+		};
+		92BE508F18D6325E00AA59D8 /* MP4Box */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92BE509918D6325E00AA59D8 /* Build configuration list for PBXNativeTarget "MP4Box" */;
+			buildPhases = (
+				92BE508C18D6325E00AA59D8 /* Sources */,
+				92BE508D18D6325E00AA59D8 /* Frameworks */,
+				92BE508E18D6325E00AA59D8 /* CopyFiles */,
+			);
+			buildRules = (
 			);
-			buildToolPath = /usr/bin/make;
-			buildWorkingDirectory = $SOURCE_ROOT/../../applications/mp4box;
 			dependencies = (
 			);
 			name = MP4Box;
-			passBuildSettingsInEnvironment = 1;
 			productName = MP4Box;
+			productReference = 92BE509018D6325E00AA59D8 /* MP4Box */;
+			productType = "com.apple.product-type.tool";
 		};
-		71D7E30411525E11003DF497 /* applications */ = {
-			isa = PBXLegacyTarget;
-			buildArgumentsString = configure;
-			buildConfigurationList = 71D7E30911525E4C003DF497 /* Build configuration list for PBXLegacyTarget "applications" */;
+		92BE50B218D6D53000AA59D8 /* MP42TS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92BE50BA18D6D53000AA59D8 /* Build configuration list for PBXNativeTarget "MP42TS" */;
 			buildPhases = (
+				92BE50AF18D6D53000AA59D8 /* Sources */,
+				92BE50B018D6D53000AA59D8 /* Frameworks */,
+				92BE50B118D6D53000AA59D8 /* CopyFiles */,
+			);
+			buildRules = (
 			);
-			buildToolPath = /bin/bash;
-			buildWorkingDirectory = $SOURCE_ROOT/../../;
 			dependencies = (
 			);
-			name = applications;
-			passBuildSettingsInEnvironment = 1;
-			productName = applications;
+			name = MP42TS;
+			productName = MP42TS;
+			productReference = 92BE50B318D6D53000AA59D8 /* MP42TS */;
+			productType = "com.apple.product-type.tool";
+		};
+		92BE50C618D6D60100AA59D8 /* MP4Client */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 92BE50CE18D6D60100AA59D8 /* Build configuration list for PBXNativeTarget "MP4Client" */;
+			buildPhases = (
+				92BE50C318D6D60100AA59D8 /* Sources */,
+				92BE50C418D6D60100AA59D8 /* Frameworks */,
+				92BE50C518D6D60100AA59D8 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				9225733618D727B500D6FD98 /* PBXTargetDependency */,
+				9225731918D717BD00D6FD98 /* PBXTargetDependency */,
+				9225731718D717BA00D6FD98 /* PBXTargetDependency */,
+				9225731518D717B400D6FD98 /* PBXTargetDependency */,
+				9225731318D717B100D6FD98 /* PBXTargetDependency */,
+				9225731118D717AE00D6FD98 /* PBXTargetDependency */,
+				9225730F18D717AB00D6FD98 /* PBXTargetDependency */,
+				92AAF18318D6F9E700E2FF12 /* PBXTargetDependency */,
+				92AAF17318D6F87A00E2FF12 /* PBXTargetDependency */,
+				92AAF17118D6F87100E2FF12 /* PBXTargetDependency */,
+			);
+			name = MP4Client;
+			productName = MP4Client;
+			productReference = 92BE50C718D6D60100AA59D8 /* MP4Client */;
+			productType = "com.apple.product-type.tool";
 		};
-/* End PBXLegacyTarget section */
+/* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
-		08FB7793FE84155DC02AAC07 /* Project object */ = {
+		9201F92918D5A359003D1ACA /* Project object */ = {
 			isa = PBXProject;
-			buildConfigurationList = 1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "gpac" */;
-			compatibilityVersion = "Xcode 3.1";
+			attributes = {
+				LastUpgradeCheck = 0420;
+				ORGANIZATIONNAME = "Telecom ParisTech";
+			};
+			buildConfigurationList = 9201F92C18D5A359003D1ACA /* Build configuration list for PBXProject "gpac" */;
+			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
-			hasScannedForEncodings = 1;
+			hasScannedForEncodings = 0;
 			knownRegions = (
-				English,
-				Japanese,
-				French,
-				German,
+				en,
 			);
-			mainGroup = 08FB7794FE84155DC02AAC07 /* gpac */;
+			mainGroup = 9201F92718D5A359003D1ACA;
+			productRefGroup = 9201F93818D5A38A003D1ACA /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				717BB66C11525AA200A39D3D /* all */,
-				71D7E310115778E1003DF497 /* configure */,
-				71D7E30411525E11003DF497 /* applications */,
-				717BAE39115238D100A39D3D /* libgpac */,
-				717BB3A71152558600A39D3D /* modules */,
-				717BB4D11152588A00A39D3D /* MP4Client */,
-				717BB66611525A4D00A39D3D /* MP4Box */,
+				9201F93618D5A38A003D1ACA /* libgpac */,
+				92BE508F18D6325E00AA59D8 /* MP4Box */,
+				92BE50B218D6D53000AA59D8 /* MP42TS */,
+				92BE50C618D6D60100AA59D8 /* MP4Client */,
+				92AAF0D218D6DB2D00E2FF12 /* sdl_out */,
+				92AAF16418D6F40400E2FF12 /* ft_font */,
+				92AAF17718D6F89B00E2FF12 /* aac_in */,
+				92AAF18718D6FA1100E2FF12 /* ac3_in */,
+				92AAF19718D6FDC300E2FF12 /* ffmpeg_in */,
+				92AAF1AD18D709D900E2FF12 /* mp3_in */,
+				92AAF1BD18D70B1C00E2FF12 /* openhevc_dec */,
+				92AAF1CA18D70C3100E2FF12 /* opensvc_dec */,
+				92AAF1DE18D7126900E2FF12 /* x11_out */,
+				9225732318D7267900D6FD98 /* ogg_in */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXSourcesBuildPhase section */
+		9201F93318D5A38A003D1ACA /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				920100B018D5A444003D1ACA /* arith_decoder.c in Sources */,
+				920100B118D5A444003D1ACA /* bifs_codec.c in Sources */,
+				920100B218D5A444003D1ACA /* bifs_node_tables.c in Sources */,
+				920100B318D5A444003D1ACA /* com_dec.c in Sources */,
+				920100B418D5A444003D1ACA /* com_enc.c in Sources */,
+				920100B518D5A444003D1ACA /* conditional.c in Sources */,
+				920100B618D5A444003D1ACA /* field_decode.c in Sources */,
+				920100B718D5A444003D1ACA /* field_encode.c in Sources */,
+				920100B818D5A444003D1ACA /* memory_decoder.c in Sources */,
+				920100B918D5A444003D1ACA /* predictive_mffield.c in Sources */,
+				920100BB18D5A444003D1ACA /* quantize.c in Sources */,
+				920100BD18D5A444003D1ACA /* script_dec.c in Sources */,
+				920100BE18D5A444003D1ACA /* script_enc.c in Sources */,
+				920100BF18D5A444003D1ACA /* unquantize.c in Sources */,
+				920100C018D5A444003D1ACA /* audio_input.c in Sources */,
+				920100C118D5A444003D1ACA /* audio_mixer.c in Sources */,
+				920100C218D5A444003D1ACA /* audio_render.c in Sources */,
+				920100C318D5A444003D1ACA /* bindable.c in Sources */,
+				920100C418D5A444003D1ACA /* camera.c in Sources */,
+				920100C518D5A444003D1ACA /* compositor.c in Sources */,
+				920100C618D5A444003D1ACA /* compositor_2d.c in Sources */,
+				920100C718D5A444003D1ACA /* compositor_3d.c in Sources */,
+				920100C818D5A444003D1ACA /* compositor_node_init.c in Sources */,
+				920100C918D5A444003D1ACA /* drawable.c in Sources */,
+				920100CB18D5A444003D1ACA /* events.c in Sources */,
+				920100CC18D5A444003D1ACA /* font_engine.c in Sources */,
+				920100CE18D5A444003D1ACA /* hardcoded_protos.c in Sources */,
+				920100CF18D5A444003D1ACA /* hc_flash_shape.c in Sources */,
+				920100D018D5A444003D1ACA /* mesh.c in Sources */,
+				920100D118D5A444003D1ACA /* mesh_collide.c in Sources */,
+				920100D218D5A444003D1ACA /* mesh_tesselate.c in Sources */,
+				920100D318D5A444003D1ACA /* mpeg4_animstream.c in Sources */,
+				920100D418D5A444003D1ACA /* mpeg4_audio.c in Sources */,
+				920100D518D5A444003D1ACA /* mpeg4_background.c in Sources */,
+				920100D618D5A444003D1ACA /* mpeg4_background2d.c in Sources */,
+				920100D718D5A444003D1ACA /* mpeg4_bitmap.c in Sources */,
+				920100D818D5A444003D1ACA /* mpeg4_composite.c in Sources */,
+				920100D918D5A444003D1ACA /* mpeg4_form.c in Sources */,
+				920100DA18D5A444003D1ACA /* mpeg4_geometry_2d.c in Sources */,
+				920100DB18D5A444003D1ACA /* mpeg4_geometry_3d.c in Sources */,
+				920100DC18D5A444003D1ACA /* mpeg4_geometry_ifs2d.c in Sources */,
+				920100DD18D5A444003D1ACA /* mpeg4_geometry_ils2d.c in Sources */,
+				920100DE18D5A444003D1ACA /* mpeg4_gradients.c in Sources */,
+				920100DF18D5A444003D1ACA /* mpeg4_grouping.c in Sources */,
+				920100E118D5A444003D1ACA /* mpeg4_grouping_2d.c in Sources */,
+				920100E218D5A444003D1ACA /* mpeg4_grouping_3d.c in Sources */,
+				920100E318D5A444003D1ACA /* mpeg4_layer_2d.c in Sources */,
+				920100E418D5A444003D1ACA /* mpeg4_layer_3d.c in Sources */,
+				920100E518D5A444003D1ACA /* mpeg4_layout.c in Sources */,
+				920100E618D5A444003D1ACA /* mpeg4_lighting.c in Sources */,
+				920100E718D5A444003D1ACA /* mpeg4_path_layout.c in Sources */,
+				920100E818D5A444003D1ACA /* mpeg4_sensors.c in Sources */,
+				920100E918D5A444003D1ACA /* mpeg4_sound.c in Sources */,
+				920100EA18D5A444003D1ACA /* mpeg4_text.c in Sources */,
+				920100EB18D5A444003D1ACA /* mpeg4_textures.c in Sources */,
+				920100EC18D5A444003D1ACA /* mpeg4_timesensor.c in Sources */,
+				920100ED18D5A444003D1ACA /* mpeg4_viewport.c in Sources */,
+				920100EE18D5A444003D1ACA /* navigate.c in Sources */,
+				920100F018D5A444003D1ACA /* offscreen_cache.c in Sources */,
+				920100F218D5A444003D1ACA /* svg_base.c in Sources */,
+				920100F318D5A444003D1ACA /* svg_filters.c in Sources */,
+				920100F418D5A444003D1ACA /* svg_font.c in Sources */,
+				920100F518D5A444003D1ACA /* svg_geometry.c in Sources */,
+				920100F618D5A444003D1ACA /* svg_grouping.c in Sources */,
+				920100F718D5A444003D1ACA /* svg_media.c in Sources */,
+				920100F818D5A444003D1ACA /* svg_paint_servers.c in Sources */,
+				920100F918D5A444003D1ACA /* svg_text.c in Sources */,
+				920100FA18D5A444003D1ACA /* texturing.c in Sources */,
+				920100FC18D5A444003D1ACA /* texturing_gl.c in Sources */,
+				920100FD18D5A444003D1ACA /* visual_manager.c in Sources */,
+				920100FF18D5A444003D1ACA /* visual_manager_2d.c in Sources */,
+				9201010118D5A444003D1ACA /* visual_manager_2d_draw.c in Sources */,
+				9201010218D5A444003D1ACA /* visual_manager_3d.c in Sources */,
+				9201010418D5A444003D1ACA /* visual_manager_3d_gl.c in Sources */,
+				9201010518D5A444003D1ACA /* x3d_geometry.c in Sources */,
+				9201010718D5A444003D1ACA /* rtcp.c in Sources */,
+				9201010818D5A444003D1ACA /* rtp.c in Sources */,
+				9201010918D5A444003D1ACA /* rtp_depacketizer.c in Sources */,
+				9201010A18D5A444003D1ACA /* rtp_packetizer.c in Sources */,
+				9201010B18D5A444003D1ACA /* rtp_pck_3gpp.c in Sources */,
+				9201010C18D5A444003D1ACA /* rtp_pck_mpeg12.c in Sources */,
+				9201010D18D5A444003D1ACA /* rtp_pck_mpeg4.c in Sources */,
+				9201010E18D5A444003D1ACA /* rtp_streamer.c in Sources */,
+				9201010F18D5A444003D1ACA /* rtsp_command.c in Sources */,
+				9201011018D5A444003D1ACA /* rtsp_common.c in Sources */,
+				9201011118D5A444003D1ACA /* rtsp_response.c in Sources */,
+				9201011218D5A444003D1ACA /* rtsp_session.c in Sources */,
+				9201011318D5A444003D1ACA /* sdp.c in Sources */,
+				9201011418D5A444003D1ACA /* avc_ext.c in Sources */,
+				9201011518D5A444003D1ACA /* box_code_3gpp.c in Sources */,
+				9201011618D5A444003D1ACA /* box_code_adobe.c in Sources */,
+				9201011718D5A444003D1ACA /* box_code_apple.c in Sources */,
+				9201011818D5A444003D1ACA /* box_code_base.c in Sources */,
+				9201011918D5A444003D1ACA /* box_code_drm.c in Sources */,
+				9201011A18D5A444003D1ACA /* box_code_meta.c in Sources */,
+				9201011B18D5A444003D1ACA /* box_dump.c in Sources */,
+				9201011C18D5A444003D1ACA /* box_funcs.c in Sources */,
+				9201011D18D5A444003D1ACA /* data_map.c in Sources */,
+				9201011E18D5A444003D1ACA /* drm_sample.c in Sources */,
+				9201012018D5A444003D1ACA /* hint_track.c in Sources */,
+				9201012118D5A444003D1ACA /* hinting.c in Sources */,
+				9201012218D5A444003D1ACA /* isom_intern.c in Sources */,
+				9201012318D5A444003D1ACA /* isom_read.c in Sources */,
+				9201012418D5A444003D1ACA /* isom_store.c in Sources */,
+				9201012518D5A444003D1ACA /* isom_write.c in Sources */,
+				9201012618D5A444003D1ACA /* media.c in Sources */,
+				9201012718D5A444003D1ACA /* media_odf.c in Sources */,
+				9201012818D5A444003D1ACA /* meta.c in Sources */,
+				9201012918D5A444003D1ACA /* movie_fragments.c in Sources */,
+				9201012A18D5A444003D1ACA /* sample_descs.c in Sources */,
+				9201012B18D5A444003D1ACA /* stbl_read.c in Sources */,
+				9201012C18D5A444003D1ACA /* stbl_write.c in Sources */,
+				9201012D18D5A444003D1ACA /* track.c in Sources */,
+				9201012E18D5A444003D1ACA /* ttml.c in Sources */,
+				9201012F18D5A444003D1ACA /* tx3g.c in Sources */,
+				9201013018D5A444003D1ACA /* lsr_dec.c in Sources */,
+				9201013118D5A444003D1ACA /* lsr_enc.c in Sources */,
+				9201013218D5A445003D1ACA /* lsr_tables.c in Sources */,
+				9201013418D5A445003D1ACA /* cbc.c in Sources */,
+				9201013518D5A445003D1ACA /* cfb.c in Sources */,
+				9201013618D5A445003D1ACA /* ctr.c in Sources */,
+				9201013718D5A445003D1ACA /* des.c in Sources */,
+				9201013818D5A445003D1ACA /* ecb.c in Sources */,
+				9201013918D5A445003D1ACA /* g_crypt.c in Sources */,
+				9201013A18D5A445003D1ACA /* ncfb.c in Sources */,
+				9201013B18D5A445003D1ACA /* nofb.c in Sources */,
+				9201013C18D5A445003D1ACA /* ofb.c in Sources */,
+				9201013D18D5A445003D1ACA /* rijndael-128.c in Sources */,
+				9201013E18D5A445003D1ACA /* rijndael-192.c in Sources */,
+				9201013F18D5A445003D1ACA /* rijndael-256.c in Sources */,
+				9201014018D5A445003D1ACA /* stream.c in Sources */,
+				9201014118D5A445003D1ACA /* tripledes.c in Sources */,
+				9201014218D5A445003D1ACA /* ait.c in Sources */,
+				9201014318D5A445003D1ACA /* av_parsers.c in Sources */,
+				9201014418D5A445003D1ACA /* avilib.c in Sources */,
+				9201014518D5A445003D1ACA /* dash_client.c in Sources */,
+				9201014618D5A445003D1ACA /* dash_segmenter.c in Sources */,
+				9201014718D5A445003D1ACA /* dsmcc.c in Sources */,
+				9201014818D5A445003D1ACA /* dvb_mpe.c in Sources */,
+				9201014918D5A445003D1ACA /* filestreamer.c in Sources */,
+				9201014A18D5A445003D1ACA /* gpac_ogg.c in Sources */,
+				9201014B18D5A445003D1ACA /* html5_media.c in Sources */,
+				9201014C18D5A445003D1ACA /* html5_mse.c in Sources */,
+				9201014D18D5A445003D1ACA /* img.c in Sources */,
+				9201014E18D5A445003D1ACA /* ismacryp.c in Sources */,
+				9201014F18D5A445003D1ACA /* isom_hinter.c in Sources */,
+				9201015018D5A445003D1ACA /* isom_tools.c in Sources */,
+				9201015118D5A445003D1ACA /* m2ts_mux.c in Sources */,
+				9201015218D5A445003D1ACA /* m3u8.c in Sources */,
+				9201015318D5A445003D1ACA /* media_export.c in Sources */,
+				9201015418D5A445003D1ACA /* media_import.c in Sources */,
+				9201015518D5A445003D1ACA /* mpd.c in Sources */,
+				9201015618D5A445003D1ACA /* mpeg2_ps.c in Sources */,
+				9201015818D5A445003D1ACA /* mpegts.c in Sources */,
+				9201015918D5A445003D1ACA /* reedsolomon.c in Sources */,
+				9201015A18D5A445003D1ACA /* saf.c in Sources */,
+				9201015B18D5A445003D1ACA /* text_import.c in Sources */,
+				9201015C18D5A445003D1ACA /* vobsub.c in Sources */,
+				9201015D18D5A445003D1ACA /* webvtt.c in Sources */,
+				9201015E18D5A445003D1ACA /* desc_private.c in Sources */,
+				9201015F18D5A445003D1ACA /* descriptors.c in Sources */,
+				9201016018D5A445003D1ACA /* ipmpx_code.c in Sources */,
+				9201016118D5A445003D1ACA /* ipmpx_dump.c in Sources */,
+				9201016218D5A445003D1ACA /* ipmpx_parse.c in Sources */,
+				9201016318D5A445003D1ACA /* oci_codec.c in Sources */,
+				9201016418D5A445003D1ACA /* odf_code.c in Sources */,
+				9201016518D5A445003D1ACA /* odf_codec.c in Sources */,
+				9201016618D5A445003D1ACA /* odf_command.c in Sources */,
+				9201016718D5A445003D1ACA /* odf_dump.c in Sources */,
+				9201016818D5A445003D1ACA /* odf_parse.c in Sources */,
+				9201016918D5A445003D1ACA /* qos.c in Sources */,
+				9201016A18D5A445003D1ACA /* slc.c in Sources */,
+				9201016B18D5A445003D1ACA /* encode_isom.c in Sources */,
+				9201016C18D5A445003D1ACA /* loader_bt.c in Sources */,
+				9201016D18D5A445003D1ACA /* loader_isom.c in Sources */,
+				9201016E18D5A445003D1ACA /* loader_qt.c in Sources */,
+				9201016F18D5A445003D1ACA /* loader_svg.c in Sources */,
+				9201017018D5A445003D1ACA /* loader_xmt.c in Sources */,
+				9201017118D5A445003D1ACA /* scene_dump.c in Sources */,
+				9201017218D5A445003D1ACA /* scene_engine.c in Sources */,
+				9201017318D5A445003D1ACA /* scene_manager.c in Sources */,
+				9201017418D5A445003D1ACA /* scene_stats.c in Sources */,
+				9201017518D5A445003D1ACA /* swf_bifs.c in Sources */,
+				9201017618D5A445003D1ACA /* swf_parse.c in Sources */,
+				9201017718D5A445003D1ACA /* swf_svg.c in Sources */,
+				9201017818D5A445003D1ACA /* text_to_bifs.c in Sources */,
+				9201017918D5A445003D1ACA /* base_scenegraph.c in Sources */,
+				9201017A18D5A445003D1ACA /* commands.c in Sources */,
+				9201017B18D5A445003D1ACA /* dom_events.c in Sources */,
+				9201017C18D5A445003D1ACA /* dom_smjs.c in Sources */,
+				9201017D18D5A445003D1ACA /* html5_media_smjs.c in Sources */,
+				9201017E18D5A445003D1ACA /* html5_mse_smjs.c in Sources */,
+				9201017F18D5A445003D1ACA /* mpeg4_animators.c in Sources */,
+				9201018018D5A445003D1ACA /* mpeg4_nodes.c in Sources */,
+				9201018118D5A445003D1ACA /* mpeg4_valuator.c in Sources */,
+				9201018218D5A445003D1ACA /* smil_anim.c in Sources */,
+				9201018318D5A445003D1ACA /* smil_timing.c in Sources */,
+				9201018418D5A445003D1ACA /* svg_attributes.c in Sources */,
+				9201018518D5A445003D1ACA /* svg_properties.c in Sources */,
+				9201018618D5A445003D1ACA /* svg_smjs.c in Sources */,
+				9201018718D5A445003D1ACA /* svg_types.c in Sources */,
+				9201018818D5A445003D1ACA /* vrml_interpolators.c in Sources */,
+				9201018918D5A445003D1ACA /* vrml_proto.c in Sources */,
+				9201018A18D5A445003D1ACA /* vrml_route.c in Sources */,
+				9201018B18D5A445003D1ACA /* vrml_script.c in Sources */,
+				9201018C18D5A445003D1ACA /* vrml_smjs.c in Sources */,
+				9201018D18D5A445003D1ACA /* vrml_tools.c in Sources */,
+				9201018E18D5A445003D1ACA /* webvtt_smjs.c in Sources */,
+				9201018F18D5A445003D1ACA /* x3d_nodes.c in Sources */,
+				9201019018D5A445003D1ACA /* xbl_process.c in Sources */,
+				9201019118D5A445003D1ACA /* xml_ns.c in Sources */,
+				9201019218D5A445003D1ACA /* channel.c in Sources */,
+				9201019318D5A445003D1ACA /* clock.c in Sources */,
+				9201019418D5A445003D1ACA /* decoder.c in Sources */,
+				9201019518D5A445003D1ACA /* input_sensor.c in Sources */,
+				9201019718D5A445003D1ACA /* media_control.c in Sources */,
+				9201019918D5A445003D1ACA /* media_manager.c in Sources */,
+				9201019A18D5A445003D1ACA /* media_memory.c in Sources */,
+				9201019C18D5A445003D1ACA /* media_object.c in Sources */,
+				9201019D18D5A445003D1ACA /* media_sensor.c in Sources */,
+				9201019E18D5A445003D1ACA /* mpeg4_inline.c in Sources */,
+				9201019F18D5A445003D1ACA /* network_service.c in Sources */,
+				920101A018D5A445003D1ACA /* object_browser.c in Sources */,
+				920101A118D5A445003D1ACA /* object_manager.c in Sources */,
+				920101A218D5A445003D1ACA /* scene.c in Sources */,
+				920101A318D5A445003D1ACA /* svg_external.c in Sources */,
+				920101A418D5A445003D1ACA /* term_node_init.c in Sources */,
+				920101A518D5A445003D1ACA /* terminal.c in Sources */,
+				920101A618D5A445003D1ACA /* alloc.c in Sources */,
+				920101A718D5A445003D1ACA /* base_encoding.c in Sources */,
+				920101A818D5A445003D1ACA /* bitstream.c in Sources */,
+				920101A918D5A445003D1ACA /* cache.c in Sources */,
+				920101AA18D5A445003D1ACA /* color.c in Sources */,
+				920101AB18D5A445003D1ACA /* configfile.c in Sources */,
+				920101AC18D5A445003D1ACA /* dlmalloc.c in Sources */,
+				920101AD18D5A445003D1ACA /* downloader.c in Sources */,
+				920101AE18D5A445003D1ACA /* error.c in Sources */,
+				920101B018D5A445003D1ACA /* list.c in Sources */,
+				920101B118D5A445003D1ACA /* map.c in Sources */,
+				920101B218D5A445003D1ACA /* math.c in Sources */,
+				920101B318D5A445003D1ACA /* module.c in Sources */,
+				920101B518D5A445003D1ACA /* os_config_init.c in Sources */,
+				920101B618D5A445003D1ACA /* os_divers.c in Sources */,
+				920101B718D5A445003D1ACA /* os_module.c in Sources */,
+				920101B818D5A445003D1ACA /* os_net.c in Sources */,
+				920101B918D5A445003D1ACA /* os_thread.c in Sources */,
+				920101BA18D5A445003D1ACA /* path2d.c in Sources */,
+				920101BB18D5A445003D1ACA /* path2d_stroker.c in Sources */,
+				920101BC18D5A445003D1ACA /* ringbuffer.c in Sources */,
+				920101BD18D5A445003D1ACA /* sha1.c in Sources */,
+				920101C018D5A445003D1ACA /* token.c in Sources */,
+				920101C118D5A445003D1ACA /* uni_bidi.c in Sources */,
+				920101C218D5A445003D1ACA /* unicode.c in Sources */,
+				920101C318D5A445003D1ACA /* url.c in Sources */,
+				920101C418D5A445003D1ACA /* utf.c in Sources */,
+				920101C518D5A445003D1ACA /* xml_parser.c in Sources */,
+				92AAF0EA18D6E3A300E2FF12 /* raw_video.c in Sources */,
+				92AAF0EB18D6E5AA00E2FF12 /* ftgrays.c in Sources */,
+				92AAF0ED18D6E5AA00E2FF12 /* raster_565.c in Sources */,
+				92AAF0EE18D6E5AA00E2FF12 /* raster_argb.c in Sources */,
+				92AAF0EF18D6E5AA00E2FF12 /* raster_load.c in Sources */,
+				92AAF0F018D6E5AA00E2FF12 /* raster_rgb.c in Sources */,
+				92AAF0F118D6E5AA00E2FF12 /* stencil.c in Sources */,
+				92AAF0F218D6E5AA00E2FF12 /* surface.c in Sources */,
+				92AAF0F518D6E5D400E2FF12 /* audio_filter.c in Sources */,
+				92AAF0F818D6E5FD00E2FF12 /* bifs_dec.c in Sources */,
+				92AAF0FB18D6E62600E2FF12 /* ctx_load.c in Sources */,
+				92AAF0FE18D6E64800E2FF12 /* dummy_in.c in Sources */,
+				92AAF10118D6E66D00E2FF12 /* gpac_js.c in Sources */,
+				92AAF10A18D6E69500E2FF12 /* bmp_dec.c in Sources */,
+				92AAF10B18D6E69500E2FF12 /* img_dec.c in Sources */,
+				92AAF10C18D6E69500E2FF12 /* img_in.c in Sources */,
+				92AAF10E18D6E69500E2FF12 /* jp2_dec.c in Sources */,
+				92AAF10F18D6E69500E2FF12 /* jpeg_dec.c in Sources */,
+				92AAF11018D6E69500E2FF12 /* png_dec.c in Sources */,
+				92AAF11318D6E6B700E2FF12 /* isma_ea.c in Sources */,
+				92AAF11A18D6E6D300E2FF12 /* isom_cache.c in Sources */,
+				92AAF11C18D6E6D300E2FF12 /* load.c in Sources */,
+				92AAF11D18D6E6D300E2FF12 /* read_ch.c in Sources */,
+				92AAF11E18D6E6D300E2FF12 /* read.c in Sources */,
+				92AAF12118D6E6F300E2FF12 /* laser_dec.c in Sources */,
+				92AAF12418D6E70D00E2FF12 /* mpd_in.c in Sources */,
+				92AAF12718D6E72800E2FF12 /* mpegts_in.c in Sources */,
+				92AAF12A18D6E74200E2FF12 /* mse_in.c in Sources */,
+				92AAF12D18D6E75800E2FF12 /* odf_dec.c in Sources */,
+				92AAF13018D6E77900E2FF12 /* osd.c in Sources */,
+				92AAF13918D6E7BC00E2FF12 /* rtp_in.c in Sources */,
+				92AAF13B18D6E7BC00E2FF12 /* rtp_session.c in Sources */,
+				92AAF13C18D6E7BC00E2FF12 /* rtp_signaling.c in Sources */,
+				92AAF13D18D6E7BC00E2FF12 /* rtp_stream.c in Sources */,
+				92AAF13E18D6E7BC00E2FF12 /* sdp_fetch.c in Sources */,
+				92AAF13F18D6E7BC00E2FF12 /* sdp_load.c in Sources */,
+				92AAF14218D6E7D800E2FF12 /* saf_in.c in Sources */,
+				92AAF14518D6E7F500E2FF12 /* svg_in.c in Sources */,
+				92AAF14918D6E82500E2FF12 /* timedtext_dec.c in Sources */,
+				92AAF14A18D6E82500E2FF12 /* timedtext_in.c in Sources */,
+				92AAF14D18D6E83B00E2FF12 /* validator.c in Sources */,
+				92AAF15518D6E87500E2FF12 /* unzip.c in Sources */,
+				92AAF15718D6E87500E2FF12 /* wgt_load.c in Sources */,
+				92AAF15818D6E87500E2FF12 /* widget.c in Sources */,
+				92AAF15918D6E87500E2FF12 /* widgetman.c in Sources */,
+				92AAF1D918D710A000E2FF12 /* vtt_dec.c in Sources */,
+				92AAF1DA18D710A000E2FF12 /* vtt_in.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		9225732018D7267900D6FD98 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				9225732F18D7269700D6FD98 /* ogg_in.c in Sources */,
+				9225733118D7269700D6FD98 /* ogg_load.c in Sources */,
+				9225733218D7269700D6FD98 /* theora_dec.c in Sources */,
+				9225733318D7269700D6FD98 /* vorbis_dec.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF0CF18D6DB2D00E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF0E418D6DB8600E2FF12 /* audio.c in Sources */,
+				92AAF0E518D6DB8600E2FF12 /* sdl_out.c in Sources */,
+				92AAF0E718D6DB8600E2FF12 /* video.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF16118D6F40400E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF16D18D6F5EB00E2FF12 /* ft_font.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF17418D6F89B00E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF18018D6F8EF00E2FF12 /* aac_in.c in Sources */,
+				92AAF18118D6F8EF00E2FF12 /* faad_dec.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF18418D6FA1100E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF19118D6FA3300E2FF12 /* ac3_in.c in Sources */,
+				92AAF19218D6FA3300E2FF12 /* liba52_dec.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF19418D6FDC300E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1A618D6FDFA00E2FF12 /* ffmpeg_decode.c in Sources */,
+				92AAF1A718D6FDFA00E2FF12 /* ffmpeg_demux.c in Sources */,
+				92AAF1A918D6FDFA00E2FF12 /* ffmpeg_load.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1AA18D709D900E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1B718D70A1000E2FF12 /* mad_dec.c in Sources */,
+				92AAF1B818D70A1000E2FF12 /* mp3_in.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1BA18D70B1C00E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1C518D70B4600E2FF12 /* openhevc_dec.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1C718D70C3100E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1D218D70D5100E2FF12 /* opensvc_dec.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92AAF1DB18D7126900E2FF12 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92AAF1EA18D712C500E2FF12 /* x11_out.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92BE508C18D6325E00AA59D8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92BE50A818D6348A00AA59D8 /* filedump.c in Sources */,
+				92BE50A918D6348A00AA59D8 /* fileimport.c in Sources */,
+				92BE50AA18D6348A00AA59D8 /* live.c in Sources */,
+				92BE50AB18D6348A00AA59D8 /* main.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92BE50AF18D6D53000AA59D8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92BE50C218D6D5DC00AA59D8 /* main.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		92BE50C318D6D60100AA59D8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				92BE50D318D6D62600AA59D8 /* extract.c in Sources */,
+				92BE50D418D6D62600AA59D8 /* main.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
 /* Begin PBXTargetDependency section */
-		717BB67011525AAA00A39D3D /* PBXTargetDependency */ = {
+		9225730F18D717AB00D6FD98 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 717BAE39115238D100A39D3D /* libgpac */;
-			targetProxy = 717BB66F11525AAA00A39D3D /* PBXContainerItemProxy */;
+			target = 92AAF18718D6FA1100E2FF12 /* ac3_in */;
+			targetProxy = 9225730E18D717AB00D6FD98 /* PBXContainerItemProxy */;
 		};
-		717BB67411525AB200A39D3D /* PBXTargetDependency */ = {
+		9225731118D717AE00D6FD98 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 717BB3A71152558600A39D3D /* modules */;
-			targetProxy = 717BB67311525AB200A39D3D /* PBXContainerItemProxy */;
+			target = 92AAF19718D6FDC300E2FF12 /* ffmpeg_in */;
+			targetProxy = 9225731018D717AE00D6FD98 /* PBXContainerItemProxy */;
 		};
-		71D7E30811525E2E003DF497 /* PBXTargetDependency */ = {
+		9225731318D717B100D6FD98 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 71D7E30411525E11003DF497 /* applications */;
-			targetProxy = 71D7E30711525E2E003DF497 /* PBXContainerItemProxy */;
+			target = 92AAF1AD18D709D900E2FF12 /* mp3_in */;
+			targetProxy = 9225731218D717B100D6FD98 /* PBXContainerItemProxy */;
 		};
-		71D7E31411577931003DF497 /* PBXTargetDependency */ = {
+		9225731518D717B400D6FD98 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 71D7E310115778E1003DF497 /* configure */;
-			targetProxy = 71D7E31311577931003DF497 /* PBXContainerItemProxy */;
+			target = 92AAF1BD18D70B1C00E2FF12 /* openhevc_dec */;
+			targetProxy = 9225731418D717B400D6FD98 /* PBXContainerItemProxy */;
+		};
+		9225731718D717BA00D6FD98 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 92AAF1CA18D70C3100E2FF12 /* opensvc_dec */;
+			targetProxy = 9225731618D717BA00D6FD98 /* PBXContainerItemProxy */;
+		};
+		9225731918D717BD00D6FD98 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 92AAF1DE18D7126900E2FF12 /* x11_out */;
+			targetProxy = 9225731818D717BD00D6FD98 /* PBXContainerItemProxy */;
+		};
+		9225733618D727B500D6FD98 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 9225732318D7267900D6FD98 /* ogg_in */;
+			targetProxy = 9225733518D727B500D6FD98 /* PBXContainerItemProxy */;
+		};
+		92AAF17118D6F87100E2FF12 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 92AAF0D218D6DB2D00E2FF12 /* sdl_out */;
+			targetProxy = 92AAF17018D6F87100E2FF12 /* PBXContainerItemProxy */;
+		};
+		92AAF17318D6F87A00E2FF12 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 92AAF16418D6F40400E2FF12 /* ft_font */;
+			targetProxy = 92AAF17218D6F87A00E2FF12 /* PBXContainerItemProxy */;
+		};
+		92AAF18318D6F9E700E2FF12 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 92AAF17718D6F89B00E2FF12 /* aac_in */;
+			targetProxy = 92AAF18218D6F9E700E2FF12 /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		1DEB928B08733DD80010E9CD /* Makefile */ = {
+		9201F92E18D5A359003D1ACA /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = ../../include;
+				OBJROOT = build;
+				OTHER_CFLAGS = "-Wno-conversion";
+				SYMROOT = ../../bin/osx/;
+			};
+			name = Debug;
+		};
+		9201F92F18D5A359003D1ACA /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				HEADER_SEARCH_PATHS = ../../include;
+				OBJROOT = build;
+				OTHER_CFLAGS = "-Wno-conversion";
+				SYMROOT = ../../bin/osx/;
+			};
+			name = Release;
+		};
+		9201F93918D5A38A003D1ACA /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				GCC_C_LANGUAGE_STANDARD = c99;
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_STATIC_MODULES,
+					GPAC_CONFIG_DARWIN,
+					CONFIG_DARWIN_GL,
+					NO_JS_RUNTIMETHREAD,
+					SPIDERMONKEY_NEW_API,
+					"DEBUG=1",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				PREBINDING = NO;
-				SDKROOT = macosx10.5;
+				HEADER_SEARCH_PATHS = (
+					/opt/local/include,
+					/opt/local/include/mozjs185,
+					/opt/local/include/nspr,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = (
+					/opt/local/lib,
+					/opt/local/lib/nspr,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OBJROOT = build;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = "-Wno-conversion";
+				OTHER_LDFLAGS = (
+					"-lcrypto",
+					"-lssl",
+					"-ljpeg",
+					"-lpng",
+					"-lmozjs185",
+					"-lplds4",
+					"-lplc4",
+					"-lnspr4",
+				);
+				PRODUCT_NAME = gpac;
+				SDKROOT = macosx;
+				SYMROOT = ../../bin/osx/;
 			};
-			name = Makefile;
+			name = Debug;
 		};
-		717BAE3B115238D100A39D3D /* Makefile */ = {
+		9201F93A18D5A38A003D1ACA /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = libgpac;
-				ZERO_LINK = NO;
+				EXECUTABLE_PREFIX = lib;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_STATIC_MODULES,
+					GPAC_CONFIG_DARWIN,
+					CONFIG_DARWIN_GL,
+				);
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/opt/local/include,
+					/opt/local/include/mozjs185,
+					/opt/local/include/nspr,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = (
+					/opt/local/lib,
+					/opt/local/lib/nspr,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OBJROOT = build;
+				OTHER_CFLAGS = "-Wno-conversion";
+				OTHER_LDFLAGS = (
+					"-lcrypto",
+					"-lssl",
+					"-ljpeg",
+					"-lpng",
+					"-lmozjs185",
+					"-lplds4",
+					"-lplc4",
+					"-lnspr4",
+				);
+				PRODUCT_NAME = gpac;
+				SDKROOT = macosx;
+				SYMROOT = ../../bin/osx/;
 			};
-			name = Makefile;
+			name = Release;
 		};
-		717BB3A91152558600A39D3D /* Makefile */ = {
+		9225732518D7267900D6FD98 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/opt/local/include,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		9225732618D7267900D6FD98 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/opt/local/include,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		92AAF0D518D6DB2D00E2FF12 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/usr/local/include/SDL2,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = /usr/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-lSDL2";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF0D618D6DB2D00E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/usr/local/include/SDL2,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = /usr/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = "-lSDL2";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		92AAF16618D6F40400E2FF12 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/usr/include/freetype2,
+					/opt/local/include/freetype2,
+				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-lfreetype";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF16718D6F40400E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/usr/include/freetype2,
+					/opt/local/include/freetype2,
+				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = "-lfreetype";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		92AAF17A18D6F89B00E2FF12 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					GPAC_HAS_FAAD,
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/opt/local/include,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-lfaad";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF17B18D6F89B00E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = GPAC_HAS_FAAD;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/opt/local/include,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = "-lfaad";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		92AAF18A18D6FA1200E2FF12 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/opt/local/include/a52dec,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-la52";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF18B18D6FA1200E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/opt/local/include/a52dec,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = "-la52";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		92AAF19A18D6FDC300E2FF12 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/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,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"-lz",
+					"-lavcodec",
+					"-lavformat",
+					"-lavutil",
+					"-lswscale",
+					"-lbz2",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF19B18D6FDC300E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/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,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = (
+					"-lz",
+					"-lavcodec",
+					"-lavformat",
+					"-lavutil",
+					"-lswscale",
+					"-lbz2",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		92AAF1B018D709D900E2FF12 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					GPAC_HAS_MAD,
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/opt/local/include,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-lmad";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF1B118D709D900E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = GPAC_HAS_MAD;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					/opt/local/include,
+					../../include,
+				);
+				LIBRARY_SEARCH_PATHS = /opt/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = "-lmad";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		92AAF1C018D70B1C00E2FF12 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/usr/local/include,
+				);
+				LIBRARY_SEARCH_PATHS = /usr/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-lLibOpenHevcWrapper";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF1C118D70B1C00E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = modules;
-				ZERO_LINK = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/usr/local/include,
+				);
+				LIBRARY_SEARCH_PATHS = /usr/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = "-lLibOpenHevcWrapper";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 			};
-			name = Makefile;
+			name = Release;
 		};
-		717BB4D31152588A00A39D3D /* Makefile */ = {
+		92AAF1CD18D70C3100E2FF12 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/usr/local/include,
+				);
+				LIBRARY_SEARCH_PATHS = /usr/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-lOpenSVCDec";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF1CE18D70C3100E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = MP4Client;
-				ZERO_LINK = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/usr/local/include,
+				);
+				LIBRARY_SEARCH_PATHS = /usr/local/lib;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = "-lOpenSVCDec";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 			};
-			name = Makefile;
+			name = Release;
 		};
-		717BB66811525A4D00A39D3D /* Makefile */ = {
+		92AAF1E118D7126900E2FF12 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/usr/X11R6/include,
+				);
+				LIBRARY_SEARCH_PATHS = "/usr/X11R6/lib\n/usr/X11R6/lib\n/usr/X11R6/lib";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = (
+					"-lX11",
+					"-lGL",
+					"-lGLU",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92AAF1E218D7126900E2FF12 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = MP4Box;
-				ZERO_LINK = NO;
+				EXECUTABLE_PREFIX = gm_;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					/usr/X11R6/include,
+				);
+				LIBRARY_SEARCH_PATHS = "/usr/X11R6/lib\n/usr/X11R6/lib\n/usr/X11R6/lib";
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OTHER_LDFLAGS = (
+					"-lX11",
+					"-lGL",
+					"-lGLU",
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		92BE509718D6325E00AA59D8 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../include;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OBJROOT = build;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SYMROOT = ../../bin/osx/;
 			};
-			name = Makefile;
+			name = Debug;
 		};
-		717BB66E11525AA200A39D3D /* Makefile */ = {
+		92BE509818D6325E00AA59D8 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = all;
-				ZERO_LINK = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../include;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OBJROOT = build;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+				SYMROOT = ../../bin/osx/;
 			};
-			name = Makefile;
+			name = Release;
 		};
-		71D7E30611525E12003DF497 /* Makefile */ = {
+		92BE50BB18D6D53000AA59D8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OBJROOT = build;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92BE50BC18D6D53000AA59D8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				PRODUCT_NAME = applications;
-				ZERO_LINK = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				OBJROOT = build;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 			};
-			name = Makefile;
+			name = Release;
 		};
-		71D7E311115778E1003DF497 /* Makefile */ = {
+		92BE50CF18D6D60100AA59D8 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = configure;
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		92BE50D018D6D60100AA59D8 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = macosx;
 			};
-			name = Makefile;
+			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		1DEB928908733DD80010E9CD /* Build configuration list for PBXProject "gpac" */ = {
+		9201F92C18D5A359003D1ACA /* Build configuration list for PBXProject "gpac" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				9201F92E18D5A359003D1ACA /* Debug */,
+				9201F92F18D5A359003D1ACA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		9201F93B18D5A38A003D1ACA /* Build configuration list for PBXNativeTarget "libgpac" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				9201F93918D5A38A003D1ACA /* Debug */,
+				9201F93A18D5A38A003D1ACA /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		9225732718D7267900D6FD98 /* Build configuration list for PBXNativeTarget "ogg_in" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				9225732518D7267900D6FD98 /* Debug */,
+				9225732618D7267900D6FD98 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		92AAF0D418D6DB2D00E2FF12 /* Build configuration list for PBXNativeTarget "sdl_out" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				92AAF0D518D6DB2D00E2FF12 /* Debug */,
+				92AAF0D618D6DB2D00E2FF12 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		92AAF16818D6F40400E2FF12 /* Build configuration list for PBXNativeTarget "ft_font" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				92AAF16618D6F40400E2FF12 /* Debug */,
+				92AAF16718D6F40400E2FF12 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		92AAF17918D6F89B00E2FF12 /* Build configuration list for PBXNativeTarget "aac_in" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				92AAF17A18D6F89B00E2FF12 /* Debug */,
+				92AAF17B18D6F89B00E2FF12 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		92AAF18918D6FA1200E2FF12 /* Build configuration list for PBXNativeTarget "ac3_in" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				92AAF18A18D6FA1200E2FF12 /* Debug */,
+				92AAF18B18D6FA1200E2FF12 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		92AAF19918D6FDC300E2FF12 /* Build configuration list for PBXNativeTarget "ffmpeg_in" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				1DEB928B08733DD80010E9CD /* Makefile */,
+				92AAF19A18D6FDC300E2FF12 /* Debug */,
+				92AAF19B18D6FDC300E2FF12 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Makefile;
+			defaultConfigurationName = Release;
 		};
-		717BAE3E115238D800A39D3D /* Build configuration list for PBXLegacyTarget "libgpac" */ = {
+		92AAF1AF18D709D900E2FF12 /* Build configuration list for PBXNativeTarget "mp3_in" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				717BAE3B115238D100A39D3D /* Makefile */,
+				92AAF1B018D709D900E2FF12 /* Debug */,
+				92AAF1B118D709D900E2FF12 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Makefile;
+			defaultConfigurationName = Release;
 		};
-		717BB3B0115255B900A39D3D /* Build configuration list for PBXAggregateTarget "modules" */ = {
+		92AAF1BF18D70B1C00E2FF12 /* Build configuration list for PBXNativeTarget "openhevc_dec" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				717BB3A91152558600A39D3D /* Makefile */,
+				92AAF1C018D70B1C00E2FF12 /* Debug */,
+				92AAF1C118D70B1C00E2FF12 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Makefile;
+			defaultConfigurationName = Release;
 		};
-		717BB4D6115258CE00A39D3D /* Build configuration list for PBXLegacyTarget "MP4Client" */ = {
+		92AAF1CC18D70C3100E2FF12 /* Build configuration list for PBXNativeTarget "opensvc_dec" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				717BB4D31152588A00A39D3D /* Makefile */,
+				92AAF1CD18D70C3100E2FF12 /* Debug */,
+				92AAF1CE18D70C3100E2FF12 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Makefile;
+			defaultConfigurationName = Release;
 		};
-		717BB66B11525A8700A39D3D /* Build configuration list for PBXLegacyTarget "MP4Box" */ = {
+		92AAF1E018D7126900E2FF12 /* Build configuration list for PBXNativeTarget "x11_out" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				717BB66811525A4D00A39D3D /* Makefile */,
+				92AAF1E118D7126900E2FF12 /* Debug */,
+				92AAF1E218D7126900E2FF12 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Makefile;
+			defaultConfigurationName = Release;
 		};
-		717BB67511525AD100A39D3D /* Build configuration list for PBXAggregateTarget "all" */ = {
+		92BE509918D6325E00AA59D8 /* Build configuration list for PBXNativeTarget "MP4Box" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				717BB66E11525AA200A39D3D /* Makefile */,
+				92BE509718D6325E00AA59D8 /* Debug */,
+				92BE509818D6325E00AA59D8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Makefile;
+			defaultConfigurationName = Release;
 		};
-		71D7E30911525E4C003DF497 /* Build configuration list for PBXLegacyTarget "applications" */ = {
+		92BE50BA18D6D53000AA59D8 /* Build configuration list for PBXNativeTarget "MP42TS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				71D7E30611525E12003DF497 /* Makefile */,
+				92BE50BB18D6D53000AA59D8 /* Debug */,
+				92BE50BC18D6D53000AA59D8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Makefile;
+			defaultConfigurationName = Release;
 		};
-		71D7E312115778FF003DF497 /* Build configuration list for PBXAggregateTarget "configure" */ = {
+		92BE50CE18D6D60100AA59D8 /* Build configuration list for PBXNativeTarget "MP4Client" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				71D7E311115778E1003DF497 /* Makefile */,
+				92BE50CF18D6D60100AA59D8 /* Debug */,
+				92BE50D018D6D60100AA59D8 /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Makefile;
+			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
-	rootObject = 08FB7793FE84155DC02AAC07 /* Project object */;
+	rootObject = 9201F92918D5A359003D1ACA /* Project object */;
 }

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

@@ -16,6 +16,18 @@
 		0496F09B16DE35C9009D9D8D /* libgpac_static.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 71CCF1311277037A00339E12 /* libgpac_static.a */; };
 		0496F09C16DE36BC009D9D8D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 71847813127860F000917298 /* libz.dylib */; };
 		04EFB63516E51E4200D1D44A /* libglues.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EFB63416E51E4200D1D44A /* libglues.a */; };
+		285DBB44170F17C500AF2B9B /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 285DBB42170F17C500AF2B9B /* ffmpeg_decode.c */; };
+		285DBB47170F17CC00AF2B9B /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 285DBB45170F17CC00AF2B9B /* ffmpeg_demux.c */; };
+		285DBB49170F17D700AF2B9B /* ffmpeg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 285DBB48170F17D700AF2B9B /* ffmpeg_in.h */; };
+		285DBBA01712C80E00AF2B9B /* libavcodec.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9B1712C80E00AF2B9B /* libavcodec.a */; };
+		285DBBA11712C80E00AF2B9B /* libavformat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9C1712C80E00AF2B9B /* libavformat.a */; };
+		285DBBA21712C80E00AF2B9B /* libavutil.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9D1712C80E00AF2B9B /* libavutil.a */; };
+		285DBBA31712C80E00AF2B9B /* libswresample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9E1712C80E00AF2B9B /* libswresample.a */; };
+		285DBBA41712C80E00AF2B9B /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 285DBB9F1712C80E00AF2B9B /* libswscale.a */; };
+		28F2240417D6367000E9D2BE /* ffmpeg_decode.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240317D6367000E9D2BE /* ffmpeg_decode.c */; };
+		28F2240617D6369700E9D2BE /* ffmpeg_demux.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240517D6369700E9D2BE /* ffmpeg_demux.c */; };
+		28F2240817D636C300E9D2BE /* ffmpeg_in.h in Headers */ = {isa = PBXBuildFile; fileRef = 28F2240717D636C300E9D2BE /* ffmpeg_in.h */; };
+		28F2240A17D636DA00E9D2BE /* ffmpeg_load.c in Sources */ = {isa = PBXBuildFile; fileRef = 28F2240917D636DA00E9D2BE /* ffmpeg_load.c */; };
 		7141FF301292CB9200FCB27D /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 7141FF2F1292CB9200FCB27D /* alloc.c */; };
 		7147426012B918C900DB5A59 /* cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 7147425F12B918C900DB5A59 /* cache.c */; };
 		71A19B2112796B6F00ACFF58 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 71A19B2012796B6F00ACFF58 /* main.c */; };
@@ -441,7 +453,6 @@
 		970FBA8216F9F0920052216D /* html5_mse_smjs.c in Sources */ = {isa = PBXBuildFile; fileRef = 970FBA8016F9F0920052216D /* html5_mse_smjs.c */; };
 		97116F211646E38D00BD1AD0 /* box_code_adobe.c in Sources */ = {isa = PBXBuildFile; fileRef = 97116F201646E38D00BD1AD0 /* box_code_adobe.c */; };
 		9719CE751704C35000381CE6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9793AE341704C0BD00E0C938 /* CoreGraphics.framework */; };
-		973B2E3115BAAE3D00394854 /* generic_subtitle.c in Sources */ = {isa = PBXBuildFile; fileRef = 973B2E3015BAAE3D00394854 /* generic_subtitle.c */; };
 		9747B6EF14864C6400280D95 /* ait.h in Headers */ = {isa = PBXBuildFile; fileRef = 9747B6EC14864C6400280D95 /* ait.h */; };
 		9747B6F014864C6400280D95 /* dsmcc.h in Headers */ = {isa = PBXBuildFile; fileRef = 9747B6ED14864C6400280D95 /* dsmcc.h */; };
 		9747B6F114864C6400280D95 /* events_constants.h in Headers */ = {isa = PBXBuildFile; fileRef = 9747B6EE14864C6400280D95 /* events_constants.h */; };
@@ -451,9 +462,16 @@
 		97793E5115E6370D005123E1 /* dash_client.c in Sources */ = {isa = PBXBuildFile; fileRef = 97793E5015E6370D005123E1 /* dash_client.c */; };
 		9793AE351704C0BD00E0C938 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9793AE341704C0BD00E0C938 /* CoreGraphics.framework */; };
 		97A5D5891704C61A00144E5D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 976AF9991704C5C9004E9C00 /* AudioToolbox.framework */; };
+		97A8DDC41896AFF300F4680F /* ttml.c in Sources */ = {isa = PBXBuildFile; fileRef = 97A8DDC31896AFF300F4680F /* ttml.c */; };
 		97DB67C51627B22F00A7E054 /* dash_segmenter.c in Sources */ = {isa = PBXBuildFile; fileRef = 97DB67C41627B22F00A7E054 /* dash_segmenter.c */; };
 		97DDAFEF1569631900528219 /* sha1.c in Sources */ = {isa = PBXBuildFile; fileRef = 97DDAFEE1569631900528219 /* sha1.c */; };
 		97E08C69160F684B00BBDC34 /* swf_svg.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E08C68160F684B00BBDC34 /* swf_svg.c */; };
+		97E29F6917D1138B00904FBF /* webvtt.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F6817D1138B00904FBF /* webvtt.c */; };
+		97E29F6E17D114E900904FBF /* mse_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F6D17D114E900904FBF /* mse_in.c */; };
+		97E29F7417D1154D00904FBF /* ac3_in.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F7217D1154D00904FBF /* ac3_in.c */; };
+		97E29F7517D1154D00904FBF /* liba52_dec.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F7317D1154D00904FBF /* liba52_dec.c */; };
+		97E29F7A17D118F100904FBF /* raw_video.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F7917D118F100904FBF /* raw_video.c */; };
+		97E29F7C17D1190600904FBF /* osd.c in Sources */ = {isa = PBXBuildFile; fileRef = 97E29F7B17D1190600904FBF /* osd.c */; };
 		97FF0660138CE4C400D6C707 /* os_config_init.c in Sources */ = {isa = PBXBuildFile; fileRef = 97FF065F138CE4C400D6C707 /* os_config_init.c */; };
 /* End PBXBuildFile section */
 
@@ -544,6 +562,18 @@
 		04E81B0A16E0FF0B004796EF /* tv_wm_gui.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = tv_wm_gui.js; sourceTree = "<group>"; };
 		04E81B0B16E0FF0B004796EF /* tv_wm_gui.svg */ = {isa = PBXFileReference; lastKnownFileType = text; path = tv_wm_gui.svg; sourceTree = "<group>"; };
 		04EFB63416E51E4200D1D44A /* libglues.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libglues.a; path = ../../extra_lib/lib/iOS/libglues.a; sourceTree = "<group>"; };
+		285DBB42170F17C500AF2B9B /* ffmpeg_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_decode.c; path = ../../modules/ffmpeg_in/ffmpeg_decode.c; sourceTree = "<group>"; };
+		285DBB45170F17CC00AF2B9B /* ffmpeg_demux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_demux.c; path = ../../modules/ffmpeg_in/ffmpeg_demux.c; sourceTree = "<group>"; };
+		285DBB48170F17D700AF2B9B /* ffmpeg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffmpeg_in.h; path = ../../modules/ffmpeg_in/ffmpeg_in.h; sourceTree = "<group>"; };
+		285DBB9B1712C80E00AF2B9B /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = ../../extra_lib/lib/iOS/libavcodec.a; sourceTree = "<group>"; };
+		285DBB9C1712C80E00AF2B9B /* libavformat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavformat.a; path = ../../extra_lib/lib/iOS/libavformat.a; sourceTree = "<group>"; };
+		285DBB9D1712C80E00AF2B9B /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = ../../extra_lib/lib/iOS/libavutil.a; sourceTree = "<group>"; };
+		285DBB9E1712C80E00AF2B9B /* libswresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswresample.a; path = ../../extra_lib/lib/iOS/libswresample.a; sourceTree = "<group>"; };
+		285DBB9F1712C80E00AF2B9B /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = ../../extra_lib/lib/iOS/libswscale.a; sourceTree = "<group>"; };
+		28F2240317D6367000E9D2BE /* ffmpeg_decode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_decode.c; path = ../../modules/ffmpeg_in/ffmpeg_decode.c; sourceTree = "<group>"; };
+		28F2240517D6369700E9D2BE /* ffmpeg_demux.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_demux.c; path = ../../modules/ffmpeg_in/ffmpeg_demux.c; sourceTree = "<group>"; };
+		28F2240717D636C300E9D2BE /* ffmpeg_in.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ffmpeg_in.h; path = ../../modules/ffmpeg_in/ffmpeg_in.h; sourceTree = "<group>"; };
+		28F2240917D636DA00E9D2BE /* ffmpeg_load.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ffmpeg_load.c; path = ../../modules/ffmpeg_in/ffmpeg_load.c; sourceTree = "<group>"; };
 		71179CBF1292EC1800A83216 /* mpd_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mpd_in.c; path = ../../modules/mpd_in/mpd_in.c; sourceTree = "<group>"; };
 		7141FF2F1292CB9200FCB27D /* alloc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alloc.c; sourceTree = "<group>"; };
 		7147425F12B918C900DB5A59 /* cache.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cache.c; sourceTree = "<group>"; };
@@ -983,7 +1013,6 @@
 		970FBA7F16F9F0910052216D /* html5_media_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_media_smjs.c; sourceTree = "<group>"; };
 		970FBA8016F9F0920052216D /* html5_mse_smjs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = html5_mse_smjs.c; sourceTree = "<group>"; };
 		97116F201646E38D00BD1AD0 /* box_code_adobe.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = box_code_adobe.c; sourceTree = "<group>"; };
-		973B2E3015BAAE3D00394854 /* generic_subtitle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = generic_subtitle.c; sourceTree = "<group>"; };
 		9747B6EC14864C6400280D95 /* ait.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ait.h; sourceTree = "<group>"; };
 		9747B6ED14864C6400280D95 /* dsmcc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsmcc.h; sourceTree = "<group>"; };
 		9747B6EE14864C6400280D95 /* events_constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = events_constants.h; sourceTree = "<group>"; };
@@ -992,9 +1021,16 @@
 		976AF9991704C5C9004E9C00 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
 		97793E5015E6370D005123E1 /* dash_client.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_client.c; sourceTree = "<group>"; };
 		9793AE341704C0BD00E0C938 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		97A8DDC31896AFF300F4680F /* ttml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ttml.c; sourceTree = "<group>"; };
 		97DB67C41627B22F00A7E054 /* dash_segmenter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dash_segmenter.c; sourceTree = "<group>"; };
 		97DDAFEE1569631900528219 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
 		97E08C68160F684B00BBDC34 /* swf_svg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = swf_svg.c; sourceTree = "<group>"; };
+		97E29F6817D1138B00904FBF /* webvtt.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = webvtt.c; sourceTree = "<group>"; };
+		97E29F6D17D114E900904FBF /* mse_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mse_in.c; path = ../../modules/mse_in/mse_in.c; sourceTree = "<group>"; };
+		97E29F7217D1154D00904FBF /* ac3_in.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ac3_in.c; path = ../../modules/ac3_in/ac3_in.c; sourceTree = "<group>"; };
+		97E29F7317D1154D00904FBF /* liba52_dec.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = liba52_dec.c; path = ../../modules/ac3_in/liba52_dec.c; sourceTree = "<group>"; };
+		97E29F7917D118F100904FBF /* raw_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = raw_video.c; path = ../../modules/raw_out/raw_video.c; sourceTree = "<group>"; };
+		97E29F7B17D1190600904FBF /* osd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = osd.c; path = ../../modules/osd/osd.c; sourceTree = "<group>"; };
 		97FF065F138CE4C400D6C707 /* os_config_init.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = os_config_init.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1003,6 +1039,11 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				285DBBA01712C80E00AF2B9B /* libavcodec.a in Frameworks */,
+				285DBBA11712C80E00AF2B9B /* libavformat.a in Frameworks */,
+				285DBBA21712C80E00AF2B9B /* libavutil.a in Frameworks */,
+				285DBBA31712C80E00AF2B9B /* libswresample.a in Frameworks */,
+				285DBBA41712C80E00AF2B9B /* libswscale.a in Frameworks */,
 				04EFB63516E51E4200D1D44A /* libglues.a in Frameworks */,
 				0496F09C16DE36BC009D9D8D /* libz.dylib in Frameworks */,
 				0496F09B16DE35C9009D9D8D /* libgpac_static.a in Frameworks */,
@@ -1143,9 +1184,25 @@
 			path = icons;
 			sourceTree = "<group>";
 		};
+		28F2240B17D6372100E9D2BE /* ffmpeg_in */ = {
+			isa = PBXGroup;
+			children = (
+				28F2240917D636DA00E9D2BE /* ffmpeg_load.c */,
+				28F2240717D636C300E9D2BE /* ffmpeg_in.h */,
+				28F2240517D6369700E9D2BE /* ffmpeg_demux.c */,
+				28F2240317D6367000E9D2BE /* ffmpeg_decode.c */,
+			);
+			name = ffmpeg_in;
+			sourceTree = "<group>";
+		};
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				285DBB9B1712C80E00AF2B9B /* libavcodec.a */,
+				285DBB9C1712C80E00AF2B9B /* libavformat.a */,
+				285DBB9D1712C80E00AF2B9B /* libavutil.a */,
+				285DBB9E1712C80E00AF2B9B /* libswresample.a */,
+				285DBB9F1712C80E00AF2B9B /* libswscale.a */,
 				71CCF1381277041D00339E12 /* libgpac */,
 				929A929516EF8A7500B7C64F /* modules */,
 				71A19B1412796AC700ACFF58 /* osmo4iOS */,
@@ -1442,8 +1499,8 @@
 		71CCF19F1277045100339E12 /* isomedia */ = {
 			isa = PBXGroup;
 			children = (
+				97A8DDC31896AFF300F4680F /* ttml.c */,
 				97116F201646E38D00BD1AD0 /* box_code_adobe.c */,
-				973B2E3015BAAE3D00394854 /* generic_subtitle.c */,
 				71CCF1A01277045100339E12 /* avc_ext.c */,
 				71CCF1A11277045100339E12 /* box_code_3gpp.c */,
 				71CCF1A21277045100339E12 /* box_code_apple.c */,
@@ -1510,6 +1567,7 @@
 		71CCF1CD1277045100339E12 /* media_tools */ = {
 			isa = PBXGroup;
 			children = (
+				97E29F6817D1138B00904FBF /* webvtt.c */,
 				970FBA7B16F9F0720052216D /* html5_media.c */,
 				970FBA7C16F9F0720052216D /* html5_mse.c */,
 				97DB67C41627B22F00A7E054 /* dash_segmenter.c */,
@@ -1805,6 +1863,12 @@
 		929A929516EF8A7500B7C64F /* modules */ = {
 			isa = PBXGroup;
 			children = (
+				28F2240B17D6372100E9D2BE /* ffmpeg_in */,
+				97E29F7B17D1190600904FBF /* osd.c */,
+				97E29F7917D118F100904FBF /* raw_video.c */,
+				97E29F7217D1154D00904FBF /* ac3_in.c */,
+				97E29F7317D1154D00904FBF /* liba52_dec.c */,
+				97E29F6D17D114E900904FBF /* mse_in.c */,
 				92FA826116F254F50002629E /* timedtext_dec.c */,
 				92FA826216F254F50002629E /* timedtext_in.c */,
 				92FA825F16F254DA0002629E /* isma_ea.c */,
@@ -1966,6 +2030,8 @@
 				9747B6EF14864C6400280D95 /* ait.h in Headers */,
 				9747B6F014864C6400280D95 /* dsmcc.h in Headers */,
 				9747B6F114864C6400280D95 /* events_constants.h in Headers */,
+				285DBB49170F17D700AF2B9B /* ffmpeg_in.h in Headers */,
+				28F2240817D636C300E9D2BE /* ffmpeg_in.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2067,6 +2133,8 @@
 				92FA826016F254DA0002629E /* isma_ea.c in Sources */,
 				92FA826316F254F50002629E /* timedtext_dec.c in Sources */,
 				92FA826416F254F50002629E /* timedtext_in.c in Sources */,
+				285DBB44170F17C500AF2B9B /* ffmpeg_decode.c in Sources */,
+				285DBB47170F17CC00AF2B9B /* ffmpeg_demux.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2365,7 +2433,6 @@
 				9747B6F414864C7800280D95 /* ait.c in Sources */,
 				9747B6F514864C7800280D95 /* dsmcc.c in Sources */,
 				97DDAFEF1569631900528219 /* sha1.c in Sources */,
-				973B2E3115BAAE3D00394854 /* generic_subtitle.c in Sources */,
 				97793E5115E6370D005123E1 /* dash_client.c in Sources */,
 				97E08C69160F684B00BBDC34 /* swf_svg.c in Sources */,
 				97DB67C51627B22F00A7E054 /* dash_segmenter.c in Sources */,
@@ -2374,6 +2441,16 @@
 				970FBA7E16F9F0720052216D /* html5_mse.c in Sources */,
 				970FBA8116F9F0920052216D /* html5_media_smjs.c in Sources */,
 				970FBA8216F9F0920052216D /* html5_mse_smjs.c in Sources */,
+				97E29F6917D1138B00904FBF /* webvtt.c in Sources */,
+				97E29F6E17D114E900904FBF /* mse_in.c in Sources */,
+				97E29F7417D1154D00904FBF /* ac3_in.c in Sources */,
+				97E29F7517D1154D00904FBF /* liba52_dec.c in Sources */,
+				97E29F7A17D118F100904FBF /* raw_video.c in Sources */,
+				97E29F7C17D1190600904FBF /* osd.c in Sources */,
+				28F2240417D6367000E9D2BE /* ffmpeg_decode.c in Sources */,
+				28F2240617D6369700E9D2BE /* ffmpeg_demux.c in Sources */,
+				28F2240A17D636DA00E9D2BE /* ffmpeg_load.c in Sources */,
+				97A8DDC41896AFF300F4680F /* ttml.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2392,7 +2469,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CODE_SIGN_ENTITLEMENTS = osmo4ios.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
@@ -2402,8 +2478,12 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../extra_lib/include,
+				);
 				INFOPLIST_FILE = "../../applications/osmo4_ios/osmo4ios-Info.plist";
 				INSTALL_PATH = /Applications;
 				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
@@ -2411,13 +2491,14 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
 				OTHER_CFLAGS = "";
 				OTHER_CPLUSPLUSFLAGS = "";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = osmo4ios;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				SDKROOT = iphoneos;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -2427,14 +2508,17 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CODE_SIGN_ENTITLEMENTS = osmo4ios.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
-				HEADER_SEARCH_PATHS = ../../include;
+				HEADER_SEARCH_PATHS = (
+					../../include,
+					../../extra_lib/include,
+				);
 				INFOPLIST_FILE = "../../applications/osmo4_ios/osmo4ios-Info.plist";
 				INSTALL_PATH = /Applications;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
@@ -2442,12 +2526,14 @@
 					"$(inherited)",
 					"\"$(SRCROOT)/../../extra_lib/lib/iOS\"",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.6;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				OTHER_LDFLAGS = "";
 				PRODUCT_NAME = osmo4ios;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+				SDKROOT = iphoneos;
 				ZERO_LINK = NO;
 			};
 			name = Release;
@@ -2520,6 +2606,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_CXX_LIBRARY = "compiler-default";
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -2531,6 +2618,8 @@
 					XP_UNIX,
 				);
 				GCC_THUMB_SUPPORT = NO;
+				GCC_USE_STANDARD_INCLUDE_SEARCHING = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = ../../../extra_lib/include;
@@ -2547,6 +2636,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_CXX_LIBRARY = "compiler-default";
 				CODE_SIGN_IDENTITY = "";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
 				GCC_C_LANGUAGE_STANDARD = c99;
@@ -2558,8 +2648,11 @@
 					XP_UNIX,
 				);
 				GCC_THUMB_SUPPORT = NO;
+				GCC_USE_STANDARD_INCLUDE_SEARCHING = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../../extra_lib/include;
 				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";

gpac-0.5.0.svn4668.tar.bz2/configure -> gpac-0.5.0.svn5178.tar.bz2/configure Changed

@@ -22,7 +22,7 @@
 
 TMPC="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.c"
 TMPH="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.h"
-TMPCPP="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.cpp"
+TMPCXX="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.cpp"
 TMPE="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}"
 TMPO="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.o"
 TMPS="${TMPDIR1}/gpac-conf-${RANDOM}-$$-${RANDOM}.S"
@@ -37,9 +37,7 @@
 dxsdk_path=""
 moz_path="local"
 cc_orig="gcc"
-cc="${cc_orig}"
-cpp_orig="g++"
-cpp="${cpp_orig}"
+cxx_orig="g++"
 ar="ar"
 ranlib="ranlib"
 make="make"
@@ -177,7 +175,7 @@
 SHFLAGS=-shared
 need_inet_aton="no"
 CFLAGS=""
-CPPFLAGS=""
+CXXFLAGS=""
 GPAC_SH_FLAGS=-lpthread
 DYN_LIB_SUFFIX="so"
 X11_PATH="/usr/X11R6"
@@ -204,8 +202,8 @@
   --source-path=PATH       path of source code [$source_path]
   --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]
   --target-os=TARGETOS     use TARGETOS for compile tools [$targetos]
-  --cc =CC                 use C   compiler CC  [$cc]
-  --cpp=CPP                use C++ compiler CPP [$cpp]
+  --cc=CC                  use C   compiler CC  [$cc]
+  --cxx=CXX                use C++ compiler CXX [$cxx]
   --make=MAKE              use specified make [$make]
   --extra-cflags=ECFLAGS   add ECFLAGS to CFLAGS [$CFLAGS]
   --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]
@@ -324,13 +322,15 @@
             ;;
         --mandir=*) mandir=`echo $opt | cut -d '=' -f 2`
             ;;
-        --source-path=*) source_path=`echo $opt | cut -d '=' -f 2`
-            ;;
         --cross-prefix=*) cross_prefix=`echo $opt | cut -d '=' -f 2` && echo "\ncross-prefix detected: $cross_prefix"
             ;;
         --target-os=*) targetos=`echo $opt | cut -d '=' -f 2` && echo "\ntarget-os detected: $targetos"
             ;;
-        --cc=*) cc=`echo $opt | cut -d '=' -f 2`
+        --cc=*) cc_orig=`echo $opt | cut -d '=' -f 2`
+            ;;
+        --cxx=*) cxx_orig=`echo $opt | cut -d '=' -f 2`
+            ;;
+        --cpp=*) cxx_orig=`echo $opt | cut -d '=' -f 2`
             ;;
         --make=*) make=`echo $opt | cut -d '=' -f 2`
             ;;
@@ -353,6 +353,9 @@
     esac
 done
 
+cc="${cc_orig}"
+cxx="${cxx_orig}"
+
 case "$cpu" in
     i386|i486|i586|i686|i86pc|BePC)
         cpu="x86"
@@ -366,6 +369,9 @@
             SunOS)
                 canon_arch=`isainfo -n`
                 ;;
+            Darwin)
+                canon_arch="x86_64"
+                ;;
             *)
                 canon_arch="`$cc -dumpmachine | sed -e 's,$[^-]*$-.*,\1,'`"
                 ;;
@@ -375,6 +381,7 @@
             if [ -z "`echo $CFLAGS | grep -- -m32`"  ]; then
                 cpu="x86_64"
                 want_pic="yes"
+	        is_64="yes"
             fi
         fi
         ;;
@@ -426,7 +433,7 @@
 cc="${cross_prefix}${cc}"
 #for ccache
 cc="${cc}"
-cpp="${cross_prefix}${cpp}"
+cxx="${cross_prefix}${cxx}"
 ar="${cross_prefix}${ar}"
 ranlib="${cross_prefix}${ranlib}"
 strip="${cross_prefix}${strip}"
@@ -546,7 +553,7 @@
         GPAC_SH_FLAGS=""
         strip="strip -x"
         if test "$is_64" = "yes" ; then
-            LDFLAGS="$LDFLAGS -read_only_relocs warning"
+            LDFLAGS="$LDFLAGS"
         fi
         darwin="yes"
         gcc_version=`$cc -v 2>&1 | grep version | cut -d ' ' -f3`
@@ -568,6 +575,10 @@
         mingw32="yes"
         win32="yes"
         extralibs="$extralibs -lws2_32 -lwinmm"
+        CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+        if test "$cross_prefix" != "" ; then
+            GPAC_SH_FLAGS=""
+        fi
         ;;
 
     CYGWIN*)
@@ -623,7 +634,7 @@
 if $cc -o $TMPO $TMPC -fno-strict-aliasing 2> /dev/null  ; then
     CFLAGS="$CFLAGS -fno-strict-aliasing"
 fi
-CPPFLAGS="$CFLAGS"
+CXXFLAGS="$CFLAGS"
 if $cc -o $TMPO $TMPC -lz -Wno-pointer-sign 2> /dev/null  ; then
     CFLAGS="$CFLAGS -Wno-pointer-sign"
 fi
@@ -643,15 +654,25 @@
 fi
 if test "$want_pic"  = "yes" ; then
     CFLAGS="$CFLAGS -fPIC -DPIC"
-    CPPFLAGS="$CPPFLAGS -fPIC -DPIC"
+    CXXFLAGS="$CXXFLAGS -fPIC -DPIC"
 fi
 
 
 #force use of cflags with cc
 cc_naked=$cc
-cpp_naked=$cpp
+cxx_naked=$cxx
 cc="$cc $CFLAGS"
-cpp="$cpp $CPPFLAGS"
+cxx="$cxx $CXXFLAGS"
+
+#look for zlib
+cat > $TMPC << EOF
+#include <emmintrin.h>
+int main( void ) {  }
+EOF
+
+if $cc -o $TMPO $TMPC -msse2 $LDFLAGS 2> /dev/null  ; then
+  CFLAGS="$CFLAGS -msse2"
+fi
 
 
 #look for zlib
@@ -892,31 +913,26 @@
                         else
 				js_flags="-DUSE_FFDEV_14 $js_flags"
          		fi
-                else
-cat > $TMPC << EOF
-#include <jsapi.h>
-int main( void ) { JSContext *cx; JS_SetContextThread(cx); }
-EOF
-		        if $cc -o $TMPO $TMPC $js_flags $LDFLAGS $js_lib 2> /dev/null  ; then
-cat > $TMPC << EOF
-#include <jsapi.h>
-int main( void ) { JSContext *cx; JS_SetRuntimeThread(cx); }
-EOF
-			        if $cc -o $TMPO $TMPC $js_flags $LDFLAGS $js_lib 2> /dev/null  ; then
-			            js_flags="$js_flags"
-			        else
-			            js_flags="-DNO_JS_RUNTIMETHREAD $js_flags"
-			        fi
-		        else
-		            js_flags="-DUSE_FFDEV_11 $js_flags"
-		        fi
                 fi
             fi
         fi
     fi
 fi
 
-#fi
+
+
+if test "$has_js" != "no" ; then
+cat > $TMPC << EOF
+cat > $TMPC << EOF
+#include <jsapi.h>
+int main( void ) { JSContext *cx; JS_SetRuntimeThread(cx); }
+EOF
+	if $cc -o $TMPO $TMPC $js_flags $LDFLAGS $js_lib 2> /dev/null  ; then
+		js_flags="$js_flags"
+	else
+		js_flags="-DNO_JS_RUNTIMETHREAD $js_flags"
+	fi
+fi
 
 
 #end JS test
@@ -928,7 +944,7 @@
 #include <Platinum.h>
 int main( void ) { return 0; }
 EOF
-if $cpp -o $TMPO $TMPC -I$local_inc/platinum $LDFLAGS -L$local_lib -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread 2> /dev/null  ; then
+if $cxx -o $TMPO $TMPC -I$local_inc/platinum $LDFLAGS -L$local_lib -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread 2> /dev/null  ; then
   has_platinum="yes"
 fi
 
@@ -950,7 +966,7 @@
   return 0; 
 }
 EOF
-if $cpp -o $TMPO $TMPC $LDFLAGS $avcap_cflags $avcap_ldflags 2> /dev/null  ; then
+if $cxx -o $TMPO $TMPC $LDFLAGS $avcap_cflags $avcap_ldflags 2> /dev/null  ; then
   has_avcap="yes"
 else
     if test "$darwin" = "yes" ; then
@@ -960,7 +976,7 @@
         avcap_cflags="-I$local_inc -I$local_inc/avcap/linux"
         avcap_ldflags="-lavcap -lpthread"
     fi
-    if $cpp -o $TMPO $TMPC $avcap_cflags $LDFLAGS -L$local_lib $avcap_ldflags 2> /dev/null  ; then
+    if $cxx -o $TMPO $TMPC $avcap_cflags $LDFLAGS -L$local_lib $avcap_ldflags 2> /dev/null  ; then
         has_avcap="yes"
         avcap_ldflags="-L../../$local_lib $avcap_ldflags"
     fi
@@ -981,13 +997,13 @@
 #include <OpenSVCDecoder/SVCDecoder_ietr_api.h>
 int main( void ) { return 0; }
 EOF
-if $cpp -o $TMPO $TMPC $osvc_cflags $LDFLAGS $osvc_ldflags 2> /dev/null  ; then
+if $cxx -o $TMPO $TMPC $osvc_cflags $LDFLAGS $osvc_ldflags 2> /dev/null  ; then
   has_opensvc="yes"
 else
 osvc_cflags="-I$local_inc"
 osvc_ldflags="-lOpenSVCDec"
 
-if $cpp -o $TMPO $TMPC $osvc_cflags $LDFLAGS -L$local_lib $osvc_ldflags 2> /dev/null  ; then
+if $cxx -o $TMPO $TMPC $osvc_cflags $LDFLAGS -L$local_lib $osvc_ldflags 2> /dev/null  ; then
   has_opensvc="yes"
   osvc_ldflags="-L../../$local_lib $osvc_ldflags"
 fi
@@ -1009,8 +1025,8 @@
 
 cat > $TMPC << EOF
 #include <stdio.h>
-int libOpenHevcInit();
-int main( void ) { libOpenHevcInit(); return 0; }
+#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
   has_openhevc="yes"
@@ -1272,7 +1288,7 @@
 
 ffmpeg_cflags=""
 ffmpeg_lflags="-lz -lavcodec -lavformat -lavutil -lswscale -lavdevice"
-if test "$pkg_config" != "no"; then
+if test "$cross_prefix" = "" -a "$pkg_config" != "no"; then
   if $pkg_config --exists libavcodec libavformat libswscale libavdevice libavutil 2> /dev/null  ; then
     ffmpeg_cflags=`$pkg_config --cflags libavcodec libavformat libswscale libavutil libavdevice`
     ffmpeg_lflags=`$pkg_config --libs libavcodec libavformat libswscale libavutil libavdevice`
@@ -1282,7 +1298,7 @@
 
 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
@@ -1292,7 +1308,12 @@
 
     cat > $TMPC << EOF
 #include <ffmpeg/avcodec.h>
-int main( void ) { return 0; }
+int main(void) {
+    AVFrame *f1, *f2;
+    f2 = av_frame_clone(f1);
+    AV_CODEC_ID_H264;
+    return 0;
+}
 EOF
 
 fi
@@ -1320,6 +1341,16 @@
     fi
 fi
 
+cat > $TMPC << EOF
+#include <libavutil/frame.h>
+int main(void) {return 0;}
+EOF
+if $cc -o $TMPO $TMPC $ffmpeg_cflags $ffmpeg_lflags 2> /dev/null  ; then
+	is_libav="no"
+else
+	is_libav="yes"
+fi
+
 
 
 #look for FREENECT support
@@ -1493,12 +1524,12 @@
             fi
         fi
 
-        cat > $TMPCPP << EOF
+        cat > $TMPCXX << EOF
 #include <wx/wx.h>
 int main( void ) { return 0; }
 EOF
 
-        if $cc $wx_cflags -o $TMPO $TMPCPP $wx_lflags > /dev/null 2>&1 ; then
+        if $cc $wx_cflags -o $TMPO $TMPCXX $wx_lflags > /dev/null 2>&1 ; then
             wx_version=`wx-config --version | sed 's/[^0-9]//g'`
             if test "$wx_version" -lt 254 ; then
                 wx_too_old="yes"
@@ -1783,11 +1814,10 @@
             ;;
         --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_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"
             ;;
-
         --disable-3d) disable_3d="yes"
             ;;
         --enable-3d) disable_3d="no"
@@ -2057,12 +2087,12 @@
 
 
 #look for GECKO support
-cat > $TMPCPP << EOF
+cat > $TMPCXX << EOF
 #include <npapi.h>
 int main( void ) { return 0; }
 EOF
 
-if $cc -o $TMPO $TMPCPP -I$xulsdk_path $LDFLAGS 2> /dev/null  ; then
+if $cc -o $TMPO $TMPCXX -I$xulsdk_path $LDFLAGS 2> /dev/null  ; then
     has_xul="system"
     xul_flags="-I$xulsdk_path $xul_flags"
 fi
@@ -2070,7 +2100,7 @@
 if test "$pkg_config" != "no"; then
   if test "$has_xul" = "no" ; then
     if $pkg_config --exists libxul 2> /dev/null ; then
-        if $cpp -o $TMPO $TMPCPP `$pkg_config --cflags libxul` `$pkg_config --libs libxul` ; then
+        if $cxx -o $TMPO $TMPCXX `$pkg_config --cflags libxul` `$pkg_config --libs libxul` ; then
             has_xul="system"
             xul_flags="`$pkg_config --cflags libxul` `$pkg_config --libs libxul`" 
         fi
@@ -2079,13 +2109,13 @@
 fi
 
 if test "$has_xul" = "no" ; then
-    if $cc -o $TMPO $TMPCPP $xul_flags -I$local_inc/gecko-sdk/include $LDFLAGS 2> /dev/null  ; then
+    if $cc -o $TMPO $TMPCXX $xul_flags -I$local_inc/gecko-sdk/include $LDFLAGS 2> /dev/null  ; then
         has_xul="local"
         xul_flags="-I$local_inc/gecko-sdk/include $xul_flags"
     else
         #xulrunner directories are sometimes included through js/xul/ff packages
         if test ! "$has_js" = "no" -a ! "$has_js" = "local" ; then
-            if $cc -o $TMPO $TMPCPP $js_flags $js_lib_pkg $LDFLAGS 2> /dev/null  ; then
+            if $cc -o $TMPO $TMPCXX $js_flags $js_lib_pkg $LDFLAGS 2> /dev/null  ; then
                 if test "$mozjs_pkgcfg" != "no" ; then
                     xul_flags=`$pkg_config --cflags $mozjs_pkgcfg`
                     has_xul="$has_js"
@@ -2334,7 +2364,7 @@
 echo "Install prefix: $prefix"
 echo "Source path: $source_path"
 echo "C   compiler: $cc_naked"
-echo "C++ compiler: $cpp_naked"
+echo "C++ compiler: $cxx_naked"
 echo "make: $make"
 echo "CPU: $cpu"
 echo "Big Endian: $bigendian"
@@ -2538,6 +2568,7 @@
 
 if test "$disable_mpd" = "yes" ; then
     echo "HLS and DASH Manifest Disabled"
+    echo "#define GPAC_DISABLE_MPD" >> $TMPH
 fi
 
 if test "$disable_dash" = "yes" ; then
@@ -2679,7 +2710,7 @@
 if test "$win32" = "no" ; then
     CFLAGS="$CFLAGS -fvisibility=\"hidden\""
 fi
-CPPFLAGS="$CPPFLAGS"
+CXXFLAGS="$CXXFLAGS"
 
 
 echo "Creating config.mak"
@@ -2713,7 +2744,7 @@
 
 echo "INSTFLAGS=$instflags" >> config.mak
 echo "OPTFLAGS=$CFLAGS" >> config.mak
-echo "CPPFLAGS=$CPPFLAGS" >> config.mak
+echo "CXXFLAGS=$CXXFLAGS" >> config.mak
 echo "LDFLAGS=$LDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
 echo "libdir=$libdir" >> config.mak
@@ -2764,6 +2795,10 @@
     echo "CONFIG_WIN32=yes" >> config.mak
     echo "CONFIG_OS=CONFIG_WIN32" >> config.mak
     echo "#define GPAC_CONFIG_WIN32" >> $TMPH
+    if test "$cygwin" = "yes" ; then
+        echo "#define ftello64 ftell" >> $TMPH
+        echo "#define fseeko64 fseek" >> $TMPH
+    fi
 elif test "$linux" = "yes" ; then
     echo "CONFIG_LINUX=yes" >> config.mak
     echo "CONFIG_OS=CONFIG_LINUX" >> config.mak
@@ -2811,9 +2846,11 @@
     echo "JS_LIBS=$js_lib" >> config.mak
     echo "#define GPAC_HAS_SPIDERMONKEY" >> $TMPH
 fi
-echo "CONFIG_ZLIB=$has_zlib" >> config.mak
-if test "$has_zlib" = "no" ; then
+if test "$has_zlib" = "no" -o "$has_zlib" = "force-no" ; then
     echo "#define GPAC_DISABLE_ZLIB" >> $TMPH
+    echo "CONFIG_ZLIB=no" >> config.mak
+else
+    echo "CONFIG_ZLIB=$has_zlib" >> config.mak
 fi
 echo "CONFIG_FT=$has_ft" >> config.mak
 
@@ -2835,10 +2872,13 @@
 echo "CONFIG_VORBIS=$has_vorbis" >> config.mak
 echo "CONFIG_THEORA=$has_theora" >> config.mak
 echo "CONFIG_FFMPEG=$has_ffmpeg" >> config.mak
-if test "$has_ffmpeg" != "no"
-then
+if test "$has_ffmpeg" = "no"; then
+echo "DISABLE_DASHCAST=yes" >> config.mak
+else
     echo "ffmpeg_cflags=$ffmpeg_cflags" >> config.mak
     echo "ffmpeg_lflags=$ffmpeg_lflags" >> config.mak
+#    echo "DISABLE_DASHCAST=$is_libav" >> config.mak
+    echo "CONFIG_LIBAV=$is_libav" >> config.mak
 fi
 echo "CONFIG_FFMPEG_OLD=$old_ffmpeg_inc" >> config.mak
 
@@ -2949,6 +2989,10 @@
     echo "#define GPAC_HAS_IPV6" >> $TMPH
 fi
 
+if test "$is_64" = "yes" ; then
+    echo "#define GPAC_64_BITS" >> $TMPH
+fi
+
 if test "$win32" = "yes" ; then
     echo "CONFIG_DIRECTX=$has_mingw_directx" >> config.mak
     if test "$has_mingw_directx" = "yes" ; then
@@ -3016,7 +3060,12 @@
 fi
 
 if test "$is_64" = "yes"; then
+#not on OSX ...
+if test "$darwin" = "yes"; then
+    echo "X11_LIB_PATH=$X11_PATH/lib" >> config.mak
+else
     echo "X11_LIB_PATH=$X11_PATH/lib64" >> config.mak
+fi
 else
     echo "X11_LIB_PATH=$X11_PATH/lib" >> config.mak
 fi
@@ -3118,7 +3167,7 @@
 fi
 
 
-rm -f $TMPO $TMPC $TMPE $TMPS $TMPCPP $TMPH
+rm -f $TMPO $TMPC $TMPE $TMPS $TMPCXX $TMPH
 
 
 if [ ! -d "./bin" ] ; then

gpac-0.5.0.svn4668.tar.bz2/doc/configuration.html -> gpac-0.5.0.svn5178.tar.bz2/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: 2013-06-13 02:48:56 +0800 (四, 2013-06-13) $</span></b>
+<b><span style="Font-Size: 18pt">Last Modified $LastChangedDate: 2014-03-15 01:53:27 +0800 (六, 2014-03-15) $</span></b>
 </p>
 
 <br/><br/>
@@ -43,6 +43,7 @@
 <b><a href="#DASH" style="text-decoration: underline;">DASH</a></b>
 <b><a href="#ALSA" style="text-decoration: underline;">ALSA</a></b>
 <b><a href="#SHORTCUTS" style="text-decoration: underline;">Shortcuts</a></b>
+<b><a href="#OpenHEVC" style="text-decoration: underline;">OpenHEVC</a></b>
 <b><a href="#DSMCC" style="text-decoration: underline;">DSMCC</a></b>
 
 </p>
@@ -220,7 +221,7 @@
 </p>
 <b>DrawLateFrames</b> [value: <i>"yes" "no"</i>]
 <p style="text-indent: 5%">
-If set, late frames will still be drawn. If not set, the late frames are droped (or executed for systems decoders) untill the decoder output is back in sync. This is by default off to keep better sync, but may be usefull when testing heavy content or slow renderers.
+If set, late frames will still be drawn. If not set, the late frames are droped (or executed for systems decoders) untill the decoder output is back in sync. This is by default on to keep better testing heavy content or slow renderers, but should be set to off when needing a better sync or monitoring skipped frames.
 </p>
 <b>ForceSingleClock</b> [value: <i>"yes" "no"</i>]
 <p style="text-indent: 5%">
@@ -319,11 +320,15 @@
 <b>DisableYUV</b> [value: <i>"yes" "no"</i>]
 <p style="text-indent: 5%">
 Disables YUV hardware support (YUV hardware support may not be available for the current video output module).</p>
+<b>TextureFromDecoderMemory</b> [value: <i>"yes" "no"</i>]
+<p style="text-indent: 5%">
+Allows video textures to be build directly from video decoder internal buffers. This may increase performances on some systems. Default is no.</p>
+
 
 
-<b>ForceOpenGL</b> [value: <i>"yes", "no", "raster"</i>]
+<b>ForceOpenGL</b> [value: <i>"always", "disable", "hybrid", "raster"</i>]
 <p style="text-indent: 5%">
-Specifies that 2D rendering will be performed by OpenGL rather than raster 2D. This will involve polygon tesselation which may not be supported on all platforms. The raster mode only uses OpenGL for pixel IO but does not perform polygin fill (no tesselation).</p>
+Specifies that 2D rendering will be performed by OpenGL rather than raster 2D. This will involve polygon tesselation which may not be supported on all platforms, and 2D graphics will not loo as nice as 2D mode. The hybrid mode performs software drawing of 2D graphics with no textures (better quality) and uses OpenGL for all textures. The raster mode only uses OpenGL for pixel IO but does not perform polygin fill (no tesselation) (slow, mainly for test purposes).</p>
 <b>DefaultNavigationMode</b> [value: <i>"Walk", "Fly", "Examine"</i>]
 <p style="text-indent: 5%">
 Overrides the default navigation mode of MPEG-4/VRML (Walk) and X3D (Examine).</p>
@@ -731,15 +736,29 @@
 <b>UseMaxResolution</b> [value: <i>yes, no</i>]
 <p style="text-indent: 5%">
 Forces the player to set the output video resolution to the max resolution available instead of resizing the window. Default is yes</p>
+<b>UseScreenResolution</b> [value: <i>yes, no</i>]
+<p style="text-indent: 5%">
+Disables all resolutions that are higher than the screen resolution. Default is yes</p>
 <b>StartRepresentation</b> [value: <i>minBandwidth, maxBandwidth, 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> ]
 <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.
-<b>LowLatency</b> [value: <i>yes, no</i>]
+Uses the given percentage of the timeshift buffer when starting playback. Default is 0 to tune to the live point.</p>
+<b>LowLatency</b> [value: <i>always, chunk, no</i>]
 <p style="text-indent: 5%">
 Sets low-latency mode enabled. In low-latency mode, media data is parsed as soon as possible while segment is being downloaded. Default is no.
+If chunk is selected, media data is re-parsed at each HTTP 1.1 chunk end. If always is selected, media data is re-parsed as soon as HTTP data is received.</p> 
+<b>AllowAbort</b> [value: <i>yes, no</i>]
+<p style="text-indent: 5%">
+Enables aborts of HTTP transfer when rate gets too low. This may result in a packet drops. Default is no.</p>
+<b>UseServerUTC</b> [value: <i>yes, no</i>]
+<p style="text-indent: 5%">
+Enables using <i>Server-UTC</i> HTTP header to compensate any drift between client and server. Default is yes.</p>
+<b>DebugAdaptationSet</b> [value: <i>integer</i>]
+<p style="text-indent: 5%">
+Plays only the adaptation set indicated by its index in the MPD. If index is negative, all sets are used (default mode).
+</p>
 
 <br/><br/>
 
@@ -804,6 +823,21 @@
 
 <br/><br/>
 
+<a name="OpenHEVC"></a>
+<span style="text-decoration: underline;"><b>Section "OpenHEVC"</b></span> <i><a href="#Overview">Back to top</a></i>
+<p>
+The openHEVC section of the config file holds the configuration option for the OpenHEVC decoder.
+</p>
+<b>NumThreads</b> [value: unsigned integer]
+<p style="text-indent: 5%">
+Specifies the number of threads to allocate to the OpenHEVC decoder. Default is the number of detected cores minus one, or one if core detection fails.</p>
+<b>ThreadingType</b> [value: <i>frame</i> , <i>wpp</i> , <i>frame+wpp</i> ]
+<p style="text-indent: 5%">
+Specifies the threading type for the openHEVC decoder. Default is frame (wpp disabled).</p>
+
+
+<br/><br/>
+
 <a name="DirectFB"></a>
 <span style="text-decoration: underline;"><b>Section "DirectFB"</b></span> <i><a href="#Overview">Back to top</a></i>
 <p>

gpac-0.5.0.svn4668.tar.bz2/doc/doxyfile -> gpac-0.5.0.svn5178.tar.bz2/doc/doxyfile Changed

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

gpac-0.5.0.svn5178.tar.bz2/doc/doxyfile-full Added

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

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/OpenSVCDecoder/ControlLayer.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/OpenSVCDecoder/ControlLayer.h Changed

@@ -1,45 +1,45 @@
-/*****************************************************************************
-   *
-   *  SVC4DSP developped in IETR image lab
-   *
-   *
-   *
-   *              Médéric BLESTEL <mblestel@insa-rennes.Fr>
-   *              Mickael RAULET <mraulet@insa-rennes.Fr>
-   *              http://www.ietr.org/
-   *
-   *
-   *
-   *
-   *
-   * This library is free software; you can redistribute it and/or
-   * modify it under the terms of the GNU Lesser 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,
-   * but WITHOUT ANY WARRANTY; without even the implied warranty of
-   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   * Lesser General Public License for more details.
-   *
-   * You should have received a copy of the GNU Lesser General Public
-   * License along with this library; if not, write to the Free Software
-   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-   *
-   *
-   * $Id$
-   *
-   **************************************************************************/
-
-#define WINEXPORT
-
-#ifdef TCPMP
-#ifndef POCKET_PC
-#include "windows.h"
-#undef WINEXPORT
-#define WINEXPORT WINAPI
-#endif
-#endif
-
-
-void getLayer(int *num_layer);
+/*****************************************************************************
+   *
+   *  SVC4DSP developped in IETR image lab
+   *
+   *
+   *
+   *              Médéric BLESTEL <mblestel@insa-rennes.Fr>
+   *              Mickael RAULET <mraulet@insa-rennes.Fr>
+   *              http://www.ietr.org/
+   *
+   *
+   *
+   *
+   *
+   * This library is free software; you can redistribute it and/or
+   * modify it under the terms of the GNU Lesser 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,
+   * but WITHOUT ANY WARRANTY; without even the implied warranty of
+   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   * Lesser General Public License for more details.
+   *
+   * You should have received a copy of the GNU Lesser General Public
+   * License along with this library; if not, write to the Free Software
+   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+   *
+   *
+   * $Id$
+   *
+   **************************************************************************/
+
+#define WINEXPORT
+
+#ifdef TCPMP
+#ifndef POCKET_PC
+#include "windows.h"
+#undef WINEXPORT
+#define WINEXPORT WINAPI
+#endif
+#endif
+
+
+void getLayer(int *num_layer);

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/OpenSVCDecoder/ParseAU.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/OpenSVCDecoder/ParseAU.h Changed

@@ -1,39 +1,39 @@
-/*****************************************************************************
-*
-*  SVC4DSP developped in IETR image lab
-*
-*
-*
-*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
-*              Mickael RAULET <mraulet@insa-rennes.Fr>
-*              http://www.ietr.org/
-*
-*
-*
-*
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser 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,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*
-* $Id$
-*
-**************************************************************************/
-
-
-
-void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc);
-int GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
-int Geth264NalSize(const unsigned char *buf, int buf_size, int *bufindex);
-
+/*****************************************************************************
+*
+*  SVC4DSP developped in IETR image lab
+*
+*
+*
+*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
+*              Mickael RAULET <mraulet@insa-rennes.Fr>
+*              http://www.ietr.org/
+*
+*
+*
+*
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser 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,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*
+*
+* $Id$
+*
+**************************************************************************/
+
+
+
+void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc);
+int GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
+int Geth264NalSize(const unsigned char *buf, int buf_size, int *bufindex);
+

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/OpenSVCDecoder/SVCDecoder_ietr_api.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/OpenSVCDecoder/SVCDecoder_ietr_api.h Changed

@@ -1,144 +1,144 @@
-/*****************************************************************************
-*
-*  SVC4DSP developped in IETR image lab
-*
-*
-*
-*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
-*              Mickael RAULET <mraulet@insa-rennes.Fr>
-*              http://www.ietr.org/
-*
-*
-*
-*
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser 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,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*
-* $Id$
-*
-**************************************************************************/
-
-#ifndef _SVCDecoder_ietr_api_h
-#define _SVCDecoder_ietr_api_h
-
-
-#include "SvcInterface.h"
-
-
-enum {
-	SVC_STATUS_ERROR	= -1,
-	SVC_STATUS_OK	    = 0,	// no error and no frame ready
-	SVC_IMAGE_READY     = 1,	// no error and image ready
-	SVC_GHOST_IMAGE		= 2		// no image for chosen layer but image could be ready for other layers
-};
-
-
-/*======================================================================================================
-int SVCDecoder_init();
-This method initializes the internal resources of the decoder
-@return SVC_STATUS_OK if creation is successful
-======================================================================================================*/
-int SVCDecoder_init(void **PlayerStruct);
-
-
-/*======================================================================================================
-void UpdateLayer(int *DqIdTable, int *CurrDqId, int MaxDqId, int Command);
-Use this method to change of quality, spatial or temporal scalability during the 
-decoding process.
-The DqIdTable specifies the DqId of each layer present into the stream.
-CurrDqId specifies the DqId of the current layer.
-MaxDqId specifies the maximal DqId present into the access unit.
-Command specifies the action to execute:
-0: To switch down of spatial or quality scalability
-1: To switch up of spatial or quality scalability 
-2: To switch up to the layer with the higthest DqId
-3: To switch down of temporal scalability
-4: To switch up of temporal scalability
-@return nothing
-=======================================================================================================*/
-void UpdateLayer(int *DqIdTable, int *CurrDqId, int *TemporalCom, int *TemporalId, int MaxDqId, int Command);
-
-
-
-/*======================================================================================================
-void SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
-Use this method to generate the right command for the SVC decoder.
-The Command is a 4 size table given to the decoder.
-DqIdMax specifies the maximal DqId present into the access unit.
-CurrDqId specifies the DqId of the current layer.
-TemporalCom is the command to use concerning the temporal scalability.
-0 -> do nothing
-1 -> decode a lower temporal scalability.
-2 -> decode a highter temporal scalability.
-3 -> define a specific temporal scalability. (use TemporalId variable to set).
-@return nothing
-=======================================================================================================*/
-void SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
-
-
-/*======================================================================================================
-int decodeNAL(	unsigned char* nal, int nal_length, OPENSVCFRAME *Frame, int DqIdMax);
-Use this method to give a new NAL Unit to the decoder. The NAL content (no start code)
-is stored at the address given by the argument pNAL and the length of the NAL is provided 
-by the argument nal_length. Memory of this nal buffer is managed by the application.
-If the function returns the code SVC_IMAGE_READY, this means that an image is ready and in this case, 
-the arguments *Frame has been updated by the decoder and the image plans are contained at 
-the addresses pY, PU, pV.
-The image stored at these location is an image centered in a rectangle of size (*pWidth + 32, *pHeight + 32)
-for Y and ((*pWidth + 32) / 2, (*pHeight + 32) / 2)) for U and V.
-Memory of these image buffers is managed by the decoder.
-In case of a SVC stream, the largest DqIq of the Access Unit should be given.
-
-@param nal is the address of the buffer that contains the NAL unit
-@param nal_length is the size of NAL Unit data
-@param Frame Contains all parameters from the displayed picture
-@param DQIdMax is the largest DQId of the current access unit
-@return SVC_STATUS_OK or SVC_STATUS_ERROR or SVC_IMAGE_READY or SVC_GHOST_IMAGE
-======================================================================================================*/
-int decodeNAL(void *PlayerStruct, unsigned char* nal, int nal_length, OPENSVCFRAME *Frame, int *LayerCommand); 
-
-
-/*======================================================================================================
-int SVCDecoder_close();
-This method releases the internal resources of the decoder
-@return SVC_STATUS_OK if creation is successfull
-=======================================================================================================*/
-int SVCDecoder_close(void *PlayerStruct);
-
-/*======================================================================================================
-int  GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
-This method return the max DqId commputed into the access unit.
-This method should be called once in each access unit.
-@param buf is the input data to decode
-@param buf_size is the size of access unit
-@param nal_length_size is the start code length
-@param DqidTable is a table in which all DqId will be stored.
-@param is_avc indicates if the stream contained SVC NAL.
-=======================================================================================================*/
-int GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
-
-
-/*======================================================================================================
-void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc;
-This method parses the first access unit in order to configure the decoder.
-This method has to be done once by video.
-@param buf is the input data to decode
-@param buf_size is the size of access unit
-@param nal_length_size is the start code length
-@param is_avc indicates if the stream contained SVC NAL.
-=======================================================================================================*/
-void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc);
-#endif	// SVCDecoder_ietr_api
+/*****************************************************************************
+*
+*  SVC4DSP developped in IETR image lab
+*
+*
+*
+*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
+*              Mickael RAULET <mraulet@insa-rennes.Fr>
+*              http://www.ietr.org/
+*
+*
+*
+*
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser 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,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*
+*
+* $Id$
+*
+**************************************************************************/
+
+#ifndef _SVCDecoder_ietr_api_h
+#define _SVCDecoder_ietr_api_h
+
+
+#include "SvcInterface.h"
+
+
+enum {
+	SVC_STATUS_ERROR	= -1,
+	SVC_STATUS_OK	    = 0,	// no error and no frame ready
+	SVC_IMAGE_READY     = 1,	// no error and image ready
+	SVC_GHOST_IMAGE		= 2		// no image for chosen layer but image could be ready for other layers
+};
+
+
+/*======================================================================================================
+int SVCDecoder_init();
+This method initializes the internal resources of the decoder
+@return SVC_STATUS_OK if creation is successful
+======================================================================================================*/
+int SVCDecoder_init(void **PlayerStruct);
+
+
+/*======================================================================================================
+void UpdateLayer(int *DqIdTable, int *CurrDqId, int MaxDqId, int Command);
+Use this method to change of quality, spatial or temporal scalability during the 
+decoding process.
+The DqIdTable specifies the DqId of each layer present into the stream.
+CurrDqId specifies the DqId of the current layer.
+MaxDqId specifies the maximal DqId present into the access unit.
+Command specifies the action to execute:
+0: To switch down of spatial or quality scalability
+1: To switch up of spatial or quality scalability 
+2: To switch up to the layer with the higthest DqId
+3: To switch down of temporal scalability
+4: To switch up of temporal scalability
+@return nothing
+=======================================================================================================*/
+void UpdateLayer(int *DqIdTable, int *CurrDqId, int *TemporalCom, int *TemporalId, int MaxDqId, int Command);
+
+
+
+/*======================================================================================================
+void SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
+Use this method to generate the right command for the SVC decoder.
+The Command is a 4 size table given to the decoder.
+DqIdMax specifies the maximal DqId present into the access unit.
+CurrDqId specifies the DqId of the current layer.
+TemporalCom is the command to use concerning the temporal scalability.
+0 -> do nothing
+1 -> decode a lower temporal scalability.
+2 -> decode a highter temporal scalability.
+3 -> define a specific temporal scalability. (use TemporalId variable to set).
+@return nothing
+=======================================================================================================*/
+void SetCommandLayer(int *Command, int DqIdMax, int CurrDqId, int *TemporalCom, int TemporalId);
+
+
+/*======================================================================================================
+int decodeNAL(	unsigned char* nal, int nal_length, OPENSVCFRAME *Frame, int DqIdMax);
+Use this method to give a new NAL Unit to the decoder. The NAL content (no start code)
+is stored at the address given by the argument pNAL and the length of the NAL is provided 
+by the argument nal_length. Memory of this nal buffer is managed by the application.
+If the function returns the code SVC_IMAGE_READY, this means that an image is ready and in this case, 
+the arguments *Frame has been updated by the decoder and the image plans are contained at 
+the addresses pY, PU, pV.
+The image stored at these location is an image centered in a rectangle of size (*pWidth + 32, *pHeight + 32)
+for Y and ((*pWidth + 32) / 2, (*pHeight + 32) / 2)) for U and V.
+Memory of these image buffers is managed by the decoder.
+In case of a SVC stream, the largest DqIq of the Access Unit should be given.
+
+@param nal is the address of the buffer that contains the NAL unit
+@param nal_length is the size of NAL Unit data
+@param Frame Contains all parameters from the displayed picture
+@param DQIdMax is the largest DQId of the current access unit
+@return SVC_STATUS_OK or SVC_STATUS_ERROR or SVC_IMAGE_READY or SVC_GHOST_IMAGE
+======================================================================================================*/
+int decodeNAL(void *PlayerStruct, unsigned char* nal, int nal_length, OPENSVCFRAME *Frame, int *LayerCommand); 
+
+
+/*======================================================================================================
+int SVCDecoder_close();
+This method releases the internal resources of the decoder
+@return SVC_STATUS_OK if creation is successfull
+=======================================================================================================*/
+int SVCDecoder_close(void *PlayerStruct);
+
+/*======================================================================================================
+int  GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
+This method return the max DqId commputed into the access unit.
+This method should be called once in each access unit.
+@param buf is the input data to decode
+@param buf_size is the size of access unit
+@param nal_length_size is the start code length
+@param DqidTable is a table in which all DqId will be stored.
+@param is_avc indicates if the stream contained SVC NAL.
+=======================================================================================================*/
+int GetDqIdMax(const unsigned char *buf, int buf_size, int nal_length_size, int *DqidTable, int is_avc);
+
+
+/*======================================================================================================
+void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc;
+This method parses the first access unit in order to configure the decoder.
+This method has to be done once by video.
+@param buf is the input data to decode
+@param buf_size is the size of access unit
+@param nal_length_size is the start code length
+@param is_avc indicates if the stream contained SVC NAL.
+=======================================================================================================*/
+void ParseAuPlayers(void *PlayerStruct, const unsigned char *buf, int buf_size, int nal_length_size, int is_avc);
+#endif	// SVCDecoder_ietr_api

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/OpenSVCDecoder/SvcInterface.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/OpenSVCDecoder/SvcInterface.h Changed

@@ -1,60 +1,60 @@
-/*****************************************************************************
-*
-*  SVC4DSP developped in IETR image lab
-*
-*
-*
-*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
-*              Mickael RAULET <mraulet@insa-rennes.Fr>
-*              http://www.ietr.org/
-*
-*
-*
-*
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser 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,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*
-* $Id$
-*
-**************************************************************************/
-
-#ifndef SVCINTERFACE_H
-#define SVCINTERFACE_H
-
-#define QoE_
-
-#ifdef QoE
-#include "SvcToQoE.h"
-#endif
-
-
-typedef struct{
-
-	int Width;				//Output frame width
-	int Height;				//Output frame height
-	int Address;
-	unsigned char* pY[1];	//Output frame Y
-	unsigned char* pU[1];	//Output frame U
-	unsigned char* pV[1];	//Output frame V
-
-#ifdef QoE
-	SVCTOQOE *QoEData[1];	//QoE structure
-#endif
-
-} OPENSVCFRAME;
-
-
-#endif
+/*****************************************************************************
+*
+*  SVC4DSP developped in IETR image lab
+*
+*
+*
+*              Médéric BLESTEL <mblestel@insa-rennes.Fr>
+*              Mickael RAULET <mraulet@insa-rennes.Fr>
+*              http://www.ietr.org/
+*
+*
+*
+*
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser 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,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this library; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*
+*
+* $Id$
+*
+**************************************************************************/
+
+#ifndef SVCINTERFACE_H
+#define SVCINTERFACE_H
+
+#define QoE_
+
+#ifdef QoE
+#include "SvcToQoE.h"
+#endif
+
+
+typedef struct{
+
+	int Width;				//Output frame width
+	int Height;				//Output frame height
+	int Address;
+	unsigned char* pY[1];	//Output frame Y
+	unsigned char* pU[1];	//Output frame U
+	unsigned char* pV[1];	//Output frame V
+
+#ifdef QoE
+	SVCTOQOE *QoEData[1];	//QoE structure
+#endif
+
+} OPENSVCFRAME;
+
+
+#endif

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/avcap-export.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/avcap-export.h Changed

@@ -1,43 +1,43 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
- */
-
-
-#ifndef AVCAP_EXPORT_H
-#define AVCAP_EXPORT_H
-
-#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
-#include "avcap-config.h"
-#endif
-
-#ifdef AVCAP_WINDOWS
-# if defined AVCAP_EXPORTS
-#   define AVCAP_Export __declspec(dllexport)
-# else /* AVCAP_BUILD_DLL */
-#   define AVCAP_Export /*__declspec(dllimport)*/
-# endif
-#else
-#define AVCAP_Export 
-#endif
-
-#endif /* AVCAP_EXPORT_H */
-
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>
+ */
+
+
+#ifndef AVCAP_EXPORT_H
+#define AVCAP_EXPORT_H
+
+#if !defined(_MSC_VER) && !defined(USE_PREBUILD_LIBS)
+#include "avcap-config.h"
+#endif
+
+#ifdef AVCAP_WINDOWS
+# if defined AVCAP_EXPORTS
+#   define AVCAP_Export __declspec(dllexport)
+# else /* AVCAP_BUILD_DLL */
+#   define AVCAP_Export /*__declspec(dllimport)*/
+# endif
+#else
+#define AVCAP_Export 
+#endif
+
+#endif /* AVCAP_EXPORT_H */
+

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_Connector.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_Connector.h Changed

@@ -1,74 +1,74 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSCONNECTOR_H_
-#define DSCONNECTOR_H_
-
-#include <string>
-#include <list>
-
-#include "Connector.h"
-#include "DeviceDescriptor.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-// forward declaration
-class DS_DeviceDescriptor;
-class DS_Tuner;
-
-	//! Implementation of the Connector for DirectShow.
-
-
-	class AVCAP_Export DS_Connector : public Connector
-	{
-	public:
-	
-#pragma warning( disable : 4800 )
-		enum {
-			INPUT_TYPE_TUNER = 0x00010000 // CAP_TUNERDEVICE --> see "HelpFunc.h" file
-		};
-	
-	protected:
-		DS_DeviceDescriptor* 	mDSDeviceDescriptor;
-		int 					mIndex;
-		int 					mAudioset;
-		int						mType;
-		std::string 			mName;
-		DS_Tuner* 				mTuner;
-	
-	public:
-		/*! The Constructor.  */
-		DS_Connector(DS_DeviceDescriptor *dd, int index, const std::string& name,
-				int type=0, int audioset=0, int tuner=0);
-	
-		/*! The Destructor. */
-		virtual ~DS_Connector();
-	
-		bool hasTuner() const
-			{ return mType & INPUT_TYPE_TUNER; }
-	};
-}
-
-#endif // DSConnector_H_
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+
+#ifndef DSCONNECTOR_H_
+#define DSCONNECTOR_H_
+
+#include <string>
+#include <list>
+
+#include "Connector.h"
+#include "DeviceDescriptor.h"
+#include "avcap-export.h"
+
+namespace avcap
+{
+// forward declaration
+class DS_DeviceDescriptor;
+class DS_Tuner;
+
+	//! Implementation of the Connector for DirectShow.
+
+
+	class AVCAP_Export DS_Connector : public Connector
+	{
+	public:
+	
+#pragma warning( disable : 4800 )
+		enum {
+			INPUT_TYPE_TUNER = 0x00010000 // CAP_TUNERDEVICE --> see "HelpFunc.h" file
+		};
+	
+	protected:
+		DS_DeviceDescriptor* 	mDSDeviceDescriptor;
+		int 					mIndex;
+		int 					mAudioset;
+		int						mType;
+		std::string 			mName;
+		DS_Tuner* 				mTuner;
+	
+	public:
+		/*! The Constructor.  */
+		DS_Connector(DS_DeviceDescriptor *dd, int index, const std::string& name,
+				int type=0, int audioset=0, int tuner=0);
+	
+		/*! The Destructor. */
+		virtual ~DS_Connector();
+	
+		bool hasTuner() const
+			{ return mType & INPUT_TYPE_TUNER; }
+	};
+}
+
+#endif // DSConnector_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_ConnectorManager.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_ConnectorManager.h Changed

@@ -1,91 +1,91 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSCONNECTORMANAGER_H_
-#define DSCONNECTORMANAGER_H_
-
-#include <list>
-
-#include "Connector.h"
-#include "ConnectorManager.h"
-#include "avcap-export.h"
-
-class IPin;
-class IBaseFilter;
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-class DS_Connector;
-
-	//! DirectShow implementation of the ConnectorManager.
-
-	class AVCAP_Export DS_ConnectorManager : public ConnectorManager
-	{
-	private:
-		void*					mCrossbar;
-		DS_DeviceDescriptor* 	mDSDeviceDescriptor;
-	
-	public:
-	
-		/*! Construct the manager and query for available inputs and outputs for audio and video.
-		 * The manager is usualy created by an CaptureDevice object.
-		 * \param dd The DeviceDescriptor to acces the device. */
-		DS_ConnectorManager(DS_DeviceDescriptor *dd);
-	
-		/*! The destructor. */
-		virtual ~DS_ConnectorManager();
-	
-		Connector* getVideoInput();
-		int setVideoInput(Connector* c);
-	
-		Connector* getAudioInput();
-		int setAudioInput(Connector* c);
-	
-		Connector* getVideoOutput();
-		int setVideoOutput(Connector* c);
-	
-		Connector* getAudioOutput();
-		int setAudioOutput(Connector* c);
-	
-		void query();
-	
-	private:
-	
-		int setConnector(bool IsVideoConnector, Connector* c);
-		
-		Connector* getConnector(bool IsVideoConnector);
-		
-		Connector* findByIndex(const ListType& l, int index);
-	
-		void getIPinFromConnector(Connector *con, IPin **ConnectorPin,
-				IBaseFilter *CaptureFilter);
-		
-		bool removeAllFilters(IPin *OutputPinToStart);
-		
-		bool getPinCategory(IPin *Pin, GUID *PinCategory);
-	};
-}
-
-#endif // DSCONNECTORMANAGER_H_
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+
+#ifndef DSCONNECTORMANAGER_H_
+#define DSCONNECTORMANAGER_H_
+
+#include <list>
+
+#include "Connector.h"
+#include "ConnectorManager.h"
+#include "avcap-export.h"
+
+class IPin;
+class IBaseFilter;
+
+namespace avcap
+{
+class DS_DeviceDescriptor;
+class DS_Connector;
+
+	//! DirectShow implementation of the ConnectorManager.
+
+	class AVCAP_Export DS_ConnectorManager : public ConnectorManager
+	{
+	private:
+		void*					mCrossbar;
+		DS_DeviceDescriptor* 	mDSDeviceDescriptor;
+	
+	public:
+	
+		/*! Construct the manager and query for available inputs and outputs for audio and video.
+		 * The manager is usualy created by an CaptureDevice object.
+		 * \param dd The DeviceDescriptor to acces the device. */
+		DS_ConnectorManager(DS_DeviceDescriptor *dd);
+	
+		/*! The destructor. */
+		virtual ~DS_ConnectorManager();
+	
+		Connector* getVideoInput();
+		int setVideoInput(Connector* c);
+	
+		Connector* getAudioInput();
+		int setAudioInput(Connector* c);
+	
+		Connector* getVideoOutput();
+		int setVideoOutput(Connector* c);
+	
+		Connector* getAudioOutput();
+		int setAudioOutput(Connector* c);
+	
+		void query();
+	
+	private:
+	
+		int setConnector(bool IsVideoConnector, Connector* c);
+		
+		Connector* getConnector(bool IsVideoConnector);
+		
+		Connector* findByIndex(const ListType& l, int index);
+	
+		void getIPinFromConnector(Connector *con, IPin **ConnectorPin,
+				IBaseFilter *CaptureFilter);
+		
+		bool removeAllFilters(IPin *OutputPinToStart);
+		
+		bool getPinCategory(IPin *Pin, GUID *PinCategory);
+	};
+}
+
+#endif // DSCONNECTORMANAGER_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_Control.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_Control.h Changed

@@ -1,185 +1,185 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSCONTROL_H_
-#define DSCONTROL_H_
-
-#include <string>
-
-#include "Control_avcap.h"
-#include "Interval.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-
-	//! Implementation of the Control-class for DirectShow.
-
-	class AVCAP_Export DS_Control
-	{
-	public:
-		enum Ctrl_Type
-		{
-			CTRL_TYPE_INTEGER = 1,
-			CTRL_TYPE_BOOLEAN = 2,
-		};
-	
-		enum DShowInterface
-		{
-			IAM_VIDEOPROCAMP = 1,
-			IAM_CAMERACONTROL = 2,
-		};
-	
-		//! Helper-class to query control-properties
-		
-		struct Query_Ctrl
-		{
-			unsigned int 	id;
-			Ctrl_Type 		type;
-			std::string 	name;
-			
-			long minimum;
-			long maximum;
-			long step;
-			long default_value;
-			long flags;
-			long property;
-	
-			DS_Control::DShowInterface DShowInterfaceType;
-		};
-	
-	private:
-		DShowInterface 	mDShowInterfaceType;
-		long			mProperty;
-		int 			mId;
-		int 			mValue;
-		std::string 	mName;
-		int 			mDefaultValue;
-		int 			mFlags;
-		bool 			mInitialized;
-	
-	protected:
-		DS_DeviceDescriptor* mDSDeviceDescriptor;
-	
-	public:
-		DS_Control(DS_DeviceDescriptor *dd, Query_Ctrl* query);
-		virtual ~DS_Control();
-	
-		inline int getId() const
-			{ return mId; }
-	
-		inline int getDefaultValue() const
-			{ return mDefaultValue; }
-	
-		inline const std::string& getName() const
-			{ return mName;	}
-	
-		int setValue(int val);
-	
-		int getValue() const;
-	
-		int reset();
-		
-	private:
-		int update();
-
-		int retrieveValue();
-	};
-	
-	//! DirectShow integer valued control.
-	
-	class DS_IntControl : public IntegerControl
-	{
-	private:
-		Interval 	mInterval;
-		DS_Control	mControlBase;
-		
-	public:
-		inline DS_IntControl(DS_DeviceDescriptor *dd, struct DS_Control::Query_Ctrl* query) :
-			mInterval(query->minimum, query->maximum, query->step),
-			mControlBase(dd, query)
-			{}
-	
-		virtual inline ~DS_IntControl()
-			{}
-	
-		inline const Interval& getInterval() const 
-			{ return mInterval; }
-
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return mControlBase.getDefaultValue(); }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return mControlBase.setValue(val); }
-	
-		virtual inline int getValue() const
-			{ return mControlBase.getValue(); }
-		
-		virtual inline int reset() 
-			{ return mControlBase.reset(); }
-	};
-	
-	//! DirectShow boolean control.
-
-	class DS_BoolControl : public BoolControl
-	{
-	private:
-		DS_Control	mControlBase;
-
-	public:
-		inline DS_BoolControl(DS_DeviceDescriptor *dd, struct DS_Control::Query_Ctrl* query) :
-			mControlBase(dd, query)
-			{}
-	
-		virtual inline ~DS_BoolControl()
-			{}
-		
-		virtual inline int getId() const
-			{ return mControlBase.getId(); }
-	
-		virtual inline int getDefaultValue() const
-			{ return mControlBase.getDefaultValue(); }
-	
-		virtual inline const std::string& getName() const
-			{ return mControlBase.getName(); }
-	
-		virtual inline int setValue(int val)
-			{ return mControlBase.setValue(val); }
-	
-		virtual inline int getValue() const
-			{ return mControlBase.getValue(); }
-		
-		virtual inline int reset() 
-			{ return mControlBase.reset(); }
-	};
-}
-
-#endif // DSCONTROL_H_
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+
+#ifndef DSCONTROL_H_
+#define DSCONTROL_H_
+
+#include <string>
+
+#include "Control_avcap.h"
+#include "Interval.h"
+#include "avcap-export.h"
+
+namespace avcap
+{
+class DS_DeviceDescriptor;
+
+	//! Implementation of the Control-class for DirectShow.
+
+	class AVCAP_Export DS_Control
+	{
+	public:
+		enum Ctrl_Type
+		{
+			CTRL_TYPE_INTEGER = 1,
+			CTRL_TYPE_BOOLEAN = 2,
+		};
+	
+		enum DShowInterface
+		{
+			IAM_VIDEOPROCAMP = 1,
+			IAM_CAMERACONTROL = 2,
+		};
+	
+		//! Helper-class to query control-properties
+		
+		struct Query_Ctrl
+		{
+			unsigned int 	id;
+			Ctrl_Type 		type;
+			std::string 	name;
+			
+			long minimum;
+			long maximum;
+			long step;
+			long default_value;
+			long flags;
+			long property;
+	
+			DS_Control::DShowInterface DShowInterfaceType;
+		};
+	
+	private:
+		DShowInterface 	mDShowInterfaceType;
+		long			mProperty;
+		int 			mId;
+		int 			mValue;
+		std::string 	mName;
+		int 			mDefaultValue;
+		int 			mFlags;
+		bool 			mInitialized;
+	
+	protected:
+		DS_DeviceDescriptor* mDSDeviceDescriptor;
+	
+	public:
+		DS_Control(DS_DeviceDescriptor *dd, Query_Ctrl* query);
+		virtual ~DS_Control();
+	
+		inline int getId() const
+			{ return mId; }
+	
+		inline int getDefaultValue() const
+			{ return mDefaultValue; }
+	
+		inline const std::string& getName() const
+			{ return mName;	}
+	
+		int setValue(int val);
+	
+		int getValue() const;
+	
+		int reset();
+		
+	private:
+		int update();
+
+		int retrieveValue();
+	};
+	
+	//! DirectShow integer valued control.
+	
+	class DS_IntControl : public IntegerControl
+	{
+	private:
+		Interval 	mInterval;
+		DS_Control	mControlBase;
+		
+	public:
+		inline DS_IntControl(DS_DeviceDescriptor *dd, struct DS_Control::Query_Ctrl* query) :
+			mInterval(query->minimum, query->maximum, query->step),
+			mControlBase(dd, query)
+			{}
+	
+		virtual inline ~DS_IntControl()
+			{}
+	
+		inline const Interval& getInterval() const 
+			{ return mInterval; }
+
+		virtual inline int getId() const
+			{ return mControlBase.getId(); }
+	
+		virtual inline int getDefaultValue() const
+			{ return mControlBase.getDefaultValue(); }
+	
+		virtual inline const std::string& getName() const
+			{ return mControlBase.getName(); }
+	
+		virtual inline int setValue(int val)
+			{ return mControlBase.setValue(val); }
+	
+		virtual inline int getValue() const
+			{ return mControlBase.getValue(); }
+		
+		virtual inline int reset() 
+			{ return mControlBase.reset(); }
+	};
+	
+	//! DirectShow boolean control.
+
+	class DS_BoolControl : public BoolControl
+	{
+	private:
+		DS_Control	mControlBase;
+
+	public:
+		inline DS_BoolControl(DS_DeviceDescriptor *dd, struct DS_Control::Query_Ctrl* query) :
+			mControlBase(dd, query)
+			{}
+	
+		virtual inline ~DS_BoolControl()
+			{}
+		
+		virtual inline int getId() const
+			{ return mControlBase.getId(); }
+	
+		virtual inline int getDefaultValue() const
+			{ return mControlBase.getDefaultValue(); }
+	
+		virtual inline const std::string& getName() const
+			{ return mControlBase.getName(); }
+	
+		virtual inline int setValue(int val)
+			{ return mControlBase.setValue(val); }
+	
+		virtual inline int getValue() const
+			{ return mControlBase.getValue(); }
+		
+		virtual inline int reset() 
+			{ return mControlBase.reset(); }
+	};
+}
+
+#endif // DSCONTROL_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_ControlManager.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_ControlManager.h Changed

@@ -1,80 +1,80 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSCONTROLMANAGER_H_
-#define DSCONTROLMANAGER_H_
-
-#include <string>
-#include <list>
-
-#include "ControlManager.h"
-#include "DS_Control.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-	
-	//! DirectShow ControlManager implementation.
-
-	/*! DirectShow doesn't provide any methods to enumerate driver- 
-	* specific controls like V4L2 does. 
-	* There are only few DirectShow COM-Interfaces (e.g. IAMExtTransport (for 
-	* Firewire or other external devices), IAMVideoControl, IAMVideoCompression, IAMVideoProcAmp, 
-	* IAMCameraControl --> see DirectShow documentation), the capture device DirectShow filter
-	* (only WDM capture devices) can expose to support the setting of global properties. The most 
-	* important settings are covered by these DirectShow COM-Interfaces. 
-	* In the future, DirectShow will provide more COM-Interfaces.
-	* 
-	* The DirectShow COM-Interfaces IAMVideoProcAmp and IAMCameraControl have been already 
-	* implemented in the avcap-library.
-	* 
-	* Most WDM capture devices and \b all VFW capture devices have their own driver-supplied dialog 
-	* boxes with user-setable controls on it, that can't be set programmatically. */
-	
-	class AVCAP_Export DS_ControlManager : public ControlManager
-	{
-	private:
-		DS_DeviceDescriptor* mDSDeviceDescriptor;
-	
-	public:
-		DS_ControlManager(DS_DeviceDescriptor *dd);
-	
-		virtual ~DS_ControlManager();
-	
-		Control* getControl(const std::string& name);
-	
-		Control* getControl(int id);
-	
-		const ListType& getControlList()
-			{ return (const ListType&) mControls; }
-		
-		void query();
-	
-	private:
-		void query(int start_id, int end_id);
-	};
-}
-
-#endif 
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+
+#ifndef DSCONTROLMANAGER_H_
+#define DSCONTROLMANAGER_H_
+
+#include <string>
+#include <list>
+
+#include "ControlManager.h"
+#include "DS_Control.h"
+#include "avcap-export.h"
+
+namespace avcap
+{
+class DS_DeviceDescriptor;
+	
+	//! DirectShow ControlManager implementation.
+
+	/*! DirectShow doesn't provide any methods to enumerate driver- 
+	* specific controls like V4L2 does. 
+	* There are only few DirectShow COM-Interfaces (e.g. IAMExtTransport (for 
+	* Firewire or other external devices), IAMVideoControl, IAMVideoCompression, IAMVideoProcAmp, 
+	* IAMCameraControl --> see DirectShow documentation), the capture device DirectShow filter
+	* (only WDM capture devices) can expose to support the setting of global properties. The most 
+	* important settings are covered by these DirectShow COM-Interfaces. 
+	* In the future, DirectShow will provide more COM-Interfaces.
+	* 
+	* The DirectShow COM-Interfaces IAMVideoProcAmp and IAMCameraControl have been already 
+	* implemented in the avcap-library.
+	* 
+	* Most WDM capture devices and \b all VFW capture devices have their own driver-supplied dialog 
+	* boxes with user-setable controls on it, that can't be set programmatically. */
+	
+	class AVCAP_Export DS_ControlManager : public ControlManager
+	{
+	private:
+		DS_DeviceDescriptor* mDSDeviceDescriptor;
+	
+	public:
+		DS_ControlManager(DS_DeviceDescriptor *dd);
+	
+		virtual ~DS_ControlManager();
+	
+		Control* getControl(const std::string& name);
+	
+		Control* getControl(int id);
+	
+		const ListType& getControlList()
+			{ return (const ListType&) mControls; }
+		
+		void query();
+	
+	private:
+		void query(int start_id, int end_id);
+	};
+}
+
+#endif

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_Device.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_Device.h Changed

@@ -1,82 +1,82 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSDEVICE_H_
-#define DSDEVICE_H_
-
-#include <string>
-#include <list>
-
-#include "DS_DeviceDescriptor.h"
-#include "CaptureDevice.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-// forward declarations
-class DS_ConnectorManager;
-class DS_ControlManager;
-class DS_VidCapManager;
-class DS_DeviceDescriptor;
-class DS_FormatManager;
-
-	//! Implementation of the CaptureDevice for DirectShow.
-
-	class AVCAP_Export DS_Device : public CaptureDevice
-	{
-	private:
-		DS_VidCapManager*		mVidCapMgr;
-		DS_ConnectorManager*	mConnectorMgr;
-		DS_ControlManager*		mControlMgr;
-		DS_FormatManager*		mFormatMgr;
-		DS_DeviceDescriptor*	mDSDeviceDescriptor;
-
-	public:
-		DS_Device(DS_DeviceDescriptor* dd);
-
-		virtual ~DS_Device();
-
-		inline const DeviceDescriptor* getDescriptor()
-			{ return (const DeviceDescriptor*) mDSDeviceDescriptor;	}
-
-		inline CaptureManager* getVidCapMgr()
-			{ return (CaptureManager*) mVidCapMgr; }
-
-		inline ConnectorManager* getConnectorMgr()
-			{ return (ConnectorManager*) mConnectorMgr;	}
-
-		inline ControlManager* getControlMgr()
-			{ return (ControlManager*) mControlMgr;	}
-
-		inline FormatManager* getFormatMgr()
-			{ return (FormatManager*)mFormatMgr; }
-
-	private:
-		int open();
-
-		int close();
-	};
-}
-
-#endif // DSDEVICE_H_
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+
+#ifndef DSDEVICE_H_
+#define DSDEVICE_H_
+
+#include <string>
+#include <list>
+
+#include "DS_DeviceDescriptor.h"
+#include "CaptureDevice.h"
+#include "avcap-export.h"
+
+namespace avcap
+{
+// forward declarations
+class DS_ConnectorManager;
+class DS_ControlManager;
+class DS_VidCapManager;
+class DS_DeviceDescriptor;
+class DS_FormatManager;
+
+	//! Implementation of the CaptureDevice for DirectShow.
+
+	class AVCAP_Export DS_Device : public CaptureDevice
+	{
+	private:
+		DS_VidCapManager*		mVidCapMgr;
+		DS_ConnectorManager*	mConnectorMgr;
+		DS_ControlManager*		mControlMgr;
+		DS_FormatManager*		mFormatMgr;
+		DS_DeviceDescriptor*	mDSDeviceDescriptor;
+
+	public:
+		DS_Device(DS_DeviceDescriptor* dd);
+
+		virtual ~DS_Device();
+
+		inline const DeviceDescriptor* getDescriptor()
+			{ return (const DeviceDescriptor*) mDSDeviceDescriptor;	}
+
+		inline CaptureManager* getVidCapMgr()
+			{ return (CaptureManager*) mVidCapMgr; }
+
+		inline ConnectorManager* getConnectorMgr()
+			{ return (ConnectorManager*) mConnectorMgr;	}
+
+		inline ControlManager* getControlMgr()
+			{ return (ControlManager*) mControlMgr;	}
+
+		inline FormatManager* getFormatMgr()
+			{ return (FormatManager*)mFormatMgr; }
+
+	private:
+		int open();
+
+		int close();
+	};
+}
+
+#endif // DSDEVICE_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_DeviceDescriptor.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_DeviceDescriptor.h Changed

@@ -1,131 +1,131 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSDEVICEDESCRIPTOR_H_
-#define DSDEVICEDESCRIPTOR_H_
-
-#include <iostream>
-#include <string>
-#include <DShow.h>
-
-#include "DeviceDescriptor.h"
-#include "avcap-export.h"
-
-class IBaseFilter;
-
-namespace avcap
-{
-class CaptureDevice;
-class DS_Device;
-
-	//! Implementation of the DeviceDescriptor for DirectShow.
-
-	class AVCAP_Export DS_DeviceDescriptor : public DeviceDescriptor
-	{
-	public:
-		// Used by AddToRot() and RemoveFromRot() for spying on
-		// filter graph with GraphEdit software
-		unsigned long mRegister; // For debugging purpose
-
-	private:
-		std::string mName;
-		std::string mCard;
-		std::string mInfo;
-
-		int 			mCapabilities;
-		DEV_HANDLE_T 	mHandle;
-		bool 			mValid;
-		bool			mIsOpen;
-		DS_Device*		mDevice;
-
-	public:
-		DS_DeviceDescriptor(const std::string &card);
-
-		virtual ~DS_DeviceDescriptor();
-
-		virtual CaptureDevice* getDevice();
-
-		int open();
-
-		int close();
-
-		virtual inline const std::string& getName() const
-			{ return mName; }
-
-		// implementation of pure virtual method
-		inline const DEV_HANDLE_T getHandle() const
-			{ return mHandle; }
-
-		// but non-const access is needed by the device-class
-		inline DEV_HANDLE_T getHandle()
-			{ return mHandle; }
-
-		bool isAVDev() const;
-
-		bool isVideoCaptureDev() const;
-
-		bool isVBIDev() const;
-
-		bool isTuner() const;
-
-		bool isAudioDev() const;
-
-		bool isRadioDev() const;
-
-		bool isOverlayDev() const;
-
-		//! Device is a VFW (Video for Windows) device.
-		/*! \return true VFW device, else false */
-		bool isVfWDevice() const;
-
-	private:
-		bool queryCapabilities();
-
-		void findDevice(std::string &UniqueDeviceID, IBaseFilter **CaptureFilter,
-				std::string &DeviceName, std::string &DeviceInfo,
-				bool *IsVideoDevice=NULL, bool *IsAudioDevice=NULL);
-
-		bool createCaptureFilterGraph(std::string &UniqueDeviceID,
-				IBaseFilter *CaptureFilter);
-
-		bool getInfosFromDevice(IBaseFilter *CaptureFilter, int *Capabilities,
-				std::string &Card, std::string &Info);
-
-		bool findOverlaySupport(IBaseFilter *CaptureFilter, int *Capabilities);
-
-		bool findVBISupport(IBaseFilter *CaptureFilter, int *Capabilities);
-
-		bool findTunerRadioSupport(IBaseFilter *CaptureFilter, int *Capabilities);
-
-		bool isAudioOrVideoDevice(IBaseFilter *CaptureFilter, int *Capabilities);
-
-		HRESULT addToRot(IUnknown *pUnkGraph, DWORD *pdwRegister);
-
-		void removeFromRot(DWORD pdwRegister);
-
-		friend class DS_Device;
-	};
-}
-
-#endif // DSEVICEDESCRIPTOR_H_
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de>
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+
+#ifndef DSDEVICEDESCRIPTOR_H_
+#define DSDEVICEDESCRIPTOR_H_
+
+#include <iostream>
+#include <string>
+#include <DShow.h>
+
+#include "DeviceDescriptor.h"
+#include "avcap-export.h"
+
+class IBaseFilter;
+
+namespace avcap
+{
+class CaptureDevice;
+class DS_Device;
+
+	//! Implementation of the DeviceDescriptor for DirectShow.
+
+	class AVCAP_Export DS_DeviceDescriptor : public DeviceDescriptor
+	{
+	public:
+		// Used by AddToRot() and RemoveFromRot() for spying on
+		// filter graph with GraphEdit software
+		unsigned long mRegister; // For debugging purpose
+
+	private:
+		std::string mName;
+		std::string mCard;
+		std::string mInfo;
+
+		int 			mCapabilities;
+		DEV_HANDLE_T 	mHandle;
+		bool 			mValid;
+		bool			mIsOpen;
+		DS_Device*		mDevice;
+
+	public:
+		DS_DeviceDescriptor(const std::string &card);
+
+		virtual ~DS_DeviceDescriptor();
+
+		virtual CaptureDevice* getDevice();
+
+		int open();
+
+		int close();
+
+		virtual inline const std::string& getName() const
+			{ return mName; }
+
+		// implementation of pure virtual method
+		inline const DEV_HANDLE_T getHandle() const
+			{ return mHandle; }
+
+		// but non-const access is needed by the device-class
+		inline DEV_HANDLE_T getHandle()
+			{ return mHandle; }
+
+		bool isAVDev() const;
+
+		bool isVideoCaptureDev() const;
+
+		bool isVBIDev() const;
+
+		bool isTuner() const;
+
+		bool isAudioDev() const;
+
+		bool isRadioDev() const;
+
+		bool isOverlayDev() const;
+
+		//! Device is a VFW (Video for Windows) device.
+		/*! \return true VFW device, else false */
+		bool isVfWDevice() const;
+
+	private:
+		bool queryCapabilities();
+
+		void findDevice(std::string &UniqueDeviceID, IBaseFilter **CaptureFilter,
+				std::string &DeviceName, std::string &DeviceInfo,
+				bool *IsVideoDevice=NULL, bool *IsAudioDevice=NULL);
+
+		bool createCaptureFilterGraph(std::string &UniqueDeviceID,
+				IBaseFilter *CaptureFilter);
+
+		bool getInfosFromDevice(IBaseFilter *CaptureFilter, int *Capabilities,
+				std::string &Card, std::string &Info);
+
+		bool findOverlaySupport(IBaseFilter *CaptureFilter, int *Capabilities);
+
+		bool findVBISupport(IBaseFilter *CaptureFilter, int *Capabilities);
+
+		bool findTunerRadioSupport(IBaseFilter *CaptureFilter, int *Capabilities);
+
+		bool isAudioOrVideoDevice(IBaseFilter *CaptureFilter, int *Capabilities);
+
+		HRESULT addToRot(IUnknown *pUnkGraph, DWORD *pdwRegister);
+
+		void removeFromRot(DWORD pdwRegister);
+
+		friend class DS_Device;
+	};
+}
+
+#endif // DSEVICEDESCRIPTOR_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_FormatManager.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_FormatManager.h Changed

@@ -1,101 +1,101 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-#ifndef DSFORMATMANAGER_H_
-#define DSFORMATMANAGER_H_
-
-#include <list>
-#include <string>
-#include <Dshow.h>
-
-#ifndef _MSC_VER
-# include <stdint.h>
-#endif
-
-#include "FormatManager.h"
-#include "avcap-export.h"
-
-class IBaseFilter;
-class IPin;
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-
-	//! Implementation of the FormatManager for DirectShow.
-	
-	/*! A capture device that still uses a VFW (Video for Windows)
-	* driver can select the available formats only by using the VFW driver-supplied dialog box.
-	* But GUI-related stuff is out of the scope of this library. */
-	
-	class AVCAP_Export DS_FormatManager : public FormatManager
-	{
-	private:
-		DS_DeviceDescriptor* mDSDeviceDescriptor;
-		int			   mFrameRate;
-
-	public:
-		DS_FormatManager(DS_DeviceDescriptor *dd);
-
-		virtual ~DS_FormatManager();
-	
-		virtual int setFormat(Format *fmt);
-	
-		virtual Format* getFormat();
-	
-		virtual int setResolution(int w, int h);
-	
-		virtual int getWidth();
-	
-		virtual int getHeight();
-	
-		virtual int getBytesPerLine();
-	
-		virtual int setFramerate(int fps);
-
-		virtual int getFramerate();
-
-		virtual int flush();
-	
-		virtual size_t getImageSize();
-	
-		virtual const VideoStandard* getVideoStandard();
-	
-		virtual int setVideoStandard(const VideoStandard* std);
-	
-		virtual void query();
-	
-	private:
-		int getParams();
-		
-		void queryVideoStandards();
-	
-		bool getVideoInfoHeader(AM_MEDIA_TYPE *MediaType,
-				VIDEOINFOHEADER *VideoInfoHeader);
-		
-		bool getCurrentConnectedVideoPin(IBaseFilter *CaptureFilter,
-				IPin **VideoPin);
-	};
-}
-
-#endif // DSFORMATMANAGER_H_
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+#ifndef DSFORMATMANAGER_H_
+#define DSFORMATMANAGER_H_
+
+#include <list>
+#include <string>
+#include <Dshow.h>
+
+#ifndef _MSC_VER
+# include <stdint.h>
+#endif
+
+#include "FormatManager.h"
+#include "avcap-export.h"
+
+class IBaseFilter;
+class IPin;
+
+namespace avcap
+{
+class DS_DeviceDescriptor;
+
+	//! Implementation of the FormatManager for DirectShow.
+	
+	/*! A capture device that still uses a VFW (Video for Windows)
+	* driver can select the available formats only by using the VFW driver-supplied dialog box.
+	* But GUI-related stuff is out of the scope of this library. */
+	
+	class AVCAP_Export DS_FormatManager : public FormatManager
+	{
+	private:
+		DS_DeviceDescriptor* mDSDeviceDescriptor;
+		int			   mFrameRate;
+
+	public:
+		DS_FormatManager(DS_DeviceDescriptor *dd);
+
+		virtual ~DS_FormatManager();
+	
+		virtual int setFormat(Format *fmt);
+	
+		virtual Format* getFormat();
+	
+		virtual int setResolution(int w, int h);
+	
+		virtual int getWidth();
+	
+		virtual int getHeight();
+	
+		virtual int getBytesPerLine();
+	
+		virtual int setFramerate(int fps);
+
+		virtual int getFramerate();
+
+		virtual int flush();
+	
+		virtual size_t getImageSize();
+	
+		virtual const VideoStandard* getVideoStandard();
+	
+		virtual int setVideoStandard(const VideoStandard* std);
+	
+		virtual void query();
+	
+	private:
+		int getParams();
+		
+		void queryVideoStandards();
+	
+		bool getVideoInfoHeader(AM_MEDIA_TYPE *MediaType,
+				VIDEOINFOHEADER *VideoInfoHeader);
+		
+		bool getCurrentConnectedVideoPin(IBaseFilter *CaptureFilter,
+				IPin **VideoPin);
+	};
+}
+
+#endif // DSFORMATMANAGER_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_Tuner.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_Tuner.h Changed

@@ -1,134 +1,134 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSTUNER_H_
-#define DSTUNER_H_
-
-#include <string>
-
-#include "Tuner_avcap.h"
-#include "avcap-export.h"
-
-class IAMTVAudio;
-class IAMTVTuner;
-class IBaseFilter;
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-
-	//! Implementation of the Tuner-class for DirectShow.
-	  
-	/*! This implementation uses the PROPSETID_TUNER property-set which is defined in 
-	 * the library kstvtuner.ax which can not be linked with gcc. 
-	 * It thus can not be used under mingw, but only if build with Visual-C++.
-	 * So the mingw-build library misses this tuner-implentation.
-	 * 
-	 * There are only three states of signal strength:
-	 * signal present, signal not present, signal not determined. Because of this limitation
-	 * the method getAFCValue() is not implemented.
-	 */
-	
-	class AVCAP_Export DS_Tuner : public Tuner
-	{
-	private:
-	
-#pragma warning( disable : 4800 )
-
-		enum
-		{
-			TUNER_RADIO = 0x00080000, // CAP_RADIO --> see "HelpFunc.h" file
-			TUNER_ANALOG_TV = 0x00020000 // CAP_TUNER --> see "HelpFunc.h" file
-		};
-	
-		int 			mIndex;
-		std::string 	mName;
-		int 			mType;
-		int 			mCapabilities;
-		unsigned int 	mRangeHigh;
-		unsigned int 	mRangeLow;
-		double 			mStep;
-		double 			mFreq;
-	
-	private:
-		DS_DeviceDescriptor* mDSDeviceDescriptor;
-	
-	public:
-		DS_Tuner(DS_DeviceDescriptor *dd, int index, const std::string &name,
-				int type, int caps, unsigned int high, unsigned int low);
-		
-		virtual ~DS_Tuner();
-	
-		inline bool isRadioTuner() const
-			{ return mType & TUNER_RADIO; }
-	
-		inline bool isTVTuner() const
-			{ return mType & TUNER_ANALOG_TV; }
-	
-		int setStereo();
-	
-		int setMono();
-	
-		int setSAP();
-	
-		int setLang1();
-	
-		int setLang2();
-	
-		double getFreq() const;
-	
-		inline double getFreqStep() const
-			{ return mStep; }
-	
-		inline double getMinFreq() const
-			{ return mRangeLow*mStep; }
-	
-		inline double getMaxFreq() const
-			{ return mRangeHigh*mStep; }
-	
-		const std::string getName() const
-			{ return mName; }
-	
-		int getSignalStrength() const;
-	
-		int increaseFreq();
-	
-		int decreaseFreq();
-	
-		int setFreq(double f);
-	
-	private:
-		int setAudioMode(int mode);
-		
-		int getAudioMode();
-	
-		bool getIAMTVTunerInterfaceFromFilter(IBaseFilter *Filter,
-			IAMTVTuner **Tuner) const;
-
-		bool getIAMTVAudioInterfaceFromFilter(IBaseFilter *Filter,
-			IAMTVAudio **Audio);
-	};
-}
-
-#endif // DSTUNER_H_
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+
+#ifndef DSTUNER_H_
+#define DSTUNER_H_
+
+#include <string>
+
+#include "Tuner_avcap.h"
+#include "avcap-export.h"
+
+class IAMTVAudio;
+class IAMTVTuner;
+class IBaseFilter;
+
+namespace avcap
+{
+class DS_DeviceDescriptor;
+
+	//! Implementation of the Tuner-class for DirectShow.
+	  
+	/*! This implementation uses the PROPSETID_TUNER property-set which is defined in 
+	 * the library kstvtuner.ax which can not be linked with gcc. 
+	 * It thus can not be used under mingw, but only if build with Visual-C++.
+	 * So the mingw-build library misses this tuner-implentation.
+	 * 
+	 * There are only three states of signal strength:
+	 * signal present, signal not present, signal not determined. Because of this limitation
+	 * the method getAFCValue() is not implemented.
+	 */
+	
+	class AVCAP_Export DS_Tuner : public Tuner
+	{
+	private:
+	
+#pragma warning( disable : 4800 )
+
+		enum
+		{
+			TUNER_RADIO = 0x00080000, // CAP_RADIO --> see "HelpFunc.h" file
+			TUNER_ANALOG_TV = 0x00020000 // CAP_TUNER --> see "HelpFunc.h" file
+		};
+	
+		int 			mIndex;
+		std::string 	mName;
+		int 			mType;
+		int 			mCapabilities;
+		unsigned int 	mRangeHigh;
+		unsigned int 	mRangeLow;
+		double 			mStep;
+		double 			mFreq;
+	
+	private:
+		DS_DeviceDescriptor* mDSDeviceDescriptor;
+	
+	public:
+		DS_Tuner(DS_DeviceDescriptor *dd, int index, const std::string &name,
+				int type, int caps, unsigned int high, unsigned int low);
+		
+		virtual ~DS_Tuner();
+	
+		inline bool isRadioTuner() const
+			{ return mType & TUNER_RADIO; }
+	
+		inline bool isTVTuner() const
+			{ return mType & TUNER_ANALOG_TV; }
+	
+		int setStereo();
+	
+		int setMono();
+	
+		int setSAP();
+	
+		int setLang1();
+	
+		int setLang2();
+	
+		double getFreq() const;
+	
+		inline double getFreqStep() const
+			{ return mStep; }
+	
+		inline double getMinFreq() const
+			{ return mRangeLow*mStep; }
+	
+		inline double getMaxFreq() const
+			{ return mRangeHigh*mStep; }
+	
+		const std::string getName() const
+			{ return mName; }
+	
+		int getSignalStrength() const;
+	
+		int increaseFreq();
+	
+		int decreaseFreq();
+	
+		int setFreq(double f);
+	
+	private:
+		int setAudioMode(int mode);
+		
+		int getAudioMode();
+	
+		bool getIAMTVTunerInterfaceFromFilter(IBaseFilter *Filter,
+			IAMTVTuner **Tuner) const;
+
+		bool getIAMTVAudioInterfaceFromFilter(IBaseFilter *Filter,
+			IAMTVAudio **Audio);
+	};
+}
+
+#endif // DSTUNER_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/avcap/windows/DS_VidCapManager.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/avcap/windows/DS_VidCapManager.h Changed

@@ -1,98 +1,98 @@
-/*
- * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
- *
- * This file is part of avcap.
- *
- * avcap is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * avcap is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* avcap is free for non-commercial use.
- * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
- */
-
-
-#ifndef DSVIDCAPMANAGER_H_
-#define DSVIDCAPMANAGER_H_
-
-#include <list>
-
-#include "CaptureManager.h"
-#include "SampleGrabberCallback.h"
-#include "avcap-export.h"
-
-namespace avcap
-{
-class DS_DeviceDescriptor;
-class DS_FormatManager;
-class IOBuffer;
-class CaptureHandler;
-class SampleGrabberCallback;
-
-	//! Implementation of the CaptureManager for DirectShow.
-
-	class AVCAP_Export DS_VidCapManager : public CaptureManager
-	{
-	private:
-		typedef std::list<IOBuffer*> IOBufList;
-		
-		DS_DeviceDescriptor*	mDSDeviceDescriptor;
-		SampleGrabberCallback*	mGrabberCallback;
-		HANDLE					mLock;
-		int 					mSequence;
-		int 					mNumBuffers;
-
-	public:
-		DS_VidCapManager(DS_DeviceDescriptor* dd, DS_FormatManager* fmt_mgr,
-				int nbufs = DEFAULT_BUFFERS);
-	
-		virtual ~DS_VidCapManager();
-	
-		int init();
-	
-		int destroy();
-	
-		int startCapture();
-	
-		int stopCapture();
-		
-		int getNumIOBuffers();
-	
-	private:
-		IOBuffer* dequeue();
-
-		int enqueue(IOBuffer* buf);
-	
-		friend class IOBuffer;
-		friend class SampleGrabberCallback;
-	};
-
-	class MutexGuard
-	{
-	private:
-		HANDLE	mLock;
-		
-	public:
-		inline MutexGuard(HANDLE lock) : 
-			mLock(lock)
-			{ WaitForSingleObject(mLock, INFINITE); }
-			
-		inline virtual ~MutexGuard()
-			{ ReleaseMutex(mLock); }
-	private:
-		inline MutexGuard()
-			{}
-	};
-}
-
-#endif // DSVIDCAPMANAGER_H_
+/*
+ * (c) 2005, 2008 Nico Pranke <Nico.Pranke@googlemail.com>, Robin Luedtke <RobinLu@gmx.de> 
+ *
+ * This file is part of avcap.
+ *
+ * avcap is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * avcap is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with avcap.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* avcap is free for non-commercial use.
+ * To use it in commercial endeavors, please contact Nico Pranke <Nico.Pranke@googlemail.com>.
+ */
+
+
+#ifndef DSVIDCAPMANAGER_H_
+#define DSVIDCAPMANAGER_H_
+
+#include <list>
+
+#include "CaptureManager.h"
+#include "SampleGrabberCallback.h"
+#include "avcap-export.h"
+
+namespace avcap
+{
+class DS_DeviceDescriptor;
+class DS_FormatManager;
+class IOBuffer;
+class CaptureHandler;
+class SampleGrabberCallback;
+
+	//! Implementation of the CaptureManager for DirectShow.
+
+	class AVCAP_Export DS_VidCapManager : public CaptureManager
+	{
+	private:
+		typedef std::list<IOBuffer*> IOBufList;
+		
+		DS_DeviceDescriptor*	mDSDeviceDescriptor;
+		SampleGrabberCallback*	mGrabberCallback;
+		HANDLE					mLock;
+		int 					mSequence;
+		int 					mNumBuffers;
+
+	public:
+		DS_VidCapManager(DS_DeviceDescriptor* dd, DS_FormatManager* fmt_mgr,
+				int nbufs = DEFAULT_BUFFERS);
+	
+		virtual ~DS_VidCapManager();
+	
+		int init();
+	
+		int destroy();
+	
+		int startCapture();
+	
+		int stopCapture();
+		
+		int getNumIOBuffers();
+	
+	private:
+		IOBuffer* dequeue();
+
+		int enqueue(IOBuffer* buf);
+	
+		friend class IOBuffer;
+		friend class SampleGrabberCallback;
+	};
+
+	class MutexGuard
+	{
+	private:
+		HANDLE	mLock;
+		
+	public:
+		inline MutexGuard(HANDLE lock) : 
+			mLock(lock)
+			{ WaitForSingleObject(mLock, INFINITE); }
+			
+		inline virtual ~MutexGuard()
+			{ ReleaseMutex(mLock); }
+	private:
+		inline MutexGuard()
+			{}
+	};
+}
+
+#endif // DSVIDCAPMANAGER_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavcodec/avcodec.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/avcodec.h Changed

@@ -23,18 +23,22 @@
 
 /**
  * @file
- * external API header
+ * @ingroup libavc
+ * Libavcodec external API header
  */
 
 #include <errno.h>
 #include "libavutil/samplefmt.h"
+#include "libavutil/attributes.h"
 #include "libavutil/avutil.h"
+#include "libavutil/buffer.h"
 #include "libavutil/cpu.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/dict.h"
+#include "libavutil/frame.h"
 #include "libavutil/log.h"
 #include "libavutil/pixfmt.h"
 #include "libavutil/rational.h"
-#include "libavutil/audioconvert.h"
 
 #include "libavcodec/version.h"
 /**
@@ -154,7 +158,6 @@
     AV_CODEC_ID_MSZH,
     AV_CODEC_ID_ZLIB,
     AV_CODEC_ID_QTRLE,
-    AV_CODEC_ID_SNOW,
     AV_CODEC_ID_TSCC,
     AV_CODEC_ID_ULTI,
     AV_CODEC_ID_QDRAW,
@@ -267,11 +270,18 @@
     AV_CODEC_ID_MTS2,
     AV_CODEC_ID_CLLC,
     AV_CODEC_ID_MSS2,
+    AV_CODEC_ID_VP9,
+    AV_CODEC_ID_AIC,
+    AV_CODEC_ID_ESCAPE130_DEPRECATED,
+    AV_CODEC_ID_G2M_DEPRECATED,
+
+    AV_CODEC_ID_BRENDER_PIX= MKBETAG('B','P','I','X'),
     AV_CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
     AV_CODEC_ID_ESCAPE130  = MKBETAG('E','1','3','0'),
     AV_CODEC_ID_EXR        = MKBETAG('0','E','X','R'),
     AV_CODEC_ID_AVRP       = MKBETAG('A','V','R','P'),
 
+    AV_CODEC_ID_012V       = MKBETAG('0','1','2','V'),
     AV_CODEC_ID_G2M        = MKBETAG( 0 ,'G','2','M'),
     AV_CODEC_ID_AVUI       = MKBETAG('A','V','U','I'),
     AV_CODEC_ID_AYUV       = MKBETAG('A','Y','U','V'),
@@ -284,6 +294,12 @@
     AV_CODEC_ID_AVRN       = MKBETAG('A','V','R','n'),
     AV_CODEC_ID_CPIA       = MKBETAG('C','P','I','A'),
     AV_CODEC_ID_XFACE      = MKBETAG('X','F','A','C'),
+    AV_CODEC_ID_SGIRLE     = MKBETAG('S','G','I','R'),
+    AV_CODEC_ID_MVC1       = MKBETAG('M','V','C','1'),
+    AV_CODEC_ID_MVC2       = MKBETAG('M','V','C','2'),
+    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'),
 
     /* various PCM "codecs" */
     AV_CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
@@ -315,6 +331,9 @@
     AV_CODEC_ID_PCM_LXF,
     AV_CODEC_ID_S302M,
     AV_CODEC_ID_PCM_S8_PLANAR,
+    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),
 
     /* various ADPCM codecs */
     AV_CODEC_ID_ADPCM_IMA_QT = 0x11000,
@@ -348,6 +367,10 @@
     AV_CODEC_ID_ADPCM_G722,
     AV_CODEC_ID_ADPCM_IMA_APC,
     AV_CODEC_ID_VIMA       = MKBETAG('V','I','M','A'),
+    AV_CODEC_ID_ADPCM_AFC  = MKBETAG('A','F','C',' '),
+    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',' '),
 
     /* AMR */
     AV_CODEC_ID_AMR_NB = 0x12000,
@@ -396,7 +419,9 @@
     AV_CODEC_ID_MLP,
     AV_CODEC_ID_GSM_MS, /* as found in WAV */
     AV_CODEC_ID_ATRAC3,
+#if FF_API_VOXWARE
     AV_CODEC_ID_VOXWARE,
+#endif
     AV_CODEC_ID_APE,
     AV_CODEC_ID_NELLYMOSER,
     AV_CODEC_ID_MUSEPACK8,
@@ -426,13 +451,17 @@
     AV_CODEC_ID_IAC,
     AV_CODEC_ID_ILBC,
     AV_CODEC_ID_OPUS_DEPRECATED,
+    AV_CODEC_ID_COMFORT_NOISE,
+    AV_CODEC_ID_TAK_DEPRECATED,
+    AV_CODEC_ID_METASOUND,
     AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
-    AV_CODEC_ID_8SVX_RAW    = MKBETAG('8','S','V','X'),
     AV_CODEC_ID_SONIC       = MKBETAG('S','O','N','C'),
     AV_CODEC_ID_SONIC_LS    = MKBETAG('S','O','N','L'),
     AV_CODEC_ID_PAF_AUDIO   = MKBETAG('P','A','F','A'),
     AV_CODEC_ID_OPUS        = MKBETAG('O','P','U','S'),
     AV_CODEC_ID_TAK         = MKBETAG('t','B','a','K'),
+    AV_CODEC_ID_EVRC        = MKBETAG('s','e','v','c'),
+    AV_CODEC_ID_SMV         = MKBETAG('s','s','m','v'),
 
     /* subtitle codecs */
     AV_CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
@@ -450,9 +479,14 @@
     AV_CODEC_ID_JACOSUB    = MKBETAG('J','S','U','B'),
     AV_CODEC_ID_SAMI       = MKBETAG('S','A','M','I'),
     AV_CODEC_ID_REALTEXT   = MKBETAG('R','T','X','T'),
+    AV_CODEC_ID_SUBVIEWER1 = MKBETAG('S','b','V','1'),
     AV_CODEC_ID_SUBVIEWER  = MKBETAG('S','u','b','V'),
     AV_CODEC_ID_SUBRIP     = MKBETAG('S','R','i','p'),
     AV_CODEC_ID_WEBVTT     = MKBETAG('W','V','T','T'),
+    AV_CODEC_ID_MPL2       = MKBETAG('M','P','L','2'),
+    AV_CODEC_ID_VPLAYER    = MKBETAG('V','P','l','r'),
+    AV_CODEC_ID_PJS        = MKBETAG('P','h','J','S'),
+    AV_CODEC_ID_ASS        = MKBETAG('A','S','S',' '),  ///< ASS as defined in Matroska
 
     /* other specific kind of codecs (generally used for attachments) */
     AV_CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
@@ -461,6 +495,9 @@
     AV_CODEC_ID_XBIN       = MKBETAG('X','B','I','N'),
     AV_CODEC_ID_IDF        = MKBETAG( 0 ,'I','D','F'),
     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_PROBE = 0x19000, ///< codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it
 
@@ -475,10 +512,6 @@
 #endif
 };
 
-#if FF_API_CODEC_ID
-#define CodecID AVCodecID
-#endif
-
 /**
  * This struct describes the properties of a single codec described by an
  * AVCodecID.
@@ -518,11 +551,16 @@
  * Codec supports lossless compression. Audio and video codecs only.
  */
 #define AV_CODEC_PROP_LOSSLESS      (1 << 2)
-
-#if FF_API_OLD_DECODE_AUDIO
-/* in bytes */
-#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-#endif
+/**
+ * Subtitle codec is bitmap based
+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->pict field.
+ */
+#define AV_CODEC_PROP_BITMAP_SUB    (1 << 16)
+/**
+ * Subtitle codec is text based.
+ * Decoded AVSubtitle data can be read from the AVSubtitleRect->ass field.
+ */
+#define AV_CODEC_PROP_TEXT_SUB      (1 << 17)
 
 /**
  * @ingroup lavc_decoding
@@ -555,8 +593,8 @@
     ME_X1,          ///< reserved for experiments
     ME_HEX,         ///< hexagon based search
     ME_UMH,         ///< uneven multi-hexagon search
-    ME_ITER,        ///< iterative search
     ME_TESA,        ///< transformed exhaustive search algorithm
+    ME_ITER=50,     ///< iterative search
 };
 
 /**
@@ -593,26 +631,6 @@
     AVCOL_TRC_NB             , ///< Not part of ABI
 };
 
-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
-};
-#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
-
-enum AVColorRange{
-    AVCOL_RANGE_UNSPECIFIED = 0,
-    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
-    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
-    AVCOL_RANGE_NB             , ///< Not part of ABI
-};
-
 /**
  *  X   X      3 4 X      X are luma samples,
  *             1 2        1-6 are possible chroma positions
@@ -659,6 +677,11 @@
    Note: Not everything is supported yet.
 */
 
+/**
+ * Allow decoders to produce frames with data planes that are not aligned
+ * to CPU requirements (e.g. due to cropping).
+ */
+#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_QPEL   0x0010  ///< Use qpel MC.
@@ -691,12 +714,8 @@
 #define CODEC_FLAG2_NO_OUTPUT     0x00000004 ///< Skip bitstream encoding.
 #define CODEC_FLAG2_LOCAL_HEADER  0x00000008 ///< Place global headers at every keyframe instead of in extradata.
 #define CODEC_FLAG2_DROP_FRAME_TIMECODE 0x00002000 ///< timecode is in drop frame format. DEPRECATED!!!!
-#if FF_API_MPV_GLOBAL_OPTS
-#define CODEC_FLAG_CBP_RD         0x04000000 ///< Use rate distortion optimization for cbp.
-#define CODEC_FLAG_QP_RD          0x08000000 ///< Use rate distortion optimization for qp selectioon.
-#define CODEC_FLAG2_STRICT_GOP    0x00000002 ///< Strictly enforce GOP size.
-#define CODEC_FLAG2_SKIP_RD       0x00004000 ///< RD optimal MB level residual skipping
-#endif
+#define CODEC_FLAG2_IGNORE_CROP   0x00010000 ///< Discard cropping information from SPS.
+
 #define CODEC_FLAG2_CHUNKS        0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries.
 #define CODEC_FLAG2_SHOW_ALL      0x00400000 ///< Show all frames before the first keyframe
 
@@ -746,10 +765,12 @@
  * This can be used to prevent truncation of the last audio samples.
  */
 #define CODEC_CAP_SMALL_LAST_FRAME 0x0040
+#if FF_API_CAP_VDPAU
 /**
  * Codec can export data for HW decoding (VDPAU).
  */
 #define CODEC_CAP_HWACCEL_VDPAU    0x0080
+#endif
 /**
  * Codec can output multiple frames per AVPacket
  * Normally demuxers return one frame at a time, demuxers which do not do
@@ -864,6 +885,7 @@
 #define FF_QSCALE_TYPE_H264  2
 #define FF_QSCALE_TYPE_VP56  3
 
+#if FF_API_GET_BUFFER
 #define FF_BUFFER_TYPE_INTERNAL 1
 #define FF_BUFFER_TYPE_USER     2 ///< direct rendering buffers (image is (de)allocated by user)
 #define FF_BUFFER_TYPE_SHARED   4 ///< Buffer from somewhere else; don't deallocate image (data/base), all other tables are not shared.
@@ -873,6 +895,12 @@
 #define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer.
 #define FF_BUFFER_HINTS_PRESERVE 0x04 // User must not alter buffer content.
 #define FF_BUFFER_HINTS_REUSABLE 0x08 // Codec will reuse the buffer (update).
+#endif
+
+/**
+ * The decoder will keep a reference to the frame and may reuse it later.
+ */
+#define AV_GET_BUFFER_FLAG_REF (1 << 0)
 
 /**
  * @defgroup lavc_packet AVPacket
@@ -942,10 +970,74 @@
      * @endcode
      */
     AV_PKT_DATA_JP_DUALMONO,
+
+    /**
+     * 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.
+     */
+    AV_PKT_DATA_STRINGS_METADATA,
+
+    /**
+     * Subtitle event position
+     * @code
+     * u32le x1
+     * u32le y1
+     * u32le x2
+     * u32le y2
+     * @endcode
+     */
+    AV_PKT_DATA_SUBTITLE_POSITION,
+
+    /**
+     * Data found in BlockAdditional element of matroska container. There is
+     * no end marker for the data, so it is required to rely on the side data
+     * size to recognize the end. 8 byte id (as found in BlockAddId) followed
+     * by data.
+     */
+    AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL,
+
+    /**
+     * The optional first identifier line of a WebVTT cue.
+     */
+    AV_PKT_DATA_WEBVTT_IDENTIFIER,
+
+    /**
+     * The optional settings (rendering instructions) that immediately
+     * follow the timestamp specifier of a WebVTT cue.
+     */
+    AV_PKT_DATA_WEBVTT_SETTINGS,
 };
 
+/**
+ * This structure stores compressed data. It is typically exported by demuxers
+ * and then passed as input to decoders, or received as output from encoders and
+ * then passed to muxers.
+ *
+ * For video, it should typically contain one compressed frame. For audio it may
+ * contain several compressed frames.
+ *
+ * AVPacket is one of the few structs in FFmpeg, whose size is a part of public
+ * ABI. Thus it may be allocated on stack and no new fields can be added to it
+ * without libavcodec and libavformat major bump.
+ *
+ * The semantics of data ownership depends on the buf or destruct (deprecated)
+ * fields. If either is set, the packet data is dynamically allocated and is
+ * valid indefinitely until av_free_packet() is called (which in turn calls
+ * av_buffer_unref()/the destruct callback to free the data). If neither is set,
+ * the packet data is typically backed by some static buffer somewhere and is
+ * only valid for a limited time (e.g. until the next read call when demuxing).
+ *
+ * The side data is always allocated with av_malloc() and is freed in
+ * av_free_packet().
+ */
 typedef struct AVPacket {
     /**
+     * A reference to the reference-counted buffer where the packet data is
+     * stored.
+     * May be NULL, then the packet data is not reference-counted.
+     */
+    AVBufferRef *buf;
+    /**
      * Presentation timestamp in AVStream->time_base units; the time at which
      * the decompressed packet will be presented to the user.
      * Can be AV_NOPTS_VALUE if it is not stored in the file.
@@ -984,8 +1076,12 @@
      * Equals next_pts - this_pts in presentation order.
      */
     int   duration;
+#if FF_API_DESTRUCT_PACKET
+    attribute_deprecated
     void  (*destruct)(struct AVPacket *);
+    attribute_deprecated
     void  *priv;
+#endif
     int64_t pos;                            ///< byte position in stream, -1 if unknown
 
     /**
@@ -1020,429 +1116,6 @@
  * @}
  */
 
-/**
- * Audio Video Frame.
- * New fields can be added to the end of AVFRAME with minor version
- * bumps. Similarly fields that are marked as to be only accessed by
- * av_opt_ptr() can be reordered. This allows 2 forks to add fields
- * without breaking compatibility with each other.
- * Removal, reordering and changes in the remaining cases require
- * a major version bump.
- * sizeof(AVFrame) must not be used outside libavcodec.
- */
-typedef struct AVFrame {
-#define AV_NUM_DATA_POINTERS 8
-    /**
-     * pointer to the picture/channel planes.
-     * This might be different from the first allocated byte
-     * - encoding: Set by user
-     * - decoding: set by AVCodecContext.get_buffer()
-     */
-    uint8_t *data[AV_NUM_DATA_POINTERS];
-
-    /**
-     * Size, in bytes, of the data for each picture/channel plane.
-     *
-     * For audio, only linesize[0] may be set. For planar audio, each channel
-     * plane must be the same size.
-     *
-     * - encoding: Set by user
-     * - decoding: set by AVCodecContext.get_buffer()
-     */
-    int linesize[AV_NUM_DATA_POINTERS];
-
-    /**
-     * 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 by get_buffer(),
-     * but for planar audio with more channels that can fit in data,
-     * extended_data must be used by the decoder in order to access all
-     * channels.
-     *
-     * encoding: set by user
-     * decoding: set by AVCodecContext.get_buffer()
-     */
-    uint8_t **extended_data;
-
-    /**
-     * width and height of the video frame
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int width, height;
-
-    /**
-     * number of audio samples (per channel) described by this frame
-     * - encoding: Set by user
-     * - decoding: Set by libavcodec
-     */
-    int nb_samples;
-
-    /**
-     * format of the frame, -1 if unknown or unset
-     * Values correspond to enum AVPixelFormat for video frames,
-     * enum AVSampleFormat for audio)
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int format;
-
-    /**
-     * 1 -> keyframe, 0-> not
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    int key_frame;
-
-    /**
-     * Picture type of the frame, see ?_TYPE below.
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
-     * - decoding: Set by libavcodec.
-     */
-    enum AVPictureType pict_type;
-
-    /**
-     * pointer to the first allocated byte of the picture. Can be used in get_buffer/release_buffer.
-     * This isn't used by libavcodec unless the default get/release_buffer() is used.
-     * - encoding:
-     * - decoding:
-     */
-    uint8_t *base[AV_NUM_DATA_POINTERS];
-
-    /**
-     * sample aspect ratio for the video frame, 0/1 if unknown/unspecified
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    AVRational sample_aspect_ratio;
-
-    /**
-     * presentation timestamp in time_base units (time when frame should be shown to user)
-     * If AV_NOPTS_VALUE then frame_rate = 1/time_base will be assumed.
-     * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int64_t pts;
-
-    /**
-     * reordered pts from the last AVPacket that has been input into the decoder
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_pts;
-
-    /**
-     * dts from the last AVPacket that has been input into the decoder
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_dts;
-
-    /**
-     * picture number in bitstream order
-     * - encoding: set by
-     * - decoding: Set by libavcodec.
-     */
-    int coded_picture_number;
-    /**
-     * picture number in display order
-     * - encoding: set by
-     * - decoding: Set by libavcodec.
-     */
-    int display_picture_number;
-
-    /**
-     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
-     * - encoding: Set by libavcodec. for coded_picture (and set by user for input).
-     * - decoding: Set by libavcodec.
-     */
-    int quality;
-
-    /**
-     * is this picture used as reference
-     * The values for this are the same as the MpegEncContext.picture_structure
-     * variable, that is 1->top field, 2->bottom field, 3->frame/both fields.
-     * Set to 4 for delayed, non-reference frames.
-     * - encoding: unused
-     * - decoding: Set by libavcodec. (before get_buffer() call)).
-     */
-    int reference;
-
-    /**
-     * QP table
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int8_t *qscale_table;
-    /**
-     * QP store stride
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int qstride;
-
-    /**
-     *
-     */
-    int qscale_type;
-
-    /**
-     * mbskip_table[mb]>=1 if MB didn't change
-     * stride= mb_width = (width+15)>>4
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    uint8_t *mbskip_table;
-
-    /**
-     * motion vector table
-     * @code
-     * example:
-     * int mv_sample_log2= 4 - motion_subsample_log2;
-     * int mb_width= (width+15)>>4;
-     * int mv_stride= (mb_width << mv_sample_log2) + 1;
-     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
-     * @endcode
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int16_t (*motion_val[2])[2];
-
-    /**
-     * macroblock type table
-     * mb_type_base + mb_width + 2
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    uint32_t *mb_type;
-
-    /**
-     * DCT coefficients
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    short *dct_coeff;
-
-    /**
-     * motion reference frame index
-     * the order in which these are stored can depend on the codec.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int8_t *ref_index[2];
-
-    /**
-     * for some private data of the user
-     * - encoding: unused
-     * - decoding: Set by user.
-     */
-    void *opaque;
-
-    /**
-     * error
-     * - encoding: Set by libavcodec. if flags&CODEC_FLAG_PSNR.
-     * - decoding: unused
-     */
-    uint64_t error[AV_NUM_DATA_POINTERS];
-
-    /**
-     * type of the buffer (to keep track of who has to deallocate data[*])
-     * - encoding: Set by the one who allocates it.
-     * - decoding: Set by the one who allocates it.
-     * Note: User allocated (direct rendering) & internal buffers cannot coexist currently.
-     */
-    int type;
-
-    /**
-     * When decoding, this signals how much the picture must be delayed.
-     * extra_delay = repeat_pict / (2*fps)
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    int repeat_pict;
-
-    /**
-     * The content of the picture is interlaced.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec. (default 0)
-     */
-    int interlaced_frame;
-
-    /**
-     * If the content is interlaced, is top field displayed first.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    int top_field_first;
-
-    /**
-     * Tell user application that palette has changed from previous frame.
-     * - encoding: ??? (no palette-enabled encoder yet)
-     * - decoding: Set by libavcodec. (default 0).
-     */
-    int palette_has_changed;
-
-    /**
-     * codec suggestion on buffer type if != 0
-     * - encoding: unused
-     * - decoding: Set by libavcodec. (before get_buffer() call)).
-     */
-    int buffer_hints;
-
-    /**
-     * Pan scan.
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVPanScan *pan_scan;
-
-    /**
-     * reordered opaque 64bit (generally an integer or a double precision float
-     * PTS but can be anything).
-     * The user sets AVCodecContext.reordered_opaque to represent the input at
-     * that time,
-     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
-     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
-     * @deprecated in favor of pkt_pts
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t reordered_opaque;
-
-    /**
-     * hardware accelerator private data (FFmpeg-allocated)
-     * - encoding: unused
-     * - decoding: Set by libavcodec
-     */
-    void *hwaccel_picture_private;
-
-    /**
-     * the AVCodecContext which ff_thread_get_buffer() was last called on
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    struct AVCodecContext *owner;
-
-    /**
-     * used by multithreading to store frame-specific info
-     * - encoding: Set by libavcodec.
-     * - decoding: Set by libavcodec.
-     */
-    void *thread_opaque;
-
-    /**
-     * log2 of the size of the block which a single vector in motion_val represents:
-     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
-     * - encoding: unused
-     * - decoding: Set by libavcodec.
-     */
-    uint8_t motion_subsample_log2;
-
-    /**
-     * Sample rate of the audio data.
-     *
-     * - encoding: unused
-     * - decoding: read by user
-     */
-    int sample_rate;
-
-    /**
-     * Channel layout of the audio data.
-     *
-     * - encoding: unused
-     * - decoding: read by user.
-     */
-    uint64_t channel_layout;
-
-    /**
-     * frame timestamp estimated using various heuristics, in stream time base
-     * Code outside libavcodec should access this field using:
-     * av_frame_get_best_effort_timestamp(frame)
-     * - encoding: unused
-     * - decoding: set by libavcodec, read by user.
-     */
-    int64_t best_effort_timestamp;
-
-    /**
-     * reordered pos from the last AVPacket that has been input into the decoder
-     * Code outside libavcodec should access this field using:
-     * av_frame_get_pkt_pos(frame)
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_pos;
-
-    /**
-     * duration of the corresponding packet, expressed in
-     * AVStream->time_base units, 0 if unknown.
-     * Code outside libavcodec should access this field using:
-     * av_frame_get_pkt_duration(frame)
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t pkt_duration;
-
-    /**
-     * metadata.
-     * Code outside libavcodec should access this field using:
-     * av_frame_get_metadata(frame)
-     * - encoding: Set by user.
-     * - decoding: Set by libavcodec.
-     */
-    AVDictionary *metadata;
-
-    /**
-     * decode error flags of the frame, set to a combination of
-     * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
-     * were errors during the decoding.
-     * Code outside libavcodec should access this field using:
-     * av_frame_get_decode_error_flags(frame)
-     * - encoding: unused
-     * - decoding: set by libavcodec, read by user.
-     */
-    int decode_error_flags;
-#define FF_DECODE_ERROR_INVALID_BITSTREAM   1
-#define FF_DECODE_ERROR_MISSING_REFERENCE   2
-
-    /**
-     * number of audio channels, only used for audio.
-     * Code outside libavcodec should access this field using:
-     * av_frame_get_channels(frame)
-     * - encoding: unused
-     * - decoding: Read by user.
-     */
-    int64_t channels;
-} AVFrame;
-
-/**
- * Accessors for some AVFrame fields.
- * The position of these field in the structure is not part of the ABI,
- * they should not be accessed directly outside libavcodec.
- */
-int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
-void    av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
-int64_t av_frame_get_pkt_duration         (const AVFrame *frame);
-void    av_frame_set_pkt_duration         (AVFrame *frame, int64_t val);
-int64_t av_frame_get_pkt_pos              (const AVFrame *frame);
-void    av_frame_set_pkt_pos              (AVFrame *frame, int64_t val);
-int64_t av_frame_get_channel_layout       (const AVFrame *frame);
-void    av_frame_set_channel_layout       (AVFrame *frame, int64_t val);
-int     av_frame_get_channels             (const AVFrame *frame);
-void    av_frame_set_channels             (AVFrame *frame, int     val);
-int     av_frame_get_sample_rate          (const AVFrame *frame);
-void    av_frame_set_sample_rate          (AVFrame *frame, int     val);
-AVDictionary *av_frame_get_metadata       (const AVFrame *frame);
-void          av_frame_set_metadata       (AVFrame *frame, AVDictionary *val);
-int     av_frame_get_decode_error_flags   (const AVFrame *frame);
-void    av_frame_set_decode_error_flags   (AVFrame *frame, int     val);
-
 struct AVCodecInternal;
 
 enum AVFieldOrder {
@@ -1499,13 +1172,6 @@
      */
     unsigned int stream_codec_tag;
 
-#if FF_API_SUB_ID
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated int sub_id;
-#endif
-
     void *priv_data;
 
     /**
@@ -1573,7 +1239,7 @@
      * rv10: additional flags
      * mpeg4: global headers (they can be in the bitstream or here)
      * The allocated memory should be FF_INPUT_BUFFER_PADDING_SIZE bytes larger
-     * than extradata_size to avoid prolems if it is read with the bitstream reader.
+     * than extradata_size to avoid problems if it is read with the bitstream reader.
      * The bytewise contents of extradata must not depend on the architecture or CPU endianness.
      * - encoding: Set/allocated/freed by libavcodec.
      * - decoding: Set/allocated/freed by user.
@@ -1601,6 +1267,8 @@
     int ticks_per_frame;
 
     /**
+     * Codec delay.
+     *
      * Encoding: Number of frames delay there will be from the encoder input to
      *           the decoder output. (we assume the decoder matches the spec)
      * Decoding: Number of frames delay in addition to what a standard decoder
@@ -1631,16 +1299,20 @@
     /**
      * picture width / height.
      * - encoding: MUST be set by user.
-     * - decoding: Set by libavcodec.
-     * Note: For compatibility it is possible to set this instead of
-     * coded_width/height before decoding.
+     * - decoding: May be set by the user before opening the decoder if known e.g.
+     *             from the container. Some decoders will require the dimensions
+     *             to be set by the caller. During decoding, the decoder may
+     *             overwrite those values as required.
      */
     int width, height;
 
     /**
-     * Bitstream width / height, may be different from width/height if lowres enabled.
+     * Bitstream width / height, may be different from width/height e.g. when
+     * the decoded frame is cropped before being output or lowres is enabled.
      * - encoding: unused
-     * - decoding: Set by user before init if known. Codec should override / dynamically change if needed.
+     * - decoding: May be set by the user before opening the decoder if known
+     *             e.g. from the container. During decoding, the decoder may
+     *             overwrite those values as required.
      */
     int coded_width, coded_height;
 
@@ -1732,22 +1404,6 @@
 
     int b_frame_strategy;
 
-#if FF_API_MPV_GLOBAL_OPTS
-    /**
-     * luma single coefficient elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int luma_elim_threshold;
-
-    /**
-     * chroma single coeff elimination threshold
-     * - encoding: Set by user.
-     * - decoding: unused
-     */
-    attribute_deprecated int chroma_elim_threshold;
-#endif
-
     /**
      * qscale offset between IP and B-frames
      * - encoding: Set by user.
@@ -1977,16 +1633,6 @@
      */
     int inter_quant_bias;
 
-#if FF_API_COLOR_TABLE_ID
-    /**
-     * color table ID
-     * - encoding: unused
-     * - decoding: Which clrtable should be used for 8bit RGB images.
-     *             Tables have to be stored somewhere. FIXME
-     */
-    attribute_deprecated int color_table_id;
-#endif
-
     /**
      * slice flags
      * - encoding: unused
@@ -2043,20 +1689,6 @@
      */
     int noise_reduction;
 
-#if FF_API_INTER_THRESHOLD
-    /**
-     * @deprecated this field is unused
-     */
-    attribute_deprecated int inter_threshold;
-#endif
-
-#if FF_API_MPV_GLOBAL_OPTS
-    /**
-     * @deprecated use mpegvideo private options instead
-     */
-    attribute_deprecated int quantizer_noise_shaping;
-#endif
-
     /**
      * Motion estimation threshold below which no motion estimation is
      * performed, but instead the user specified motion vectors are used.
@@ -2243,7 +1875,13 @@
 
     /* The following data should not be initialized. */
     /**
-     * Samples per packet, initialized when calling 'init'.
+     * Number of samples per channel in an audio frame.
+     *
+     * - encoding: set by libavcodec in avcodec_open2(). Each submitted frame
+     *   except the last must contain exactly frame_size samples per channel.
+     *   May be 0 when the codec has CODEC_CAP_VARIABLE_FRAME_SIZE set, then the
+     *   frame size is not restricted.
+     * - decoding: may be set by some decoders to indicate constant frame size
      */
     int frame_size;
 
@@ -2278,7 +1916,7 @@
      * - decoding: Set by user.
      * @deprecated Deprecated in favor of request_channel_layout.
      */
-    int request_channels;
+    attribute_deprecated int request_channels;
 #endif
 
     /**
@@ -2310,6 +1948,7 @@
      */
     enum AVSampleFormat request_sample_fmt;
 
+#if FF_API_GET_BUFFER
     /**
      * Called at the beginning of each frame to get a buffer for it.
      *
@@ -2352,7 +1991,12 @@
      *
      * Decoders cannot use the buffer after returning from
      * avcodec_decode_audio4(), so they will not call release_buffer(), as it
-     * is assumed to be released immediately upon return.
+     * is assumed to be released immediately upon return. In some rare cases,
+     * a decoder may need to call get_buffer() more than once in a single
+     * call to avcodec_decode_audio4(). In that case, when get_buffer() is
+     * called again after it has already been called once, the previously
+     * acquired buffer is assumed to be released at that time and may not be
+     * reused by the decoder.
      *
      * As a convenience, av_samples_get_buffer_size() and
      * av_samples_fill_arrays() in libavutil may be used by custom get_buffer()
@@ -2364,7 +2008,10 @@
      *
      * - encoding: unused
      * - decoding: Set by libavcodec, user can override.
+     *
+     * @deprecated use get_buffer2()
      */
+    attribute_deprecated
     int (*get_buffer)(struct AVCodecContext *c, AVFrame *pic);
 
     /**
@@ -2375,7 +2022,10 @@
      * but not by more than one thread at once, so does not need to be reentrant.
      * - encoding: unused
      * - decoding: Set by libavcodec, user can override.
+     *
+     * @deprecated custom freeing callbacks should be set from get_buffer2()
      */
+    attribute_deprecated
     void (*release_buffer)(struct AVCodecContext *c, AVFrame *pic);
 
     /**
@@ -2390,8 +2040,105 @@
      * - encoding: unused
      * - decoding: Set by libavcodec, user can override.
      */
+    attribute_deprecated
     int (*reget_buffer)(struct AVCodecContext *c, AVFrame *pic);
+#endif
 
+    /**
+     * This callback is called at the beginning of each frame to get data
+     * buffer(s) for it. There may be one contiguous buffer for all the data or
+     * there may be a buffer per each data plane or anything in between. What
+     * this means is, you may set however many entries in buf[] you feel necessary.
+     * Each buffer must be reference-counted using the AVBuffer API (see description
+     * of buf[] below).
+     *
+     * The following fields will be set in the frame before this callback is
+     * called:
+     * - format
+     * - width, height (video only)
+     * - sample_rate, channel_layout, nb_samples (audio only)
+     * Their values may differ from the corresponding values in
+     * AVCodecContext. This callback must use the frame values, not the codec
+     * context values, to calculate the required buffer size.
+     *
+     * This callback must fill the following fields in the frame:
+     * - data[]
+     * - linesize[]
+     * - extended_data:
+     *   * if the data is planar audio with more than 8 channels, then this
+     *     callback must allocate and fill extended_data to contain all pointers
+     *     to all data planes. data[] must hold as many pointers as it can.
+     *     extended_data must be allocated with av_malloc() and will be freed in
+     *     av_frame_unref().
+     *   * otherwise exended_data must point to data
+     * - buf[] must contain one or more pointers to AVBufferRef structures. Each of
+     *   the frame's data and extended_data pointers must be contained in these. That
+     *   is, one AVBufferRef for each allocated chunk of memory, not necessarily one
+     *   AVBufferRef per data[] entry. See: av_buffer_create(), av_buffer_alloc(),
+     *   and av_buffer_ref().
+     * - extended_buf and nb_extended_buf must be allocated with av_malloc() by
+     *   this callback and filled with the extra buffers if there are more
+     *   buffers than buf[] can hold. extended_buf will be freed in
+     *   av_frame_unref().
+     *
+     * If CODEC_CAP_DR1 is not set then get_buffer2() must call
+     * avcodec_default_get_buffer2() instead of providing buffers allocated by
+     * some other means.
+     *
+     * Each data plane must be aligned to the maximum required by the target
+     * CPU.
+     *
+     * @see avcodec_default_get_buffer2()
+     *
+     * Video:
+     *
+     * 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.
+     *
+     * 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.
+     *
+     * @see avcodec_align_dimensions2()
+     *
+     * Audio:
+     *
+     * Decoders request a buffer of a particular size by setting
+     * AVFrame.nb_samples prior to calling get_buffer2(). The decoder may,
+     * however, utilize only part of the buffer by setting AVFrame.nb_samples
+     * to a smaller value in the output frame.
+     *
+     * As a convenience, av_samples_get_buffer_size() and
+     * av_samples_fill_arrays() in libavutil may be used by custom get_buffer2()
+     * functions to find the required data size and to fill data pointers and
+     * linesize. In AVFrame.linesize, only linesize[0] may be set for audio
+     * since all planes must be the same size.
+     *
+     * @see av_samples_get_buffer_size(), av_samples_fill_arrays()
+     *
+     * - encoding: unused
+     * - decoding: Set by libavcodec, user can override.
+     */
+    int (*get_buffer2)(struct AVCodecContext *s, AVFrame *frame, int flags);
+
+    /**
+     * If non-zero, the decoded audio and video frames returned from
+     * avcodec_decode_video2() and avcodec_decode_audio4() are reference-counted
+     * and are valid indefinitely. The caller must free them with
+     * av_frame_unref() when they are not needed anymore.
+     * Otherwise, the decoded frames must not be freed by the caller and are
+     * only valid until the next decode call.
+     *
+     * - encoding: unused
+     * - decoding: set by the caller before avcodec_open2().
+     */
+    int refcounted_frames;
 
     /* - encoding parameters */
     float qcompress;  ///< amount of qscale change between easy & hard scenes (0.0-1.0)
@@ -2788,36 +2535,18 @@
 #define FF_IDCT_INT           1
 #define FF_IDCT_SIMPLE        2
 #define FF_IDCT_SIMPLEMMX     3
-#define FF_IDCT_LIBMPEG2MMX   4
-#if FF_API_MMI
-#define FF_IDCT_MMI           5
-#endif
 #define FF_IDCT_ARM           7
 #define FF_IDCT_ALTIVEC       8
 #define FF_IDCT_SH4           9
 #define FF_IDCT_SIMPLEARM     10
-#define FF_IDCT_H264          11
-#define FF_IDCT_VP3           12
 #define FF_IDCT_IPP           13
 #define FF_IDCT_XVIDMMX       14
-#define FF_IDCT_CAVS          15
 #define FF_IDCT_SIMPLEARMV5TE 16
 #define FF_IDCT_SIMPLEARMV6   17
 #define FF_IDCT_SIMPLEVIS     18
-#define FF_IDCT_WMV2          19
 #define FF_IDCT_FAAN          20
-#define FF_IDCT_EA            21
 #define FF_IDCT_SIMPLENEON    22
 #define FF_IDCT_SIMPLEALPHA   23
-#define FF_IDCT_BINK          24
-
-#if FF_API_DSP_MASK
-    /**
-     * Unused.
-     * @deprecated use av_set_cpu_flags_mask() instead.
-     */
-    attribute_deprecated unsigned dsp_mask;
-#endif
 
     /**
      * bits per sample/pixel from the demuxer (needed for huffyuv).
@@ -2833,12 +2562,16 @@
      */
     int bits_per_raw_sample;
 
+#if FF_API_LOWRES
     /**
      * low resolution decoding, 1-> 1/2 size, 2->1/4 size
      * - encoding: unused
      * - decoding: Set by user.
+     * Code outside libavcodec should access this field using:
+     * av_codec_{get,set}_lowres(avctx)
      */
      int lowres;
+#endif
 
     /**
      * the picture in the bitstream
@@ -2947,6 +2680,8 @@
 #define FF_PROFILE_AAC_HE_V2 28
 #define FF_PROFILE_AAC_LD   22
 #define FF_PROFILE_AAC_ELD  38
+#define FF_PROFILE_MPEG2_AAC_LOW 128
+#define FF_PROFILE_MPEG2_AAC_HE  131
 
 #define FF_PROFILE_DTS         20
 #define FF_PROFILE_DTS_ES      30
@@ -3000,6 +2735,12 @@
 #define FF_PROFILE_MPEG4_SIMPLE_STUDIO             14
 #define FF_PROFILE_MPEG4_ADVANCED_SIMPLE           15
 
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_0   0
+#define FF_PROFILE_JPEG2000_CSTREAM_RESTRICTION_1   1
+#define FF_PROFILE_JPEG2000_CSTREAM_NO_RESTRICTION  2
+#define FF_PROFILE_JPEG2000_DCINEMA_2K              3
+#define FF_PROFILE_JPEG2000_DCINEMA_4K              4
+
     /**
      * level
      * - encoding: Set by user.
@@ -3009,21 +2750,21 @@
 #define FF_LEVEL_UNKNOWN -99
 
     /**
-     *
+     * Skip loop filtering for selected frames.
      * - encoding: unused
      * - decoding: Set by user.
      */
     enum AVDiscard skip_loop_filter;
 
     /**
-     *
+     * Skip IDCT/dequantization for selected frames.
      * - encoding: unused
      * - decoding: Set by user.
      */
     enum AVDiscard skip_idct;
 
     /**
-     *
+     * Skip decoding for selected frames.
      * - encoding: unused
      * - decoding: Set by user.
      */
@@ -3067,21 +2808,32 @@
     /**
      * Timebase in which pkt_dts/pts and AVPacket.dts/pts are.
      * Code outside libavcodec should access this field using:
-     * avcodec_set_pkt_timebase(avctx)
+     * av_codec_{get,set}_pkt_timebase(avctx)
      * - encoding unused.
-     * - decodimg set by user
+     * - decoding set by user.
      */
     AVRational pkt_timebase;
 
     /**
      * AVCodecDescriptor
      * Code outside libavcodec should access this field using:
-     * avcodec_get_codec_descriptior(avctx)
+     * av_codec_{get,set}_codec_descriptor(avctx)
      * - encoding: unused.
      * - decoding: set by libavcodec.
      */
     const AVCodecDescriptor *codec_descriptor;
 
+#if !FF_API_LOWRES
+    /**
+     * low resolution decoding, 1-> 1/2 size, 2->1/4 size
+     * - encoding: unused
+     * - decoding: Set by user.
+     * Code outside libavcodec should access this field using:
+     * av_codec_{get,set}_lowres(avctx)
+     */
+     int lowres;
+#endif
+
     /**
      * Current statistics for PTS correction.
      * - decoding: maintained and used by libavcodec, not intended to be used by user apps
@@ -3091,6 +2843,25 @@
     int64_t pts_correction_num_faulty_dts; /// Number of incorrect DTS values so far
     int64_t pts_correction_last_pts;       /// PTS of the last frame
     int64_t pts_correction_last_dts;       /// DTS of the last frame
+
+    /**
+     * Character encoding of the input subtitles file.
+     * - decoding: set by user
+     * - encoding: unused
+     */
+    char *sub_charenc;
+
+    /**
+     * Subtitles character encoding mode. Formats or codecs might be adjusting
+     * this setting (if they are doing the conversion themselves for instance).
+     * - decoding: set by libavcodec
+     * - encoding: unused
+     */
+    int sub_charenc_mode;
+#define FF_SUB_CHARENC_MODE_DO_NOTHING  -1  ///< do nothing (demuxer outputs a stream supposed to be already in UTF-8, or the codec is bitmap for instance)
+#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
+
 } AVCodecContext;
 
 AVRational av_codec_get_pkt_timebase         (const AVCodecContext *avctx);
@@ -3099,6 +2870,9 @@
 const AVCodecDescriptor *av_codec_get_codec_descriptor(const AVCodecContext *avctx);
 void                     av_codec_set_codec_descriptor(AVCodecContext *avctx, const AVCodecDescriptor *desc);
 
+int  av_codec_get_lowres(const AVCodecContext *avctx);
+void av_codec_set_lowres(AVCodecContext *avctx, int val);
+
 /**
  * AVProfile.
  */
@@ -3304,11 +3078,13 @@
  */
 
 /**
- * four components are given, that's all.
- * the last component is alpha
+ * Picture data structure.
+ *
+ * Up to four components can be stored into it, the last component is
+ * alpha.
  */
 typedef struct AVPicture {
-    uint8_t *data[AV_NUM_DATA_POINTERS];
+    uint8_t *data[AV_NUM_DATA_POINTERS];    ///< pointers to the image data planes
     int linesize[AV_NUM_DATA_POINTERS];     ///< number of bytes per line
 } AVPicture;
 
@@ -3334,6 +3110,8 @@
     SUBTITLE_ASS,
 };
 
+#define AV_SUBTITLE_FLAG_FORCED 0x00000001
+
 typedef struct AVSubtitleRect {
     int x;         ///< top left corner  of pict, undefined when pict is not set
     int y;         ///< top left corner  of pict, undefined when pict is not set
@@ -3357,11 +3135,7 @@
      */
     char *ass;
 
-    /**
-     * 1 indicates this subtitle is a forced subtitle.
-     * A forced subtitle should be displayed even when subtitles are hidden.
-     */
-    int forced;
+    int flags;
 } AVSubtitleRect;
 
 typedef struct AVSubtitle {
@@ -3510,7 +3284,7 @@
  * can use this AVCodecContext to decode/encode video/audio data.
  *
  * @param dest target codec context, should be initialized with
- *             avcodec_alloc_context3(), but otherwise uninitialized
+ *             avcodec_alloc_context3(NULL), but otherwise uninitialized
  * @param src source codec context
  * @return AVERROR() on error (e.g. memory allocation error), 0 on success
  */
@@ -3643,10 +3417,14 @@
  * @{
  */
 
+#if FF_API_DESTRUCT_PACKET
 /**
  * Default packet destructor.
+ * @deprecated use the AVBuffer API instead
  */
+attribute_deprecated
 void av_destruct_packet(AVPacket *pkt);
+#endif
 
 /**
  * Initialize optional fields of a packet with default values.
@@ -3685,6 +3463,21 @@
 int av_grow_packet(AVPacket *pkt, int grow_by);
 
 /**
+ * Initialize a reference-counted packet from av_malloc()ed data.
+ *
+ * @param pkt packet to be initialized. This function will set the data, size,
+ *        buf and destruct fields, all others are left untouched.
+ * @param data Data allocated by av_malloc() to be used as packet data. If this
+ *        function returns successfully, the data is owned by the underlying AVBuffer.
+ *        The caller may not access the data through other means.
+ * @param size size of data in bytes, without the padding. I.e. the full buffer
+ *        size is assumed to be size + FF_INPUT_BUFFER_PADDING_SIZE.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+int av_packet_from_data(AVPacket *pkt, uint8_t *data, int size);
+
+/**
  * @warning This is a hack - the packet memory allocation stuff is broken. The
  * packet is allocated if it was not really allocated.
  */
@@ -3698,6 +3491,13 @@
 int av_copy_packet(AVPacket *dst, AVPacket *src);
 
 /**
+ * Copy packet side data
+ *
+ * @return 0 on success, negative AVERROR on fail
+ */
+int av_copy_packet_side_data(AVPacket *dst, AVPacket *src);
+
+/**
  * Free a packet.
  *
  * @param pkt packet to free
@@ -3743,6 +3543,66 @@
 
 
 /**
+ * Convenience function to free all the side data stored.
+ * All the other fields stay untouched.
+ *
+ * @param pkt packet
+ */
+void av_packet_free_side_data(AVPacket *pkt);
+
+/**
+ * Setup a new reference to the data described by a given packet
+ *
+ * If src is reference-counted, setup dst as a new reference to the
+ * buffer in src. Otherwise allocate a new buffer in dst and copy the
+ * data from src into it.
+ *
+ * All the other fields are copied from src.
+ *
+ * @see av_packet_unref
+ *
+ * @param dst Destination packet
+ * @param src Source packet
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_packet_ref(AVPacket *dst, AVPacket *src);
+
+/**
+ * Wipe the packet.
+ *
+ * Unreference the buffer referenced by the packet and reset the
+ * remaining packet fields to their default values.
+ *
+ * @param pkt The packet to be unreferenced.
+ */
+void av_packet_unref(AVPacket *pkt);
+
+/**
+ * Move every field in src to dst and reset src.
+ *
+ * @see av_packet_unref
+ *
+ * @param src Source packet, will be reset
+ * @param dst Destination packet
+ */
+void av_packet_move_ref(AVPacket *dst, AVPacket *src);
+
+/**
+ * Copy only "properties" fields from src to dst.
+ *
+ * Properties for the purpose of this function are all the fields
+ * beside those related to the packet data (buf, data, size)
+ *
+ * @param dst Destination packet
+ * @param src Source packet
+ *
+ * @return 0 on success AVERROR on failure.
+ *
+ */
+int av_packet_copy_props(AVPacket *dst, const AVPacket *src);
+
+/**
  * @}
  */
 
@@ -3767,9 +3627,18 @@
  */
 AVCodec *avcodec_find_decoder_by_name(const char *name);
 
-int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
-void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
-int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+#if FF_API_GET_BUFFER
+attribute_deprecated int avcodec_default_get_buffer(AVCodecContext *s, AVFrame *pic);
+attribute_deprecated void avcodec_default_release_buffer(AVCodecContext *s, AVFrame *pic);
+attribute_deprecated int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic);
+#endif
+
+/**
+ * The default callback for AVCodecContext.get_buffer2(). It is made public so
+ * it can be called by custom get_buffer2() implementations for decoders without
+ * CODEC_CAP_DR1 set.
+ */
+int avcodec_default_get_buffer2(AVCodecContext *s, AVFrame *frame, int flags);
 
 /**
  * Return the amount of padding in pixels which the get_buffer callback must
@@ -3803,6 +3672,28 @@
 void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
                                int linesize_align[AV_NUM_DATA_POINTERS]);
 
+/**
+ * Converts AVChromaLocation to swscale x/y chroma position.
+ *
+ * The positions represent the chroma (0,0) position in a coordinates system
+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
+ *
+ * @param xpos  horizontal chroma sample position
+ * @param ypos  vertical   chroma sample position
+ */
+int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos);
+
+/**
+ * Converts swscale x/y chroma position to AVChromaLocation.
+ *
+ * The positions represent the chroma (0,0) position in a coordinates system
+ * with luma (0,0) representing the origin and luma(1,1) representing 256,256
+ *
+ * @param xpos  horizontal chroma sample position
+ * @param ypos  vertical   chroma sample position
+ */
+enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos);
+
 #if FF_API_OLD_DECODE_AUDIO
 /**
  * Wrapper function which calls avcodec_decode_audio4.
@@ -3882,11 +3773,17 @@
  *
  * @param      avctx the codec context
  * @param[out] frame The AVFrame in which to store decoded audio samples.
- *                   Decoders request a buffer of a particular size by setting
- *                   AVFrame.nb_samples prior to calling get_buffer(). The
- *                   decoder may, however, only utilize part of the buffer by
- *                   setting AVFrame.nb_samples to a smaller value in the
- *                   output frame.
+ *                   The decoder will allocate a buffer for the decoded frame by
+ *                   calling the AVCodecContext.get_buffer2() callback.
+ *                   When AVCodecContext.refcounted_frames is set to 1, the frame is
+ *                   reference counted and the returned reference belongs to the
+ *                   caller. The caller must release the frame using av_frame_unref()
+ *                   when the frame is no longer needed. The caller may safely write
+ *                   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.
  * @param[out] got_frame_ptr Zero if no frame could be decoded, otherwise it is
  *                           non-zero.
  * @param[in]  avpkt The input AVPacket containing the input buffer.
@@ -3924,12 +3821,18 @@
  *
  * @param avctx the codec context
  * @param[out] picture The AVFrame in which the decoded video frame will be stored.
- *             Use avcodec_alloc_frame to get an AVFrame, the codec will
- *             allocate memory for the actual bitmap.
- *             with default get/release_buffer(), the decoder frees/reuses the bitmap as it sees fit.
- *             with overridden get/release_buffer() (needs CODEC_CAP_DR1) the user decides into what buffer the decoder
- *                   decodes and the decoder tells the user once it does not need the data anymore,
- *                   the user app can at this point free/reuse/keep the memory as it sees fit.
+ *             Use av_frame_alloc() to get an AVFrame. The codec will
+ *             allocate memory for the actual bitmap by calling the
+ *             AVCodecContext.get_buffer2() callback.
+ *             When AVCodecContext.refcounted_frames is set to 1, the frame is
+ *             reference counted and the returned reference belongs to the
+ *             caller. The caller must release the frame using av_frame_unref()
+ *             when the frame is no longer needed. The caller may safely write
+ *             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.
  *
  * @param[in] avpkt The input AVpacket containing the input buffer.
  *            You can create such packet with av_init_packet() and by then setting
@@ -3969,6 +3872,13 @@
  * @{
  */
 
+enum AVPictureStructure {
+    AV_PICTURE_STRUCTURE_UNKNOWN,      //< unknown
+    AV_PICTURE_STRUCTURE_TOP_FIELD,    //< coded as top field
+    AV_PICTURE_STRUCTURE_BOTTOM_FIELD, //< coded as bottom field
+    AV_PICTURE_STRUCTURE_FRAME,        //< coded as frame
+};
+
 typedef struct AVCodecParserContext {
     void *priv_data;
     struct AVCodecParser *parser;
@@ -4103,6 +4013,26 @@
      * For all other types, this is in units of AVCodecContext.time_base.
      */
     int duration;
+
+    enum AVFieldOrder field_order;
+
+    /**
+     * Indicate whether a picture is coded as a frame, top field or bottom field.
+     *
+     * For example, H.264 field_pic_flag equal to 0 corresponds to
+     * AV_PICTURE_STRUCTURE_FRAME. An H.264 picture with field_pic_flag
+     * equal to 1 and bottom_field_flag equal to 0 corresponds to
+     * AV_PICTURE_STRUCTURE_TOP_FIELD.
+     */
+    enum AVPictureStructure picture_structure;
+
+    /**
+     * Picture number incremented in presentation or output order.
+     * This field may be reinitialized at the first picture of a new sequence.
+     *
+     * For example, this corresponds to H.264 PicOrderCnt.
+     */
+    int output_picture_number;
 } AVCodecParserContext;
 
 typedef struct AVCodecParser {
@@ -4158,6 +4088,10 @@
                      int64_t pts, int64_t dts,
                      int64_t pos);
 
+/**
+ * @return 0 if the output buffer is a subset of the input, 1 if it is allocated and must be freed
+ * @deprecated use AVBitStreamFilter
+ */
 int av_parser_change(AVCodecParserContext *s,
                      AVCodecContext *avctx,
                      uint8_t **poutbuf, int *poutbuf_size,
@@ -4430,15 +4364,18 @@
  */
 
 /**
- * Allocate memory for a picture.  Call avpicture_free() to free it.
+ * Allocate memory for the pixels of a picture and setup the AVPicture
+ * fields for it.
+ *
+ * Call avpicture_free() to free it.
  *
- * @see avpicture_fill()
+ * @param picture            the picture structure to be filled in
+ * @param pix_fmt            the pixel format of the picture
+ * @param width              the width of the picture
+ * @param height             the height of the picture
+ * @return zero if successful, a negative error code otherwise
  *
- * @param picture the picture to be filled in
- * @param pix_fmt the format of the picture
- * @param width the width of the picture
- * @param height the height of the picture
- * @return zero if successful, a negative value if not
+ * @see av_image_alloc(), avpicture_fill()
  */
 int avpicture_alloc(AVPicture *picture, enum AVPixelFormat pix_fmt, int width, int height);
 
@@ -4452,38 +4389,77 @@
 void avpicture_free(AVPicture *picture);
 
 /**
- * Fill in the AVPicture fields, always assume a linesize alignment of
- * 1.
+ * Setup the picture fields based on the specified image parameters
+ * and the provided image data buffer.
+ *
+ * The picture fields are filled in by using the image data buffer
+ * pointed to by ptr.
+ *
+ * If ptr is NULL, the function will fill only the picture linesize
+ * array and return the required size for the image buffer.
+ *
+ * To allocate an image buffer and fill the picture data in one call,
+ * use avpicture_alloc().
+ *
+ * @param picture       the picture to be filled in
+ * @param ptr           buffer where the image data is stored, or NULL
+ * @param pix_fmt       the pixel format of the image
+ * @param width         the width of the image in pixels
+ * @param height        the height of the image in pixels
+ * @return the size in bytes required for src, a negative error code
+ * in case of failure
  *
  * @see av_image_fill_arrays()
  */
-int avpicture_fill(AVPicture *picture, uint8_t *ptr,
+int avpicture_fill(AVPicture *picture, const uint8_t *ptr,
                    enum AVPixelFormat pix_fmt, int width, int height);
 
 /**
- * Copy pixel data from an AVPicture into a buffer, always assume a
- * linesize alignment of 1.
+ * Copy pixel data from an AVPicture into a buffer.
+ *
+ * avpicture_get_size() can be used to compute the required size for
+ * the buffer to fill.
+ *
+ * @param src        source picture with filled data
+ * @param pix_fmt    picture pixel format
+ * @param width      picture width
+ * @param height     picture height
+ * @param dest       destination buffer
+ * @param dest_size  destination buffer size in bytes
+ * @return the number of bytes written to dest, or a negative value
+ * (error code) on error, for example if the destination buffer is not
+ * big enough
  *
  * @see av_image_copy_to_buffer()
  */
-int avpicture_layout(const AVPicture* src, enum AVPixelFormat pix_fmt,
+int avpicture_layout(const AVPicture *src, enum AVPixelFormat pix_fmt,
                      int width, int height,
                      unsigned char *dest, int dest_size);
 
 /**
  * Calculate the size in bytes that a picture of the given width and height
  * would occupy if stored in the given picture format.
- * Always assume a linesize alignment of 1.
+ *
+ * @param pix_fmt    picture pixel format
+ * @param width      picture width
+ * @param height     picture height
+ * @return the computed picture buffer size or a negative error code
+ * in case of error
  *
  * @see av_image_get_buffer_size().
  */
 int avpicture_get_size(enum AVPixelFormat pix_fmt, int width, int height);
 
+#if FF_API_DEINTERLACE
 /**
  *  deinterlace - if not supported return -1
+ *
+ * @deprecated - use yadif (in libavfilter) instead
  */
+attribute_deprecated
 int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
                           enum AVPixelFormat pix_fmt, int width, int height);
+#endif
 /**
  * Copy image src to dst. Wraps av_image_copy().
  */
@@ -4522,6 +4498,21 @@
  * @{
  */
 
+/**
+ * Utility function to access log2_chroma_w log2_chroma_h from
+ * the pixel format AVPixFmtDescriptor.
+ *
+ * This function asserts that pix_fmt is valid. See av_pix_fmt_get_chroma_sub_sample
+ * for one that returns a failure code and continues in case of invalid
+ * pix_fmts.
+ *
+ * @param[in]  pix_fmt the pixel format
+ * @param[out] h_shift store log2_chroma_w
+ * @param[out] v_shift store log2_chroma_h
+ *
+ * @see av_pix_fmt_get_chroma_sub_sample
+ */
+
 void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift);
 
 /**
@@ -4559,38 +4550,6 @@
 int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt,
                              int has_alpha);
 
-#if FF_API_FIND_BEST_PIX_FMT
-/**
- * @deprecated use avcodec_find_best_pix_fmt_of_2() instead.
- *
- * Find the best pixel format to convert to given a certain source pixel
- * format.  When converting from one pixel format to another, information loss
- * may occur.  For example, when converting from RGB24 to GRAY, the color
- * information will be lost. Similarly, other losses occur when converting from
- * some formats to other formats. avcodec_find_best_pix_fmt() searches which of
- * the given pixel formats should be used to suffer the least amount of loss.
- * The pixel formats from which it chooses one, are determined by the
- * pix_fmt_mask parameter.
- *
- * Note, only the first 64 pixel formats will fit in pix_fmt_mask.
- *
- * @code
- * src_pix_fmt = AV_PIX_FMT_YUV420P;
- * pix_fmt_mask = (1 << AV_PIX_FMT_YUV422P) | (1 << AV_PIX_FMT_RGB24);
- * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss);
- * @endcode
- *
- * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from
- * @param[in] src_pix_fmt source pixel format
- * @param[in] has_alpha Whether the source pixel format alpha channel is used.
- * @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.
- */
-attribute_deprecated
-enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt,
-                              int has_alpha, int *loss_ptr);
-#endif /* FF_API_FIND_BEST_PIX_FMT */
-
 /**
  * Find the best pixel format to convert to given a certain source pixel
  * format.  When converting from one pixel format to another, information loss
@@ -4646,7 +4605,7 @@
                                             enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr);
 
 attribute_deprecated
-#if AV_HAVE_INCOMPATIBLE_FORK_ABI
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
 enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list,
                                               enum AVPixelFormat src_pix_fmt,
                                               int has_alpha, int *loss_ptr);
@@ -4689,7 +4648,12 @@
 //FIXME func typedef
 
 /**
- * Fill audio frame data and linesize.
+ * Fill AVFrame audio data and linesize pointers.
+ *
+ * The buffer buf must be a preallocated buffer with a size big enough
+ * to contain the specified samples amount. The filled AVFrame data
+ * pointers will point to this buffer.
+ *
  * AVFrame extended_data channel pointers are allocated if necessary for
  * planar audio.
  *
@@ -4702,7 +4666,9 @@
  * @param buf         buffer to use for frame data
  * @param buf_size    size of buffer
  * @param align       plane size sample alignment (0 = default)
- * @return            0 on success, negative error code on failure
+ * @return            >=0 on success, negative error code on failure
+ * @todo return the size in bytes required to store the samples in
+ * case of success, at the next libavutil bump
  */
 int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
                              enum AVSampleFormat sample_fmt, const uint8_t *buf,
@@ -4713,8 +4679,6 @@
  */
 void avcodec_flush_buffers(AVCodecContext *avctx);
 
-void avcodec_default_free_buffers(AVCodecContext *s);
-
 /**
  * Return codec bits per sample.
  *
@@ -4771,14 +4735,78 @@
     struct AVBitStreamFilter *next;
 } AVBitStreamFilter;
 
+/**
+ * Register a bitstream filter.
+ *
+ * The filter will be accessible to the application code through
+ * av_bitstream_filter_next() or can be directly initialized with
+ * av_bitstream_filter_init().
+ *
+ * @see avcodec_register_all()
+ */
 void av_register_bitstream_filter(AVBitStreamFilter *bsf);
+
+/**
+ * Create and initialize a bitstream filter context given a bitstream
+ * filter name.
+ *
+ * The returned context must be freed with av_bitstream_filter_close().
+ *
+ * @param name    the name of the bitstream filter
+ * @return a bitstream filter context if a matching filter was found
+ * and successfully initialized, NULL otherwise
+ */
 AVBitStreamFilterContext *av_bitstream_filter_init(const char *name);
+
+/**
+ * Filter bitstream.
+ *
+ * This function filters the buffer buf with size buf_size, and places the
+ * filtered buffer in the buffer pointed to by poutbuf.
+ *
+ * The output buffer must be freed by the caller.
+ *
+ * @param bsfc            bitstream filter context created by av_bitstream_filter_init()
+ * @param avctx           AVCodecContext accessed by the filter, may be NULL.
+ *                        If specified, this must point to the encoder context of the
+ *                        output stream the packet is sent to.
+ * @param args            arguments which specify the filter configuration, may be NULL
+ * @param poutbuf         pointer which is updated to point to the filtered buffer
+ * @param poutbuf_size    pointer which is updated to the filtered buffer size in bytes
+ * @param buf             buffer containing the data to filter
+ * @param buf_size        size in bytes of buf
+ * @param keyframe        set to non-zero if the buffer to filter corresponds to a key-frame packet data
+ * @return >= 0 in case of success, or a negative error code in case of failure
+ *
+ * If the return value is positive, an output buffer is allocated and
+ * is availble in *poutbuf, and is distinct from the input buffer.
+ *
+ * If the return value is 0, the output buffer is not allocated and
+ * should be considered identical to the input buffer, or in case
+ * *poutbuf was set it points to the input buffer (not necessarily to
+ * its starting address).
+ */
 int av_bitstream_filter_filter(AVBitStreamFilterContext *bsfc,
                                AVCodecContext *avctx, const char *args,
                                uint8_t **poutbuf, int *poutbuf_size,
                                const uint8_t *buf, int buf_size, int keyframe);
+
+/**
+ * Release bitstream filter context.
+ *
+ * @param bsf the bitstream filter context created with
+ * av_bitstream_filter_init(), can be NULL
+ */
 void av_bitstream_filter_close(AVBitStreamFilterContext *bsf);
 
+/**
+ * If f is NULL, return the first registered bitstream filter,
+ * if f is non-NULL, return the next registered bitstream filter
+ * after f, or NULL if f is the last one.
+ *
+ * This function can be used to iterate over all registered bitstream
+ * filters.
+ */
 AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f);
 
 /* memory */
@@ -4806,7 +4834,7 @@
 
 /**
  * Same behaviour av_fast_malloc but the buffer has additional
- * FF_INPUT_PADDING_SIZE at the end which will will always be 0.
+ * FF_INPUT_BUFFER_PADDING_SIZE at the end which will always be 0.
  *
  * In addition the whole buffer will initially and after resizes
  * be 0-initialized so that no uninitialized data will ever appear.
@@ -4828,6 +4856,7 @@
  */
 unsigned int av_xiphlacing(unsigned char *s, unsigned int v);
 
+#if FF_API_MISSING_SAMPLE
 /**
  * Log a generic warning message about a missing feature. This function is
  * intended to be used internally by FFmpeg (libavcodec, libavformat, etc.)
@@ -4839,7 +4868,9 @@
  * If want_sample is non-zero, additional verbage will be added to the log
  * message which tells the user how to report samples to the development
  * mailing list.
+ * @deprecated Use avpriv_report_missing_feature() instead.
  */
+attribute_deprecated
 void av_log_missing_feature(void *avc, const char *feature, int want_sample);
 
 /**
@@ -4849,8 +4880,11 @@
  * @param[in] avc a pointer to an arbitrary struct of which the first field is
  * a pointer to an AVClass struct
  * @param[in] msg string containing an optional message, or NULL if no message
+ * @deprecated Use avpriv_request_sample() instead.
  */
+attribute_deprecated
 void av_log_ask_for_sample(void *avc, const char *msg, ...) av_printf_format(2, 3);
+#endif /* FF_API_MISSING_SAMPLE */
 
 /**
  * Register the hardware accelerator hwaccel.

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavcodec/dxva2.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/dxva2.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavcodec/old_codec_ids.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/old_codec_ids.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavcodec/vda.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/vda.h Changed

@@ -29,12 +29,6 @@
  * Public libavcodec VDA header.
  */
 
-#include "libavcodec/version.h"
-
-#if FF_API_VDA_ASYNC
-#include <pthread.h>
-#endif
-
 #include <stdint.h>
 
 // emmintrin.h is unable to compile with -std=c99 -Werror=missing-prototypes
@@ -45,6 +39,8 @@
 #include <VideoDecodeAcceleration/VDADecoder.h>
 #undef Picture
 
+#include "libavcodec/version.h"
+
 /**
  * @defgroup lavc_codec_hwaccel_vda VDA
  * @ingroup lavc_codec_hwaccel
@@ -52,39 +48,6 @@
  * @{
  */
 
-#if FF_API_VDA_ASYNC
-/**
- * This structure is used to store decoded frame information and data.
- *
- * @deprecated Use synchronous decoding mode.
- */
-typedef struct {
-    /**
-     * The PTS of the frame.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    int64_t             pts;
-
-    /**
-     * The CoreVideo buffer that contains the decoded data.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    CVPixelBufferRef    cv_buffer;
-
-    /**
-     * A pointer to the next frame.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    struct vda_frame    *next_frame;
-} vda_frame;
-#endif
-
 /**
  * This structure is used to provide the necessary configurations and data
  * to the VDA FFmpeg HWAccel implementation.
@@ -116,28 +79,6 @@
      */
     int                 use_sync_decoding;
 
-#if FF_API_VDA_ASYNC
-    /**
-     * VDA frames queue ordered by presentation timestamp.
-     *
-     * @deprecated Use synchronous decoding mode.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    vda_frame           *queue;
-
-    /**
-     * Mutex for locking queue operations.
-     *
-     * @deprecated Use synchronous decoding mode.
-     *
-     * - encoding: unused
-     * - decoding: Set/Unset by libavcodec.
-     */
-    pthread_mutex_t     queue_mutex;
-#endif
-
     /**
      * The frame width.
      *
@@ -193,6 +134,17 @@
      * - decoding: Set/Unset by libavcodec.
      */
     int                 priv_allocated_size;
+
+    /**
+     * Use av_buffer to manage buffer.
+     * When the flag is set, the CVPixelBuffers returned by the decoder will
+     * be released automatically, so you have to retain them if necessary.
+     * Not setting this flag may cause memory leak.
+     *
+     * encoding: unused
+     * decoding: Set by user.
+     */
+    int                 use_ref_buffer;
 };
 
 /** Create the video decoder. */
@@ -203,22 +155,6 @@
 /** Destroy the video decoder. */
 int ff_vda_destroy_decoder(struct vda_context *vda_ctx);
 
-#if FF_API_VDA_ASYNC
-/**
- * Return the top frame of the queue.
- *
- * @deprecated Use synchronous decoding mode.
- */
-vda_frame *ff_vda_queue_pop(struct vda_context *vda_ctx);
-
-/**
- * Release the given frame.
- *
- * @deprecated Use synchronous decoding mode.
- */
-void ff_vda_release_vda_frame(vda_frame *frame);
-#endif
-
 /**
  * @}
  */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavcodec/vdpau.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/vdpau.h Changed

@@ -51,7 +51,105 @@
 
 #include <vdpau/vdpau.h>
 #include <vdpau/vdpau_x11.h>
+#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
+
+#if FF_API_BUFS_VDPAU
+union AVVDPAUPictureInfo {
+    VdpPictureInfoH264        h264;
+    VdpPictureInfoMPEG1Or2    mpeg;
+    VdpPictureInfoVC1          vc1;
+    VdpPictureInfoMPEG4Part2 mpeg4;
+};
+#endif
+
+struct AVCodecContext;
+struct AVFrame;
+
+typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *,
+                               const VdpPictureInfo *, uint32_t,
+                               const VdpBitstreamBuffer *);
+
+/**
+ * This structure is used to share data between the libavcodec library and
+ * the client video application.
+ * The user shall allocate the structure via the av_alloc_vdpau_hwaccel
+ * function and make it available as
+ * AVCodecContext.hwaccel_context. Members can be set by the user once
+ * during initialization or through each AVCodecContext.get_buffer()
+ * function call. In any case, they must be valid prior to calling
+ * decoding functions.
+ */
+typedef struct AVVDPAUContext {
+    /**
+     * VDPAU decoder handle
+     *
+     * Set by user.
+     */
+    VdpDecoder decoder;
+
+    /**
+     * VDPAU decoder render callback
+     *
+     * Set by the user.
+     */
+    VdpDecoderRender *render;
+
+#if FF_API_BUFS_VDPAU
+    /**
+     * VDPAU picture information
+     *
+     * Set by libavcodec.
+     */
+    attribute_deprecated
+    union AVVDPAUPictureInfo info;
+
+    /**
+     * Allocated size of the bitstream_buffers table.
+     *
+     * Set by libavcodec.
+     */
+    attribute_deprecated
+    int bitstream_buffers_allocated;
+
+    /**
+     * Useful bitstream buffers in the bitstream buffers table.
+     *
+     * Set by libavcodec.
+     */
+    attribute_deprecated
+    int bitstream_buffers_used;
+
+   /**
+     * Table of bitstream buffers.
+     * The user is responsible for freeing this buffer using av_freep().
+     *
+     * Set by libavcodec.
+     */
+    attribute_deprecated
+    VdpBitstreamBuffer *bitstream_buffers;
+#endif
+    AVVDPAU_Render2 render2;
+} AVVDPAUContext;
+
+/**
+ * @brief allocation function for AVVDPAUContext
+ *
+ * Allows extending the struct without breaking API/ABI
+ */
+AVVDPAUContext *av_alloc_vdpaucontext(void);
+
+AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
+void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
+
+#if FF_API_CAP_VDPAU
 /** @brief The videoSurface is used for rendering. */
 #define FF_VDPAU_STATE_USED_FOR_RENDER 1
 
@@ -73,6 +171,11 @@
 
     int state; ///< Holds FF_VDPAU_STATE_* values.
 
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
+    /** picture parameter information for all supported codecs */
+    union AVVDPAUPictureInfo info;
+#endif
+
     /** Describe size/location of the compressed video data.
         Set to 0 when freeing bitstream_buffers. */
     int bitstream_buffers_allocated;
@@ -80,14 +183,12 @@
     /** The user is responsible for freeing this buffer using av_freep(). */
     VdpBitstreamBuffer *bitstream_buffers;
 
+#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
     /** picture parameter information for all supported codecs */
-    union VdpPictureInfo {
-        VdpPictureInfoH264        h264;
-        VdpPictureInfoMPEG1Or2    mpeg;
-        VdpPictureInfoVC1          vc1;
-        VdpPictureInfoMPEG4Part2 mpeg4;
-    } info;
+    union AVVDPAUPictureInfo info;
+#endif
 };
+#endif
 
 /* @}*/

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavcodec/version.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavcodec/version.h Changed

@@ -28,8 +28,8 @@
 
 #include "libavutil/avutil.h"
 
-#define LIBAVCODEC_VERSION_MAJOR 54
-#define LIBAVCODEC_VERSION_MINOR 67
+#define LIBAVCODEC_VERSION_MAJOR 55
+#define LIBAVCODEC_VERSION_MINOR  29
 #define LIBAVCODEC_VERSION_MICRO 100
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
@@ -49,7 +49,7 @@
  */
 
 #ifndef FF_API_REQUEST_CHANNELS
-#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 55)
+#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_ALLOC_CONTEXT
 #define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 55)
@@ -58,50 +58,47 @@
 #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 < 55)
+#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 < 55)
+#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_OLD_ENCODE_VIDEO
-#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 55)
+#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_MPV_GLOBAL_OPTS
-#define FF_API_MPV_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_CODEC_ID
+#define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_COLOR_TABLE_ID
-#define FF_API_COLOR_TABLE_ID   (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_AVCODEC_RESAMPLE
+#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_INTER_THRESHOLD
-#define FF_API_INTER_THRESHOLD  (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_DEINTERLACE
+#define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_SUB_ID
-#define FF_API_SUB_ID           (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_DESTRUCT_PACKET
+#define FF_API_DESTRUCT_PACKET   (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_DSP_MASK
-#define FF_API_DSP_MASK         (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_GET_BUFFER
+#define FF_API_GET_BUFFER        (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_FIND_BEST_PIX_FMT
-#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_MISSING_SAMPLE
+#define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_CODEC_ID
-#define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_LOWRES
+#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_VDA_ASYNC
-#define FF_API_VDA_ASYNC         (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_CAP_VDPAU
+#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_LIBMPEG2
-#define FF_API_LIBMPEG2          (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_BUFS_VDPAU
+#define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_MMI
-#define FF_API_MMI               (LIBAVCODEC_VERSION_MAJOR < 55)
+#ifndef FF_API_VOXWARE
+#define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
 
 #endif /* AVCODEC_VERSION_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavdevice Added

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavdevice/avdevice.h Added

@@ -0,0 +1,69 @@
+/*
+ * 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 AVDEVICE_AVDEVICE_H
+#define AVDEVICE_AVDEVICE_H
+
+#include "version.h"
+
+/**
+ * @file
+ * @ingroup lavd
+ * Main libavdevice API header
+ */
+
+/**
+ * @defgroup lavd Special devices muxing/demuxing library
+ * @{
+ * Libavdevice is a complementary library to @ref libavf "libavformat". It
+ * provides various "special" platform-specific muxers and demuxers, e.g. for
+ * grabbing devices, audio capture and playback etc. As a consequence, the
+ * (de)muxers in libavdevice are of the AVFMT_NOFILE type (they use their own
+ * I/O functions). The filename passed to avformat_open_input() often does not
+ * refer to an actually existing file, but has some special device-specific
+ * meaning - e.g. for x11grab it is the display name.
+ *
+ * To use libavdevice, simply call avdevice_register_all() to register all
+ * compiled muxers and demuxers. They all use standard libavformat API.
+ * @}
+ */
+
+#include "libavformat/avformat.h"
+
+/**
+ * Return the LIBAVDEVICE_VERSION_INT constant.
+ */
+unsigned avdevice_version(void);
+
+/**
+ * Return the libavdevice build-time configuration.
+ */
+const char *avdevice_configuration(void);
+
+/**
+ * Return the libavdevice license.
+ */
+const char *avdevice_license(void);
+
+/**
+ * Initialize libavdevice and register all the input and output devices.
+ * @warning This function is not thread safe.
+ */
+void avdevice_register_all(void);
+
+#endif /* AVDEVICE_AVDEVICE_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavdevice/version.h Added

@@ -0,0 +1,50 @@
+/*
+ * 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 AVDEVICE_VERSION_H
+#define AVDEVICE_VERSION_H
+
+/**
+ * @file
+ * @ingroup lavd
+ * Libavdevice version macros
+ */
+
+#include "libavutil/avutil.h"
+
+#define LIBAVDEVICE_VERSION_MAJOR  55
+#define LIBAVDEVICE_VERSION_MINOR   3
+#define LIBAVDEVICE_VERSION_MICRO 100
+
+#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
+                                               LIBAVDEVICE_VERSION_MINOR, \
+                                               LIBAVDEVICE_VERSION_MICRO)
+#define LIBAVDEVICE_VERSION     AV_VERSION(LIBAVDEVICE_VERSION_MAJOR, \
+                                           LIBAVDEVICE_VERSION_MINOR, \
+                                           LIBAVDEVICE_VERSION_MICRO)
+#define LIBAVDEVICE_BUILD       LIBAVDEVICE_VERSION_INT
+
+#define LIBAVDEVICE_IDENT       "Lavd" AV_STRINGIFY(LIBAVDEVICE_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.
+ */
+
+#endif /* AVDEVICE_VERSION_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavformat/avformat.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavformat/avformat.h Changed

@@ -158,9 +158,15 @@
  * information will be in AVStream.time_base units, i.e. it has to be
  * multiplied by the timebase to convert them to seconds.
  *
- * The packet data belongs to the demuxer and is invalid after the next call to
- * av_read_frame(). The user must free the packet with av_free_packet() before
- * calling av_read_frame() again or closing the file.
+ * If AVPacket.buf is set on the returned packet, then the packet is
+ * allocated dynamically and the user may keep it indefinitely.
+ * Otherwise, if AVPacket.buf is NULL, the packet data is backed by a
+ * static storage somewhere inside the demuxer and the packet is only valid
+ * until the next av_read_frame() call or closing the file. If the caller
+ * requires a longer lifetime, av_dup_packet() will make an av_malloc()ed copy
+ * of it.
+ * In both cases, the packet must be freed with av_free_packet() when it is no
+ * longer needed.
  *
  * @section lavf_decoding_seek Seeking
  * @}
@@ -201,10 +207,6 @@
 #include "avio.h"
 #include "libavformat/version.h"
 
-#if FF_API_AV_GETTIME
-#include "libavutil/time.h"
-#endif
-
 struct AVFormatContext;
 
 
@@ -335,8 +337,10 @@
     int buf_size;       /**< Size of buf except extra allocated bytes */
 } AVProbeData;
 
-#define AVPROBE_SCORE_MAX 100               ///< maximum score, half of that is used for file-extension-based detection
 #define AVPROBE_SCORE_RETRY (AVPROBE_SCORE_MAX/4)
+#define AVPROBE_SCORE_EXTENSION  50 ///< score for file extension
+#define AVPROBE_SCORE_MAX       100 ///< maximum score
+
 #define AVPROBE_PADDING_SIZE 32             ///< extra allocated bytes at the end of the probe buffer
 
 /// Demuxer will use avio_open, no opened file should be provided by the caller.
@@ -352,8 +356,8 @@
 #define AVFMT_VARIABLE_FPS  0x0400 /**< Format allows variable fps. */
 #define AVFMT_NODIMENSIONS  0x0800 /**< Format does not need width/height */
 #define AVFMT_NOSTREAMS     0x1000 /**< Format does not require any streams */
-#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fallback to binary search via read_timestamp */
-#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fallback to generic search */
+#define AVFMT_NOBINSEARCH   0x2000 /**< Format does not allow to fall back on binary search via read_timestamp */
+#define AVFMT_NOGENSEARCH   0x4000 /**< Format does not allow to fall back on generic search */
 #define AVFMT_NO_BYTE_SEEK  0x8000 /**< Format does not allow seeking by bytes */
 #define AVFMT_ALLOW_FLUSH  0x10000 /**< Format allows flushing. If not set, the muxer will not receive a NULL packet in the write_packet function. */
 #if LIBAVFORMAT_VERSION_MAJOR <= 54
@@ -364,6 +368,14 @@
                                    /**< Format does not require strictly
                                         increasing timestamps, but they must
                                         still be monotonic */
+#define AVFMT_TS_NEGATIVE  0x40000 /**< Format allows muxing negative
+                                        timestamps. If not set the timestamp
+                                        will be shifted in av_write_frame and
+                                        av_interleaved_write_frame so they
+                                        start from 0.
+                                        The user or muxer can override this through
+                                        AVFormatContext.avoid_negative_ts
+                                        */
 
 #define AVFMT_SEEK_TO_PTS   0x4000000 /**< Seeking is based on PTS */
 
@@ -624,6 +636,20 @@
 #define AV_DISPOSITION_ATTACHED_PIC      0x0400
 
 /**
+ * To specify text track kind (different from subtitles default).
+ */
+#define AV_DISPOSITION_CAPTIONS     0x10000
+#define AV_DISPOSITION_DESCRIPTIONS 0x20000
+#define AV_DISPOSITION_METADATA     0x40000
+
+/**
+ * Options for behavior on timestamp wrap detection.
+ */
+#define AV_PTS_WRAP_IGNORE      0   ///< ignore the wrap
+#define AV_PTS_WRAP_ADD_OFFSET  1   ///< add the format specific offset on wrap detection
+#define AV_PTS_WRAP_SUB_OFFSET  -1  ///< subtract the format specific offset on wrap detection
+
+/**
  * Stream structure.
  * New fields can be added to the end with minor version bumps.
  * Removal, reordering and changes to existing fields require a major
@@ -635,7 +661,7 @@
     /**
      * Format-specific stream ID.
      * decoding: set by libavformat
-     * encoding: set by the user
+     * encoding: set by the user, replaced by libavformat if left unset
      */
     int id;
     /**
@@ -650,17 +676,6 @@
      *             not actually used for encoding.
      */
     AVCodecContext *codec;
-#if FF_API_R_FRAME_RATE
-    /**
-     * Real base framerate of the stream.
-     * This is the lowest framerate with which all timestamps can be
-     * represented accurately (it is the least common multiple of all
-     * framerates in the stream). Note, this value is just a guess!
-     * For example, if the time base is 1/90000 and all frames have either
-     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
-     */
-    AVRational r_frame_rate;
-#endif
     void *priv_data;
 
     /**
@@ -741,11 +756,13 @@
         int64_t last_dts;
         int64_t duration_gcd;
         int duration_count;
-        double duration_error[2][2][MAX_STD_TIMEBASES];
+        double (*duration_error)[2][MAX_STD_TIMEBASES];
         int64_t codec_info_duration;
         int64_t codec_info_duration_fields;
         int found_decoder;
 
+        int64_t last_duration;
+
         /**
          * Those are used for average framerate estimation.
          */
@@ -783,16 +800,6 @@
      */
     int codec_info_nb_frames;
 
-    /**
-     * Stream Identifier
-     * This is the MPEG-TS stream identifier +1
-     * 0 means unknown
-     */
-    int stream_identifier;
-
-    int64_t interleaver_chunk_size;
-    int64_t interleaver_chunk_duration;
-
     /* av_read_frame() support */
     enum AVStreamParseType need_parsing;
     struct AVCodecParserContext *parser;
@@ -811,6 +818,29 @@
     unsigned int index_entries_allocated_size;
 
     /**
+     * Real base framerate of the stream.
+     * This is the lowest framerate with which all timestamps can be
+     * represented accurately (it is the least common multiple of all
+     * framerates in the stream). Note, this value is just a guess!
+     * For example, if the time base is 1/90000 and all frames have either
+     * approximately 3600 or 1800 timer ticks, then r_frame_rate will be 50/1.
+     *
+     * Code outside avformat should access this field using:
+     * av_stream_get/set_r_frame_rate(stream)
+     */
+    AVRational r_frame_rate;
+
+    /**
+     * Stream Identifier
+     * This is the MPEG-TS stream identifier +1
+     * 0 means unknown
+     */
+    int stream_identifier;
+
+    int64_t interleaver_chunk_size;
+    int64_t interleaver_chunk_duration;
+
+    /**
      * stream probing state
      * -1   -> probing finished
      *  0   -> no probing requested
@@ -831,7 +861,7 @@
 
     /**
      * Number of internally decoded frames, used internally in libavformat, do not access
-     * its lifetime differs from info which is why its not in that structure.
+     * its lifetime differs from info which is why it is not in that structure.
      */
     int nb_decoded_frames;
 
@@ -841,8 +871,28 @@
      */
     int64_t mux_ts_offset;
 
+    /**
+     * Internal data to check for wrapping of the time stamp
+     */
+    int64_t pts_wrap_reference;
+
+    /**
+     * Options for behavior, when a wrap is detected.
+     *
+     * Defined by AV_PTS_WRAP_ values.
+     *
+     * If correction is enabled, there are two possibilities:
+     * If the first time stamp is near the wrap point, the wrap offset
+     * will be subtracted, which will create negative time stamps.
+     * Otherwise the offset will be added.
+     */
+    int pts_wrap_behavior;
+
 } AVStream;
 
+AVRational av_stream_get_r_frame_rate(const AVStream *s);
+void       av_stream_set_r_frame_rate(AVStream *s, AVRational r);
+
 #define AV_PROGRAM_RUNNING 1
 
 /**
@@ -862,6 +912,19 @@
     int program_num;
     int pmt_pid;
     int pcr_pid;
+
+    /*****************************************************************
+     * 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
+     * removed at will.
+     * New public fields should be added right above.
+     *****************************************************************
+     */
+    int64_t start_time;
+    int64_t end_time;
+
+    int64_t pts_wrap_reference;    ///< reference dts for wrap detection
+    int pts_wrap_behavior;         ///< behavior on wrap detection
 } AVProgram;
 
 #define AVFMTCTX_NOHEADER      0x0001 /**< signal that no header is present
@@ -1121,11 +1184,11 @@
     int use_wallclock_as_timestamps;
 
     /**
-     * Avoids negative timestamps during muxing
+     * Avoid negative timestamps during muxing.
      *  0 -> allow negative timestamps
      *  1 -> avoid negative timestamps
      * -1 -> choose automatically (default)
-     * Note, this is only works when interleave_packet_per_dts is in use
+     * Note, this only works when interleave_packet_per_dts is in use.
      * - encoding: Set by user via AVOptions (NO direct access)
      * - decoding: unused
      */
@@ -1146,6 +1209,34 @@
      */
     enum AVDurationEstimationMethod duration_estimation_method;
 
+    /**
+     * Skip initial bytes when opening stream
+     * - encoding: unused
+     * - decoding: Set by user via AVOptions (NO direct access)
+     */
+    unsigned int skip_initial_bytes;
+
+    /**
+     * Correct single timestamp overflows
+     * - encoding: unused
+     * - 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)
+     */
+    int seek2any;
+
+    /**
+     * Flush the I/O context after each packet.
+     * - encoding: Set by user via AVOptions (NO direct access)
+     * - decoding: unused
+     */
+    int flush_packets;
+
     /*****************************************************************
      * 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
@@ -1183,6 +1274,26 @@
      */
 #define RAW_PACKET_BUFFER_SIZE 2500000
     int raw_packet_buffer_remaining_size;
+
+    /**
+     * Offset to remap timestamps to be non-negative.
+     * Expressed in timebase units.
+     * @see AVStream.mux_ts_offset
+     */
+    int64_t offset;
+
+    /**
+     * Timebase for the timestamp offset.
+     */
+    AVRational offset_timebase;
+
+    /**
+     * 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;
 } AVFormatContext;
 
 /**
@@ -1229,7 +1340,6 @@
  *
  * @see av_register_input_format()
  * @see av_register_output_format()
- * @see av_register_protocol()
  */
 void av_register_all(void);
 
@@ -1295,13 +1405,16 @@
  *
  * When muxing, should be called by the user before avformat_write_header().
  *
+ * User is required to call avcodec_close() and avformat_free_context() to
+ * clean up the allocation by avformat_new_stream().
+ *
  * @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.
  *
  * @return newly created stream or NULL on error.
  */
-AVStream *avformat_new_stream(AVFormatContext *s, AVCodec *c);
+AVStream *avformat_new_stream(AVFormatContext *s, const AVCodec *c);
 
 AVProgram *av_new_program(AVFormatContext *s, int id);
 
@@ -1310,12 +1423,6 @@
  */
 
 
-#if FF_API_PKT_DUMP
-attribute_deprecated void av_pkt_dump(FILE *f, AVPacket *pkt, int dump_payload);
-attribute_deprecated void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt,
-                                          int dump_payload);
-#endif
-
 #if FF_API_ALLOC_OUTPUT_CONTEXT
 /**
  * @deprecated deprecated in favor of avformat_alloc_output_context2()
@@ -1406,7 +1513,7 @@
 
 /**
  * Open an input stream and read the header. The codecs are not opened.
- * The stream must be closed with av_close_input_file().
+ * The stream must be closed with avformat_close_input().
  *
  * @param ps Pointer to user-supplied AVFormatContext (allocated by avformat_alloc_context).
  *           May be a pointer to NULL, in which case an AVFormatContext is allocated by this
@@ -1540,13 +1647,13 @@
  * omit invalid data between valid frames so as to give the decoder the maximum
  * information possible for decoding.
  *
- * The returned packet is valid
- * until the next av_read_frame() or until av_close_input_file() and
- * must be freed with av_free_packet. For video, the packet contains
- * exactly one frame. For audio, it contains an integer number of
- * frames if each frame has a known fixed size (e.g. PCM or ADPCM
- * data). If the audio frames have a variable size (e.g. MPEG audio),
- * then it contains one frame.
+ * If pkt->buf is NULL, then the packet is valid until the next
+ * av_read_frame() or until avformat_close_input(). Otherwise the packet
+ * is valid indefinitely. In both cases the packet must be freed with
+ * av_free_packet when it is no longer needed. For video, the packet contains
+ * exactly one frame. For audio, it contains an integer number of frames if each
+ * frame has a known fixed size (e.g. PCM or ADPCM data). If the audio frames
+ * have a variable size (e.g. MPEG audio), then it contains one frame.
  *
  * pkt->pts, pkt->dts and pkt->duration are always set to correct
  * values in AVStream.time_base units (and guessed if the format cannot
@@ -1586,6 +1693,7 @@
  * or if stream_index is -1, in AV_TIME_BASE units.
  * If flags contain AVSEEK_FLAG_ANY, then non-keyframes are treated as
  * keyframes (this may not be supported by all demuxers).
+ * If flags contain AVSEEK_FLAG_BACKWARD, it is ignored.
  *
  * @param stream_index index of the stream which is used as time base reference
  * @param min_ts smallest acceptable timestamp
@@ -1672,7 +1780,7 @@
  *
  * @param s Media file handle, must be allocated with avformat_alloc_context().
  *          Its oformat field must be set to the desired output format;
- *          Its pb field must be set to an already openened AVIOContext.
+ *          Its pb field must be set to an already opened AVIOContext.
  * @param options  An AVDictionary filled with AVFormatContext and muxer-private options.
  *                 On return this parameter will be destroyed and replaced with a dict containing
  *                 options that were not found. May be NULL.
@@ -1712,12 +1820,12 @@
  * demuxer level.
  *
  * @param s media file handle
- * @param pkt The packet containing the data to be written. Libavformat takes
- * ownership of the data and will free it when it sees fit using the packet's
+ * @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.
- * @ref AVPacket.destruct "destruct" field. The caller must not access the data
- * after this function returns, as it may already be freed.
  * 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".
@@ -1729,16 +1837,6 @@
  */
 int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt);
 
-#if FF_API_INTERLEAVE_PACKET
-/**
- * @deprecated this function was never meant to be called by the user
- * programs.
- */
-attribute_deprecated
-int av_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
-                                 AVPacket *pkt, int flush);
-#endif
-
 /**
  * Write the stream trailer to an output media file and free the
  * file private data.
@@ -1780,9 +1878,9 @@
  * work in real time.
  * @param s          media file handle
  * @param stream     stream in the media file
- * @param dts[out]   DTS of the last packet output for the stream, in stream
+ * @param[out] dts   DTS of the last packet output for the stream, in stream
  *                   time_base units
- * @param wall[out]  absolute time when that packet whas output,
+ * @param[out] wall  absolute time when that packet whas output,
  *                   in microsecond
  * @return  0 if OK, AVERROR(ENOSYS) if the format does not support it
  * Note: some formats or devices may not allow to measure dts and wall
@@ -1874,6 +1972,18 @@
  */
 unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum AVCodecID id);
 
+/**
+ * Get the codec tag for the given codec id.
+ *
+ * @param tags list of supported codec_id - codec_tag pairs, as stored
+ * in AVInputFormat.codec_tag and AVOutputFormat.codec_tag
+ * @param id codec id that should be searched for in the list
+ * @param tag A pointer to the found tag
+ * @return 0 if id was not found in tags, > 0 if it was found
+ */
+int av_codec_get_tag2(const struct AVCodecTag * const *tags, enum AVCodecID id,
+                      unsigned int *tag);
+
 int av_find_default_stream_index(AVFormatContext *s);
 
 /**
@@ -1954,6 +2064,9 @@
 /**
  * Generate an SDP for an RTP session.
  *
+ * Note, this overwrites the id values of AVStreams in the muxer contexts
+ * for getting unique dynamic payload types.
+ *
  * @param ac array of AVFormatContexts describing the RTP streams. If the
  *           array is composed by only one context, such context can contain
  *           multiple AVStreams (one AVStream per RTP stream). Otherwise,
@@ -2030,6 +2143,16 @@
 AVRational av_guess_sample_aspect_ratio(AVFormatContext *format, AVStream *stream, AVFrame *frame);
 
 /**
+ * Guess the frame rate, based on both the container and codec information.
+ *
+ * @param ctx the format context which the stream is part of
+ * @param stream the stream which the frame is part of
+ * @param frame the frame for which the frame rate should be determined, may be NULL
+ * @return the guessed (valid) frame rate, 0/1 if no idea
+ */
+AVRational av_guess_frame_rate(AVFormatContext *ctx, AVStream *stream, AVFrame *frame);
+
+/**
  * Check if the stream st contained in s is matched by the stream specifier
  * spec.
  *
@@ -2045,7 +2168,7 @@
 int avformat_match_stream_specifier(AVFormatContext *s, AVStream *st,
                                     const char *spec);
 
-void avformat_queue_attached_pictures(AVFormatContext *s);
+int avformat_queue_attached_pictures(AVFormatContext *s);
 
 
 /**

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavformat/avio.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavformat/avio.h Changed

@@ -120,26 +120,32 @@
      * max filesize, used to limit allocations
      * This field is internal to libavformat and access from outside is not allowed.
      */
-     int64_t maxsize;
+    int64_t maxsize;
 
-     /**
-      * avio_read and avio_write should if possible be satisfied directly
-      * instead of going through a buffer, and avio_seek will always
-      * call the underlying seek function directly.
-      */
-     int direct;
+    /**
+     * avio_read and avio_write should if possible be satisfied directly
+     * instead of going through a buffer, and avio_seek will always
+     * call the underlying seek function directly.
+     */
+    int direct;
 
     /**
      * Bytes read statistic
      * This field is internal to libavformat and access from outside is not allowed.
      */
-     int64_t bytes_read;
+    int64_t bytes_read;
 
     /**
      * seek statistic
      * This field is internal to libavformat and access from outside is not allowed.
      */
-     int seek_count;
+    int seek_count;
+
+    /**
+     * writeout statistic
+     * This field is internal to libavformat and access from outside is not allowed.
+     */
+    int writeout_count;
 } AVIOContext;
 
 /* unbuffered I/O */
@@ -217,8 +223,8 @@
 
 /**
  * Oring this flag as into the "whence" parameter to a seek function causes it to
- * seek by any means (like reopening and linear reading) or other normally unreasonble
- * means that can be extreemly slow.
+ * seek by any means (like reopening and linear reading) or other normally unreasonable
+ * means that can be extremely slow.
  * This may be ignored by the seek code.
  */
 #define AVSEEK_FORCE 0x20000

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavformat/version.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavformat/version.h Changed

@@ -29,9 +29,9 @@
 
 #include "libavutil/avutil.h"
 
-#define LIBAVFORMAT_VERSION_MAJOR 54
-#define LIBAVFORMAT_VERSION_MINOR 33
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MAJOR 55
+#define LIBAVFORMAT_VERSION_MINOR 14
+#define LIBAVFORMAT_VERSION_MICRO 102
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \
@@ -49,41 +49,28 @@
  * the public API and may change, break or disappear at any time.
  */
 
-#ifndef FF_API_OLD_AVIO
-#define FF_API_OLD_AVIO                (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_PKT_DUMP
-#define FF_API_PKT_DUMP                (LIBAVFORMAT_VERSION_MAJOR < 54)
-#endif
 #ifndef FF_API_ALLOC_OUTPUT_CONTEXT
-#define FF_API_ALLOC_OUTPUT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 55)
+#define FF_API_ALLOC_OUTPUT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_FORMAT_PARAMETERS
-#define FF_API_FORMAT_PARAMETERS       (LIBAVFORMAT_VERSION_MAJOR < 55)
+#define FF_API_FORMAT_PARAMETERS       (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_NEW_STREAM
-#define FF_API_NEW_STREAM              (LIBAVFORMAT_VERSION_MAJOR < 55)
+#define FF_API_NEW_STREAM              (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_SET_PTS_INFO
-#define FF_API_SET_PTS_INFO            (LIBAVFORMAT_VERSION_MAJOR < 55)
+#define FF_API_SET_PTS_INFO            (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_CLOSE_INPUT_FILE
-#define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_APPLEHTTP_PROTO
-#define FF_API_APPLEHTTP_PROTO         (LIBAVFORMAT_VERSION_MAJOR < 55)
+#define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_READ_PACKET
-#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 55)
+#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_INTERLEAVE_PACKET
-#define FF_API_INTERLEAVE_PACKET       (LIBAVFORMAT_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_AV_GETTIME
-#define FF_API_AV_GETTIME              (LIBAVFORMAT_VERSION_MAJOR < 55)
+#ifndef FF_API_ASS_SSA
+#define FF_API_ASS_SSA                 (LIBAVFORMAT_VERSION_MAJOR < 56)
 #endif
 #ifndef FF_API_R_FRAME_RATE
-#define FF_API_R_FRAME_RATE            (LIBAVFORMAT_VERSION_MAJOR < 55)
+#define FF_API_R_FRAME_RATE            1
 #endif
-
 #endif /* AVFORMAT_VERSION_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/adler32.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/adler32.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/aes.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/aes.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/audio_fifo.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/audio_fifo.h Changed

@@ -85,7 +85,8 @@
  * @param data        audio data plane pointers
  * @param nb_samples  number of samples to write
  * @return            number of samples actually written, or negative AVERROR
- *                    code on failure.
+ *                    code on failure. If successful, the number of samples
+ *                    actually written will always be nb_samples.
  */
 int av_audio_fifo_write(AVAudioFifo *af, void **data, int nb_samples);
 
@@ -99,7 +100,9 @@
  * @param data        audio data plane pointers
  * @param nb_samples  number of samples to read
  * @return            number of samples actually read, or negative AVERROR code
- *                    on failure.
+ *                    on failure. The number of samples actually read will not
+ *                    be greater than nb_samples, and will only be less than
+ *                    nb_samples if av_audio_fifo_size is less than nb_samples.
  */
 int av_audio_fifo_read(AVAudioFifo *af, void **data, int nb_samples);

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/audioconvert.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/audioconvert.h Changed

@@ -1,208 +1,6 @@
-/*
- * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- * Copyright (c) 2008 Peter Ross
- *
- * 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_AUDIOCONVERT_H
-#define AVUTIL_AUDIOCONVERT_H
+#include "version.h"
 
-#include <stdint.h>
-
-/**
- * @file
- * audio conversion routines
- */
-
-/**
- * @addtogroup lavu_audio
- * @{
- */
-
-/**
- * @defgroup channel_masks Audio channel masks
- * @{
- */
-#define AV_CH_FRONT_LEFT             0x00000001
-#define AV_CH_FRONT_RIGHT            0x00000002
-#define AV_CH_FRONT_CENTER           0x00000004
-#define AV_CH_LOW_FREQUENCY          0x00000008
-#define AV_CH_BACK_LEFT              0x00000010
-#define AV_CH_BACK_RIGHT             0x00000020
-#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
-#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
-#define AV_CH_BACK_CENTER            0x00000100
-#define AV_CH_SIDE_LEFT              0x00000200
-#define AV_CH_SIDE_RIGHT             0x00000400
-#define AV_CH_TOP_CENTER             0x00000800
-#define AV_CH_TOP_FRONT_LEFT         0x00001000
-#define AV_CH_TOP_FRONT_CENTER       0x00002000
-#define AV_CH_TOP_FRONT_RIGHT        0x00004000
-#define AV_CH_TOP_BACK_LEFT          0x00008000
-#define AV_CH_TOP_BACK_CENTER        0x00010000
-#define AV_CH_TOP_BACK_RIGHT         0x00020000
-#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
-#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
-#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
-#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
-#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
-#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
-#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
-
-/** Channel mask value used for AVCodecContext.request_channel_layout
-    to indicate that the user requests the channel order of the decoder output
-    to be the native codec channel order. */
-#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
-
-/**
- * @}
- * @defgroup channel_mask_c Audio channel convenience macros
- * @{
- * */
-#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
-#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
-#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
-#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
-#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
-#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
-#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
-#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
-
-enum AVMatrixEncoding {
-    AV_MATRIX_ENCODING_NONE,
-    AV_MATRIX_ENCODING_DOLBY,
-    AV_MATRIX_ENCODING_DPLII,
-    AV_MATRIX_ENCODING_NB
-};
-
-/**
- * @}
- */
-
-/**
- * Return a channel layout id that matches name, or 0 if no match is found.
- *
- * name can be one or several of the following notations,
- * separated by '+' or '|':
- * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
- *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
- * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
- *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
- * - a number of channels, in decimal, optionally followed by 'c', yielding
- *   the default channel layout for that number of channels (@see
- *   av_get_default_channel_layout);
- * - a channel layout mask, in hexadecimal starting with "0x" (see the
- *   AV_CH_* macros).
- *
- * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7"
- */
-uint64_t av_get_channel_layout(const char *name);
-
-/**
- * Return a description of a channel layout.
- * If nb_channels is <= 0, it is guessed from the channel_layout.
- *
- * @param buf put here the string containing the channel layout
- * @param buf_size size in bytes of the buffer
- */
-void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
-
-struct AVBPrint;
-/**
- * Append a description of a channel layout to a bprint buffer.
- */
-void av_bprint_channel_layout(struct AVBPrint *bp, int nb_channels, uint64_t channel_layout);
-
-/**
- * Return the number of channels in the channel layout.
- */
-int av_get_channel_layout_nb_channels(uint64_t channel_layout);
-
-/**
- * Return default channel layout for a given number of channels.
- */
-int64_t av_get_default_channel_layout(int nb_channels);
-
-/**
- * Get the index of a channel in channel_layout.
- *
- * @param channel a channel layout describing exactly one channel which must be
- *                present in channel_layout.
- *
- * @return index of channel in channel_layout on success, a negative AVERROR
- *         on error.
- */
-int av_get_channel_layout_channel_index(uint64_t channel_layout,
-                                        uint64_t channel);
-
-/**
- * Get the channel with the given index in channel_layout.
- */
-uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
-
-/**
- * Get the name of a given channel.
- *
- * @return channel name on success, NULL on error.
- */
-const char *av_get_channel_name(uint64_t channel);
-
-/**
- * Get the description of a given channel.
- *
- * @param channel  a channel layout with a single channel
- * @return  channel description on success, NULL on error
- */
-const char *av_get_channel_description(uint64_t channel);
-
-/**
- * Get the value and name of a standard channel layout.
- *
- * @param[in]  index   index in an internal list, starting at 0
- * @param[out] layout  channel layout mask
- * @param[out] name    name of the layout
- * @return  0  if the layout exists,
- *          <0 if index is beyond the limits
- */
-int av_get_standard_channel_layout(unsigned index, uint64_t *layout,
-                                   const char **name);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_AUDIOCONVERT_H */
+#if FF_API_AUDIOCONVERT
+#include "channel_layout.h"
+#endif

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/avassert.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/avassert.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/avconfig.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/avconfig.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/avstring.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/avstring.h Changed

@@ -67,6 +67,21 @@
 char *av_stristr(const char *haystack, const char *needle);
 
 /**
+ * Locate the first occurrence of the string needle in the string haystack
+ * where not more than hay_length characters are searched. A zero-length
+ * string needle is considered to match at the start of haystack.
+ *
+ * This function is a length-limited version of the standard strstr().
+ *
+ * @param haystack   string to search in
+ * @param needle     string to search for
+ * @param hay_length length of string to search in
+ * @return           pointer to the located match within haystack
+ *                   or a null pointer if no match
+ */
+char *av_strnstr(const char *haystack, const char *needle, size_t hay_length);
+
+/**
  * Copy the string src to dst, but no more than size - 1 bytes, and
  * null-terminate dst.
  *
@@ -171,6 +186,21 @@
 char *av_strtok(char *s, const char *delim, char **saveptr);
 
 /**
+ * Locale-independent conversion of ASCII isdigit.
+ */
+int av_isdigit(int c);
+
+/**
+ * Locale-independent conversion of ASCII isgraph.
+ */
+int av_isgraph(int c);
+
+/**
+ * Locale-independent conversion of ASCII isspace.
+ */
+int av_isspace(int c);
+
+/**
  * Locale-independent conversion of ASCII characters to uppercase.
  */
 static inline int av_toupper(int c)
@@ -191,6 +221,11 @@
 }
 
 /**
+ * Locale-independent conversion of ASCII isxdigit.
+ */
+int av_isxdigit(int c);
+
+/**
  * Locale-independent case-insensitive compare.
  * @note This means only ASCII-range characters are case-insensitive
  */
@@ -202,6 +237,64 @@
  */
 int av_strncasecmp(const char *a, const char *b, size_t n);
 
+
+/**
+ * Thread safe basename.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return pointer to the basename substring.
+ */
+const char *av_basename(const char *path);
+
+/**
+ * Thread safe dirname.
+ * @param path the path, on DOS both \ and / are considered separators.
+ * @return the path with the separator replaced by the string terminator or ".".
+ * @note the function may change the input string.
+ */
+const char *av_dirname(char *path);
+
+enum AVEscapeMode {
+    AV_ESCAPE_MODE_AUTO,      ///< Use auto-selected escaping mode.
+    AV_ESCAPE_MODE_BACKSLASH, ///< Use backslash escaping.
+    AV_ESCAPE_MODE_QUOTE,     ///< Use single-quote escaping.
+};
+
+/**
+ * Consider spaces special and escape them even in the middle of the
+ * string.
+ *
+ * This is equivalent to adding the whitespace characters to the special
+ * characters lists, except it is guaranteed to use the exact same list
+ * of whitespace characters as the rest of libavutil.
+ */
+#define AV_ESCAPE_FLAG_WHITESPACE 0x01
+
+/**
+ * Escape only specified special characters.
+ * Without this flag, escape also any characters that may be considered
+ * special by av_get_token(), such as the single quote.
+ */
+#define AV_ESCAPE_FLAG_STRICT 0x02
+
+/**
+ * Escape string in src, and put the escaped string in an allocated
+ * string in *dst, which must be freed with av_free().
+ *
+ * @param dst           pointer where an allocated string is put
+ * @param src           string to escape, must be non-NULL
+ * @param special_chars string containing the special characters which
+ *                      need to be escaped, can be NULL
+ * @param mode          escape mode to employ, see AV_ESCAPE_MODE_* macros.
+ *                      Any unknown value for mode will be considered equivalent to
+ *                      AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without
+ *                      notice.
+ * @param flags         flags which control how to escape, see AV_ESCAPE_FLAG_ macros
+ * @return the length of the allocated string, or a negative error code in case of error
+ * @see av_bprint_escape()
+ */
+int av_escape(char **dst, const char *src, const char *special_chars,
+              enum AVEscapeMode mode, int flags);
+
 /**
  * @}
  */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/avutil.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/avutil.h Changed

@@ -26,7 +26,7 @@
  * external API header
  */
 
-/*
+/**
  * @mainpage
  *
  * @section ffmpeg_intro Introduction
@@ -35,12 +35,46 @@
  * provided by FFmpeg.
  *
  * @li @ref libavc "libavcodec" encoding/decoding library
- * @li @subpage libavfilter graph based frame editing library
+ * @li @ref lavfi "libavfilter" graph-based frame editing library
  * @li @ref libavf "libavformat" I/O and muxing/demuxing library
  * @li @ref lavd "libavdevice" special devices muxing/demuxing library
  * @li @ref lavu "libavutil" common utility library
- * @li @subpage libpostproc post processing library
- * @li @subpage libswscale  color conversion and scaling 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
+ *
+ * @section ffmpeg_versioning Versioning and compatibility
+ *
+ * Each of the FFmpeg libraries contains a version.h header, which defines a
+ * major, minor and micro version number with the
+ * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
+ * number is incremented with backward incompatible changes - e.g. removing
+ * parts of the public API, reordering public struct members, etc. The minor
+ * version number is incremented for backward compatible API changes or major
+ * new features - e.g. adding a new public function or a new decoder. The micro
+ * version number is incremented for smaller changes that a calling program
+ * might still want to check for - e.g. changing behavior in a previously
+ * unspecified situation.
+ *
+ * FFmpeg guarantees backward API and ABI compatibility for each library as long
+ * as its major version number is unchanged. This means that no public symbols
+ * will be removed or renamed. Types and names of the public struct members and
+ * values of public macros and enums will remain the same (unless they were
+ * explicitly declared as not part of the public API). Documented behavior will
+ * not change.
+ *
+ * In other words, any correct program that works with a given FFmpeg snapshot
+ * should work just as well without any changes with any later snapshot with the
+ * same major versions. This applies to both rebuilding the program against new
+ * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program
+ * links against.
+ *
+ * However, new public symbols may be added and new members may be appended to
+ * public structs whose size is not part of public ABI (most public structs in
+ * FFmpeg). New macros and enum values may be added. Behavior in undocumented
+ * situations may change slightly (and be documented). All those are accompanied
+ * by an entry in doc/APIchanges and incrementing either the minor or micro
+ * version number.
  */
 
 /**
@@ -252,6 +286,27 @@
 }
 
 /**
+ * Compute the length of an integer list.
+ *
+ * @param elsize  size in bytes of each list element (only 1, 2, 4 or 8)
+ * @param term    list terminator (usually 0 or -1)
+ * @param list    pointer to the list
+ * @return  length of the list, in elements, not counting the terminator
+ */
+unsigned av_int_list_length_for_size(unsigned elsize,
+                                     const void *list, uint64_t term) av_pure;
+
+/**
+ * Compute the length of an integer list.
+ *
+ * @param term  list terminator (usually 0 or -1)
+ * @param list  pointer to the list
+ * @return  length of the list, in elements, not counting the terminator
+ */
+#define av_int_list_length(list, term) \
+    av_int_list_length_for_size(sizeof(*(list)), list, term)
+
+/**
  * @}
  * @}
  */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/base64.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/base64.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/bprint.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/bprint.h Changed

@@ -21,7 +21,10 @@
 #ifndef AVUTIL_BPRINT_H
 #define AVUTIL_BPRINT_H
 
+#include <stdarg.h>
+
 #include "attributes.h"
+#include "avstring.h"
 
 /**
  * Define a structure with extra padding to a fixed size
@@ -73,10 +76,10 @@
  */
 typedef struct AVBPrint {
     FF_PAD_STRUCTURE(1024,
-    char *str;         /** string so far */
-    unsigned len;      /** length so far */
-    unsigned size;     /** allocated memory */
-    unsigned size_max; /** maximum allocated memory */
+    char *str;         /**< string so far */
+    unsigned len;      /**< length so far */
+    unsigned size;     /**< allocated memory */
+    unsigned size_max; /**< maximum allocated memory */
     char reserved_internal_buffer[1];
     )
 } AVBPrint;
@@ -116,15 +119,46 @@
 void av_bprint_init_for_buffer(AVBPrint *buf, char *buffer, unsigned size);
 
 /**
- * Append a formated string to a print buffer.
+ * Append a formatted string to a print buffer.
  */
 void av_bprintf(AVBPrint *buf, const char *fmt, ...) av_printf_format(2, 3);
 
 /**
+ * Append a formatted string to a print buffer.
+ */
+void av_vbprintf(AVBPrint *buf, const char *fmt, va_list vl_arg);
+
+/**
  * Append char c n times to a print buffer.
  */
 void av_bprint_chars(AVBPrint *buf, char c, unsigned n);
 
+struct tm;
+/**
+ * Append a formatted date and time to a print buffer.
+ *
+ * param buf  bprint buffer to use
+ * param fmt  date and time format string, see strftime()
+ * param tm   broken-down time structure to translate
+ *
+ * @note due to poor design of the standard strftime function, it may
+ * produce poor results if the format string expands to a very long text and
+ * the bprint buffer is near the limit stated by the size_max option.
+ */
+void av_bprint_strftime(AVBPrint *buf, const char *fmt, const struct tm *tm);
+
+/**
+ * Allocate bytes in the buffer for external use.
+ *
+ * @param[in]  buf          buffer structure
+ * @param[in]  size         required size
+ * @param[out] mem          pointer to the memory area
+ * @param[out] actual_size  size of the memory area after allocation;
+ *                          can be larger or smaller than size
+ */
+void av_bprint_get_buffer(AVBPrint *buf, unsigned size,
+                          unsigned char **mem, unsigned *actual_size);
+
 /**
  * Reset the string to "" but keep internal allocated data.
  */
@@ -154,4 +188,20 @@
  */
 int av_bprint_finalize(AVBPrint *buf, char **ret_str);
 
+/**
+ * Escape the content in src and append it to dstbuf.
+ *
+ * @param dstbuf        already inited destination bprint buffer
+ * @param src           string containing the text to escape
+ * @param special_chars string containing the special characters which
+ *                      need to be escaped, can be NULL
+ * @param mode          escape mode to employ, see AV_ESCAPE_MODE_* macros.
+ *                      Any unknown value for mode will be considered equivalent to
+ *                      AV_ESCAPE_MODE_BACKSLASH, but this behaviour can change without
+ *                      notice.
+ * @param flags         flags which control how to escape, see AV_ESCAPE_FLAG_* macros
+ */
+void av_bprint_escape(AVBPrint *dstbuf, const char *src, const char *special_chars,
+                      enum AVEscapeMode mode, int flags);
+
 #endif /* AVUTIL_BPRINT_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/buffer.h Added

@@ -0,0 +1,274 @@
+/*
+ * 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_buffer
+ * refcounted data buffer API
+ */
+
+#ifndef AVUTIL_BUFFER_H
+#define AVUTIL_BUFFER_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_buffer AVBuffer
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBuffer is an API for reference-counted data buffers.
+ *
+ * There are two core objects in this API -- AVBuffer and AVBufferRef. AVBuffer
+ * represents the data buffer itself; it is opaque and not meant to be accessed
+ * by the caller directly, but only through AVBufferRef. However, the caller may
+ * e.g. compare two AVBuffer pointers to check whether two different references
+ * are describing the same data buffer. AVBufferRef represents a single
+ * reference to an AVBuffer and it is the object that may be manipulated by the
+ * caller directly.
+ *
+ * There are two functions provided for creating a new AVBuffer with a single
+ * reference -- av_buffer_alloc() to just allocate a new buffer, and
+ * av_buffer_create() to wrap an existing array in an AVBuffer. From an existing
+ * reference, additional references may be created with av_buffer_ref().
+ * Use av_buffer_unref() to free a reference (this will automatically free the
+ * data once all the references are freed).
+ *
+ * The convention throughout this API and the rest of FFmpeg is such that the
+ * buffer is considered writable if there exists only one reference to it (and
+ * it has not been marked as read-only). The av_buffer_is_writable() function is
+ * provided to check whether this is true and av_buffer_make_writable() will
+ * automatically create a new writable buffer when necessary.
+ * Of course nothing prevents the calling code from violating this convention,
+ * however that is safe only when all the existing references are under its
+ * control.
+ *
+ * @note Referencing and unreferencing the buffers is thread-safe and thus
+ * may be done from multiple threads simultaneously without any need for
+ * additional locking.
+ *
+ * @note Two different references to the same buffer can point to different
+ * parts of the buffer (i.e. their AVBufferRef.data will not be equal).
+ */
+
+/**
+ * A reference counted buffer type. It is opaque and is meant to be used through
+ * references (AVBufferRef).
+ */
+typedef struct AVBuffer AVBuffer;
+
+/**
+ * A reference to a data buffer.
+ *
+ * The size of this struct is not a part of the public ABI and it is not meant
+ * to be allocated directly.
+ */
+typedef struct AVBufferRef {
+    AVBuffer *buffer;
+
+    /**
+     * The data buffer. It is considered writable if and only if
+     * this is the only reference to the buffer, in which case
+     * av_buffer_is_writable() returns 1.
+     */
+    uint8_t *data;
+    /**
+     * Size of data in bytes.
+     */
+    int      size;
+} AVBufferRef;
+
+/**
+ * Allocate an AVBuffer of the given size using av_malloc().
+ *
+ * @return an AVBufferRef of given size or NULL when out of memory
+ */
+AVBufferRef *av_buffer_alloc(int size);
+
+/**
+ * Same as av_buffer_alloc(), except the returned buffer will be initialized
+ * to zero.
+ */
+AVBufferRef *av_buffer_allocz(int size);
+
+/**
+ * Always treat the buffer as read-only, even when it has only one
+ * reference.
+ */
+#define AV_BUFFER_FLAG_READONLY (1 << 0)
+
+/**
+ * Create an AVBuffer from an existing array.
+ *
+ * If this function is successful, data is owned by the AVBuffer. The caller may
+ * only access data through the returned AVBufferRef and references derived from
+ * it.
+ * If this function fails, data is left untouched.
+ * @param data   data array
+ * @param size   size of data in bytes
+ * @param free   a callback for freeing this buffer's data
+ * @param opaque parameter to be got for processing or passed to free
+ * @param flags  a combination of AV_BUFFER_FLAG_*
+ *
+ * @return an AVBufferRef referring to data on success, NULL on failure.
+ */
+AVBufferRef *av_buffer_create(uint8_t *data, int size,
+                              void (*free)(void *opaque, uint8_t *data),
+                              void *opaque, int flags);
+
+/**
+ * Default free callback, which calls av_free() on the buffer data.
+ * This function is meant to be passed to av_buffer_create(), not called
+ * directly.
+ */
+void av_buffer_default_free(void *opaque, uint8_t *data);
+
+/**
+ * Create a new reference to an AVBuffer.
+ *
+ * @return a new AVBufferRef referring to the same AVBuffer as buf or NULL on
+ * failure.
+ */
+AVBufferRef *av_buffer_ref(AVBufferRef *buf);
+
+/**
+ * Free a given reference and automatically free the buffer if there are no more
+ * references to it.
+ *
+ * @param buf the reference to be freed. The pointer is set to NULL on return.
+ */
+void av_buffer_unref(AVBufferRef **buf);
+
+/**
+ * @return 1 if the caller may write to the data referred to by buf (which is
+ * true if and only if buf is the only reference to the underlying AVBuffer).
+ * Return 0 otherwise.
+ * A positive answer is valid until av_buffer_ref() is called on buf.
+ */
+int av_buffer_is_writable(const AVBufferRef *buf);
+
+/**
+ * @return the opaque parameter set by av_buffer_create.
+ */
+void *av_buffer_get_opaque(const AVBufferRef *buf);
+
+int av_buffer_get_ref_count(const AVBufferRef *buf);
+
+/**
+ * Create a writable reference from a given buffer reference, avoiding data copy
+ * if possible.
+ *
+ * @param buf buffer reference to make writable. On success, buf is either left
+ *            untouched, or it is unreferenced and a new writable AVBufferRef is
+ *            written in its place. On failure, buf is left untouched.
+ * @return 0 on success, a negative AVERROR on failure.
+ */
+int av_buffer_make_writable(AVBufferRef **buf);
+
+/**
+ * Reallocate a given buffer.
+ *
+ * @param buf  a buffer reference to reallocate. On success, buf will be
+ *             unreferenced and a new reference with the required size will be
+ *             written in its place. On failure buf will be left untouched. *buf
+ *             may be NULL, then a new buffer is allocated.
+ * @param size required new buffer size.
+ * @return 0 on success, a negative AVERROR on failure.
+ *
+ * @note the buffer is actually reallocated with av_realloc() only if it was
+ * initially allocated through av_buffer_realloc(NULL) and there is only one
+ * reference to it (i.e. the one passed to this function). In all other cases
+ * a new buffer is allocated and the data is copied.
+ */
+int av_buffer_realloc(AVBufferRef **buf, int size);
+
+/**
+ * @}
+ */
+
+/**
+ * @defgroup lavu_bufferpool AVBufferPool
+ * @ingroup lavu_data
+ *
+ * @{
+ * AVBufferPool is an API for a lock-free thread-safe pool of AVBuffers.
+ *
+ * Frequently allocating and freeing large buffers may be slow. AVBufferPool is
+ * meant to solve this in cases when the caller needs a set of buffers of the
+ * same size (the most obvious use case being buffers for raw video or audio
+ * frames).
+ *
+ * At the beginning, the user must call av_buffer_pool_init() to create the
+ * buffer pool. Then whenever a buffer is needed, call av_buffer_pool_get() to
+ * get a reference to a new buffer, similar to av_buffer_alloc(). This new
+ * reference works in all aspects the same way as the one created by
+ * av_buffer_alloc(). However, when the last reference to this buffer is
+ * unreferenced, it is returned to the pool instead of being freed and will be
+ * reused for subsequent av_buffer_pool_get() calls.
+ *
+ * When the caller is done with the pool and no longer needs to allocate any new
+ * buffers, av_buffer_pool_uninit() must be called to mark the pool as freeable.
+ * Once all the buffers are released, it will automatically be freed.
+ *
+ * Allocating and releasing buffers with this API is thread-safe as long as
+ * either the default alloc callback is used, or the user-supplied one is
+ * thread-safe.
+ */
+
+/**
+ * The buffer pool. This structure is opaque and not meant to be accessed
+ * directly. It is allocated with av_buffer_pool_init() and freed with
+ * av_buffer_pool_uninit().
+ */
+typedef struct AVBufferPool AVBufferPool;
+
+/**
+ * Allocate and initialize a buffer pool.
+ *
+ * @param size size of each buffer in this pool
+ * @param alloc a function that will be used to allocate new buffers when the
+ * pool is empty. May be NULL, then the default allocator will be used
+ * (av_buffer_alloc()).
+ * @return newly created buffer pool on success, NULL on error.
+ */
+AVBufferPool *av_buffer_pool_init(int size, AVBufferRef* (*alloc)(int size));
+
+/**
+ * Mark the pool as being available for freeing. It will actually be freed only
+ * once all the allocated buffers associated with the pool are released. Thus it
+ * is safe to call this function while some of the allocated buffers are still
+ * in use.
+ *
+ * @param pool pointer to the pool to be freed. It will be set to NULL.
+ * @see av_buffer_pool_can_uninit()
+ */
+void av_buffer_pool_uninit(AVBufferPool **pool);
+
+/**
+ * Allocate a new AVBuffer, reusing an old buffer from the pool when available.
+ * This function may be called simultaneously from multiple threads.
+ *
+ * @return a reference to the new buffer on success, NULL on error.
+ */
+AVBufferRef *av_buffer_pool_get(AVBufferPool *pool);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_BUFFER_H */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/channel_layout.h Added

@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (c) 2008 Peter Ross
+ *
+ * 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_CHANNEL_LAYOUT_H
+#define AVUTIL_CHANNEL_LAYOUT_H
+
+#include <stdint.h>
+
+/**
+ * @file
+ * audio channel layout utility functions
+ */
+
+/**
+ * @addtogroup lavu_audio
+ * @{
+ */
+
+/**
+ * @defgroup channel_masks Audio channel masks
+ *
+ * A channel layout is a 64-bits integer with a bit set for every channel.
+ * The number of bits set must be equal to the number of channels.
+ * The value 0 means that the channel layout is not known.
+ * @note this data structure is not powerful enough to handle channels
+ * combinations that have the same channel multiple times, such as
+ * dual-mono.
+ *
+ * @{
+ */
+#define AV_CH_FRONT_LEFT             0x00000001
+#define AV_CH_FRONT_RIGHT            0x00000002
+#define AV_CH_FRONT_CENTER           0x00000004
+#define AV_CH_LOW_FREQUENCY          0x00000008
+#define AV_CH_BACK_LEFT              0x00000010
+#define AV_CH_BACK_RIGHT             0x00000020
+#define AV_CH_FRONT_LEFT_OF_CENTER   0x00000040
+#define AV_CH_FRONT_RIGHT_OF_CENTER  0x00000080
+#define AV_CH_BACK_CENTER            0x00000100
+#define AV_CH_SIDE_LEFT              0x00000200
+#define AV_CH_SIDE_RIGHT             0x00000400
+#define AV_CH_TOP_CENTER             0x00000800
+#define AV_CH_TOP_FRONT_LEFT         0x00001000
+#define AV_CH_TOP_FRONT_CENTER       0x00002000
+#define AV_CH_TOP_FRONT_RIGHT        0x00004000
+#define AV_CH_TOP_BACK_LEFT          0x00008000
+#define AV_CH_TOP_BACK_CENTER        0x00010000
+#define AV_CH_TOP_BACK_RIGHT         0x00020000
+#define AV_CH_STEREO_LEFT            0x20000000  ///< Stereo downmix.
+#define AV_CH_STEREO_RIGHT           0x40000000  ///< See AV_CH_STEREO_LEFT.
+#define AV_CH_WIDE_LEFT              0x0000000080000000ULL
+#define AV_CH_WIDE_RIGHT             0x0000000100000000ULL
+#define AV_CH_SURROUND_DIRECT_LEFT   0x0000000200000000ULL
+#define AV_CH_SURROUND_DIRECT_RIGHT  0x0000000400000000ULL
+#define AV_CH_LOW_FREQUENCY_2        0x0000000800000000ULL
+
+/** Channel mask value used for AVCodecContext.request_channel_layout
+    to indicate that the user requests the channel order of the decoder output
+    to be the native codec channel order. */
+#define AV_CH_LAYOUT_NATIVE          0x8000000000000000ULL
+
+/**
+ * @}
+ * @defgroup channel_mask_c Audio channel convenience macros
+ * @{
+ * */
+#define AV_CH_LAYOUT_MONO              (AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_STEREO            (AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT)
+#define AV_CH_LAYOUT_2POINT1           (AV_CH_LAYOUT_STEREO|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_1               (AV_CH_LAYOUT_STEREO|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_SURROUND          (AV_CH_LAYOUT_STEREO|AV_CH_FRONT_CENTER)
+#define AV_CH_LAYOUT_3POINT1           (AV_CH_LAYOUT_SURROUND|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_4POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_4POINT1           (AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_2_2               (AV_CH_LAYOUT_STEREO|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_QUAD              (AV_CH_LAYOUT_STEREO|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT0           (AV_CH_LAYOUT_SURROUND|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT)
+#define AV_CH_LAYOUT_5POINT1           (AV_CH_LAYOUT_5POINT0|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_5POINT0_BACK      (AV_CH_LAYOUT_SURROUND|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_5POINT1_BACK      (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_6POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT0_FRONT     (AV_CH_LAYOUT_2_2|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_HEXAGONAL         (AV_CH_LAYOUT_5POINT0_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_BACK      (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_BACK_CENTER)
+#define AV_CH_LAYOUT_6POINT1_FRONT     (AV_CH_LAYOUT_6POINT0_FRONT|AV_CH_LOW_FREQUENCY)
+#define AV_CH_LAYOUT_7POINT0           (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT0_FRONT     (AV_CH_LAYOUT_5POINT0|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1           (AV_CH_LAYOUT_5POINT1|AV_CH_BACK_LEFT|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_7POINT1_WIDE      (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER)
+#define AV_CH_LAYOUT_OCTAGONAL         (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT)
+#define AV_CH_LAYOUT_STEREO_DOWNMIX    (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
+
+enum AVMatrixEncoding {
+    AV_MATRIX_ENCODING_NONE,
+    AV_MATRIX_ENCODING_DOLBY,
+    AV_MATRIX_ENCODING_DPLII,
+    AV_MATRIX_ENCODING_NB
+};
+
+/**
+ * @}
+ */
+
+/**
+ * Return a channel layout id that matches name, or 0 if no match is found.
+ *
+ * name can be one or several of the following notations,
+ * separated by '+' or '|':
+ * - the name of an usual channel layout (mono, stereo, 4.0, quad, 5.0,
+ *   5.0(side), 5.1, 5.1(side), 7.1, 7.1(wide), downmix);
+ * - the name of a single channel (FL, FR, FC, LFE, BL, BR, FLC, FRC, BC,
+ *   SL, SR, TC, TFL, TFC, TFR, TBL, TBC, TBR, DL, DR);
+ * - a number of channels, in decimal, optionally followed by 'c', yielding
+ *   the default channel layout for that number of channels (@see
+ *   av_get_default_channel_layout);
+ * - a channel layout mask, in hexadecimal starting with "0x" (see the
+ *   AV_CH_* macros).
+ *
+ * Example: "stereo+FC" = "2+FC" = "2c+1c" = "0x7"
+ */
+uint64_t av_get_channel_layout(const char *name);
+
+/**
+ * Return a description of a channel layout.
+ * If nb_channels is <= 0, it is guessed from the channel_layout.
+ *
+ * @param buf put here the string containing the channel layout
+ * @param buf_size size in bytes of the buffer
+ */
+void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint64_t channel_layout);
+
+struct AVBPrint;
+/**
+ * Append a description of a channel layout to a bprint buffer.
+ */
+void av_bprint_channel_layout(struct AVBPrint *bp, int nb_channels, uint64_t channel_layout);
+
+/**
+ * Return the number of channels in the channel layout.
+ */
+int av_get_channel_layout_nb_channels(uint64_t channel_layout);
+
+/**
+ * Return default channel layout for a given number of channels.
+ */
+int64_t av_get_default_channel_layout(int nb_channels);
+
+/**
+ * Get the index of a channel in channel_layout.
+ *
+ * @param channel a channel layout describing exactly one channel which must be
+ *                present in channel_layout.
+ *
+ * @return index of channel in channel_layout on success, a negative AVERROR
+ *         on error.
+ */
+int av_get_channel_layout_channel_index(uint64_t channel_layout,
+                                        uint64_t channel);
+
+/**
+ * Get the channel with the given index in channel_layout.
+ */
+uint64_t av_channel_layout_extract_channel(uint64_t channel_layout, int index);
+
+/**
+ * Get the name of a given channel.
+ *
+ * @return channel name on success, NULL on error.
+ */
+const char *av_get_channel_name(uint64_t channel);
+
+/**
+ * Get the description of a given channel.
+ *
+ * @param channel  a channel layout with a single channel
+ * @return  channel description on success, NULL on error
+ */
+const char *av_get_channel_description(uint64_t channel);
+
+/**
+ * Get the value and name of a standard channel layout.
+ *
+ * @param[in]  index   index in an internal list, starting at 0
+ * @param[out] layout  channel layout mask
+ * @param[out] name    name of the layout
+ * @return  0  if the layout exists,
+ *          <0 if index is beyond the limits
+ */
+int av_get_standard_channel_layout(unsigned index, uint64_t *layout,
+                                   const char **name);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_CHANNEL_LAYOUT_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/common.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/common.h Changed

@@ -26,7 +26,6 @@
 #ifndef AVUTIL_COMMON_H
 #define AVUTIL_COMMON_H
 
-#include <ctype.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -49,6 +48,9 @@
 #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
 /* assume b>0 */
 #define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
+/* assume a>0 and b>0 */
+#define FF_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \
+                                                       : ((a) + (1<<(b)) - 1) >> (b))
 #define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b))
 #define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b))
 #define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
@@ -64,7 +66,6 @@
 #define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
 
 /* misc math functions */
-extern const uint8_t ff_log2_tab[256];
 
 /**
  * Reverse the order of the bits of an 8-bits unsigned integer.
@@ -73,34 +74,6 @@
 extern attribute_deprecated const uint8_t av_reverse[256];
 #endif
 
-static av_always_inline av_const int av_log2_c(unsigned int v)
-{
-    int n = 0;
-    if (v & 0xffff0000) {
-        v >>= 16;
-        n += 16;
-    }
-    if (v & 0xff00) {
-        v >>= 8;
-        n += 8;
-    }
-    n += ff_log2_tab[v];
-
-    return n;
-}
-
-static av_always_inline av_const int av_log2_16bit_c(unsigned int v)
-{
-    int n = 0;
-    if (v & 0xff00) {
-        v >>= 8;
-        n += 8;
-    }
-    n += ff_log2_tab[v];
-
-    return n;
-}
-
 #ifdef HAVE_AV_CONFIG_H
 #   include "config.h"
 #   include "intmath.h"
@@ -109,6 +82,14 @@
 /* Pull in unguarded fallback defines at the end of this file. */
 #include "common.h"
 
+#ifndef av_log2
+av_const int av_log2(unsigned v);
+#endif
+
+#ifndef av_log2_16bit
+av_const int av_log2_16bit(unsigned v);
+#endif
+
 /**
  * Clip a signed integer value into the amin-amax range.
  * @param a value to clip
@@ -118,6 +99,26 @@
  */
 static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
 {
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+    if (amin > amax) abort();
+#endif
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
+/**
+ * Clip a signed 64bit integer value into the amin-amax range.
+ * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
+ * @return clipped value
+ */
+static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax)
+{
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+    if (amin > amax) abort();
+#endif
     if      (a < amin) return amin;
     else if (a > amax) return amax;
     else               return a;
@@ -174,7 +175,7 @@
  */
 static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
 {
-    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (a>>63) ^ 0x7FFFFFFF;
+    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (int32_t)((a>>63) ^ 0x7FFFFFFF);
     else                                         return (int32_t)a;
 }
 
@@ -223,6 +224,26 @@
  */
 static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
 {
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+    if (amin > amax) abort();
+#endif
+    if      (a < amin) return amin;
+    else if (a > amax) return amax;
+    else               return a;
+}
+
+/**
+ * Clip a double value into the amin-amax range.
+ * @param a value to clip
+ * @param amin minimum value of the clip range
+ * @param amax maximum value of the clip range
+ * @return clipped value
+ */
+static av_always_inline av_const double av_clipd_c(double a, double amin, double amax)
+{
+#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
+    if (amin > amax) abort();
+#endif
     if      (a < amin) return amin;
     else if (a > amax) return amax;
     else               return a;
@@ -258,7 +279,7 @@
  */
 static av_always_inline av_const int av_popcount64_c(uint64_t x)
 {
-    return av_popcount((uint32_t)x) + av_popcount(x >> 32);
+    return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
 }
 
 #define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
@@ -278,16 +299,17 @@
 #define GET_UTF8(val, GET_BYTE, ERROR)\
     val= GET_BYTE;\
     {\
-        int ones= 7 - av_log2(val ^ 255);\
-        if(ones==1)\
+        uint32_t top = (val & 128) >> 1;\
+        if ((val & 0xc0) == 0x80 || val >= 0xFE)\
             ERROR\
-        val&= 127>>ones;\
-        while(--ones > 0){\
+        while (val & top) {\
             int tmp= GET_BYTE - 128;\
             if(tmp>>6)\
                 ERROR\
             val= (val<<6) + tmp;\
+            top <<= 5;\
         }\
+        val &= (top << 1) - 1;\
     }
 
 /**
@@ -390,18 +412,15 @@
  * to ensure they are immediately available in intmath.h.
  */
 
-#ifndef av_log2
-#   define av_log2       av_log2_c
-#endif
-#ifndef av_log2_16bit
-#   define av_log2_16bit av_log2_16bit_c
-#endif
 #ifndef av_ceil_log2
 #   define av_ceil_log2     av_ceil_log2_c
 #endif
 #ifndef av_clip
 #   define av_clip          av_clip_c
 #endif
+#ifndef av_clip64
+#   define av_clip64        av_clip64_c
+#endif
 #ifndef av_clip_uint8
 #   define av_clip_uint8    av_clip_uint8_c
 #endif
@@ -429,6 +448,9 @@
 #ifndef av_clipf
 #   define av_clipf         av_clipf_c
 #endif
+#ifndef av_clipd
+#   define av_clipd         av_clipd_c
+#endif
 #ifndef av_popcount
 #   define av_popcount      av_popcount_c
 #endif

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/cpu.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/cpu.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/crc.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/crc.h Changed

@@ -25,6 +25,12 @@
 #include <stddef.h>
 #include "attributes.h"
 
+/**
+ * @defgroup lavu_crc32 CRC32
+ * @ingroup lavu_crypto
+ * @{
+ */
+
 typedef uint32_t AVCRC;
 
 typedef enum {
@@ -33,11 +39,47 @@
     AV_CRC_16_CCITT,
     AV_CRC_32_IEEE,
     AV_CRC_32_IEEE_LE,  /*< reversed bitorder version of AV_CRC_32_IEEE */
+    AV_CRC_24_IEEE = 12,
     AV_CRC_MAX,         /*< Not part of public API! Do not use outside libavutil. */
 }AVCRCId;
 
+/**
+ * Initialize a CRC table.
+ * @param ctx must be an array of size sizeof(AVCRC)*257 or sizeof(AVCRC)*1024
+ * @param le If 1, the lowest bit represents the coefficient for the highest
+ *           exponent of the corresponding polynomial (both for poly and
+ *           actual CRC).
+ *           If 0, you must swap the CRC parameter and the result of av_crc
+ *           if you need the standard representation (can be simplified in
+ *           most cases to e.g. bswap16):
+ *           av_bswap32(crc << (32-bits))
+ * @param bits number of bits for the CRC
+ * @param poly generator polynomial without the x**bits coefficient, in the
+ *             representation as specified by le
+ * @param ctx_size size of ctx in bytes
+ * @return <0 on failure
+ */
 int av_crc_init(AVCRC *ctx, int le, int bits, uint32_t poly, int ctx_size);
+
+/**
+ * Get an initialized standard CRC table.
+ * @param crc_id ID of a standard CRC
+ * @return a pointer to the CRC table or NULL on failure
+ */
 const AVCRC *av_crc_get_table(AVCRCId crc_id);
-uint32_t av_crc(const AVCRC *ctx, uint32_t start_crc, const uint8_t *buffer, size_t length) av_pure;
+
+/**
+ * Calculate the CRC of a block.
+ * @param crc CRC of previous blocks if any or initial value for CRC
+ * @return CRC updated with the data from the given block
+ *
+ * @see av_crc_init() "le" parameter
+ */
+uint32_t av_crc(const AVCRC *ctx, uint32_t crc,
+                const uint8_t *buffer, size_t length) av_pure;
+
+/**
+ * @}
+ */
 
 #endif /* AVUTIL_CRC_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/dict.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/dict.h Changed

@@ -113,6 +113,23 @@
 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.
+ *
+ * @param key_val_sep  a 0-terminated list of characters used to separate
+ *                     key from value
+ * @param pairs_sep    a 0-terminated list of characters used to separate
+ *                     two pairs from each other
+ * @param flags        flags to use when adding to dictionary.
+ *                     AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL
+ *                     are ignored since the key/value tokens will always
+ *                     be duplicated.
+ * @return             0 on success, negative AVERROR code on failure
+ */
+int av_dict_parse_string(AVDictionary **pm, const char *str,
+                         const char *key_val_sep, const char *pairs_sep,
+                         int flags);
+
+/**
  * Copy entries from one AVDictionary struct into another.
  * @param dst pointer to a pointer to a AVDictionary struct. If *dst is NULL,
  *            this function will allocate a struct for you and put it in *dst

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/error.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/error.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/eval.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/eval.h Changed

@@ -91,39 +91,6 @@
  */
 void av_expr_free(AVExpr *e);
 
-#if FF_API_OLD_EVAL_NAMES
-/**
- * @deprecated Deprecated in favor of av_expr_parse_and_eval().
- */
-attribute_deprecated
-int av_parse_and_eval_expr(double *res, const char *s,
-                           const char * const *const_names, const double *const_values,
-                           const char * const *func1_names, double (* const *funcs1)(void *, double),
-                           const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                           void *opaque, int log_offset, void *log_ctx);
-
-/**
- * @deprecated Deprecated in favor of av_expr_parse().
- */
-attribute_deprecated
-int av_parse_expr(AVExpr **expr, const char *s,
-                  const char * const *const_names,
-                  const char * const *func1_names, double (* const *funcs1)(void *, double),
-                  const char * const *func2_names, double (* const *funcs2)(void *, double, double),
-                  int log_offset, void *log_ctx);
-/**
- * @deprecated Deprecated in favor of av_expr_eval().
- */
-attribute_deprecated
-double av_eval_expr(AVExpr *e, const double *const_values, void *opaque);
-
-/**
- * @deprecated Deprecated in favor of av_expr_free().
- */
-attribute_deprecated
-void av_free_expr(AVExpr *e);
-#endif /* FF_API_OLD_EVAL_NAMES */
-
 /**
  * Parse the string in numstr and return its value as a double. If
  * the string is empty, contains only whitespaces, or does not contain

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/fifo.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/fifo.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/file.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/file.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/frame.h Added

@@ -0,0 +1,650 @@
+/*
+ *
+ * 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_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"
+
+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
+};
+#define AVCOL_SPC_YCGCO AVCOL_SPC_YCOCG
+
+enum AVColorRange{
+    AVCOL_RANGE_UNSPECIFIED = 0,
+    AVCOL_RANGE_MPEG        = 1, ///< the normal 219*2^(n-8) "MPEG" YUV ranges
+    AVCOL_RANGE_JPEG        = 2, ///< the normal     2^n-1   "JPEG" YUV ranges
+    AVCOL_RANGE_NB             , ///< Not part of ABI
+};
+
+enum AVFrameSideDataType {
+    /**
+     * The data is the AVPanScan struct defined in libavcodec.
+     */
+    AV_FRAME_DATA_PANSCAN,
+};
+
+typedef struct AVFrameSideData {
+    enum AVFrameSideDataType type;
+    uint8_t *data;
+    int      size;
+    AVDictionary *metadata;
+} AVFrameSideData;
+
+/**
+ * This structure describes decoded (raw) audio or video data.
+ *
+ * AVFrame must be allocated using av_frame_alloc(). Note that this only
+ * allocates the AVFrame itself, the buffers for the data must be managed
+ * through other means (see below).
+ * AVFrame must be freed with av_frame_free().
+ *
+ * AVFrame is typically allocated once and then reused multiple times to hold
+ * different data (e.g. a single AVFrame to hold frames received from a
+ * decoder). In such a case, av_frame_unref() will free any references held by
+ * the frame and reset it to its original clean state before it
+ * is reused again.
+ *
+ * The data described by an AVFrame is usually reference counted through the
+ * AVBuffer API. The underlying buffer references are stored in AVFrame.buf /
+ * AVFrame.extended_buf. An AVFrame is considered to be reference counted if at
+ * least one reference is set, i.e. if AVFrame.buf[0] != NULL. In such a case,
+ * every single data plane must be contained in one of the buffers in
+ * AVFrame.buf or AVFrame.extended_buf.
+ * There may be a single buffer for all the data, or one separate buffer for
+ * each plane, or anything in between.
+ *
+ * sizeof(AVFrame) is not a part of the public ABI, so new fields may be added
+ * to the end with a minor bump.
+ * Similarly fields that are marked as to be only accessed by
+ * av_opt_ptr() can be reordered. This allows 2 forks to add fields
+ * without breaking compatibility with each other.
+ */
+typedef struct AVFrame {
+#define AV_NUM_DATA_POINTERS 8
+    /**
+     * pointer to the picture/channel planes.
+     * This might be different from the first allocated byte
+     *
+     * Some decoders access areas outside 0,0 - width,height, please
+     * see avcodec_align_dimensions2(). Some filters and swscale can read
+     * up to 16 bytes beyond the planes, if these filters are to be used,
+     * then 16 extra bytes must be allocated.
+     */
+    uint8_t *data[AV_NUM_DATA_POINTERS];
+
+    /**
+     * For video, size in bytes of each picture line.
+     * For audio, size in bytes of each plane.
+     *
+     * For audio, only linesize[0] may be set. For planar audio, each channel
+     * plane must be the same size.
+     *
+     * For video the linesizes should be multiplies of the CPUs alignment
+     * 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.
+     */
+    int linesize[AV_NUM_DATA_POINTERS];
+
+    /**
+     * 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 should always be set in a valid frame,
+     * 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;
+
+    /**
+     * width and height of the video frame
+     */
+    int width, height;
+
+    /**
+     * number of audio samples (per channel) described by this frame
+     */
+    int nb_samples;
+
+    /**
+     * format of the frame, -1 if unknown or unset
+     * Values correspond to enum AVPixelFormat for video frames,
+     * enum AVSampleFormat for audio)
+     */
+    int format;
+
+    /**
+     * 1 -> keyframe, 0-> not
+     */
+    int key_frame;
+
+    /**
+     * Picture type of the frame.
+     */
+    enum AVPictureType pict_type;
+
+#if FF_API_AVFRAME_LAVC
+    attribute_deprecated
+    uint8_t *base[AV_NUM_DATA_POINTERS];
+#endif
+
+    /**
+     * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified.
+     */
+    AVRational sample_aspect_ratio;
+
+    /**
+     * Presentation timestamp in time_base units (time when frame should be shown to user).
+     */
+    int64_t pts;
+
+    /**
+     * PTS copied from the AVPacket that was decoded to produce this frame.
+     */
+    int64_t pkt_pts;
+
+    /**
+     * DTS copied from the AVPacket that triggered returning this frame. (if frame threading isnt used)
+     * This is also the Presentation time of this AVFrame calculated from
+     * only AVPacket.dts values without pts values.
+     */
+    int64_t pkt_dts;
+
+    /**
+     * picture number in bitstream order
+     */
+    int coded_picture_number;
+    /**
+     * picture number in display order
+     */
+    int display_picture_number;
+
+    /**
+     * quality (between 1 (good) and FF_LAMBDA_MAX (bad))
+     */
+    int quality;
+
+#if FF_API_AVFRAME_LAVC
+    attribute_deprecated
+    int reference;
+
+    /**
+     * QP table
+     */
+    attribute_deprecated
+    int8_t *qscale_table;
+    /**
+     * QP store stride
+     */
+    attribute_deprecated
+    int qstride;
+
+    attribute_deprecated
+    int qscale_type;
+
+    /**
+     * mbskip_table[mb]>=1 if MB didn't change
+     * stride= mb_width = (width+15)>>4
+     */
+    attribute_deprecated
+    uint8_t *mbskip_table;
+
+    /**
+     * motion vector table
+     * @code
+     * example:
+     * int mv_sample_log2= 4 - motion_subsample_log2;
+     * int mb_width= (width+15)>>4;
+     * int mv_stride= (mb_width << mv_sample_log2) + 1;
+     * motion_val[direction][x + y*mv_stride][0->mv_x, 1->mv_y];
+     * @endcode
+     */
+    attribute_deprecated
+    int16_t (*motion_val[2])[2];
+
+    /**
+     * macroblock type table
+     * mb_type_base + mb_width + 2
+     */
+    attribute_deprecated
+    uint32_t *mb_type;
+
+    /**
+     * DCT coefficients
+     */
+    attribute_deprecated
+    short *dct_coeff;
+
+    /**
+     * motion reference frame index
+     * the order in which these are stored can depend on the codec.
+     */
+    attribute_deprecated
+    int8_t *ref_index[2];
+#endif
+
+    /**
+     * for some private data of the user
+     */
+    void *opaque;
+
+    /**
+     * error
+     */
+    uint64_t error[AV_NUM_DATA_POINTERS];
+
+#if FF_API_AVFRAME_LAVC
+    attribute_deprecated
+    int type;
+#endif
+
+    /**
+     * When decoding, this signals how much the picture must be delayed.
+     * extra_delay = repeat_pict / (2*fps)
+     */
+    int repeat_pict;
+
+    /**
+     * The content of the picture is interlaced.
+     */
+    int interlaced_frame;
+
+    /**
+     * If the content is interlaced, is top field displayed first.
+     */
+    int top_field_first;
+
+    /**
+     * Tell user application that palette has changed from previous frame.
+     */
+    int palette_has_changed;
+
+#if FF_API_AVFRAME_LAVC
+    attribute_deprecated
+    int buffer_hints;
+
+    /**
+     * Pan scan.
+     */
+    attribute_deprecated
+    struct AVPanScan *pan_scan;
+#endif
+
+    /**
+     * reordered opaque 64bit (generally an integer or a double precision float
+     * PTS but can be anything).
+     * The user sets AVCodecContext.reordered_opaque to represent the input at
+     * that time,
+     * the decoder reorders values as needed and sets AVFrame.reordered_opaque
+     * to exactly one of the values provided by the user through AVCodecContext.reordered_opaque
+     * @deprecated in favor of pkt_pts
+     */
+    int64_t reordered_opaque;
+
+#if FF_API_AVFRAME_LAVC
+    /**
+     * @deprecated this field is unused
+     */
+    attribute_deprecated void *hwaccel_picture_private;
+
+    attribute_deprecated
+    struct AVCodecContext *owner;
+    attribute_deprecated
+    void *thread_opaque;
+
+    /**
+     * log2 of the size of the block which a single vector in motion_val represents:
+     * (4->16x16, 3->8x8, 2-> 4x4, 1-> 2x2)
+     */
+    attribute_deprecated
+    uint8_t motion_subsample_log2;
+#endif
+
+    /**
+     * Sample rate of the audio data.
+     */
+    int sample_rate;
+
+    /**
+     * Channel layout of the audio data.
+     */
+    uint64_t channel_layout;
+
+    /**
+     * AVBuffer references backing the data for this frame. If all elements of
+     * this array are NULL, then this frame is not reference counted.
+     *
+     * There may be at most one AVBuffer per data plane, so for video this array
+     * always contains all the references. For planar audio with more than
+     * AV_NUM_DATA_POINTERS channels, there may be more buffers than can fit in
+     * this array. Then the extra AVBufferRef pointers are stored in the
+     * extended_buf array.
+     */
+    AVBufferRef *buf[AV_NUM_DATA_POINTERS];
+
+    /**
+     * For planar audio which requires more than AV_NUM_DATA_POINTERS
+     * AVBufferRef pointers, this array will hold all the references which
+     * cannot fit into AVFrame.buf.
+     *
+     * Note that this is different from AVFrame.extended_data, which always
+     * contains all the pointers. This array only contains the extra pointers,
+     * which cannot fit into AVFrame.buf.
+     *
+     * This array is always allocated using av_malloc() by whoever constructs
+     * the frame. It is freed in av_frame_unref().
+     */
+    AVBufferRef **extended_buf;
+    /**
+     * Number of elements in extended_buf.
+     */
+    int        nb_extended_buf;
+
+    AVFrameSideData **side_data;
+    int            nb_side_data;
+
+    /**
+     * frame timestamp estimated using various heuristics, in stream time base
+     * Code outside libavcodec should access this field using:
+     * av_frame_get_best_effort_timestamp(frame)
+     * - encoding: unused
+     * - decoding: set by libavcodec, read by user.
+     */
+    int64_t best_effort_timestamp;
+
+    /**
+     * reordered pos from the last AVPacket that has been input into the decoder
+     * Code outside libavcodec should access this field using:
+     * av_frame_get_pkt_pos(frame)
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t pkt_pos;
+
+    /**
+     * duration of the corresponding packet, expressed in
+     * AVStream->time_base units, 0 if unknown.
+     * Code outside libavcodec should access this field using:
+     * av_frame_get_pkt_duration(frame)
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int64_t pkt_duration;
+
+    /**
+     * metadata.
+     * Code outside libavcodec should access this field using:
+     * av_frame_get_metadata(frame)
+     * - encoding: Set by user.
+     * - decoding: Set by libavcodec.
+     */
+    AVDictionary *metadata;
+
+    /**
+     * decode error flags of the frame, set to a combination of
+     * FF_DECODE_ERROR_xxx flags if the decoder produced a frame, but there
+     * were errors during the decoding.
+     * Code outside libavcodec should access this field using:
+     * av_frame_get_decode_error_flags(frame)
+     * - encoding: unused
+     * - decoding: set by libavcodec, read by user.
+     */
+    int decode_error_flags;
+#define FF_DECODE_ERROR_INVALID_BITSTREAM   1
+#define FF_DECODE_ERROR_MISSING_REFERENCE   2
+
+    /**
+     * number of audio channels, only used for audio.
+     * Code outside libavcodec should access this field using:
+     * av_frame_get_channels(frame)
+     * - encoding: unused
+     * - decoding: Read by user.
+     */
+    int channels;
+
+    /**
+     * size of the corresponding packet containing the compressed
+     * frame. It must be accessed using av_frame_get_pkt_size() and
+     * av_frame_set_pkt_size().
+     * It is set to a negative value if unknown.
+     * - encoding: unused
+     * - decoding: set by libavcodec, read by user.
+     */
+    int pkt_size;
+
+    /**
+     * YUV colorspace type.
+     * It must be accessed using av_frame_get_colorspace() and
+     * av_frame_set_colorspace().
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorSpace colorspace;
+
+    /**
+     * MPEG vs JPEG YUV range.
+     * It must be accessed using av_frame_get_color_range() and
+     * av_frame_set_color_range().
+     * - encoding: Set by user
+     * - decoding: Set by libavcodec
+     */
+    enum AVColorRange color_range;
+
+
+    /**
+     * Not to be accessed directly from outside libavutil
+     */
+    AVBufferRef *qp_table_buf;
+} AVFrame;
+
+/**
+ * Accessors for some AVFrame fields.
+ * The position of these field in the structure is not part of the ABI,
+ * they should not be accessed directly outside libavcodec.
+ */
+int64_t av_frame_get_best_effort_timestamp(const AVFrame *frame);
+void    av_frame_set_best_effort_timestamp(AVFrame *frame, int64_t val);
+int64_t av_frame_get_pkt_duration         (const AVFrame *frame);
+void    av_frame_set_pkt_duration         (AVFrame *frame, int64_t val);
+int64_t av_frame_get_pkt_pos              (const AVFrame *frame);
+void    av_frame_set_pkt_pos              (AVFrame *frame, int64_t val);
+int64_t av_frame_get_channel_layout       (const AVFrame *frame);
+void    av_frame_set_channel_layout       (AVFrame *frame, int64_t val);
+int     av_frame_get_channels             (const AVFrame *frame);
+void    av_frame_set_channels             (AVFrame *frame, int     val);
+int     av_frame_get_sample_rate          (const AVFrame *frame);
+void    av_frame_set_sample_rate          (AVFrame *frame, int     val);
+AVDictionary *av_frame_get_metadata       (const AVFrame *frame);
+void          av_frame_set_metadata       (AVFrame *frame, AVDictionary *val);
+int     av_frame_get_decode_error_flags   (const AVFrame *frame);
+void    av_frame_set_decode_error_flags   (AVFrame *frame, int     val);
+int     av_frame_get_pkt_size(const AVFrame *frame);
+void    av_frame_set_pkt_size(AVFrame *frame, int val);
+AVDictionary **avpriv_frame_get_metadatap(AVFrame *frame);
+int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type);
+int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int type);
+enum AVColorSpace av_frame_get_colorspace(const AVFrame *frame);
+void    av_frame_set_colorspace(AVFrame *frame, enum AVColorSpace val);
+enum AVColorRange av_frame_get_color_range(const AVFrame *frame);
+void    av_frame_set_color_range(AVFrame *frame, enum AVColorRange val);
+
+/**
+ * Allocate an AVFrame and set its fields to default values.  The resulting
+ * struct must be freed using av_frame_free().
+ *
+ * @return An AVFrame filled with default values or NULL on failure.
+ *
+ * @note this only allocates the AVFrame itself, not the data buffers. Those
+ * must be allocated through other means, e.g. with av_frame_get_buffer() or
+ * manually.
+ */
+AVFrame *av_frame_alloc(void);
+
+/**
+ * Free the frame and any dynamically allocated objects in it,
+ * e.g. extended_data. If the frame is reference counted, it will be
+ * unreferenced first.
+ *
+ * @param frame frame to be freed. The pointer will be set to NULL.
+ */
+void av_frame_free(AVFrame **frame);
+
+/**
+ * Setup a new reference to the data described by a given frame.
+ *
+ * Copy frame properties from src to dst and create a new reference for each
+ * AVBufferRef from src.
+ *
+ * If src is not reference counted, new buffers are allocated and the data is
+ * copied.
+ *
+ * @return 0 on success, a negative AVERROR on error
+ */
+int av_frame_ref(AVFrame *dst, AVFrame *src);
+
+/**
+ * Create a new frame that references the same data as src.
+ *
+ * This is a shortcut for av_frame_alloc()+av_frame_ref().
+ *
+ * @return newly created AVFrame on success, NULL on error.
+ */
+AVFrame *av_frame_clone(AVFrame *src);
+
+/**
+ * Unreference all the buffers referenced by frame and reset the frame fields.
+ */
+void av_frame_unref(AVFrame *frame);
+
+/**
+ * Move everythnig contained in src to dst and reset src.
+ */
+void av_frame_move_ref(AVFrame *dst, AVFrame *src);
+
+/**
+ * Allocate new buffer(s) for audio or video data.
+ *
+ * The following fields must be set on frame before calling this function:
+ * - format (pixel format for video, sample format for audio)
+ * - width and height for video
+ * - nb_samples and channel_layout for audio
+ *
+ * This function will fill AVFrame.data and AVFrame.buf arrays and, if
+ * necessary, allocate and fill AVFrame.extended_data and AVFrame.extended_buf.
+ * For planar formats, one buffer will be allocated for each plane.
+ *
+ * @param frame frame in which to store the new buffers.
+ * @param align required buffer size alignment
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ */
+int av_frame_get_buffer(AVFrame *frame, int align);
+
+/**
+ * Check if the frame data is writable.
+ *
+ * @return A positive value if the frame data is writable (which is true if and
+ * only if each of the underlying buffers has only one reference, namely the one
+ * stored in this frame). Return 0 otherwise.
+ *
+ * If 1 is returned the answer is valid until av_buffer_ref() is called on any
+ * of the underlying AVBufferRefs (e.g. through av_frame_ref() or directly).
+ *
+ * @see av_frame_make_writable(), av_buffer_is_writable()
+ */
+int av_frame_is_writable(AVFrame *frame);
+
+/**
+ * Ensure that the frame data is writable, avoiding data copy if possible.
+ *
+ * Do nothing if the frame is writable, allocate new buffers and copy the data
+ * if it is not.
+ *
+ * @return 0 on success, a negative AVERROR on error.
+ *
+ * @see av_frame_is_writable(), av_buffer_is_writable(),
+ * av_buffer_make_writable()
+ */
+int av_frame_make_writable(AVFrame *frame);
+
+/**
+ * Copy only "metadata" fields from src to dst.
+ *
+ * Metadata for the purpose of this function are those fields that do not affect
+ * the data layout in the buffers.  E.g. pts, sample rate (for audio) or sample
+ * aspect ratio (for video), but not width/height or channel layout.
+ * Side data is also copied.
+ */
+int av_frame_copy_props(AVFrame *dst, const AVFrame *src);
+
+/**
+ * Get the buffer reference a given data plane is stored in.
+ *
+ * @param plane index of the data plane of interest in frame->extended_data.
+ *
+ * @return the buffer reference that contains the plane or NULL if the input
+ * frame is not valid.
+ */
+AVBufferRef *av_frame_get_plane_buffer(AVFrame *frame, int plane);
+
+/**
+ * Add a new side data to a frame.
+ *
+ * @param frame a frame to which the side data should be added
+ * @param type type of the added side data
+ * @param size size of the side data
+ *
+ * @return newly added side data on success, NULL on error
+ */
+AVFrameSideData *av_frame_new_side_data(AVFrame *frame,
+                                        enum AVFrameSideDataType type,
+                                        int size);
+
+/**
+ * @return a pointer to the side data of a given type on success, NULL if there
+ * is no side data with such type in this frame.
+ */
+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/hmac.h Added

@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2012 Martin Storsjo
+ *
+ * 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_HMAC_H
+#define AVUTIL_HMAC_H
+
+#include <stdint.h>
+
+/**
+ * @defgroup lavu_hmac HMAC
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+enum AVHMACType {
+    AV_HMAC_MD5,
+    AV_HMAC_SHA1,
+    AV_HMAC_SHA224 = 10,
+    AV_HMAC_SHA256,
+    AV_HMAC_SHA384,
+    AV_HMAC_SHA512,
+};
+
+typedef struct AVHMAC AVHMAC;
+
+/**
+ * Allocate an AVHMAC context.
+ * @param type The hash function used for the HMAC.
+ */
+AVHMAC *av_hmac_alloc(enum AVHMACType type);
+
+/**
+ * Free an AVHMAC context.
+ * @param ctx The context to free, may be NULL
+ */
+void av_hmac_free(AVHMAC *ctx);
+
+/**
+ * Initialize an AVHMAC context with an authentication key.
+ * @param ctx    The HMAC context
+ * @param key    The authentication key
+ * @param keylen The length of the key, in bytes
+ */
+void av_hmac_init(AVHMAC *ctx, const uint8_t *key, unsigned int keylen);
+
+/**
+ * Hash data with the HMAC.
+ * @param ctx  The HMAC context
+ * @param data The data to hash
+ * @param len  The length of the data, in bytes
+ */
+void av_hmac_update(AVHMAC *ctx, const uint8_t *data, unsigned int len);
+
+/**
+ * Finish hashing and output the HMAC digest.
+ * @param ctx    The HMAC context
+ * @param out    The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return       The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_final(AVHMAC *ctx, uint8_t *out, unsigned int outlen);
+
+/**
+ * Hash an array of data with a key.
+ * @param ctx    The HMAC context
+ * @param data   The data to hash
+ * @param len    The length of the data, in bytes
+ * @param key    The authentication key
+ * @param keylen The length of the key, in bytes
+ * @param out    The output buffer to write the digest into
+ * @param outlen The length of the out buffer, in bytes
+ * @return       The number of bytes written to out, or a negative error code.
+ */
+int av_hmac_calc(AVHMAC *ctx, const uint8_t *data, unsigned int len,
+                 const uint8_t *key, unsigned int keylen,
+                 uint8_t *out, unsigned int outlen);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_HMAC_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/imgutils.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/imgutils.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/intreadwrite.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/intreadwrite.h Changed

@@ -47,7 +47,7 @@
 
 /*
  * Arch-specific headers can provide any combination of
- * AV_[RW][BLN](16|24|32|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
+ * AV_[RW][BLN](16|24|32|48|64) and AV_(COPY|SWAP|ZERO)(64|128) macros.
  * Preprocessor symbols must be defined, even if these are implemented
  * as inline functions.
  */
@@ -114,6 +114,18 @@
 #       define AV_WN32(p, v) AV_WB32(p, v)
 #   endif
 
+#   if    defined(AV_RN48) && !defined(AV_RB48)
+#       define AV_RB48(p) AV_RN48(p)
+#   elif !defined(AV_RN48) &&  defined(AV_RB48)
+#       define AV_RN48(p) AV_RB48(p)
+#   endif
+
+#   if    defined(AV_WN48) && !defined(AV_WB48)
+#       define AV_WB48(p, v) AV_WN48(p, v)
+#   elif !defined(AV_WN48) &&  defined(AV_WB48)
+#       define AV_WN48(p, v) AV_WB48(p, v)
+#   endif
+
 #   if    defined(AV_RN64) && !defined(AV_RB64)
 #       define AV_RB64(p) AV_RN64(p)
 #   elif !defined(AV_RN64) &&  defined(AV_RB64)
@@ -164,6 +176,18 @@
 #       define AV_WN32(p, v) AV_WL32(p, v)
 #   endif
 
+#   if    defined(AV_RN48) && !defined(AV_RL48)
+#       define AV_RL48(p) AV_RN48(p)
+#   elif !defined(AV_RN48) &&  defined(AV_RL48)
+#       define AV_RN48(p) AV_RL48(p)
+#   endif
+
+#   if    defined(AV_WN48) && !defined(AV_WL48)
+#       define AV_WL48(p, v) AV_WN48(p, v)
+#   elif !defined(AV_WN48) &&  defined(AV_WL48)
+#       define AV_WN48(p, v) AV_WL48(p, v)
+#   endif
+
 #   if    defined(AV_RN64) && !defined(AV_RL64)
 #       define AV_RL64(p) AV_RN64(p)
 #   elif !defined(AV_RN64) &&  defined(AV_RL64)
@@ -436,6 +460,48 @@
     } while(0)
 #endif
 
+#ifndef AV_RB48
+#   define AV_RB48(x)                                     \
+    (((uint64_t)((const uint8_t*)(x))[0] << 40) |         \
+     ((uint64_t)((const uint8_t*)(x))[1] << 32) |         \
+     ((uint64_t)((const uint8_t*)(x))[2] << 24) |         \
+     ((uint64_t)((const uint8_t*)(x))[3] << 16) |         \
+     ((uint64_t)((const uint8_t*)(x))[4] <<  8) |         \
+      (uint64_t)((const uint8_t*)(x))[5])
+#endif
+#ifndef AV_WB48
+#   define AV_WB48(p, darg) do {                \
+        uint64_t d = (darg);                    \
+        ((uint8_t*)(p))[5] = (d);               \
+        ((uint8_t*)(p))[4] = (d)>>8;            \
+        ((uint8_t*)(p))[3] = (d)>>16;           \
+        ((uint8_t*)(p))[2] = (d)>>24;           \
+        ((uint8_t*)(p))[1] = (d)>>32;           \
+        ((uint8_t*)(p))[0] = (d)>>40;           \
+    } while(0)
+#endif
+
+#ifndef AV_RL48
+#   define AV_RL48(x)                                     \
+    (((uint64_t)((const uint8_t*)(x))[5] << 40) |         \
+     ((uint64_t)((const uint8_t*)(x))[4] << 32) |         \
+     ((uint64_t)((const uint8_t*)(x))[3] << 24) |         \
+     ((uint64_t)((const uint8_t*)(x))[2] << 16) |         \
+     ((uint64_t)((const uint8_t*)(x))[1] <<  8) |         \
+      (uint64_t)((const uint8_t*)(x))[0])
+#endif
+#ifndef AV_WL48
+#   define AV_WL48(p, darg) do {                \
+        uint64_t d = (darg);                    \
+        ((uint8_t*)(p))[0] = (d);               \
+        ((uint8_t*)(p))[1] = (d)>>8;            \
+        ((uint8_t*)(p))[2] = (d)>>16;           \
+        ((uint8_t*)(p))[3] = (d)>>24;           \
+        ((uint8_t*)(p))[4] = (d)>>32;           \
+        ((uint8_t*)(p))[5] = (d)>>40;           \
+    } while(0)
+#endif
+
 /*
  * The AV_[RW]NA macros access naturally aligned data
  * in a type-safe way.
@@ -468,6 +534,33 @@
 #   define AV_WN64A(p, v) AV_WNA(64, p, v)
 #endif
 
+/*
+ * The AV_COPYxxU macros are suitable for copying data to/from unaligned
+ * memory locations.
+ */
+
+#define AV_COPYU(n, d, s) AV_WN##n(d, AV_RN##n(s));
+
+#ifndef AV_COPY16U
+#   define AV_COPY16U(d, s) AV_COPYU(16, d, s)
+#endif
+
+#ifndef AV_COPY32U
+#   define AV_COPY32U(d, s) AV_COPYU(32, d, s)
+#endif
+
+#ifndef AV_COPY64U
+#   define AV_COPY64U(d, s) AV_COPYU(64, d, s)
+#endif
+
+#ifndef AV_COPY128U
+#   define AV_COPY128U(d, s)                                    \
+    do {                                                        \
+        AV_COPY64U(d, s);                                       \
+        AV_COPY64U((char *)(d) + 8, (const char *)(s) + 8);     \
+    } while(0)
+#endif
+
 /* Parameters for AV_COPY*, AV_SWAP*, AV_ZERO* must be
  * naturally aligned. They may be implemented using MMX,
  * so emms_c() must be called before using any float code

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/log.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/log.h Changed

@@ -40,6 +40,8 @@
     AV_CLASS_CATEGORY_NB, ///< not part of ABI/API
 }AVClassCategory;
 
+struct AVOptionRanges;
+
 /**
  * Describe the class of an AVClass context structure. That is an
  * arbitrary struct of which the first field is a pointer to an
@@ -80,10 +82,11 @@
     int log_level_offset_offset;
 
     /**
-     * Offset in the structure where a pointer to the parent context for loging is stored.
-     * for example a decoder that uses eval.c could pass its AVCodecContext to eval as such
-     * parent context. And a av_log() implementation could then display the parent context
-     * can be NULL of course
+     * Offset in the structure where a pointer to the parent context for
+     * logging is stored. For example a decoder could pass its AVCodecContext
+     * to eval as such a parent context, which an av_log() implementation
+     * could then leverage to display the parent context.
+     * The offset can be NULL.
      */
     int parent_log_context_offset;
 
@@ -93,7 +96,7 @@
     void* (*child_next)(void *obj, void *prev);
 
     /**
-     * Return an AVClass corresponding to next potential
+     * Return an AVClass corresponding to the next potential
      * AVOptions-enabled child.
      *
      * The difference between child_next and this is that
@@ -114,6 +117,12 @@
      * available since version (51 << 16 | 59 << 8 | 100)
      */
     AVClassCategory (*get_category)(void* ctx);
+
+    /**
+     * Callback to return the supported/allowed ranges.
+     * available since version (52.12)
+     */
+    int (*query_ranges)(struct AVOptionRanges **, void *obj, const char *key, int flags);
 } AVClass;
 
 /* av_log API */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/lzo.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/lzo.h Changed

@@ -32,18 +32,18 @@
 #include <stdint.h>
 
 /** @name Error flags returned by av_lzo1x_decode
-  * @{ */
+ * @{ */
 /// end of the input buffer reached before decoding finished
-#define AV_LZO_INPUT_DEPLETED 1
+#define AV_LZO_INPUT_DEPLETED  1
 /// decoded data did not fit into output buffer
-#define AV_LZO_OUTPUT_FULL 2
+#define AV_LZO_OUTPUT_FULL     2
 /// a reference to previously decoded data was wrong
 #define AV_LZO_INVALID_BACKPTR 4
 /// a non-specific error in the compressed bitstream
-#define AV_LZO_ERROR 8
+#define AV_LZO_ERROR           8
 /** @} */
 
-#define AV_LZO_INPUT_PADDING 8
+#define AV_LZO_INPUT_PADDING   8
 #define AV_LZO_OUTPUT_PADDING 12
 
 /**
@@ -60,17 +60,6 @@
 int av_lzo1x_decode(void *out, int *outlen, const void *in, int *inlen);
 
 /**
- * @brief deliberately overlapping memcpy implementation
- * @param dst destination buffer; must be padded with 12 additional bytes
- * @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
- *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
  * @}
  */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/mathematics.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/mathematics.h Changed

@@ -1,5 +1,5 @@
 /*
- * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
+ * copyright (c) 2005-2012 Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of FFmpeg.
  *
@@ -70,6 +70,7 @@
     AV_ROUND_DOWN     = 2, ///< Round toward -infinity.
     AV_ROUND_UP       = 3, ///< Round toward +infinity.
     AV_ROUND_NEAR_INF = 5, ///< Round to nearest and halfway cases away from zero.
+    AV_ROUND_PASS_MINMAX = 8192, ///< Flag to pass INT64_MIN/MAX through instead of rescaling, this avoids special cases for AV_NOPTS_VALUE
 };
 
 /**
@@ -88,6 +89,9 @@
 /**
  * Rescale a 64-bit integer with specified rounding.
  * A simple a*b/c isn't possible as it can overflow.
+ *
+ * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is
+ *         INT64_MIN or INT64_MAX then a is passed through unchanged.
  */
 int64_t av_rescale_rnd(int64_t a, int64_t b, int64_t c, enum AVRounding) av_const;
 
@@ -98,6 +102,9 @@
 
 /**
  * Rescale a 64-bit integer by 2 rational numbers with specified rounding.
+ *
+ * @return rescaled value a, or if AV_ROUND_PASS_MINMAX is set and a is
+ *         INT64_MIN or INT64_MAX then a is passed through unchanged.
  */
 int64_t av_rescale_q_rnd(int64_t a, AVRational bq, AVRational cq,
                          enum AVRounding) av_const;
@@ -123,6 +130,17 @@
 int64_t av_compare_mod(uint64_t a, uint64_t b, uint64_t mod);
 
 /**
+ * Rescale a timestamp while preserving known durations.
+ *
+ * @param in_ts Input timestamp
+ * @param in_tb Input timesbase
+ * @param fs_tb Duration and *last timebase
+ * @param duration duration till the next call
+ * @param out_tb Output timesbase
+ */
+int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts,  AVRational fs_tb, int duration, int64_t *last, AVRational out_tb);
+
+/**
  * @}
  */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/md5.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/md5.h Changed

@@ -32,16 +32,46 @@
  * @{
  */
 
-#if FF_API_CONTEXT_SIZE
-extern attribute_deprecated const int av_md5_size;
-#endif
+extern const int av_md5_size;
 
 struct AVMD5;
 
+/**
+ * Allocate an AVMD5 context.
+ */
 struct AVMD5 *av_md5_alloc(void);
+
+/**
+ * Initialize MD5 hashing.
+ *
+ * @param ctx pointer to the function context (of size av_md5_size)
+ */
 void av_md5_init(struct AVMD5 *ctx);
-void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, const int len);
+
+/**
+ * Update hash value.
+ *
+ * @param ctx hash function context
+ * @param src input data to update hash with
+ * @param len input data length
+ */
+void av_md5_update(struct AVMD5 *ctx, const uint8_t *src, int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param ctx hash function context
+ * @param dst buffer where output digest value is stored
+ */
 void av_md5_final(struct AVMD5 *ctx, uint8_t *dst);
+
+/**
+ * Hash an array of data.
+ *
+ * @param dst The output buffer to write the digest into
+ * @param src The data to hash
+ * @param len The length of the data, in bytes
+ */
 void av_md5_sum(uint8_t *dst, const uint8_t *src, const int len);
 
 /**

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/mem.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/mem.h Changed

@@ -27,6 +27,7 @@
 #define AVUTIL_MEM_H
 
 #include <limits.h>
+#include <stdint.h>
 
 #include "attributes.h"
 #include "error.h"
@@ -90,7 +91,7 @@
  * be allocated.
  * @see av_malloc()
  */
-av_alloc_size(1,2) static inline void *av_malloc_array(size_t nmemb, size_t size)
+av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
 {
     if (size <= 0 || nmemb >= INT_MAX / size)
         return NULL;
@@ -122,6 +123,32 @@
 void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
 
 /**
+ * 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.
+ * @param nmemb Number of elements
+ * @param size Size of the single element
+ * @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.
+ */
+av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, 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 pointer to a memory block already allocated
+ * with av_malloc(z)() or 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.
+ */
+av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
+
+/**
  * Free a memory block which has been allocated with av_malloc(z)() or
  * av_realloc().
  * @param ptr Pointer to the memory block which should be freed.
@@ -163,7 +190,7 @@
  * @see av_mallocz()
  * @see av_malloc_array()
  */
-av_alloc_size(1,2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
+av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
 {
     if (size <= 0 || nmemb >= INT_MAX / size)
         return NULL;
@@ -179,6 +206,14 @@
 char *av_strdup(const char *s) av_malloc_attrib;
 
 /**
+ * Duplicate the buffer p.
+ * @param p buffer to be duplicated
+ * @return Pointer to a newly allocated buffer containing a
+ * copy of p or NULL if the buffer cannot be allocated.
+ */
+void *av_memdup(const void *p, size_t size);
+
+/**
  * Free a memory block which has been allocated with av_malloc(z)() or
  * av_realloc() and set the pointer pointing to it to NULL.
  * @param ptr Pointer to the pointer to the memory block which should
@@ -190,13 +225,51 @@
 /**
  * Add an element to a dynamic array.
  *
- * @param tab_ptr Pointer to the array.
- * @param nb_ptr  Pointer to the number of elements in the array.
- * @param elem    Element to be added.
+ * The array to grow is supposed to be an array of pointers to
+ * structures, and the element to add must be a pointer to an already
+ * allocated structure.
+ *
+ * The array is reallocated when its size reaches powers of 2.
+ * Therefore, the amortized cost of adding an element is constant.
+ *
+ * In case of success, the pointer to the array is updated in order to
+ * point to the new grown array, and the number pointed to by nb_ptr
+ * is incremented.
+ * In case of failure, the array is freed, *tab_ptr is set to NULL and
+ * *nb_ptr is set to 0.
+ *
+ * @param tab_ptr pointer to the array to grow
+ * @param nb_ptr  pointer to the number of elements in the array
+ * @param elem    element to add
+ * @see av_dynarray2_add()
  */
 void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem);
 
 /**
+ * Add an element of size elem_size to a dynamic array.
+ *
+ * The array is reallocated when its number of elements reaches powers of 2.
+ * Therefore, the amortized cost of adding an element is constant.
+ *
+ * In case of success, the pointer to the array is updated in order to
+ * point to the new grown array, and the number pointed to by nb_ptr
+ * is incremented.
+ * In case of failure, the array is freed, *tab_ptr is set to NULL and
+ * *nb_ptr is set to 0.
+ *
+ * @param tab_ptr   pointer to the array to grow
+ * @param nb_ptr    pointer to the number of elements in the array
+ * @param elem_size size in bytes of the elements in the array
+ * @param elem_data pointer to the data of the element to add. If NULL, the space of
+ *                  the new added element is not filled.
+ * @return          pointer to the data of the element to copy in the new allocated space.
+ *                  If NULL, the new allocated space is left uninitialized."
+ * @see av_dynarray_add()
+ */
+void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size,
+                       const uint8_t *elem_data);
+
+/**
  * Multiply two size_t values checking for overflow.
  * @return  0 if success, AVERROR(EINVAL) if overflow.
  */
@@ -217,6 +290,17 @@
 void av_max_alloc(size_t max);
 
 /**
+ * @brief 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
+ *
+ * cnt > back is valid, this will copy the bytes we just copied,
+ * thus creating a repeating pattern with a period length of back.
+ */
+void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
+
+/**
  * @}
  */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/murmur3.h Added

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2013 Reimar Döffinger <Reimar.Doeffinger@gmx.de>
+ *
+ * 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_MURMUR3_H
+#define AVUTIL_MURMUR3_H
+
+#include <stdint.h>
+
+struct AVMurMur3 *av_murmur3_alloc(void);
+void av_murmur3_init_seeded(struct AVMurMur3 *c, uint64_t seed);
+void av_murmur3_init(struct AVMurMur3 *c);
+void av_murmur3_update(struct AVMurMur3 *c, const uint8_t *src, int len);
+void av_murmur3_final(struct AVMurMur3 *c, uint8_t dst[16]);
+
+#endif /* AVUTIL_MURMUR3_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/old_pix_fmts.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/old_pix_fmts.h Changed

@@ -67,11 +67,13 @@
     PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
     PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
     PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
     PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
     PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
     PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
 
@@ -95,7 +97,9 @@
     PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
     PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
     PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
     PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
     PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
 
     PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/opt.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/opt.h Changed

@@ -31,6 +31,8 @@
 #include "avutil.h"
 #include "dict.h"
 #include "log.h"
+#include "pixfmt.h"
+#include "samplefmt.h"
 
 /**
  * @defgroup avoptions AVOptions
@@ -62,7 +64,7 @@
  *     int      bin_len;
  * } test_struct;
  *
- * static const AVOption options[] = {
+ * static const AVOption test_options[] = {
  *   { "test_int", "This is a test option of int type.", offsetof(test_struct, int_opt),
  *     AV_OPT_TYPE_INT, { .i64 = -1 }, INT_MIN, INT_MAX },
  *   { "test_str", "This is a test option of string type.", offsetof(test_struct, str_opt),
@@ -75,7 +77,7 @@
  * static const AVClass test_class = {
  *     .class_name = "test class",
  *     .item_name  = av_default_item_name,
- *     .option     = options,
+ *     .option     = test_options,
  *     .version    = LIBAVUTIL_VERSION_INT,
  * };
  * @endcode
@@ -161,7 +163,7 @@
  *
  * @subsection avoptions_implement_named_constants Named constants
  *      It is possible to create named constants for options. Simply set the unit
- *      field of the option the constants should apply to to a string and
+ *      field of the option the constants should apply to a string and
  *      create the constants themselves as options of type AV_OPT_TYPE_CONST
  *      with their unit field set to the same string.
  *      Their default_val field should contain the value of the named
@@ -227,6 +229,10 @@
     AV_OPT_TYPE_CONST = 128,
     AV_OPT_TYPE_IMAGE_SIZE = MKBETAG('S','I','Z','E'), ///< offset must point to two consecutive integers
     AV_OPT_TYPE_PIXEL_FMT  = MKBETAG('P','F','M','T'),
+    AV_OPT_TYPE_SAMPLE_FMT = MKBETAG('S','F','M','T'),
+    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'),
 #if FF_API_OLD_AVOPTIONS
     FF_OPT_TYPE_FLAGS = 0,
     FF_OPT_TYPE_INT,
@@ -290,6 +296,25 @@
     const char *unit;
 } AVOption;
 
+/**
+ * A single allowed range of values, or a single allowed value.
+ */
+typedef struct AVOptionRange {
+    const char *str;
+    double value_min, value_max;             ///< For string ranges this represents the min/max length, for dimensions this represents the min/max pixel count
+    double component_min, component_max;     ///< For string this represents the unicode range for chars, 0-127 limits to ASCII
+    int is_range;                            ///< if set to 1 the struct encodes a range, if set to 0 a single value
+} AVOptionRange;
+
+/**
+ * List of AVOptionRange structs
+ */
+typedef struct AVOptionRanges {
+    AVOptionRange **range;
+    int nb_ranges;
+} AVOptionRanges;
+
+
 #if FF_API_FIND_OPT
 /**
  * Look for an option in obj. Look only for the options which
@@ -438,7 +463,7 @@
  */
 int av_opt_flag_is_set(void *obj, const char *field_name, const char *flag_name);
 
-/*
+/**
  * Set all the options from a given dictionary on an object.
  *
  * @param obj a struct whose first element is a pointer to AVClass
@@ -455,6 +480,39 @@
 int av_opt_set_dict(void *obj, struct AVDictionary **options);
 
 /**
+ * Extract a key-value pair from the beginning of a string.
+ *
+ * @param ropts        pointer to the options string, will be updated to
+ *                     point to the rest of the string (one of the pairs_sep
+ *                     or the final NUL)
+ * @param key_val_sep  a 0-terminated list of characters used to separate
+ *                     key from value, for example '='
+ * @param pairs_sep    a 0-terminated list of characters used to separate
+ *                     two pairs from each other, for example ':' or ','
+ * @param flags        flags; see the AV_OPT_FLAG_* values below
+ * @param rkey         parsed key; must be freed using av_free()
+ * @param rval         parsed value; must be freed using av_free()
+ *
+ * @return  >=0 for success, or a negative value corresponding to an
+ *          AVERROR code in case of error; in particular:
+ *          AVERROR(EINVAL) if no key is present
+ *
+ */
+int av_opt_get_key_value(const char **ropts,
+                         const char *key_val_sep, const char *pairs_sep,
+                         unsigned flags,
+                         char **rkey, char **rval);
+
+enum {
+
+    /**
+     * Accept to parse a value without a key; the key will then be returned
+     * as NULL.
+     */
+    AV_OPT_FLAG_IMPLICIT_KEY = 1,
+};
+
+/**
  * @defgroup opt_eval_funcs Evaluating option strings
  * @{
  * This group of functions can be used to evaluate option strings
@@ -595,6 +653,26 @@
 int av_opt_set_double(void *obj, const char *name, double      val, int search_flags);
 int av_opt_set_q     (void *obj, const char *name, AVRational  val, int search_flags);
 int av_opt_set_bin   (void *obj, const char *name, const uint8_t *val, int size, int search_flags);
+int av_opt_set_image_size(void *obj, const char *name, int w, int h, int search_flags);
+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);
+
+/**
+ * Set a binary option to an integer list.
+ *
+ * @param obj    AVClass object to set options on
+ * @param name   name of the binary option
+ * @param val    pointer to an integer list (must have the correct type with
+ *               regard to the contents of the list)
+ * @param term   list terminator (usually 0 or -1)
+ * @param flags  search flags
+ */
+#define av_opt_set_int_list(obj, name, val, term, flags) \
+    (av_int_list_length(val, term) > INT_MAX / sizeof(*(val)) ? \
+     AVERROR(EINVAL) : \
+     av_opt_set_bin(obj, name, (const uint8_t *)(val), \
+                    av_int_list_length(val, term) * sizeof(*(val)), flags))
 /**
  * @}
  */
@@ -618,6 +696,10 @@
 int av_opt_get_int   (void *obj, const char *name, int search_flags, int64_t    *out_val);
 int av_opt_get_double(void *obj, const char *name, int search_flags, double     *out_val);
 int av_opt_get_q     (void *obj, const char *name, int search_flags, AVRational *out_val);
+int av_opt_get_image_size(void *obj, const char *name, int search_flags, int *w_out, int *h_out);
+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);
 /**
  * @}
  */
@@ -630,6 +712,41 @@
  *          or written to.
  */
 void *av_opt_ptr(const AVClass *avclass, void *obj, const char *name);
+
+/**
+ * Free an AVOptionRanges struct and set it to NULL.
+ */
+void av_opt_freep_ranges(AVOptionRanges **ranges);
+
+/**
+ * Get a list of allowed ranges for the given option.
+ *
+ * The returned list may depend on other fields in obj like for example profile.
+ *
+ * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored
+ *              AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance
+ *
+ * The result must be freed with av_opt_freep_ranges.
+ *
+ * @return >= 0 on success, a negative errro code otherwise
+ */
+int av_opt_query_ranges(AVOptionRanges **, void *obj, const char *key, int flags);
+
+/**
+ * Get a default list of allowed ranges for the given option.
+ *
+ * This list is constructed without using the AVClass.query_ranges() callback
+ * and can be used as fallback from within the callback.
+ *
+ * @param flags is a bitmask of flags, undefined flags should not be set and should be ignored
+ *              AV_OPT_SEARCH_FAKE_OBJ indicates that the obj is a double pointer to a AVClass instead of a full instance
+ *
+ * The result must be freed with av_opt_free_ranges.
+ *
+ * @return >= 0 on success, a negative errro code otherwise
+ */
+int av_opt_query_ranges_default(AVOptionRanges **, void *obj, const char *key, int flags);
+
 /**
  * @}
  */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/parseutils.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/parseutils.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/pixdesc.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/pixdesc.h Changed

@@ -23,6 +23,8 @@
 #define AVUTIL_PIXDESC_H
 
 #include <inttypes.h>
+
+#include "attributes.h"
 #include "pixfmt.h"
 
 typedef struct AVComponentDescriptor{
@@ -86,24 +88,60 @@
     AVComponentDescriptor comp[4];
 }AVPixFmtDescriptor;
 
-#define PIX_FMT_BE        1 ///< Pixel format is big-endian.
-#define PIX_FMT_PAL       2 ///< Pixel format has a palette in data[1], values are indexes in this palette.
-#define PIX_FMT_BITSTREAM 4 ///< All values of a component are bit-wise packed end to end.
-#define PIX_FMT_HWACCEL   8 ///< Pixel format is an HW accelerated format.
-#define PIX_FMT_PLANAR   16 ///< At least one pixel component is not in the first data plane
-#define PIX_FMT_RGB      32 ///< The pixel format contains RGB-like data (as opposed to YUV/grayscale)
+/**
+ * Pixel format is big-endian.
+ */
+#define AV_PIX_FMT_FLAG_BE           (1 << 0)
+/**
+ * Pixel format has a palette in data[1], values are indexes in this palette.
+ */
+#define AV_PIX_FMT_FLAG_PAL          (1 << 1)
+/**
+ * All values of a component are bit-wise packed end to end.
+ */
+#define AV_PIX_FMT_FLAG_BITSTREAM    (1 << 2)
+/**
+ * Pixel format is an HW accelerated format.
+ */
+#define AV_PIX_FMT_FLAG_HWACCEL      (1 << 3)
+/**
+ * At least one pixel component is not in the first data plane.
+ */
+#define AV_PIX_FMT_FLAG_PLANAR       (1 << 4)
+/**
+ * The pixel format contains RGB-like data (as opposed to YUV/grayscale).
+ */
+#define AV_PIX_FMT_FLAG_RGB          (1 << 5)
 /**
  * The pixel format is "pseudo-paletted". This means that FFmpeg treats it as
  * paletted internally, but the palette is generated by the decoder and is not
  * stored in the file.
  */
-#define PIX_FMT_PSEUDOPAL 64
+#define AV_PIX_FMT_FLAG_PSEUDOPAL    (1 << 6)
+/**
+ * The pixel format has an alpha channel.
+ */
+#define AV_PIX_FMT_FLAG_ALPHA        (1 << 7)
+
+#if FF_API_PIX_FMT
+/**
+ * @deprecate use the AV_PIX_FMT_FLAG_* flags
+ */
+#define PIX_FMT_BE        AV_PIX_FMT_FLAG_BE
+#define PIX_FMT_PAL       AV_PIX_FMT_FLAG_PAL
+#define PIX_FMT_BITSTREAM AV_PIX_FMT_FLAG_BITSTREAM
+#define PIX_FMT_HWACCEL   AV_PIX_FMT_FLAG_HWACCEL
+#define PIX_FMT_PLANAR    AV_PIX_FMT_FLAG_PLANAR
+#define PIX_FMT_RGB       AV_PIX_FMT_FLAG_RGB
+#define PIX_FMT_PSEUDOPAL AV_PIX_FMT_FLAG_PSEUDOPAL
+#define PIX_FMT_ALPHA     AV_PIX_FMT_FLAG_ALPHA
+#endif
 
 #if FF_API_PIX_FMT_DESC
 /**
  * The array of all the pixel format descriptors.
  */
-extern const AVPixFmtDescriptor av_pix_fmt_descriptors[];
+extern attribute_deprecated const AVPixFmtDescriptor av_pix_fmt_descriptors[];
 #endif
 
 /**
@@ -165,7 +203,7 @@
 
 /**
  * Print in buf the string corresponding to the pixel format with
- * number pix_fmt, or an header if pix_fmt is negative.
+ * number pix_fmt, or a header if pix_fmt is negative.
  *
  * @param buf the buffer where to write the string
  * @param buf_size the size of buf
@@ -177,7 +215,8 @@
 
 /**
  * Return the number of bits per pixel used by the pixel format
- * described by pixdesc.
+ * described by pixdesc. Note that this is not the same as the number
+ * of bits per sample.
  *
  * The returned number of bits refers to the number of bits actually
  * used for storing the pixel information, that is padding bits are
@@ -186,6 +225,12 @@
 int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
 
 /**
+ * Return the number of bits per pixel for the pixel format
+ * described by pixdesc, including any padding or unused bits.
+ */
+int av_get_padded_bits_per_pixel(const AVPixFmtDescriptor *pixdesc);
+
+/**
  * @return a pixel format descriptor for provided pixel format or NULL if
  * this pixel format is unknown.
  */
@@ -206,4 +251,41 @@
  */
 enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc);
 
+/**
+ * Utility function to access log2_chroma_w log2_chroma_h from
+ * the pixel format AVPixFmtDescriptor.
+ *
+ * See avcodec_get_chroma_sub_sample() for a function that asserts a
+ * valid pixel format instead of returning an error code.
+ * Its recommanded that you use avcodec_get_chroma_sub_sample unless
+ * you do check the return code!
+ *
+ * @param[in]  pix_fmt the pixel format
+ * @param[out] h_shift store log2_chroma_w
+ * @param[out] v_shift store log2_chroma_h
+ *
+ * @return 0 on success, AVERROR(ENOSYS) on invalid or unknown pixel format
+ */
+int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt,
+                                     int *h_shift, int *v_shift);
+
+/**
+ * @return number of planes in pix_fmt, a negative AVERROR if pix_fmt is not a
+ * valid pixel format.
+ */
+int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt);
+
+void ff_check_pixfmt_descriptors(void);
+
+/**
+ * Utility function to swap the endianness of a pixel format.
+ *
+ * @param[in]  pix_fmt the pixel format
+ *
+ * @return pixel format with swapped endianness if it exists,
+ * otherwise AV_PIX_FMT_NONE
+ */
+enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt);
+
+
 #endif /* AVUTIL_PIXDESC_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/pixfmt.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/pixfmt.h Changed

@@ -37,17 +37,17 @@
  * Pixel format.
  *
  * @note
- * PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
+ * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
  * color is put together as:
  *  (A << 24) | (R << 16) | (G << 8) | B
  * This is stored as BGRA on little-endian CPU architectures and ARGB on
  * big-endian CPUs.
  *
  * @par
- * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized
+ * When the pixel format is palettized RGB (AV_PIX_FMT_PAL8), the palettized
  * image data is stored in AVFrame.data[0]. The palette is transported in
  * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in PIX_FMT_RGB32 described above (i.e., it is
+ * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
  * also endian-specific). Note also that the individual RGB palette
  * components stored in AVFrame.data[1] should be in the range 0..255.
  * This is important as many custom PAL8 video codecs that were designed
@@ -59,9 +59,9 @@
  * 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
- * this allows simpler detection of big vs little endian.
+ * 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 {
     AV_PIX_FMT_NONE = -1,
@@ -103,11 +103,13 @@
     AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
     AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
     AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
+#if FF_API_VDPAU
     AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
     AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
     AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
     AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
 
@@ -131,7 +133,9 @@
     AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
     AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
     AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
+#if FF_API_VDPAU
     AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
+#endif
     AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
 
     AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
@@ -142,9 +146,11 @@
     AV_PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
     AV_PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
 
-    //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
-    //If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately
-    //is better
+    /**
+     * The following 12 formats have the disadvantage of needing 1 format for each bit depth.
+     * Notice that each 9/10 bits sample is stored in 16 bits with extra padding.
+     * If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately is better.
+     */
     AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
     AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
     AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
@@ -166,12 +172,12 @@
     AV_PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
 #endif
     AV_PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
-    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
-    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
-    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
-    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
-    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
+    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big-endian
+    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little-endian
+    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big-endian
+    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little-endian
+    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big-endian
+    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little-endian
 
     /**
      * duplicated pixel formats for compatibility with libav.
@@ -181,6 +187,30 @@
     AV_PIX_FMT_YUVA422P_LIBAV,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
     AV_PIX_FMT_YUVA444P_LIBAV,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
 
+    AV_PIX_FMT_YUVA420P9BE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA420P9LE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA422P9BE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA422P9LE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA444P9BE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
+    AV_PIX_FMT_YUVA444P9LE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
+    AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
+    AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
+    AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
+
+    AV_PIX_FMT_VDPAU,     ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface
+
+    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
+
 #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
     AV_PIX_FMT_RGBA64LE,  ///< 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 little-endian
@@ -206,11 +236,14 @@
     AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
     AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
     AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big endian
-    AV_PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little endian
-    AV_PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big endian
-    AV_PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little endian
-
+    AV_PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big-endian
+    AV_PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little-endian
+    AV_PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big-endian
+    AV_PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little-endian
+    AV_PIX_FMT_GBRAP,       ///< planar GBRA 4:4:4:4 32bpp
+    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_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
@@ -218,7 +251,7 @@
 #endif
 };
 
-#if AV_HAVE_INCOMPATIBLE_FORK_ABI
+#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
 #define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV
 #define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV
 #endif
@@ -274,6 +307,18 @@
 #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_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
+#define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
+#define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
+#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
+#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
+#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
+#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
+#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
+#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
+
+#define AV_PIX_FMT_XYZ12      AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
+
 #if FF_API_PIX_FMT
 #define PixelFormat AVPixelFormat

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/rational.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/rational.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/ripemd.h Added

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2013 James Almer <jamrial@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_RIPEMD_H
+#define AVUTIL_RIPEMD_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_ripemd RIPEMD
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_ripemd_size;
+
+struct AVRIPEMD;
+
+/**
+ * Allocate an AVRIPEMD context.
+ */
+struct AVRIPEMD *av_ripemd_alloc(void);
+
+/**
+ * Initialize RIPEMD hashing.
+ *
+ * @param context pointer to the function context (of size av_ripemd_size)
+ * @param bits    number of bits in digest (128, 160, 256 or 320 bits)
+ * @return        zero if initialization succeeded, -1 otherwise
+ */
+int av_ripemd_init(struct AVRIPEMD* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data    input data to update hash with
+ * @param len     input data length
+ */
+void av_ripemd_update(struct AVRIPEMD* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest  buffer where output digest value is stored
+ */
+void av_ripemd_final(struct AVRIPEMD* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_RIPEMD_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/samplefmt.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/samplefmt.h Changed

@@ -37,7 +37,7 @@
  * [-1.0, 1.0]. Any values outside this range are beyond full volume level.
  *
  * @par
- * The data layout as used in av_samples_fill_arrays() and elsewhere in Libav
+ * The data layout as used in av_samples_fill_arrays() and elsewhere in FFmpeg
  * (such as AVFrame in libavcodec) is as follows:
  *
  * For planar sample formats, each audio channel is in a separate data plane,
@@ -183,7 +183,9 @@
  * @param nb_samples       the number of samples in a single channel
  * @param sample_fmt       the sample format
  * @param align            buffer size alignment (0 = default, 1 = no alignment)
- * @return                 0 on success or a negative error code on failure
+ * @return                 >=0 on success or a negative error code on failure
+ * @todo return minimum size in bytes required for the buffer in case
+ * of success at the next bump
  */
 int av_samples_fill_arrays(uint8_t **audio_data, int *linesize,
                            const uint8_t *buf,
@@ -204,13 +206,27 @@
  * @param nb_channels      number of audio channels
  * @param nb_samples       number of samples per channel
  * @param align            buffer size alignment (0 = default, 1 = no alignment)
- * @return                 0 on success or a negative error code on failure
+ * @return                 >=0 on success or a negative error code on failure
+ * @todo return the size of the allocated buffer in case of success at the next bump
  * @see av_samples_fill_arrays()
+ * @see av_samples_alloc_array_and_samples()
  */
 int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels,
                      int nb_samples, enum AVSampleFormat sample_fmt, int align);
 
 /**
+ * Allocate a data pointers array, samples buffer for nb_samples
+ * samples, and fill data pointers and linesize accordingly.
+ *
+ * This is the same as av_samples_alloc(), but also allocates the data
+ * pointers array.
+ *
+ * @see av_samples_alloc()
+ */
+int av_samples_alloc_array_and_samples(uint8_t ***audio_data, int *linesize, int nb_channels,
+                                       int nb_samples, enum AVSampleFormat sample_fmt, int align);
+
+/**
  * Copy samples from src to dst.
  *
  * @param dst destination array of pointers to data planes

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/sha.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/sha.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/sha512.h Added

@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni@gmx.at>
+ * Copyright (C) 2013 James Almer <jamrial@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_SHA512_H
+#define AVUTIL_SHA512_H
+
+#include <stdint.h>
+
+#include "attributes.h"
+#include "version.h"
+
+/**
+ * @defgroup lavu_sha512 SHA512
+ * @ingroup lavu_crypto
+ * @{
+ */
+
+extern const int av_sha512_size;
+
+struct AVSHA512;
+
+/**
+ * Allocate an AVSHA512 context.
+ */
+struct AVSHA512 *av_sha512_alloc(void);
+
+/**
+ * Initialize SHA-2 512 hashing.
+ *
+ * @param context pointer to the function context (of size av_sha512_size)
+ * @param bits    number of bits in digest (224, 256, 384 or 512 bits)
+ * @return        zero if initialization succeeded, -1 otherwise
+ */
+int av_sha512_init(struct AVSHA512* context, int bits);
+
+/**
+ * Update hash value.
+ *
+ * @param context hash function context
+ * @param data    input data to update hash with
+ * @param len     input data length
+ */
+void av_sha512_update(struct AVSHA512* context, const uint8_t* data, unsigned int len);
+
+/**
+ * Finish hashing and output digest value.
+ *
+ * @param context hash function context
+ * @param digest  buffer where output digest value is stored
+ */
+void av_sha512_final(struct AVSHA512* context, uint8_t *digest);
+
+/**
+ * @}
+ */
+
+#endif /* AVUTIL_SHA512_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/timecode.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/timecode.h Changed

@@ -49,16 +49,6 @@
  * Adjust frame number for NTSC drop frame time code.
  *
  * @param framenum frame number to adjust
- * @return         adjusted frame number
- * @warning        adjustment is only valid in NTSC 29.97
- * @deprecated     use av_timecode_adjust_ntsc_framenum2 instead
- */
-attribute_deprecated int av_timecode_adjust_ntsc_framenum(int framenum);
-
-/**
- * Adjust frame number for NTSC drop frame time code.
- *
- * @param framenum frame number to adjust
  * @param fps      frame per second, 30 or 60
  * @return         adjusted frame number
  * @warning        adjustment is only valid in NTSC 29.97 and 59.94
@@ -73,7 +63,7 @@
  * @return         the SMPTE binary representation
  *
  * @note Frame number adjustment is automatically done in case of drop timecode,
- *       you do NOT have to call av_timecode_adjust_ntsc_framenum().
+ *       you do NOT have to call av_timecode_adjust_ntsc_framenum2().
  * @note The frame number is relative to tc->start.
  * @note Color frame (CF), binary group flags (BGF) and biphase mark polarity
  *       correction (PC) bits are set to zero.

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/timestamp.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/timestamp.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libavutil/version.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libavutil/version.h Changed

@@ -74,8 +74,8 @@
  * @{
  */
 
-#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 76
+#define LIBAVUTIL_VERSION_MAJOR  52
+#define LIBAVUTIL_VERSION_MINOR  42
 #define LIBAVUTIL_VERSION_MICRO 100
 
 #define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -99,35 +99,44 @@
  * @{
  */
 
-#ifndef FF_API_OLD_EVAL_NAMES
-#define FF_API_OLD_EVAL_NAMES           (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
 #ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 #ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
-#ifndef FF_API_AV_FIFO_PEEK
-#define FF_API_AV_FIFO_PEEK             (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 #ifndef FF_API_OLD_AVOPTIONS
-#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 52)
-#endif
-#ifndef FF_API_OLD_TC_ADJUST_FRAMENUM
-#define FF_API_OLD_TC_ADJUST_FRAMENUM   (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 #ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 #ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 #ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 #ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 52)
+#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_AUDIOCONVERT
+#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_CPU_FLAG_MMX2
+#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
+#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_LLS_PRIVATE
+#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_AVFRAME_LAVC
+#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 53)
+#endif
+#ifndef FF_API_VDPAU
+#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 53)
 #endif
 
 /**

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libswscale/swscale.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libswscale/swscale.h Changed

@@ -23,8 +23,13 @@
 
 /**
  * @file
- * @brief
- *     external api for the swscale stuff
+ * @ingroup lsws
+ * external API header
+ */
+
+/**
+ * @defgroup lsws Libswscale
+ * @{
  */
 
 #include <stdint.h>
@@ -77,6 +82,7 @@
 #define SWS_DIRECT_BGR        0x8000
 #define SWS_ACCURATE_RND      0x40000
 #define SWS_BITEXACT          0x80000
+#define SWS_ERROR_DIFFUSION  0x800000
 
 #if FF_API_SWS_CPU_CAPS
 /**
@@ -85,9 +91,7 @@
  */
 #define SWS_CPU_CAPS_MMX      0x80000000
 #define SWS_CPU_CAPS_MMXEXT   0x20000000
-#if LIBSWSCALE_VERSION_MAJOR < 3
 #define SWS_CPU_CAPS_MMX2     0x20000000
-#endif
 #define SWS_CPU_CAPS_3DNOW    0x40000000
 #define SWS_CPU_CAPS_ALTIVEC  0x10000000
 #define SWS_CPU_CAPS_BFIN     0x01000000
@@ -143,6 +147,13 @@
 int sws_isSupportedOutput(enum AVPixelFormat pix_fmt);
 
 /**
+ * @param[in]  pix_fmt the pixel format
+ * @return a positive value if an endianness conversion for pix_fmt is
+ * supported, 0 otherwise.
+ */
+int sws_isSupportedEndiannessConversion(enum AVPixelFormat pix_fmt);
+
+/**
  * Allocate an empty SwsContext. This must be filled and passed to
  * sws_init_context(). For filling see AVOptions, options.c and
  * sws_setColorspaceDetails().
@@ -344,4 +355,8 @@
  */
 const AVClass *sws_get_class(void);
 
+/**
+ * @}
+ */
+
 #endif /* SWSCALE_SWSCALE_H */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/libswscale/version.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/libswscale/version.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/openHevcWrapper.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/openHevcWrapper.h Changed

@@ -1,65 +1,72 @@
-#ifndef OPEN_HEVC_WRAPPER_H
-#define OPEN_HEVC_WRAPPER_H
-
-#define NV_VERSION  "1.2" ///< Current software version
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-
-typedef void* OpenHevc_Handle;
-
-typedef struct OpenHevc_Rational{
-    int num; ///< numerator
-    int den; ///< denominator
-} OpenHevc_Rational;
-
-typedef struct OpenHevc_FrameInfo
-{
-   int         nYPitch;
-   int         nUPitch;
-   int         nVPitch;
-   int         nBitDepth;
-   int         nWidth;
-   int         nHeight;
-   OpenHevc_Rational  sample_aspect_ratio;
-   OpenHevc_Rational  frameRate;
-   int         display_picture_number;
-   int         flag; //progressive, interlaced, interlaced top field first, interlaced bottom field first.
-   int64_t     nTimeStamp;
-} OpenHevc_FrameInfo;
-
-typedef struct OpenHevc_Frame
-{
-   void**      pvY;
-   void**      pvU;
-   void**      pvV;
-   OpenHevc_FrameInfo frameInfo;
-} OpenHevc_Frame;
-
-typedef struct OpenHevc_Frame_cpy
-{
-   void*        pvY;
-   void*        pvU;
-   void*        pvV;
-   OpenHevc_FrameInfo frameInfo;
-} OpenHevc_Frame_cpy;
-
-OpenHevc_Handle libOpenHevcInit(int nb_pthreads);
-int  libOpenHevcDecode(OpenHevc_Handle openHevcHandle, const unsigned char *buff, int nal_len, int64_t pts);
-void libOpenHevcGetPictureInfo(OpenHevc_Handle openHevcHandle, OpenHevc_FrameInfo *openHevcFrameInfo);
-void libOpenHevcGetPictureSize2(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 libOpenHevcClose(OpenHevc_Handle openHevcHandle);
-void libOpenHevcFlush(OpenHevc_Handle openHevcHandle);
-const char *libOpenHevcVersion(OpenHevc_Handle openHevcHandle);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif // OPEN_HEVC_WRAPPER_H
+#ifndef OPEN_HEVC_WRAPPER_H
+#define OPEN_HEVC_WRAPPER_H
+
+#define NV_VERSION  "1.2" ///< Current software version
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+
+typedef void* OpenHevc_Handle;
+
+typedef struct OpenHevc_Rational{
+    int num; ///< numerator
+    int den; ///< denominator
+} OpenHevc_Rational;
+
+typedef struct OpenHevc_FrameInfo
+{
+   int         nYPitch;
+   int         nUPitch;
+   int         nVPitch;
+   int         nBitDepth;
+   int         nWidth;
+   int         nHeight;
+   OpenHevc_Rational  sample_aspect_ratio;
+   OpenHevc_Rational  frameRate;
+   int         display_picture_number;
+   int         flag; //progressive, interlaced, interlaced top field first, interlaced bottom field first.
+   int64_t     nTimeStamp;
+} OpenHevc_FrameInfo;
+
+typedef struct OpenHevc_Frame
+{
+   void**      pvY;
+   void**      pvU;
+   void**      pvV;
+   OpenHevc_FrameInfo frameInfo;
+} OpenHevc_Frame;
+
+typedef struct OpenHevc_Frame_cpy
+{
+   void*        pvY;
+   void*        pvU;
+   void*        pvV;
+   OpenHevc_FrameInfo frameInfo;
+} OpenHevc_Frame_cpy;
+
+OpenHevc_Handle libOpenHevcInit(int nb_pthreads, int thread_type);
+int libOpenHevcStartDecoder(OpenHevc_Handle openHevcHandle);
+int  libOpenHevcDecode(OpenHevc_Handle openHevcHandle, const unsigned char *buff, int nal_len, int64_t pts);
+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);
+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 libOpenHevcClose(OpenHevc_Handle openHevcHandle);
+void libOpenHevcFlush(OpenHevc_Handle openHevcHandle);
+const char *libOpenHevcVersion(OpenHevc_Handle openHevcHandle);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // OPEN_HEVC_WRAPPER_H

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/Neptune.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/Neptune.h Changed

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptAutomaticCleaner.h Added

@@ -0,0 +1,90 @@
+/*****************************************************************
+|
+|   Neptune - Automatic Cleaner
+|
+| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
+| All rights reserved.
+|
+| Redistribution and use in source and binary forms, with or without
+| modification, are permitted provided that the following conditions are met:
+|     * Redistributions of source code must retain the above copyright
+|       notice, this list of conditions and the following disclaimer.
+|     * Redistributions in binary form must reproduce the above copyright
+|       notice, this list of conditions and the following disclaimer in the
+|       documentation and/or other materials provided with the distribution.
+|     * Neither the name of Axiomatic Systems nor the
+|       names of its contributors may be used to endorse or promote products
+|       derived from this software without specific prior written permission.
+|
+| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
+| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
+| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+|
+****************************************************************/
+
+#ifndef _NPT_AUTOMATIC_CLEANER_H_
+#define _NPT_AUTOMATIC_CLEANER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptList.h"
+
+/*----------------------------------------------------------------------
+|   NPT_AutomaticCleaner
++---------------------------------------------------------------------*/
+class NPT_AutomaticCleaner
+{
+public:
+    class Singleton {
+    public:
+        virtual ~Singleton() {}
+    };
+    
+    // singleton management
+    class Cleaner {
+        static Cleaner AutomaticCleaner;
+        ~Cleaner() {
+            if (Instance) {
+                delete Instance;
+                Instance = NULL;
+            }
+        }
+    };
+    static NPT_AutomaticCleaner* GetInstance();
+    static void Shutdown() {
+        if (Instance) {
+            delete Instance;
+            Instance = NULL;
+        }
+	}
+    
+    // destructor
+    ~NPT_AutomaticCleaner();
+    
+    // methods
+    NPT_Result Register(Singleton* singleton);
+    NPT_Result RegisterTlsContext(Singleton* singleton);
+    NPT_Result RegisterHttpConnectionManager(Singleton* singleton);
+    
+private:
+    // class members
+    static NPT_AutomaticCleaner* Instance;
+    
+    // constructor
+    NPT_AutomaticCleaner();
+    
+    // members
+    NPT_List<Singleton*> m_Singletons;
+    Singleton* m_TlsContext;
+    Singleton* m_HttpConnectionManager;
+};
+
+#endif // _NPT_AUTOMATIC_CLEANER_H_

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptAutoreleasePool.h Added

@@ -0,0 +1,57 @@
+/*****************************************************************
+|
+|   Neptune - AutoreleasePool
+|
+| Copyright (c) 2002-2008, Axiomatic Systems, LLC.
+| All rights reserved.
+|
+| Redistribution and use in source and binary forms, with or without
+| modification, are permitted provided that the following conditions are met:
+|     * Redistributions of source code must retain the above copyright
+|       notice, this list of conditions and the following disclaimer.
+|     * Redistributions in binary form must reproduce the above copyright
+|       notice, this list of conditions and the following disclaimer in the
+|       documentation and/or other materials provided with the distribution.
+|     * Neither the name of Axiomatic Systems nor the
+|       names of its contributors may be used to endorse or promote products
+|       derived from this software without specific prior written permission.
+|
+| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
+| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
+| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+|
+ ****************************************************************/
+
+#ifndef _NPT_AUTORELEASE_POOL_H_
+#define _NPT_AUTORELEASE_POOL_H_
+
+/*----------------------------------------------------------------------
+|   NPT_AutoreleasePoolInterface
++---------------------------------------------------------------------*/
+class NPT_AutoreleasePoolInterface 
+{
+public:
+    virtual ~NPT_AutoreleasePoolInterface() {}
+};
+
+/*----------------------------------------------------------------------
+|   NPT_AutoreleasePool
++---------------------------------------------------------------------*/
+class NPT_AutoreleasePool : public NPT_AutoreleasePoolInterface 
+{
+public:
+    NPT_AutoreleasePool();
+    virtual ~NPT_AutoreleasePool();
+
+private:
+    NPT_AutoreleasePoolInterface* m_Delegate;
+};
+
+#endif // _NPT_AUTORELEASE_POOL_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptCommon.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptCommon.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptConfig.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptConfig.h Changed

@@ -37,9 +37,12 @@
 +---------------------------------------------------------------------*/
 #define NPT_CONFIG_HAVE_ASSERT_H
 #define NPT_CONFIG_HAVE_STD_C
+#define NPT_CONFIG_HAVE_POSIX_TIME
+#define NPT_CONFIG_HAVE_ASSERT_H
 #define NPT_CONFIG_HAVE_STDLIB_H
 #define NPT_CONFIG_HAVE_STDIO_H
 #define NPT_CONFIG_HAVE_STDARG_H
+#define NPT_CONFIG_HAVE_STDINT_H
 #define NPT_CONFIG_HAVE_STRING_H
 #define NPT_CONFIG_HAVE_LIMITS_H
 
@@ -55,9 +58,18 @@
 #define NPT_CONFIG_HAVE_MEMSET
 #define NPT_CONFIG_HAVE_MEMCMP
 #define NPT_CONFIG_HAVE_GETENV
+#define NPT_CONFIG_HAVE_SETENV
+#define NPT_CONFIG_HAVE_UNSETENV
 #define NPT_CONFIG_HAVE_READDIR_R
 #endif /* NPT_CONFIG_HAS_STD_C */
 
+#if defined(NPT_CONFIG_HAVE_POSIX_TIME)
+#define NPT_CONFIG_HAVE_GMTIME
+#define NPT_CONFIG_HAVE_GMTIME_R
+#define NPT_CONFIG_HAVE_LOCALTIME
+#define NPT_CONFIG_HAVE_LOCALTIME_R
+#endif
+
 #if defined(NPT_CONFIG_HAVE_STRING_H)
 #define NPT_CONFIG_HAVE_STRCMP
 #define NPT_CONFIG_HAVE_STRNCMP
@@ -119,6 +131,7 @@
 
 /* linux */
 #if defined(__linux__)
+#define NPT_CONFIG_HAVE_GETADDRINFO
 #undef NPT_CONFIG_HAVE_SOCKADDR_SA_LEN
 #endif
 
@@ -128,6 +141,19 @@
 #define NPT_CONFIG_THREAD_STACK_SIZE   0x14000
 #endif
 
+/* android */
+#if defined(ANDROID)
+#define NPT_CONFIG_HAVE_GETADDRINFO
+#undef NPT_CONFIG_HAVE_SOCKADDR_SA_LEN
+#endif
+
+/* OSX and iOS */
+#if defined(__APPLE__)
+#define NPT_CONFIG_HAVE_GETADDRINFO
+#define NPT_CONFIG_HAVE_AUTORELEASE_POOL
+#define NPT_CONFIG_HAVE_SYSTEM_LOG_CONFIG
+#endif
+
 /*----------------------------------------------------------------------
 |   compiler specifics
 +---------------------------------------------------------------------*/
@@ -157,6 +183,9 @@
 
 /* Microsoft C/C++ Compiler */
 #if defined(_MSC_VER)
+#undef NPT_CONFIG_HAVE_STDINT_H
+#define NPT_CONFIG_HAVE_GETADDRINFO
+#define NPT_CONFIG_STAT_ST_CTIME_IS_ST_BIRTHTIME
 #define NPT_FORMAT_64 "I64"
 #define NPT_CONFIG_INT64_TYPE __int64
 #define NPT_INT64_MIN _I64_MIN
@@ -185,8 +214,8 @@
 #endif
 #define NPT_POINTER_TO_LONG(_p) ((NPT_PointerLong) (_p) )
 #if _MSC_VER >= 1400 && !defined(_WIN32_WCE)
-#define NPT_CONFIG_HAVE_GMTIME_S
-#define NPT_CONFIG_HAVE_LOCALTIME_S
+#define gmtime_r(a,b) gmtime_s(a,b)
+#define localtime_r(a,b) localtime_s(b,a)
 #define NPT_CONFIG_HAVE_FOPEN_S
 #define NPT_CONFIG_HAVE_FSOPEN
 #define NPT_CONFIG_HAVE_SHARE_H
@@ -197,7 +226,13 @@
 #undef NPT_CONFIG_HAVE_GETENV
 #define NPT_CONFIG_HAVE_DUPENV_S
 #define dupenv_s _dupenv_s
+#undef NPT_CONFIG_HAVE_SETENV
+#undef NPT_CONFIG_HAVE_UNSETENV
+#define NPT_CONFIG_HAVE_PUTENV_S
+#define putenv_s _putenv_s
 #else
+#undef NPT_CONFIG_HAVE_GMTIME_R
+#undef NPT_CONFIG_HAVE_LOCALTIME_R
 #define NPT_vsnprintf  _vsnprintf
 #define NPT_snprintf   _snprintf
 #endif
@@ -211,12 +246,6 @@
 #if defined(NPT_CONFIG_HAVE_FOPEN_S)
 #undef NPT_CONFIG_HAVE_FOPEN_S
 #endif
-#if defined(NPT_CONFIG_HAVE_GMTIME_S)
-#undef NPT_CONFIG_HAVE_GMTIME_S
-#endif
-#if defined(NPT_CONFIG_HAVE_LOCALTIME_S)
-#undef NPT_CONFIG_HAVE_LOCALTIME_S
-#endif
 #endif
 
 /* Symbian */
@@ -230,8 +259,24 @@
 
 /* Android */
 #if defined(ANDROID)
+#if !defined(NPT_CONFIG_NO_RTTI)
 #define NPT_CONFIG_NO_RTTI
 #endif
+#endif
+
+/* OSX and iOS */
+#if defined(__APPLE__)
+#include <TargetConditionals.h>
+#include <AvailabilityMacros.h>
+#define NPT_CONFIG_HAVE_NET_IF_DL_H
+#define NPT_CONFIG_HAVE_SOCKADDR_DL
+#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
+#define NPT_CONFIG_HAVE_NET_IF_TYPES_H
+#if defined(MAC_OS_X_VERSION_10_6) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6)
+#define NPT_CONFIG_HAVE_STAT_ST_BIRTHTIME
+#endif
+#endif
+#endif
 
 /*----------------------------------------------------------------------
 |   defaults

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptCrypto.h Added

@@ -0,0 +1,78 @@
+/*****************************************************************
+|
+|   Neptune - Crypto
+|
+| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
+| All rights reserved.
+|
+| Redistribution and use in source and binary forms, with or without
+| modification, are permitted provided that the following conditions are met:
+|     * Redistributions of source code must retain the above copyright
+|       notice, this list of conditions and the following disclaimer.
+|     * Redistributions in binary form must reproduce the above copyright
+|       notice, this list of conditions and the following disclaimer in the
+|       documentation and/or other materials provided with the distribution.
+|     * Neither the name of Axiomatic Systems nor the
+|       names of its contributors may be used to endorse or promote products
+|       derived from this software without specific prior written permission.
+|
+| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
+| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
+| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+|
+ ****************************************************************/
+
+#ifndef _NPT_CRYPTO_H_
+#define _NPT_CRYPTO_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptTypes.h"
+#include "NptDataBuffer.h"
+
+/*----------------------------------------------------------------------
+|   NPT_BlockCipher
++---------------------------------------------------------------------*/
+class NPT_BlockCipher {
+public:
+    // types
+    typedef enum {
+        AES_128
+    } Algorithm;
+    
+    typedef enum {
+        ENCRYPT,
+        DECRYPT
+    } Direction;
+    
+    // factory
+    static NPT_Result Create(Algorithm         algorithm, 
+                             Direction         direction,
+                             const NPT_UInt8*  key,
+                             NPT_Size          key_size,
+                             NPT_BlockCipher*& cipher);
+    
+    // methods
+    virtual           ~NPT_BlockCipher() {}
+    virtual NPT_Size   GetBlockSize() = 0;
+    virtual Direction  GetDirection() = 0;
+    virtual Algorithm  GetAlgorithm() = 0;
+    virtual NPT_Result ProcessBlock(const NPT_UInt8* input, NPT_UInt8* output) = 0;
+    /**
+     * @param iv Initial vector (same size as cipher block size), or NULL for an IV made up of all zeros.
+     */
+    virtual NPT_Result ProcessCbc(const NPT_UInt8* input, NPT_Size input_size, const NPT_UInt8* iv, NPT_DataBuffer& output);
+    
+protected:
+    NPT_BlockCipher() {} // don't instantiate directly
+};
+
+#endif // _NPT_CRYPTO_H_

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptDigest.h Added

@@ -0,0 +1,78 @@
+/*****************************************************************
+|
+|   Neptune - Message Digests
+|
+| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
+| All rights reserved.
+|
+| Redistribution and use in source and binary forms, with or without
+| modification, are permitted provided that the following conditions are met:
+|     * Redistributions of source code must retain the above copyright
+|       notice, this list of conditions and the following disclaimer.
+|     * Redistributions in binary form must reproduce the above copyright
+|       notice, this list of conditions and the following disclaimer in the
+|       documentation and/or other materials provided with the distribution.
+|     * Neither the name of Axiomatic Systems nor the
+|       names of its contributors may be used to endorse or promote products
+|       derived from this software without specific prior written permission.
+|
+| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
+| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
+| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+|
+ ****************************************************************/
+
+#ifndef _NPT_DIGEST_H_
+#define _NPT_DIGEST_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptTypes.h"
+#include "NptDataBuffer.h"
+
+/*----------------------------------------------------------------------
+|   NPT_Digest
++---------------------------------------------------------------------*/
+class NPT_Digest {
+public:
+    // types
+    typedef enum {
+        ALGORITHM_SHA1,
+        ALGORITHM_SHA256,
+        ALGORITHM_MD5
+    } Algorithm;
+    
+    // factory
+    static NPT_Result Create(Algorithm algorithm, NPT_Digest*& digest);
+    
+    // methods
+    virtual             ~NPT_Digest() {}
+    virtual unsigned int GetSize() = 0;
+    virtual NPT_Result   Update(const NPT_UInt8* data, NPT_Size data_size) = 0;
+    virtual NPT_Result   GetDigest(NPT_DataBuffer& digest) = 0;
+
+protected:
+    NPT_Digest() {} // don't instantiate directly
+};
+
+class NPT_Hmac {
+public:
+    static NPT_Result Create(NPT_Digest::Algorithm algorithm,
+                             const NPT_UInt8*      key,
+                             NPT_Size              key_size, 
+                             NPT_Digest*&          digest);
+
+private:
+    // methods
+    NPT_Hmac() {} // don't instantiate
+};
+
+#endif // _NPT_DIGEST_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptFile.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptFile.h Changed

@@ -53,6 +53,17 @@
 const int NPT_ERROR_FILE_NOT_ENOUGH_SPACE = NPT_ERROR_BASE_FILE - 8;
 const int NPT_ERROR_DIRECTORY_NOT_EMPTY   = NPT_ERROR_BASE_FILE - 9;
 
+/**
+ * File open modes.
+ * Use a combination of these flags to indicate how a file should be opened 
+ * Note all combinations of flags are valid or meaningful:
+ * If NPT_FILE_OPEN_MODE_WRITE is not set, then NPT_FILE_OPEN_MODE_CREATE, 
+ * NPT_FILE_OPEN_MODE_TRUNCATE and NPT_FILE_OPEN_MODE_APPEND are ignored.
+ * If NPT_FILE_OPEN_MODE_APPEND is set, then NPT_FILE_OPEN_MODE_CREATE is
+ * automatically implied whether it is set or not.
+ * NPT_FILE_OPEN_MODE_CREATE and NPT_FILE_OPEN_MODE_TRUNCATE imply each
+ * other (if one is set, the other one is automatically implied)
+ */
 const unsigned int NPT_FILE_OPEN_MODE_READ       = 0x01;
 const unsigned int NPT_FILE_OPEN_MODE_WRITE      = 0x02;
 const unsigned int NPT_FILE_OPEN_MODE_CREATE     = 0x04;
@@ -90,12 +101,12 @@
     NPT_FileInfo() : m_Type(FILE_TYPE_NONE), m_Size(0), m_AttributesMask(0), m_Attributes(0) {}
     
     // members
-    FileType        m_Type;
-    NPT_UInt64      m_Size;
-    NPT_Flags       m_AttributesMask;
-    NPT_Flags       m_Attributes;
-    NPT_TimeStamp   m_Created;
-    NPT_TimeStamp   m_Modified;
+    FileType      m_Type;
+    NPT_UInt64    m_Size;
+    NPT_Flags     m_AttributesMask;
+    NPT_Flags     m_Attributes;
+    NPT_TimeStamp m_CreationTime;
+    NPT_TimeStamp m_ModificationTime;
 };
 
 /*----------------------------------------------------------------------
@@ -105,7 +116,7 @@
 {
 public:
     // class members
-    static const NPT_String Separator;
+    static const char* const Separator;
 
     // class methods
     static NPT_String BaseName(const char* path, bool with_extension = true);
@@ -146,16 +157,15 @@
     static NPT_Result GetRoots(NPT_List<NPT_String>& roots);
     static NPT_Result GetSize(const char* path, NPT_LargeSize &size);
     static NPT_Result GetInfo(const char* path, NPT_FileInfo* info = NULL);
-    static NPT_Result GetCount(const char* path, NPT_Cardinal& count);
     static bool       Exists(const char* path) { return NPT_SUCCEEDED(GetInfo(path)); }
-    static NPT_Result Remove(const char* path, bool recursively = false);
+    static NPT_Result Remove(const char* path, bool recurse = false);
     static NPT_Result RemoveFile(const char* path);
     static NPT_Result RemoveDir(const char* path);
-    static NPT_Result RemoveDir(const char* path, bool recursively);
+    static NPT_Result RemoveDir(const char* path, bool force_if_not_empty);
     static NPT_Result Rename(const char* from_path, const char* to_path);
     static NPT_Result ListDir(const char* path, NPT_List<NPT_String>& entries, NPT_Ordinal start = 0, NPT_Cardinal count = 0);
     static NPT_Result CreateDir(const char* path);
-    static NPT_Result CreateDir(const char* path, bool recursively);
+    static NPT_Result CreateDir(const char* path, bool create_intermediate_dirs);
     static NPT_Result GetWorkingDir(NPT_String& path);
     static NPT_Result Load(const char* path, NPT_DataBuffer& buffer, NPT_FileInterface::OpenMode mode = NPT_FILE_OPEN_MODE_READ);
     static NPT_Result Load(const char* path, NPT_String& data, NPT_FileInterface::OpenMode mode = NPT_FILE_OPEN_MODE_READ);
@@ -174,7 +184,6 @@
     NPT_Result          GetInfo(NPT_FileInfo& info);
     NPT_Result          ListDir(NPT_List<NPT_String>& entries);
     NPT_Result          Rename(const char* path);
-    NPT_Result          GetCount(NPT_Cardinal& count);
     
     // NPT_FileInterface methods
     NPT_Result Open(OpenMode mode) {
@@ -200,4 +209,21 @@
     bool               m_IsSpecial;
 };
 
+/*----------------------------------------------------------------------
+|   NPT_FileDateComparator
++---------------------------------------------------------------------*/
+class NPT_FileDateComparator {
+public: 
+    NPT_FileDateComparator(const char* directory) : m_Directory(directory) {}
+    NPT_Int32 operator()(const NPT_String& file1, const NPT_String& file2) const {
+        NPT_FileInfo info1, info2;
+        if (NPT_FAILED(NPT_File::GetInfo(NPT_FilePath::Create(m_Directory, file1), &info1))) return -1;
+        if (NPT_FAILED(NPT_File::GetInfo(NPT_FilePath::Create(m_Directory, file2), &info2))) return -1;
+        return (info1.m_ModificationTime == info2.m_ModificationTime) ? 0 : (info1.m_ModificationTime < info2.m_ModificationTime ? -1 : 1);
+    }
+    
+private:
+    NPT_String m_Directory;
+};
+
 #endif // _NPT_FILE_H_

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptHash.h Added

@@ -0,0 +1,83 @@
+/*****************************************************************
+|
+|   Neptune - Hashing
+|
+| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
+| All rights reserved.
+|
+| Redistribution and use in source and binary forms, with or without
+| modification, are permitted provided that the following conditions are met:
+|     * Redistributions of source code must retain the above copyright
+|       notice, this list of conditions and the following disclaimer.
+|     * Redistributions in binary form must reproduce the above copyright
+|       notice, this list of conditions and the following disclaimer in the
+|       documentation and/or other materials provided with the distribution.
+|     * Neither the name of Axiomatic Systems nor the
+|       names of its contributors may be used to endorse or promote products
+|       derived from this software without specific prior written permission.
+|
+| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
+| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
+| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+|
+****************************************************************/
+
+#ifndef _NPT_HASH_H_
+#define _NPT_HASH_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptTypes.h"
+#include "NptResults.h"
+
+/*----------------------------------------------------------------------
+|    Fowler/Noll/Vo FNV-1a hash functions
++---------------------------------------------------------------------*/
+const NPT_UInt32 NPT_FNV1A_32_INIT = ((NPT_UInt32)0x811c9dc5);
+NPT_UInt32 NPT_Fnv1aHash32(const NPT_UInt8* data, NPT_Size data_size, NPT_UInt32 hash_init=NPT_FNV1A_32_INIT);
+NPT_UInt32 NPT_Fnv1aHashStr32(const char* data, NPT_UInt32 hash_init=NPT_FNV1A_32_INIT);
+const NPT_UInt64 NPT_FNV1A_64_INIT = ((NPT_UInt64)0xcbf29ce484222325ULL);
+NPT_UInt64 NPT_Fnv1aHash64(const NPT_UInt8* data, NPT_Size data_size, NPT_UInt64 hash_init=NPT_FNV1A_64_INIT);
+NPT_UInt64 NPT_Fnv1aHashStr64(const char* data, NPT_UInt64 hash_init=NPT_FNV1A_64_INIT);
+
+/*----------------------------------------------------------------------
+|   NPT_Hash
++---------------------------------------------------------------------*/
+template <typename K>
+struct NPT_Hash
+{
+};
+
+template <>
+struct NPT_Hash<const char*>
+{
+    NPT_UInt32 operator()(const char* s) const { return NPT_Fnv1aHashStr32(s); }
+};
+
+template <>
+struct NPT_Hash<char*>
+{
+    NPT_UInt32 operator()(char* s) const { return NPT_Fnv1aHashStr32(s); }
+};
+
+template <>
+struct NPT_Hash<int>
+{
+    NPT_UInt32 operator()(int i) const { return NPT_Fnv1aHash32(reinterpret_cast<const NPT_UInt8*>(&i), sizeof(int)); }
+};
+
+template <>
+struct NPT_Hash<unsigned int>
+{
+    NPT_UInt32 operator()(unsigned int i) const { return NPT_Fnv1aHash32(reinterpret_cast<const NPT_UInt8*>(&i), sizeof(int)); }
+};
+
+#endif // _NPT_HASH_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptHttp.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptHttp.h Changed

@@ -41,20 +41,32 @@
 #include "NptBufferedStreams.h"
 #include "NptSockets.h"
 #include "NptMap.h"
+#include "NptDynamicCast.h"
+#include "NptVersion.h"
+#include "NptTime.h"
+#include "NptThreads.h"
+#include "NptAutomaticCleaner.h"
 
 /*----------------------------------------------------------------------
 |   constants
 +---------------------------------------------------------------------*/
-const unsigned int NPT_HTTP_DEFAULT_PORT = 80;
-const unsigned int NPT_HTTP_INVALID_PORT = 0;
+const unsigned int NPT_HTTP_DEFAULT_PORT  = 80;
+const unsigned int NPT_HTTPS_DEFAULT_PORT = 443;
+const unsigned int NPT_HTTP_INVALID_PORT  = 0;
 
-const NPT_Timeout NPT_HTTP_CLIENT_DEFAULT_CONNECTION_TIMEOUT    = 30000;
-const NPT_Timeout NPT_HTTP_CLIENT_DEFAULT_IO_TIMEOUT            = 30000;
-const NPT_Timeout NPT_HTTP_CLIENT_DEFAULT_NAME_RESOLVER_TIMEOUT = 60000;
+const NPT_Timeout  NPT_HTTP_CLIENT_DEFAULT_CONNECTION_TIMEOUT    = 30000;
+const NPT_Timeout  NPT_HTTP_CLIENT_DEFAULT_IO_TIMEOUT            = 30000;
+const NPT_Timeout  NPT_HTTP_CLIENT_DEFAULT_NAME_RESOLVER_TIMEOUT = 60000;
+const unsigned int NPT_HTTP_CLIENT_DEFAULT_MAX_REDIRECTS         = 20;
 
 const NPT_Timeout NPT_HTTP_SERVER_DEFAULT_CONNECTION_TIMEOUT    = NPT_TIMEOUT_INFINITE;
 const NPT_Timeout NPT_HTTP_SERVER_DEFAULT_IO_TIMEOUT            = 60000;
 
+const unsigned int NPT_HTTP_CONNECTION_MANAGER_MAX_CONNECTION_POOL_SIZE = 5;
+const unsigned int NPT_HTTP_CONNECTION_MANAGER_MAX_CONNECTION_AGE       = 50; // seconds
+const unsigned int NPT_HTTP_MAX_RECONNECTS                              = 10;
+const unsigned int NPT_HTTP_MAX_100_RESPONSES                           = 10;
+
 const int NPT_HTTP_PROTOCOL_MAX_LINE_LENGTH  = 8192;
 const int NPT_HTTP_PROTOCOL_MAX_HEADER_COUNT = 100;
 
@@ -63,6 +75,10 @@
 #define NPT_HTTP_METHOD_GET     "GET"
 #define NPT_HTTP_METHOD_HEAD    "HEAD"
 #define NPT_HTTP_METHOD_POST    "POST"
+#define NPT_HTTP_METHOD_PUT     "PUT"
+#define NPT_HTTP_METHOD_OPTIONS "OPTIONS"
+#define NPT_HTTP_METHOD_DELETE  "DELETE"
+#define NPT_HTTP_METHOD_TRACE   "TRACE"
 
 #define NPT_HTTP_HEADER_HOST                "Host"
 #define NPT_HTTP_HEADER_CONNECTION          "Connection"
@@ -78,19 +94,26 @@
 #define NPT_HTTP_HEADER_COOKIE              "Cookie"
 #define NPT_HTTP_HEADER_ACCEPT_RANGES       "Accept-Ranges"
 #define NPT_HTTP_HEADER_CONTENT_RANGE       "Content-Range"
+#define NPT_HTTP_HEADER_AUTHORIZATION       "Authorization"
 
 #define NPT_HTTP_TRANSFER_ENCODING_CHUNKED  "chunked"
 
-#define NPT_HTTP_HEADER_AUTHORIZATION		"Authorization"
 
 const int NPT_ERROR_HTTP_INVALID_RESPONSE_LINE = NPT_ERROR_BASE_HTTP - 0;
 const int NPT_ERROR_HTTP_INVALID_REQUEST_LINE  = NPT_ERROR_BASE_HTTP - 1;
 const int NPT_ERROR_HTTP_NO_PROXY              = NPT_ERROR_BASE_HTTP - 2;
 const int NPT_ERROR_HTTP_INVALID_REQUEST       = NPT_ERROR_BASE_HTTP - 3;
 const int NPT_ERROR_HTTP_METHOD_NOT_SUPPORTED  = NPT_ERROR_BASE_HTTP - 4;
+const int NPT_ERROR_HTTP_TOO_MANY_REDIRECTS    = NPT_ERROR_BASE_HTTP - 5;
+const int NPT_ERROR_HTTP_TOO_MANY_RECONNECTS   = NPT_ERROR_BASE_HTTP - 6;
+const int NPT_ERROR_HTTP_CANNOT_RESEND_BODY    = NPT_ERROR_BASE_HTTP - 7;
 
 #define NPT_HTTP_LINE_TERMINATOR "\r\n"
 
+#if !defined(NPT_CONFIG_HTTP_DEFAULT_USER_AGENT)
+#define NPT_CONFIG_HTTP_DEFAULT_USER_AGENT "Neptune/" NPT_NEPTUNE_VERSION_STRING
+#endif
+
 /*----------------------------------------------------------------------
 |   types
 +---------------------------------------------------------------------*/
@@ -159,11 +182,12 @@
     // methods
     NPT_Result Parse(NPT_BufferedInputStream& stream);
     NPT_Result Emit(NPT_OutputStream& stream) const;
-    NPT_List<NPT_HttpHeader*>& GetHeaders() { return m_Headers; }
+    const NPT_List<NPT_HttpHeader*>& GetHeaders() const { return m_Headers; }
     NPT_HttpHeader*   GetHeader(const char* name) const;
     const NPT_String* GetHeaderValue(const char* name) const;
     NPT_Result        SetHeader(const char* name, const char* value, bool replace=true);
     NPT_Result        AddHeader(const char* name, const char* value);
+    NPT_Result        RemoveHeader(const char* name);
 
 private:
     // members
@@ -195,11 +219,11 @@
     NPT_Result        SetContentType(const char* type);
     NPT_Result        SetContentEncoding(const char* encoding);
     NPT_Result        SetTransferEncoding(const char* encoding);
-    NPT_LargeSize     GetContentLength()   { return m_ContentLength;   }
-    const NPT_String& GetContentType()     { return m_ContentType;     }
-    const NPT_String& GetContentEncoding() { return m_ContentEncoding; }
-    const NPT_String& GetTransferEncoding(){ return m_TransferEncoding;}
-    bool              HasContentLength()   { return m_HasContentLength;}
+    NPT_LargeSize     GetContentLength()     { return m_ContentLength;   }
+    const NPT_String& GetContentType()       { return m_ContentType;     }
+    const NPT_String& GetContentEncoding()   { return m_ContentEncoding; }
+    const NPT_String& GetTransferEncoding()  { return m_TransferEncoding;}
+    bool              ContentLengthIsKnown() { return m_ContentLengthIsKnown; }
 
 private:
     // members
@@ -208,7 +232,7 @@
     NPT_String               m_ContentType;
     NPT_String               m_ContentEncoding;
     NPT_String               m_TransferEncoding;
-    bool                     m_HasContentLength;
+    bool                     m_ContentLengthIsKnown;
 };
 
 /*----------------------------------------------------------------------
@@ -230,10 +254,16 @@
     NPT_HttpHeaders& GetHeaders() { 
         return m_Headers;  
     }
+    const NPT_HttpHeaders& GetHeaders() const { 
+        return m_Headers;  
+    }
     NPT_Result SetEntity(NPT_HttpEntity* entity);
     NPT_HttpEntity* GetEntity() {
         return m_Entity;
     }
+    NPT_HttpEntity* GetEntity() const {
+        return m_Entity;
+    }
     virtual NPT_Result ParseHeaders(NPT_BufferedInputStream& stream);
 
 protected:
@@ -286,8 +316,7 @@
 public:
     // class methods
     static NPT_Result Parse(NPT_BufferedInputStream& stream, 
-                            NPT_HttpResponse*&       response,
-                            bool                     reuse_response = false);
+                            NPT_HttpResponse*&       response);
 
     // constructors and destructor
              NPT_HttpResponse(NPT_HttpStatusCode status_code,
@@ -298,10 +327,10 @@
     // methods
     NPT_Result         SetStatus(NPT_HttpStatusCode status_code,
                                  const char*        reason_phrase,
-                                 const char*        protocol = NPT_HTTP_PROTOCOL_1_0);
+                                 const char*        protocol = NULL);
     NPT_Result         SetProtocol(const char* protocol);
-    NPT_HttpStatusCode GetStatusCode()   { return m_StatusCode;   }
-    NPT_String&        GetReasonPhrase() { return m_ReasonPhrase; }
+    NPT_HttpStatusCode GetStatusCode() const { return m_StatusCode;   }
+    const NPT_String&  GetReasonPhrase() const { return m_ReasonPhrase; }
     virtual NPT_Result Emit(NPT_OutputStream& stream) const;
 
 protected:
@@ -337,13 +366,20 @@
 {
 public:
     // class methods
-    static NPT_HttpProxySelector* GetSystemDefault();
-
+    static NPT_HttpProxySelector* GetDefault();
+    static NPT_HttpProxySelector* GetSystemSelector();
+    
     // methods
     virtual ~NPT_HttpProxySelector() {};
     virtual NPT_Result GetProxyForUrl(const NPT_HttpUrl& url, NPT_HttpProxyAddress& proxy) = 0;
+    
+private:
+    // class members
+    static NPT_HttpProxySelector* m_SystemDefault;
 };
 
+class NPT_HttpRequestContext;
+
 /*----------------------------------------------------------------------
 |   NPT_HttpClient
 +---------------------------------------------------------------------*/
@@ -351,66 +387,177 @@
 public:
     // types
     struct Config {
-        NPT_Timeout m_ConnectionTimeout;
-        NPT_Timeout m_IoTimeout;
-        NPT_Timeout m_NameResolverTimeout;
-        bool        m_FollowRedirect;
+        Config() : m_ConnectionTimeout(  NPT_HTTP_CLIENT_DEFAULT_CONNECTION_TIMEOUT),
+                   m_IoTimeout(          NPT_HTTP_CLIENT_DEFAULT_CONNECTION_TIMEOUT),
+                   m_NameResolverTimeout(NPT_HTTP_CLIENT_DEFAULT_NAME_RESOLVER_TIMEOUT),
+                   m_MaxRedirects(       NPT_HTTP_CLIENT_DEFAULT_MAX_REDIRECTS),
+                   m_UserAgent(          NPT_CONFIG_HTTP_DEFAULT_USER_AGENT) {}
+        NPT_Timeout  m_ConnectionTimeout;
+        NPT_Timeout  m_IoTimeout;
+        NPT_Timeout  m_NameResolverTimeout;
+        NPT_Cardinal m_MaxRedirects;
+        NPT_String   m_UserAgent;
     };
-
+    
+    class Connection {
+    public:
+        virtual ~Connection() {}
+        virtual NPT_InputStreamReference&  GetInputStream()  = 0;
+        virtual NPT_OutputStreamReference& GetOutputStream() = 0;
+        virtual NPT_Result                 GetInfo(NPT_SocketInfo& info) = 0;
+        virtual bool                       SupportsPersistence() { return false;                    }
+        virtual bool                       IsRecycled()          { return false;                    }
+        virtual NPT_Result                 Recycle()             { delete this; return NPT_SUCCESS; }
+        virtual NPT_Result                 Abort()               { return NPT_ERROR_NOT_IMPLEMENTED; }
+    };
+    
     class Connector {
     public:
         virtual ~Connector() {}
 
-        virtual NPT_Result Connect(const char*                hostname, 
-                                   NPT_UInt16                 port, 
-                                   NPT_Timeout                connection_timeout,
-                                   NPT_Timeout                io_timeout,
-                                   NPT_Timeout                name_resolver_timeout,
-                                   NPT_InputStreamReference&  input_stream,
-                                   NPT_OutputStreamReference& output_stream) = 0;
-
+        virtual NPT_Result Connect(const NPT_HttpUrl&          url,
+                                   NPT_HttpClient&             client,
+                                   const NPT_HttpProxyAddress* proxy,
+                                   bool                        reuse, // whether we can reuse a connection or not
+                                   Connection*&                connection) = 0;
+        
+    protected:
+        NPT_Result TrackConnection(NPT_HttpClient& client,
+                                   Connection*     connection) { return client.TrackConnection(connection); }
+        Connector() {} // don't instantiate directly
     };
 
     // class methods
     static NPT_Result WriteRequest(NPT_OutputStream& output_stream, 
                                    NPT_HttpRequest&  request,
+                                   bool              should_persist,
                                    bool			     use_proxy = false);
-    static NPT_Result ReadResponse(NPT_InputStreamReference& input_stream,
-                                   bool                      expect_entity,
-                                   NPT_HttpResponse*&        response);
+    static NPT_Result ReadResponse(NPT_InputStreamReference&  input_stream,
+                                   bool                       should_persist,
+                                   bool                       expect_entity,
+                                   NPT_HttpResponse*&         response,
+                                   NPT_Reference<Connection>* cref = NULL);
 
     /**
-     * @param connector Pointer to a Connector instance, or NULL to use 
+     * @param connector Pointer to a connector instance, or NULL to use 
      * the default (TCP) connector.
+     * @param transfer_ownership Boolean flag. If true, the NPT_HttpClient object
+     * becomes the owner of the passed Connector and will delete it when it is 
+     * itself deleted. If false, the caller keeps the ownership of the connector. 
+     * This flag is ignored if the connector parameter is NULL.
      */
-    NPT_HttpClient(Connector* connector = NULL);
+    NPT_HttpClient(Connector* connector = NULL, bool transfer_ownership = true);
 
     virtual ~NPT_HttpClient();
 
     // methods
-    NPT_Result SendRequest(NPT_HttpRequest&   request,
-                           NPT_HttpResponse*& response);
+    NPT_Result SendRequest(NPT_HttpRequest&        request,
+                           NPT_HttpResponse*&      response,
+                           NPT_HttpRequestContext* context = NULL);
+    NPT_Result Abort();
+    const Config& GetConfig() const { return m_Config; }
     NPT_Result SetConfig(const Config& config);
-    NPT_Result SetProxy(const char* hostname, NPT_UInt16 port);
+    NPT_Result SetProxy(const char* http_proxy_hostname, 
+                        NPT_UInt16  http_proxy_port,
+                        const char* https_proxy_hostname = NULL,
+                        NPT_UInt16  https_proxy_port = 0);
     NPT_Result SetProxySelector(NPT_HttpProxySelector* selector);
     NPT_Result SetConnector(Connector* connector);
     NPT_Result SetTimeouts(NPT_Timeout connection_timeout,
                            NPT_Timeout io_timeout,
                            NPT_Timeout name_resolver_timeout);
-
+    NPT_Result SetUserAgent(const char* user_agent);
+    NPT_Result SetOptions(NPT_Flags options, bool on);
+    
 protected:
     // methods
-    NPT_Result SendRequestOnce(NPT_HttpRequest&   request,
-                               NPT_HttpResponse*& response);
+    NPT_Result TrackConnection(Connection* connection);
+    NPT_Result SendRequestOnce(NPT_HttpRequest&        request,
+                               NPT_HttpResponse*&      response,
+                               NPT_HttpRequestContext* context = NULL);
 
     // members
     Config                 m_Config;
     NPT_HttpProxySelector* m_ProxySelector;
     bool                   m_ProxySelectorIsOwned;
     Connector*             m_Connector;
-    
+    bool                   m_ConnectorIsOwned;
+    NPT_Mutex              m_AbortLock;
+    bool                   m_Aborted;
+};
+
+/*----------------------------------------------------------------------
+|   NPT_HttpConnectionManager
++---------------------------------------------------------------------*/
+class NPT_HttpConnectionManager : public NPT_Thread,
+                                  public NPT_AutomaticCleaner::Singleton
+{
 public:
-    static NPT_String m_UserAgentHeader;
+    // singleton management
+    static NPT_HttpConnectionManager* GetInstance();
+    
+    class Connection : public NPT_HttpClient::Connection 
+    {
+    public:
+        Connection(NPT_HttpConnectionManager& manager,
+                   NPT_SocketReference&       socket,
+                   NPT_InputStreamReference   input_stream,
+                   NPT_OutputStreamReference  output_stream);
+        virtual ~Connection();
+                   
+        // NPT_HttpClient::Connection methods
+        virtual NPT_InputStreamReference&  GetInputStream()      { return m_InputStream;           }
+        virtual NPT_OutputStreamReference& GetOutputStream()     { return m_OutputStream;          }
+        virtual NPT_Result                 GetInfo(NPT_SocketInfo& info) { return m_Socket->GetInfo(info); }
+        virtual bool                       SupportsPersistence() { return true;                    }
+        virtual bool                       IsRecycled()          { return m_IsRecycled;            }
+        virtual NPT_Result                 Recycle();
+        virtual NPT_Result                 Abort()               { return m_Socket->Cancel(); }
+
+        // members
+        NPT_HttpConnectionManager& m_Manager;
+        bool                       m_IsRecycled;
+        NPT_TimeStamp              m_TimeStamp;
+        NPT_SocketReference        m_Socket;
+        NPT_InputStreamReference   m_InputStream;
+        NPT_OutputStreamReference  m_OutputStream;
+    };
+    
+    // destructor
+    ~NPT_HttpConnectionManager();
+    
+    // methods
+    Connection* FindConnection(NPT_SocketAddress& address);
+    NPT_Result  Recycle(Connection* connection);
+    NPT_Result  Track(NPT_HttpClient* client, NPT_HttpClient::Connection* connection);
+    NPT_Result  AbortConnections(NPT_HttpClient* client);
+    
+    // class methods
+    static NPT_Result  Untrack(NPT_HttpClient::Connection* connection);
+    
+private:
+    typedef NPT_List<NPT_HttpClient::Connection*> ConnectionList;
+    
+    // class members
+    static NPT_HttpConnectionManager* Instance;
+    
+    // constructor
+    NPT_HttpConnectionManager();
+    
+    // NPT_Thread methods
+    void Run();
+    
+    // methods
+    NPT_Result      UntrackConnection(NPT_HttpClient::Connection* connection);
+    NPT_Result      Cleanup();
+
+    // members
+    NPT_Mutex             m_Lock;
+    NPT_Cardinal          m_MaxConnections;
+    NPT_Cardinal          m_MaxConnectionAge;
+    NPT_SharedVariable    m_Aborted;
+    NPT_List<Connection*> m_Connections;
+    NPT_Map<NPT_HttpClient*, ConnectionList> m_ClientConnections;
 };
 
 /*----------------------------------------------------------------------
@@ -446,6 +593,8 @@
 class NPT_HttpRequestHandler 
 {
 public:
+    NPT_IMPLEMENT_DYNAMIC_CAST(NPT_HttpRequestHandler)
+
     // destructor
     virtual ~NPT_HttpRequestHandler() {}
 
@@ -484,7 +633,7 @@
                                      const NPT_HttpRequestContext& context,
                                      NPT_HttpResponse&             response);
 
-protected:
+private:
     NPT_String     m_MimeType;
     NPT_DataBuffer m_Buffer;
 };
@@ -492,14 +641,11 @@
 /*----------------------------------------------------------------------
 |   NPT_HttpFileRequestHandler_FileTypeMap
 +---------------------------------------------------------------------*/
-typedef struct NPT_HttpFileRequestHandler_FileTypeMapEntry {
+typedef struct NPT_HttpFileRequestHandler_DefaultFileTypeMapEntry {
     const char* extension;
     const char* mime_type;
 } NPT_HttpFileRequestHandler_FileTypeMapEntry;
 
-// specify size here so NPT_ARRAY_SIZE can work
-extern const NPT_HttpFileRequestHandler_FileTypeMapEntry NPT_HttpFileRequestHandler_DefaultFileTypeMap[43];
-
 /*----------------------------------------------------------------------
 |   NPT_HttpFileRequestHandler
 +---------------------------------------------------------------------*/
@@ -509,13 +655,17 @@
     // constructors
     NPT_HttpFileRequestHandler(const char* url_root,
                                const char* file_root,
-                               bool        auto_dir = false);
+                               bool        auto_dir = false,
+                               const char* auto_index = NULL);
 
     // NPT_HttpRequestHandler methods
     virtual NPT_Result SetupResponse(NPT_HttpRequest&              request, 
                                      const NPT_HttpRequestContext& context,
                                      NPT_HttpResponse&             response);
-
+    
+    // class methods
+    static const char* GetDefaultContentType(const char* extension);
+    
     // accessors
     NPT_Map<NPT_String,NPT_String>& GetFileTypeMap() { return m_FileTypeMap; }
     void SetDefaultMimeType(const char* mime_type) {
@@ -524,6 +674,10 @@
     void SetUseDefaultFileTypeMap(bool use_default) {
         m_UseDefaultFileTypeMap = use_default;
     }
+    
+    static NPT_Result SetupResponseBody(NPT_HttpResponse&         response,
+                                        NPT_InputStreamReference& stream,
+                                        const NPT_String*         range_spec = NULL);
 
 protected:
     // methods
@@ -536,6 +690,7 @@
     NPT_String                      m_DefaultMimeType;
     bool                            m_UseDefaultFileTypeMap;
     bool                            m_AutoDir;
+    NPT_String                      m_AutoIndex;
 };
 
 /*----------------------------------------------------------------------
@@ -565,33 +720,41 @@
     const Config& GetConfig() const { return m_Config; }
     NPT_Result SetListenPort(NPT_UInt16 port, bool reuse_address = true);
     NPT_Result SetTimeouts(NPT_Timeout connection_timeout, NPT_Timeout io_timeout);
+    NPT_Result SetServerHeader(const char* server_header);
     NPT_Result Abort();
     NPT_Result WaitForNewClient(NPT_InputStreamReference&  input,
                                 NPT_OutputStreamReference& output,
-                                NPT_HttpRequestContext*    context);
-    NPT_Result Loop();
+                                NPT_HttpRequestContext*    context,
+                                NPT_Flags                  socket_flags = 0);
+    NPT_Result Loop(bool cancellable_sockets=true);
     NPT_UInt16 GetPort() { return m_BoundPort; }
+    void Terminate();
     
     /**
-     * Add a request handler. The ownership of the handler is NOT transfered to this object,
+     * Add a request handler. By default the ownership of the handler is NOT transfered to this object,
      * so the caller is responsible for the lifetime management of the handler object.
      */
-    NPT_Result AddRequestHandler(NPT_HttpRequestHandler* handler, const char* path, bool include_children = false);
-    NPT_HttpRequestHandler* FindRequestHandler(NPT_HttpRequest& request);
+    virtual NPT_Result AddRequestHandler(NPT_HttpRequestHandler* handler, 
+                                         const char*             path, 
+                                         bool                    include_children = false,
+                                         bool                    transfer_ownership = false);
+    virtual NPT_HttpRequestHandler* FindRequestHandler(NPT_HttpRequest& request);
+    virtual NPT_List<NPT_HttpRequestHandler*> FindRequestHandlers(NPT_HttpRequest& request);
 
     /**
      * Parse the request from a new client, form a response, and send it back. 
      */
-    NPT_Result RespondToClient(NPT_InputStreamReference&     input,
-                               NPT_OutputStreamReference&    output,
-                               const NPT_HttpRequestContext& context);
+    virtual NPT_Result RespondToClient(NPT_InputStreamReference&     input,
+                                       NPT_OutputStreamReference&    output,
+                                       const NPT_HttpRequestContext& context);
 
 protected:
     // types
     struct HandlerConfig {
         HandlerConfig(NPT_HttpRequestHandler* handler,
                       const char*             path,
-                      bool                    include_children);
+                      bool                    include_children,
+                      bool                    transfer_ownership = false);
         ~HandlerConfig();
 
         // methods
@@ -601,6 +764,7 @@
         NPT_HttpRequestHandler* m_Handler;
         NPT_String              m_Path;
         bool                    m_IncludeChildren;
+        bool                    m_HandlerIsOwned;
     };
 
     // methods
@@ -611,9 +775,8 @@
     NPT_UInt16               m_BoundPort;
     Config                   m_Config;
     NPT_List<HandlerConfig*> m_RequestHandlers;
-    
-public:
-    static NPT_String m_ServerHeader;
+    NPT_String               m_ServerHeader;
+    bool                     m_Run;
 };
 
 /*----------------------------------------------------------------------

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptJson.h Added

@@ -0,0 +1,42 @@
+/*****************************************************************
+|
+|   Neptune - JSON
+|
+| Copyright (c) 2002-2012, Axiomatic Systems, LLC.
+| All rights reserved.
+|
+| Redistribution and use in source and binary forms, with or without
+| modification, are permitted provided that the following conditions are met:
+|     * Redistributions of source code must retain the above copyright
+|       notice, this list of conditions and the following disclaimer.
+|     * Redistributions in binary form must reproduce the above copyright
+|       notice, this list of conditions and the following disclaimer in the
+|       documentation and/or other materials provided with the distribution.
+|     * Neither the name of Axiomatic Systems nor the
+|       names of its contributors may be used to endorse or promote products
+|       derived from this software without specific prior written permission.
+|
+| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
+| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
+| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+|
+ ****************************************************************/
+
+#ifndef _NPT_JSON_H_
+#define _NPT_JSON_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "NptTypes.h"
+#include "NptStrings.h"
+
+
+#endif // _NPT_JSON_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptList.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptList.h Changed

@@ -129,7 +129,8 @@
     // list manipulation
     NPT_Result   Add(NPT_List<T>& list);
     NPT_Result   Remove(const NPT_List<T>& list, bool all=false);
-
+    NPT_Result   Cut(NPT_Cardinal keep, NPT_List<T>& cut);
+    
     // item manipulation
     NPT_Result   Add(Item& item);
     NPT_Result   Detach(Item& item);
@@ -184,6 +185,69 @@
         return Iterator(NULL);
     }
 
+    // Merge sort algorithm
+    // http://en.wikipedia.org/wiki/Mergesort
+    template <typename X> 
+    NPT_Result Sort(const X& function)
+    {   
+        if (GetItemCount() <= 1) return NPT_SUCCESS;
+        
+        NPT_List<T> right;
+        NPT_CHECK(Cut(GetItemCount() >> 1, right));
+        
+        // Sort ourselves again
+        Sort(function);
+        
+        // sort the right side
+        right.Sort(function);
+        
+        // merge the two back inline
+        if (function(m_Tail->m_Data, right.m_Head->m_Data) > 0) {
+            Merge(right, function);
+        } else {
+            // append right
+            right.m_Head->m_Prev = m_Tail;
+            if (m_Tail) m_Tail->m_Next = right.m_Head;
+            if (!m_Head) m_Head = right.m_Head;
+            m_Tail = right.m_Tail;
+            m_ItemCount += right.m_ItemCount;
+            
+            right.m_ItemCount = 0;
+            right.m_Head = right.m_Tail = NULL;
+        }
+        
+        return NPT_SUCCESS;
+    }
+
+    template <typename X> 
+    NPT_Result Merge(NPT_List<T>& other, const X& function) 
+    {
+        Iterator left = GetFirstItem();
+        Iterator right;
+        while (left && other.m_Head) {
+            if (function(*left, other.m_Head->m_Data) <= 0) {
+                ++left;
+            } else {
+                // remove head and insert it
+                Item* head = other.m_Head;
+                other.Detach(*head);
+                Insert(left, *head);
+            }
+        }
+        
+        // add what's left of other if any
+        if (other.m_Head) {
+            other.m_Head->m_Prev = m_Tail;
+            if (m_Tail) m_Tail->m_Next = other.m_Head;
+            m_Tail = other.m_Tail;
+            if (!m_Head) m_Head = other.m_Head;
+            other.m_Head = other.m_Tail = NULL;
+        }
+        m_ItemCount += other.m_ItemCount;
+        other.m_ItemCount = 0;
+        return NPT_SUCCESS;
+    }
+
     // operators
     void operator=(const NPT_List<T>& other);
     bool operator==(const NPT_List<T>& other) const;
@@ -391,7 +455,8 @@
 |   NPT_List<T>::Insert
 +---------------------------------------------------------------------*/
 template <typename T>
-inline NPT_Result
+inline 
+NPT_Result
 NPT_List<T>::Insert(Iterator where, const T&data)
 {
     return Insert(where, *new Item(data));
@@ -602,4 +667,39 @@
     return false;
 }
 
+/*----------------------------------------------------------------------
+|   NPT_List<T>::Cut
++---------------------------------------------------------------------*/
+template <typename T> 
+NPT_Result 
+NPT_List<T>::Cut(NPT_Cardinal keep, NPT_List<T>& cut) 
+{
+    cut.Clear();
+    
+    // shortcut
+    if (keep >= GetItemCount()) return NPT_SUCCESS;
+    
+    // update new counts first
+    cut.m_ItemCount = m_ItemCount-keep;
+    m_ItemCount = keep;
+    
+    // look for the cut-point item
+    Item* item = m_Head;
+    while (keep--) { item = item->m_Next;}
+    
+    // the cut list goes from the cut-point item to the tail
+    cut.m_Head = item;
+    cut.m_Tail = m_Tail;
+    
+    // update the portion of the list we keep
+    if (item == m_Head) m_Head = NULL;
+    m_Tail = item->m_Prev;
+    
+    // update the cut list
+    if (item->m_Prev) item->m_Prev->m_Next = NULL;
+    item->m_Prev = NULL;
+    
+    return NPT_SUCCESS;
+}
+
 #endif // _NPT_LIST_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptLogging.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptLogging.h Changed

@@ -39,7 +39,6 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "NptConfig.h"
-#include "NptDebug.h"
 #include "NptTypes.h"
 #include "NptTime.h"
 #include "NptStrings.h"
@@ -65,11 +64,15 @@
     const char*   m_SourceFile;
     unsigned int  m_SourceLine;
     const char*   m_SourceFunction;
+    unsigned long m_ThreadId;
 };
 
 class NPT_LogHandler {
 public:
+    typedef void(*CustomHandlerExternalFunction)(const NPT_LogRecord* record);
+    
     // class methods
+    static NPT_Result SetCustomHandlerFunction(CustomHandlerExternalFunction function);
     static NPT_Result Create(const char*      logger_name,
                              const char*      handler_name,
                              NPT_LogHandler*& handler);
@@ -92,7 +95,7 @@
              const char*  msg, 
                           ...);
 
-    NPT_Result AddHandler(NPT_LogHandler* handler);
+    NPT_Result AddHandler(NPT_LogHandler* handler, bool transfer_ownership = true);
     NPT_Result DeleteHandlers();
     NPT_Result SetParent(NPT_Logger* parent);
     const NPT_String& GetName()  const { return m_Name;  }
@@ -109,6 +112,7 @@
     bool                      m_ForwardToParent;
     NPT_Logger*               m_Parent;
     NPT_List<NPT_LogHandler*> m_Handlers;
+    NPT_List<NPT_LogHandler*> m_ExternalHandlers;
 
     // friends
     friend class NPT_LogManager;
@@ -153,10 +157,11 @@
     NPT_Result                    Configure(const char* config_sources = NULL);
     NPT_String*                   GetConfigValue(const char* prefix, const char* suffix);
     NPT_List<NPT_Logger*>&        GetLoggers() { return m_Loggers; }
-	NPT_List<NPT_LogConfigEntry>& GetConfig()  { return m_Config;  }
-	void Enable(bool value) { m_Enabled = value; }
-    void Lock()   { m_Lock.Lock();   }
-    void Unlock() { m_Lock.Unlock(); }
+    NPT_List<NPT_LogConfigEntry>& GetConfig()  { return m_Config;  }
+    void                          SetEnabled(bool enabled) { m_Enabled = enabled; }
+    bool                          IsEnabled()              { return m_Enabled;    }
+    void                          Lock();
+    void                          Unlock();
 
 private:
     // methods
@@ -170,9 +175,9 @@
 
     // members
     NPT_Mutex                    m_Lock;
-    volatile bool                m_Enabled;
-    volatile bool                m_Configured;
-    volatile bool                m_Configuring;
+    NPT_Thread::ThreadId         m_LockOwner;
+    bool                         m_Enabled;
+    bool                         m_Configured;
     NPT_List<NPT_LogConfigEntry> m_Config;
     NPT_List<NPT_Logger*>        m_Loggers;
     NPT_Logger*                  m_Root;
@@ -199,6 +204,8 @@
     NPT_HttpServer* m_Server;
 };
 
+NPT_Result NPT_GetSystemLogConfig(NPT_String& config);
+
 /*----------------------------------------------------------------------
 |   constants
 +---------------------------------------------------------------------*/
@@ -222,7 +229,8 @@
     }
 
 #if defined(NPT_CONFIG_ENABLE_LOGGING)
-
+//TODO: volatile makes tons of errors for me
+//#define NPT_DEFINE_LOGGER(_logger, _name) static volatile NPT_LoggerReference _logger = { NULL, (_name) };
 #define NPT_DEFINE_LOGGER(_logger, _name) static NPT_LoggerReference _logger = { NULL, (_name) };
 
 #define NPT_LOG_X(_logger, _level, _argsx)                              \

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptMap.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptMap.h Changed

@@ -38,6 +38,7 @@
 #include "NptTypes.h"
 #include "NptResults.h"
 #include "NptList.h"
+#include "NptHash.h"
 
 /*----------------------------------------------------------------------
 |   NPT_Map
@@ -74,13 +75,6 @@
         friend class NPT_Map<K,V>;
     };
 
-    class EntryValueDeleter {
-    public:
-        void operator()(Entry* entry) const {
-            delete entry->GetValue();
-        }
-    };
-
     // constructors
     NPT_Map<K,V>() {}
     NPT_Map<K,V>(const NPT_Map<K,V>& copy);
@@ -90,7 +84,7 @@
 
     // methods
     NPT_Result   Put(const K& key, const V& value);
-    NPT_Result   Get(const K& key, V*& value) const;
+    NPT_Result   Get(const K& key, V*& value) const; // WARNING: the second parameter is a POINTER on the value type!!!
     bool         HasKey(const K& key) const { return GetEntry(key) != NULL; }
     bool         HasValue(const V& value) const;
     NPT_Result   Erase(const K& key);
@@ -128,7 +122,6 @@
 |   NPT_Map<K,V>::~NPT_Map<K,V>
 +---------------------------------------------------------------------*/
 template <typename K, typename V>
-inline
 NPT_Map<K,V>::~NPT_Map()
 {
     // call Clear to ensure we delete all entry objects
@@ -139,7 +132,6 @@
 |   NPT_Map<K,V>::Clear
 +---------------------------------------------------------------------*/
 template <typename K, typename V>
-inline
 NPT_Result
 NPT_Map<K,V>::Clear()
 {
@@ -171,7 +163,6 @@
 |   NPT_Map<K,V>::Put
 +---------------------------------------------------------------------*/
 template <typename K, typename V>
-inline
 NPT_Result
 NPT_Map<K,V>::Put(const K& key, const V& value)
 {
@@ -191,7 +182,6 @@
 |   NPT_Map<K,V>::Get
 +---------------------------------------------------------------------*/
 template <typename K, typename V>
-inline
 NPT_Result
 NPT_Map<K,V>::Get(const K& key, V*& value) const
 {
@@ -252,7 +242,6 @@
 |   NPT_Map<K,V>::Erase
 +---------------------------------------------------------------------*/
 template <typename K, typename V>
-inline
 NPT_Result
 NPT_Map<K,V>::Erase(const K& key)
 {
@@ -302,7 +291,6 @@
 |   NPT_Map<K,V>::operator!=
 +---------------------------------------------------------------------*/
 template <typename K, typename V>
-inline
 bool
 NPT_Map<K,V>::operator!=(const NPT_Map<K,V>& other) const
 {
@@ -313,7 +301,6 @@
 |   NPT_Map<K,V>::operator[]
 +---------------------------------------------------------------------*/
 template <typename K, typename V>
-inline
 V&
 NPT_Map<K,V>::operator[](const K& key)
 {
@@ -327,4 +314,494 @@
     return entry->m_Value;
 }
 
+/*----------------------------------------------------------------------
+|   NPT_HashMap
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF = NPT_Hash<K> > 
+class NPT_HashMap 
+{
+public:
+    // types
+    class Entry {
+    public:
+        // constructor
+        Entry(NPT_UInt32 hash_value, const K& key, const V& value) : m_HashValue(hash_value), m_Key(key), m_Value(value) {}
+        Entry(NPT_UInt32 hash_value, const K& key)                 : m_HashValue(hash_value), m_Key(key) {}
+        
+        // accessors
+        const K&   GetKey()       const { return m_Key;   }
+        const V&   GetValue()     const { return m_Value; }
+        NPT_UInt32 GetHashValue() const { return m_HashValue; }
+        
+        // operators 
+        bool operator==(const Entry& other) const {
+            return m_HashValue == other.m_HashValue && m_Key == other.m_Key && m_Value == other.m_Value;
+        }
+
+    protected:
+        // methods
+        void SetValue(const V& value) { m_Value = value; }
+
+        // members
+        NPT_UInt32 m_HashValue;
+        K          m_Key;
+        V          m_Value;
+
+        // friends
+        friend class NPT_HashMap<K,V,HF>;
+    };
+
+    class Iterator {
+    public:
+        Iterator() : m_Entry(NULL), m_Map(NULL) {}
+        Iterator(Entry** entry, const NPT_HashMap<K,V,HF>* map) : m_Entry(entry), m_Map(map) {}
+        Iterator(const Iterator& copy) : m_Entry(copy.m_Entry), m_Map(copy.m_Map) {}
+        const Entry&  operator*()  const { return **m_Entry; }
+        Iterator& operator++()  { // prefix
+            if (m_Map && m_Entry) {
+                do {
+                    ++m_Entry;
+                    if (m_Entry >= &m_Map->m_Buckets[1<<m_Map->m_BucketCountLog]) {
+                        m_Entry = NULL;
+                    } else {
+                        if (*m_Entry) break;
+                    }
+                } while (m_Entry);
+            }
+            return (*this); 
+        }
+        Iterator operator++(int) { // postfix
+            Iterator saved_this = *this;
+            ++(*this);
+            return saved_this;
+        }
+        operator bool() const {
+            return m_Entry != NULL;
+        }
+        bool operator==(const Iterator& other) const {
+            return m_Map == other.m_Map && m_Entry == other.m_Entry;
+        }
+        bool operator!=(const Iterator& other) const {
+            return !(*this == other);
+        }
+        void operator=(const Iterator& other) {
+            m_Entry = other.m_Entry;
+            m_Map   = other.m_Map;
+        }
+
+    private:
+        // friends
+        friend class NPT_HashMap<K,V,HF>;
+
+        // members
+        Entry**                    m_Entry;
+        const NPT_HashMap<K,V,HF>* m_Map;
+    };
+
+    // constructors
+    NPT_HashMap<K,V,HF>();
+    NPT_HashMap<K,V,HF>(const HF& hasher);
+    NPT_HashMap<K,V,HF>(const NPT_HashMap<K,V,HF>& copy);
+
+    // destructor
+    ~NPT_HashMap<K,V,HF>();
+
+    // methods
+    NPT_Result   Put(const K& key, const V& value);
+    NPT_Result   Get(const K& key, V*& value) const; // WARNING: the second parameter is a POINTER on the value type!!!
+    bool         HasKey(const K& key) const { return GetEntry(key) != NULL; }
+    bool         HasValue(const V& value) const;
+    NPT_Result   Erase(const K& key);
+    NPT_Cardinal GetEntryCount() const { return m_EntryCount; }
+    Iterator     GetEntries() const;
+    NPT_Result   Clear();
+    
+    // list operations
+    // keep these template members defined here because MSV6 does not let
+    // us define them later
+    template <typename X> 
+    NPT_Result Apply(const X& function) const
+    {                          
+        for (int i=0; i<(1<<m_BucketCountLog); i++) {
+            if (m_Buckets[i]) {
+                function(m_Buckets[i]);
+            }
+        }
+        return NPT_SUCCESS;
+    }
+
+    // operators
+    V&                         operator[](const K& key);
+    const NPT_HashMap<K,V,HF>& operator=(const NPT_HashMap<K,V,HF>& copy);
+    bool                       operator==(const NPT_HashMap<K,V,HF>& other) const;
+    bool                       operator!=(const NPT_HashMap<K,V,HF>& other) const;
+
+private:
+    // methods
+    Entry*     GetEntry(const K& key, NPT_UInt32* position=NULL) const;
+    NPT_Result AddEntry(Entry* entry);
+    void       AllocateBuckets(unsigned int count_log);
+    void       AdjustBuckets(NPT_Cardinal entry_count, bool allow_shrink=false);
+    
+    // members
+    HF           m_Hasher;
+    Entry**      m_Buckets;
+    NPT_Cardinal m_BucketCountLog;
+    NPT_Cardinal m_EntryCount;
+};
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V>::NPT_HashMap
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_HashMap<K,V,HF>::NPT_HashMap() :
+    m_Buckets(NULL),
+    m_EntryCount(0)
+{
+    AllocateBuckets(4);
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V>::NPT_HashMap
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_HashMap<K,V,HF>::NPT_HashMap(const HF& hasher) :
+    m_Hasher(hasher),
+    m_Buckets(NULL),
+    m_EntryCount(0)
+{
+    AllocateBuckets(4);
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V>::NPT_HashMap
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_HashMap<K,V,HF>::NPT_HashMap(const NPT_HashMap<K,V,HF>& copy) :
+    m_Buckets(NULL),
+    m_BucketCountLog(0),
+    m_EntryCount(0)
+{
+    *this = copy;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_MapMap<K,V,HF>::NPT_HashMap
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_HashMap<K,V,HF>::~NPT_HashMap()
+{
+    for (int i=0; i<(1<<m_BucketCountLog); i++) {
+        delete m_Buckets[i];
+    }
+    delete[] m_Buckets;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::AllocateBuckets
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+void
+NPT_HashMap<K,V,HF>::AllocateBuckets(unsigned int count_log)
+{
+    m_Buckets = new Entry*[1<<count_log];
+    m_BucketCountLog = count_log;
+    for (int i=0; i<(1<<count_log); i++) {
+        m_Buckets[i] = NULL;
+    }
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::AdjustBuckets
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+void
+NPT_HashMap<K,V,HF>::AdjustBuckets(NPT_Cardinal entry_count, bool allow_shrink)
+{
+    Entry** buckets = NULL;
+    unsigned int bucket_count = 1<<m_BucketCountLog;
+    if (2*entry_count >= bucket_count) {
+        // we need to grow
+        buckets = m_Buckets;
+        AllocateBuckets(m_BucketCountLog+1);
+    } else if (allow_shrink && (5*entry_count < bucket_count) && m_BucketCountLog > 4) {
+        // we need to shrink
+        buckets = m_Buckets;
+        AllocateBuckets(m_BucketCountLog-1);
+    }
+    if (buckets) {
+        m_EntryCount = 0;
+        for (unsigned int i=0; i<bucket_count; i++) {
+            if (buckets[i]) AddEntry(buckets[i]);
+        }
+        delete[] buckets;
+    }
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::Clear
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_Result
+NPT_HashMap<K,V,HF>::Clear()
+{
+    if (m_Buckets) {
+        for (int i=0; i<(1<<m_BucketCountLog); i++) {
+            delete m_Buckets[i];
+        }
+        delete[] m_Buckets;
+    }
+    m_EntryCount = 0;
+    AllocateBuckets(4);
+    
+    return NPT_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::GetEntries
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+typename NPT_HashMap<K,V,HF>::Iterator
+NPT_HashMap<K,V,HF>::GetEntries() const
+{
+    for (int i=0; i<(1<<m_BucketCountLog); i++) {
+        if (m_Buckets[i]) {
+            return Iterator(&m_Buckets[i], this);
+        }
+    }
+    return Iterator(NULL, this);
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::GetEntry
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+typename NPT_HashMap<K,V,HF>::Entry*
+NPT_HashMap<K,V,HF>::GetEntry(const K& key, NPT_UInt32* position) const
+{
+    NPT_UInt32 hash_value = m_Hasher(key);
+    NPT_UInt32 mask       = (1<<m_BucketCountLog)-1;
+    NPT_UInt32 cursor     = hash_value & mask;
+    while (m_Buckets[cursor]) {
+        Entry* entry = m_Buckets[cursor];
+        if (entry->m_HashValue == hash_value &&
+            entry->m_Key       == key) {
+            if (position) *position = cursor;
+            return entry;
+        }
+        cursor = (cursor + 1) & mask;
+    }
+    
+    return NULL;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::AddEntry
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_Result
+NPT_HashMap<K,V,HF>::AddEntry(Entry* entry)
+{
+    AdjustBuckets(m_EntryCount+1);
+
+    NPT_UInt32 hash_value = entry->m_HashValue;
+    NPT_UInt32 mask       = (1<<m_BucketCountLog)-1;
+    NPT_UInt32 cursor     = hash_value & mask;
+    while (m_Buckets[cursor]) {
+        cursor = (cursor + 1) & mask;
+    }
+    m_Buckets[cursor] = entry;
+    ++m_EntryCount;
+    
+    return NPT_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::Put
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_Result
+NPT_HashMap<K,V,HF>::Put(const K& key, const V& value)
+{
+    Entry* entry = GetEntry(key);
+    if (entry == NULL) {
+        // no existing entry for that key, create one
+        return AddEntry(new Entry(m_Hasher(key), key, value));
+    } else {
+        // replace the existing entry for that key
+        entry->SetValue(value);
+    }
+
+    return NPT_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::Get
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_Result
+NPT_HashMap<K,V,HF>::Get(const K& key, V*& value) const
+{
+    Entry* entry = GetEntry(key);
+    if (entry == NULL) {
+        // no existing entry for that key
+        value = NULL;
+        return NPT_ERROR_NO_SUCH_ITEM;
+    } else {
+        // found an entry with that key
+        value = &entry->m_Value;
+        return NPT_SUCCESS;
+    }
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::HasValue
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+bool
+NPT_HashMap<K,V,HF>::HasValue(const V& value) const
+{
+    for (int i=0; i<(1<<m_BucketCountLog); i++) {
+        if (m_Buckets[i] && m_Buckets[i]->m_Value == value) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::Erase
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+NPT_Result
+NPT_HashMap<K,V,HF>::Erase(const K& key)
+{
+    NPT_UInt32 position;
+    Entry* entry = GetEntry(key, &position);
+    if (entry == NULL) {
+        return NPT_ERROR_NO_SUCH_ITEM;
+    }
+    
+    // mark the bucket as unoccupied
+    m_Buckets[position] = NULL;
+    
+    // look for buckets that need to be relocated:
+    // there should be no empty bucket between an entry's ideal hash bucket
+    // and its actual bucket.
+    NPT_UInt32 mask = (1<<m_BucketCountLog)-1;
+    for (NPT_UInt32 cursor = (position+1) & mask; m_Buckets[cursor]; cursor = (cursor + 1) & mask) {
+        NPT_UInt32 target = m_Buckets[cursor]->m_HashValue & mask;
+        // check if target is between position and cursor (modulo the bucket array size)
+        // |    position.target.cursor |
+        // |....cursor position.target.| or |.target..cursor position...|
+        if ( (position <= cursor) ?
+             ((position < target) && (target <= cursor)) :
+             ((position < target) || (target <= cursor)) ) {
+             continue;
+        }
+        
+        // move the bucket back
+        m_Buckets[position] = m_Buckets[cursor];
+        m_Buckets[cursor] = NULL;
+        position = cursor;
+    }
+        
+    // cleanup and adjust the counter and buckets
+    delete entry;
+    --m_EntryCount;
+    AdjustBuckets(m_EntryCount, true);
+
+    return NPT_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::operator=
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+const NPT_HashMap<K,V,HF>&
+NPT_HashMap<K,V,HF>::operator=(const NPT_HashMap<K,V,HF>& copy)
+{
+    // do nothing if we're assigning to ourselves
+    if (this == &copy) return copy;
+
+    // destroy all entries
+    Clear();
+
+    // prepare to receive all the entries
+    AdjustBuckets(copy.m_EntryCount);
+    
+    // copy all entries
+    for (int i=0; i<1<<copy.m_BucketCountLog; i++) {
+        if (copy.m_Buckets[i]) {
+            AddEntry(new Entry(m_Hasher(copy.m_Buckets[i]->GetKey()),
+                               copy.m_Buckets[i]->GetKey(), 
+                               copy.m_Buckets[i]->GetValue()));
+        }
+    }
+    
+    return *this;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::operator==
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+bool
+NPT_HashMap<K,V,HF>::operator==(const NPT_HashMap<K,V,HF>& other) const
+{
+    // quick check
+    if (m_EntryCount != other.m_EntryCount) return false;
+    
+    // compare all entries to all other entries
+    for (int i=0; i<(1<<m_BucketCountLog); i++) {
+        Entry* entry = m_Buckets[i];
+        if (entry == NULL) continue;
+        Entry* other_entry = other.GetEntry(entry->m_Key);
+        if (other_entry == NULL || !(other_entry->m_Value == entry->m_Value)) {
+            return false;
+        }
+    }
+    
+    return true;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V,HF>::operator!=
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+bool
+NPT_HashMap<K,V,HF>::operator!=(const NPT_HashMap<K,V,HF>& other) const
+{
+    return !(*this == other);
+}
+
+/*----------------------------------------------------------------------
+|   NPT_HashMap<K,V>::operator[]
++---------------------------------------------------------------------*/
+template <typename K, typename V, typename HF>
+V&
+NPT_HashMap<K,V,HF>::operator[](const K& key)
+{
+    Entry* entry = GetEntry(key);
+    if (entry == NULL) {
+        // create a new "default" entry for this key
+        entry = new Entry(m_Hasher(key), key);
+        AddEntry(entry);
+    }
+     
+    return entry->m_Value;
+}
+
+/*----------------------------------------------------------------------
+|   NPT_MapEntryValueDeleter
++---------------------------------------------------------------------*/
+template <class T>
+class NPT_MapEntryValueDeleter {
+public:
+    void operator()(T* entry) const {
+        delete entry->GetValue();
+    }
+};
+
 #endif // _NPT_MAP_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptMessaging.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptMessaging.h Changed

@@ -39,6 +39,7 @@
 #include "NptTypes.h"
 #include "NptResults.h"
 #include "NptList.h"
+#include "NptThreads.h"
 #include "NptDynamicCast.h"
 
 /*----------------------------------------------------------------------
@@ -61,12 +62,65 @@
     virtual void OnMessage(NPT_Message*) {}
 
     // this method is a central point of handling for received messages.
-    // it can be overloaded by subclasses who wish to process all 
+    // it can be overloaded by subclasses that wish to process all 
     // incoming messages
     virtual NPT_Result HandleMessage(NPT_Message* message);
 };
 
 /*----------------------------------------------------------------------
+|   NPT_MessageHandlerProxy
++---------------------------------------------------------------------*/
+class NPT_MessageHandlerProxy : public NPT_MessageHandler
+{
+public:
+    NPT_IMPLEMENT_DYNAMIC_CAST_D(NPT_MessageHandlerProxy, NPT_MessageHandler)
+
+    /**
+     * Create a proxy for a message handler.
+     * All calls to HandleMessage() and OnMessage() on the proxy
+     * are automatically forwarded to the handler.
+     * This class is useful in cases where a handler is passed
+     * asynchronously (for example in a message queue) and one wishes
+     * to guarantee right away that no more calls to the handler will be 
+     * made (because, for example, the handler needs to be deleted).
+     *
+     * The proxy object keeps a pointer to the handler, but does not own it.
+     */
+    NPT_MessageHandlerProxy(NPT_MessageHandler* handler);
+    
+    // destructor
+    virtual ~NPT_MessageHandlerProxy();
+
+    // NPT_MessageHandler methods
+    virtual void OnMessage(NPT_Message*);
+    virtual NPT_Result HandleMessage(NPT_Message* message);
+    
+    /**
+     * Detach the proxy from the handler implementation.
+     * After this call returns, calls will no longer be
+     * forwarded to the handler object. It is then safe, for example,
+     * to delete the handler.
+     */
+    void DetachHandler();
+    
+    /**
+     * Increment the reference count
+     */
+    void AddReference();
+
+    /**
+     * Decrement the reference count and delete if 0
+     */
+    void Release();
+    
+private:
+    // members
+    NPT_MessageHandler* m_Handler;
+    NPT_Cardinal        m_ReferenceCount;
+    NPT_Mutex           m_Lock;
+};
+
+/*----------------------------------------------------------------------
 |   NPT_Messsage
 +---------------------------------------------------------------------*/
 class NPT_Message
@@ -76,7 +130,7 @@
     typedef const char* Type;
 
     // static members
-    static Type MessageType;
+    static Type const MessageType;
 
     // methods
     virtual           ~NPT_Message() {}
@@ -97,7 +151,7 @@
 +---------------------------------------------------------------------*/
 class NPT_TerminateMessage : public NPT_Message
 {
- public:
+public:
     // methods
     NPT_Result Dispatch(NPT_MessageHandler* /*handler*/) {
         return NPT_ERROR_TERMINATED;
@@ -109,7 +163,7 @@
 +---------------------------------------------------------------------*/
 class NPT_MessageQueue
 {
- public:
+public:
     // methods
     virtual           ~NPT_MessageQueue() {}
     virtual NPT_Result PumpMessage(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) = 0;

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptNetwork.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptNetwork.h Changed

@@ -80,6 +80,7 @@
     // constructors and destructor
     NPT_IpAddress();
     NPT_IpAddress(unsigned long address);
+    NPT_IpAddress(unsigned char a, unsigned char b, unsigned char c, unsigned char d);
 
     // methods
     NPT_Result       ResolveName(const char* name, 
@@ -90,10 +91,13 @@
     const unsigned char* AsBytes() const;
     unsigned long    AsLong() const;
     NPT_String       ToString() const;
-
+    
     // operators
     bool             operator==(const NPT_IpAddress& other) const;
     
+    // FIXME: temporary
+    NPT_String       m_HostName;
+
 private:
     // members
     unsigned char m_Address[4];
@@ -165,10 +169,10 @@
         return m_NetMask;
     }
     
-    bool IsAddressInNetwork(const NPT_IpAddress& adress) {
-        if (m_PrimaryAddress.AsLong() == adress.AsLong()) return true;
+    bool IsAddressInNetwork(const NPT_IpAddress& address) {
+        if (m_PrimaryAddress.AsLong() == address.AsLong()) return true;
         if (m_NetMask.AsLong() == 0) return false;
-        return (m_PrimaryAddress.AsLong() & m_NetMask.AsLong()) == (adress.AsLong() & m_NetMask.AsLong());
+        return (m_PrimaryAddress.AsLong() & m_NetMask.AsLong()) == (address.AsLong() & m_NetMask.AsLong());
     }
 
 private:
@@ -192,6 +196,8 @@
     NPT_NetworkInterface(const char*           name,
                          const NPT_MacAddress& mac,
                          NPT_Flags             flags);
+    NPT_NetworkInterface(const char*           name,
+                         NPT_Flags             flags);
    ~NPT_NetworkInterface() {}
 
     // methods
@@ -202,6 +208,11 @@
     const NPT_MacAddress& GetMacAddress() const {
         return m_MacAddress;
     }
+    void SetMacAddress(NPT_MacAddress::Type type,
+                       const unsigned char* addr, 
+                       unsigned int         length) {
+        m_MacAddress.SetAddress(type, addr, length);
+    }
     NPT_Flags GetFlags() const { return m_Flags; }
     const NPT_List<NPT_NetworkInterfaceAddress>& GetAddresses() const {
         return m_Addresses;
@@ -224,5 +235,16 @@
     NPT_List<NPT_NetworkInterfaceAddress> m_Addresses;
 };
 
+/*----------------------------------------------------------------------
+|   NPT_NetworkNameResolver
++---------------------------------------------------------------------*/
+class NPT_NetworkNameResolver
+{
+public:
+    // class methods
+    static NPT_Result Resolve(const char*              name, 
+                              NPT_List<NPT_IpAddress>& addresses,
+                              NPT_Timeout              timeout = NPT_TIMEOUT_INFINITE);
+};
 
 #endif // _NPT_NETWORK_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptQueue.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptQueue.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptReferences.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptReferences.h Changed

@@ -36,6 +36,7 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "NptConstants.h"
+#include "NptThreads.h"
 
 /*----------------------------------------------------------------------
 |   NPT_Reference
@@ -45,13 +46,18 @@
 {
 public:
     // constructors and destructor
-    NPT_Reference() : m_Object(NULL), m_Counter(NULL) {}
-    explicit NPT_Reference(T* object) : 
-        m_Object(object), m_Counter(object?new NPT_Cardinal(1):NULL) {}
+    NPT_Reference() : m_Object(NULL), m_Counter(NULL), m_Mutex(NULL), m_ThreadSafe(true) {}
+    explicit NPT_Reference(T* object, bool thread_safe = true) : 
+        m_Object(object), 
+        m_Counter(object?new NPT_Cardinal(1):NULL),
+        m_Mutex((object && thread_safe)?new NPT_Mutex():NULL),
+        m_ThreadSafe(thread_safe) {}
 
     NPT_Reference(const NPT_Reference<T>& ref) :
-        m_Object(ref.m_Object), m_Counter(ref.m_Counter) {
+        m_Object(ref.m_Object), m_Counter(ref.m_Counter), m_Mutex(ref.m_Mutex), m_ThreadSafe(ref.m_ThreadSafe) {
+        if (m_Mutex) m_Mutex->Lock();
         if (m_Counter) ++(*m_Counter);
+        if (m_Mutex) m_Mutex->Unlock();
     }
 
     // this methods should be private, but this causes a problem on some
@@ -59,9 +65,11 @@
     // the cast operator operator NPT_Reference<U>() below, which would
     // have to be marked as a friend, and friend declarations with the 
     // same class name confuses some compilers
-    NPT_Reference(T* object, NPT_Cardinal* counter) : 
-        m_Object(object), m_Counter(counter) {
+    NPT_Reference(T* object, NPT_Cardinal* counter, NPT_Mutex* mutex, bool thread_safe) : 
+        m_Object(object), m_Counter(counter), m_Mutex(mutex), m_ThreadSafe(thread_safe) {
+        if (m_Mutex) m_Mutex->Lock();
         if (m_Counter) ++(*m_Counter);
+        if (m_Mutex) m_Mutex->Unlock();
     }
 
     ~NPT_Reference() {
@@ -74,14 +82,20 @@
             Release();
             m_Object = ref.m_Object;
             m_Counter = ref.m_Counter;
+            m_Mutex = ref.m_Mutex;
+            m_ThreadSafe = ref.m_ThreadSafe;
+            
+            if (m_Mutex) m_Mutex->Lock();
             if (m_Counter) ++(*m_Counter);
+            if (m_Mutex) m_Mutex->Unlock();
         }
         return *this;
     }
     NPT_Reference<T>& operator=(T* object) {
         Release();
-        m_Object = object;
+        m_Object  = object;
         m_Counter = object?new NPT_Cardinal(1):NULL;
+        m_Mutex   = (object && m_ThreadSafe)?new NPT_Mutex():NULL;
         return *this;
     }
     T& operator*() const { return *m_Object; }
@@ -96,7 +110,7 @@
 
     // overloaded cast operators
     template <typename U> operator NPT_Reference<U>() {
-        return NPT_Reference<U>(m_Object, m_Counter);
+        return NPT_Reference<U>(m_Object, m_Counter, m_Mutex, m_ThreadSafe);
     }
 
     // methods
@@ -111,7 +125,7 @@
     NPT_Cardinal GetCounter() const { return *m_Counter; }
     
     /**
-     * Returns wether this references a NULL object.
+     * Returns whether this references a NULL object.
      */
     bool IsNull()  const { return m_Object == NULL; }
     
@@ -122,25 +136,38 @@
      * After the method returns, this reference does not point to any shared object.
      */
     void Detach() {
-        if (m_Counter && --(*m_Counter) == 0) {
-            delete m_Counter; 
-        }
-        m_Counter = NULL;
-        m_Object  = NULL;
+        Release(true);        
     }
     
 private:
     // methods
-    void Release() {
+    void Release(bool detach_only = false) {
+        bool last_reference = false;
+        if (m_Mutex) m_Mutex->Lock();
+            
         if (m_Counter && --(*m_Counter) == 0) {
-            delete m_Counter; m_Counter = NULL;
-            delete m_Object;  m_Object  = NULL;
+            delete m_Counter;
+            if (!detach_only) delete m_Object;
+            last_reference = true;
+        }
+        
+        m_Counter = NULL;
+        m_Object  = NULL;
+        
+        if (m_Mutex) {
+            NPT_Mutex* mutex = m_Mutex;
+            m_Mutex = NULL;
+            mutex->Unlock();
+            if (last_reference) delete mutex;
         }
+        
     }
 
     // members
     T*            m_Object;
     NPT_Cardinal* m_Counter;
+    NPT_Mutex*    m_Mutex;
+    bool          m_ThreadSafe;
 };
 
 #endif // _NPT_REFERENCES_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptResults.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptResults.h Changed

@@ -41,14 +41,14 @@
 do {                                \
     NPT_Result _result = (_x);      \
     if (_result != NPT_SUCCESS) {   \
-        NPT_Debug("%s(%d): @@@ NPT_CHECK failed, result=%d (%s)", __FILE__, __LINE__, _result, NPT_ResultText(_result)); \
+        NPT_Debug("%s(%d): @@@ NPT_CHECK failed, result=%d (%s)\n", __FILE__, __LINE__, _result, NPT_ResultText(_result)); \
         return _result;             \
     }                               \
 } while(0)
 #define NPT_CHECK_POINTER(_p)                 \
 do {                                          \
     if ((_p) == NULL) {                       \
-        NPT_Debug("%s(%d): @@@ NULL pointer parameter", __FILE__, __LINE__); \
+        NPT_Debug("%s(%d): @@@ NULL pointer parameter\n", __FILE__, __LINE__); \
         return NPT_ERROR_INVALID_PARAMETERS;  \
     }                                         \
 } while(0)
@@ -56,14 +56,14 @@
 do {                                \
     NPT_Result _result = (_x);      \
     if (_result != NPT_SUCCESS) {   \
-        NPT_Debug("%s(%d): @@@ NPT_CHECK failed, result=%d (%s)", __FILE__, __LINE__, _result, NPT_ResultText(_result)); \
+        NPT_Debug("%s(%d): @@@ NPT_CHECK failed, result=%d (%s)\n", __FILE__, __LINE__, _result, NPT_ResultText(_result)); \
         goto label;                 \
     }                               \
 } while(0)
 #define NPT_CHECK_POINTER_LABEL(_p, label)   \
 do {                                         \
     if (_p == NULL) {                        \
-        NPT_Debug("%s(%d): @@@ NULL pointer parameter", __FILE__, __LINE__); \
+        NPT_Debug("%s(%d): @@@ NULL pointer parameter\n", __FILE__, __LINE__); \
         goto label;                          \
     }                                        \
 } while(0)
@@ -111,46 +111,49 @@
 #endif
 
 // error bases
-const int NPT_ERROR_BASE_GENERAL        = NPT_ERROR_BASE-0;
-const int NPT_ERROR_BASE_LIST           = NPT_ERROR_BASE-100;
-const int NPT_ERROR_BASE_FILE           = NPT_ERROR_BASE-200;
-const int NPT_ERROR_BASE_IO             = NPT_ERROR_BASE-300;
-const int NPT_ERROR_BASE_SOCKET         = NPT_ERROR_BASE-400;
-const int NPT_ERROR_BASE_INTERFACES     = NPT_ERROR_BASE-500;
-const int NPT_ERROR_BASE_XML            = NPT_ERROR_BASE-600;
-const int NPT_ERROR_BASE_UNIX           = NPT_ERROR_BASE-700;
-const int NPT_ERROR_BASE_HTTP           = NPT_ERROR_BASE-800;
-const int NPT_ERROR_BASE_THREADS        = NPT_ERROR_BASE-900;
-const int NPT_ERROR_BASE_SERIAL_PORT    = NPT_ERROR_BASE-1000;
-const int NPT_ERROR_BASE_TLS            = NPT_ERROR_BASE-1100;
+#define NPT_ERROR_BASE_GENERAL        (NPT_ERROR_BASE-0)
+#define NPT_ERROR_BASE_LIST           (NPT_ERROR_BASE-100)
+#define NPT_ERROR_BASE_FILE           (NPT_ERROR_BASE-200)
+#define NPT_ERROR_BASE_IO             (NPT_ERROR_BASE-300)
+#define NPT_ERROR_BASE_SOCKET         (NPT_ERROR_BASE-400)
+#define NPT_ERROR_BASE_INTERFACES     (NPT_ERROR_BASE-500)
+#define NPT_ERROR_BASE_XML            (NPT_ERROR_BASE-600)
+#define NPT_ERROR_BASE_UNIX           (NPT_ERROR_BASE-700)
+#define NPT_ERROR_BASE_HTTP           (NPT_ERROR_BASE-800)
+#define NPT_ERROR_BASE_THREADS        (NPT_ERROR_BASE-900)
+#define NPT_ERROR_BASE_SERIAL_PORT    (NPT_ERROR_BASE-1000)
+#define NPT_ERROR_BASE_TLS            (NPT_ERROR_BASE-1100)
 
 // general errors
-const int NPT_ERROR_INVALID_PARAMETERS  = NPT_ERROR_BASE_GENERAL - 0;
-const int NPT_ERROR_PERMISSION_DENIED   = NPT_ERROR_BASE_GENERAL - 1;
-const int NPT_ERROR_OUT_OF_MEMORY       = NPT_ERROR_BASE_GENERAL - 2;
-const int NPT_ERROR_NO_SUCH_NAME        = NPT_ERROR_BASE_GENERAL - 3;
-const int NPT_ERROR_NO_SUCH_PROPERTY    = NPT_ERROR_BASE_GENERAL - 4;
-const int NPT_ERROR_NO_SUCH_ITEM        = NPT_ERROR_BASE_GENERAL - 5;
-const int NPT_ERROR_NO_SUCH_CLASS       = NPT_ERROR_BASE_GENERAL - 6;
-const int NPT_ERROR_OVERFLOW            = NPT_ERROR_BASE_GENERAL - 7;
-const int NPT_ERROR_INTERNAL            = NPT_ERROR_BASE_GENERAL - 8;
-const int NPT_ERROR_INVALID_STATE       = NPT_ERROR_BASE_GENERAL - 9;
-const int NPT_ERROR_INVALID_FORMAT      = NPT_ERROR_BASE_GENERAL - 10;
-const int NPT_ERROR_INVALID_SYNTAX      = NPT_ERROR_BASE_GENERAL - 11;
-const int NPT_ERROR_NOT_IMPLEMENTED     = NPT_ERROR_BASE_GENERAL - 12;
-const int NPT_ERROR_NOT_SUPPORTED       = NPT_ERROR_BASE_GENERAL - 13;
-const int NPT_ERROR_TIMEOUT             = NPT_ERROR_BASE_GENERAL - 14;
-const int NPT_ERROR_WOULD_BLOCK         = NPT_ERROR_BASE_GENERAL - 15;
-const int NPT_ERROR_TERMINATED          = NPT_ERROR_BASE_GENERAL - 16;
-const int NPT_ERROR_OUT_OF_RANGE        = NPT_ERROR_BASE_GENERAL - 17;
-const int NPT_ERROR_OUT_OF_RESOURCES    = NPT_ERROR_BASE_GENERAL - 18;
+#define NPT_ERROR_INVALID_PARAMETERS  (NPT_ERROR_BASE_GENERAL - 0)
+#define NPT_ERROR_PERMISSION_DENIED   (NPT_ERROR_BASE_GENERAL - 1)
+#define NPT_ERROR_OUT_OF_MEMORY       (NPT_ERROR_BASE_GENERAL - 2)
+#define NPT_ERROR_NO_SUCH_NAME        (NPT_ERROR_BASE_GENERAL - 3)
+#define NPT_ERROR_NO_SUCH_PROPERTY    (NPT_ERROR_BASE_GENERAL - 4)
+#define NPT_ERROR_NO_SUCH_ITEM        (NPT_ERROR_BASE_GENERAL - 5)
+#define NPT_ERROR_NO_SUCH_CLASS       (NPT_ERROR_BASE_GENERAL - 6)
+#define NPT_ERROR_OVERFLOW            (NPT_ERROR_BASE_GENERAL - 7)
+#define NPT_ERROR_INTERNAL            (NPT_ERROR_BASE_GENERAL - 8)
+#define NPT_ERROR_INVALID_STATE       (NPT_ERROR_BASE_GENERAL - 9)
+#define NPT_ERROR_INVALID_FORMAT      (NPT_ERROR_BASE_GENERAL - 10)
+#define NPT_ERROR_INVALID_SYNTAX      (NPT_ERROR_BASE_GENERAL - 11)
+#define NPT_ERROR_NOT_IMPLEMENTED     (NPT_ERROR_BASE_GENERAL - 12)
+#define NPT_ERROR_NOT_SUPPORTED       (NPT_ERROR_BASE_GENERAL - 13)
+#define NPT_ERROR_TIMEOUT             (NPT_ERROR_BASE_GENERAL - 14)
+#define NPT_ERROR_WOULD_BLOCK         (NPT_ERROR_BASE_GENERAL - 15)
+#define NPT_ERROR_TERMINATED          (NPT_ERROR_BASE_GENERAL - 16)
+#define NPT_ERROR_OUT_OF_RANGE        (NPT_ERROR_BASE_GENERAL - 17)
+#define NPT_ERROR_OUT_OF_RESOURCES    (NPT_ERROR_BASE_GENERAL - 18)
+#define NPT_ERROR_NOT_ENOUGH_SPACE    (NPT_ERROR_BASE_GENERAL - 19)
+#define NPT_ERROR_INTERRUPTED         (NPT_ERROR_BASE_GENERAL - 20)
+#define NPT_ERROR_CANCELLED           (NPT_ERROR_BASE_GENERAL - 21)
 
 /* standard error codes                                  */
 /* these are special codes to convey an errno            */
 /* the error code is (SHI_ERROR_BASE_ERRNO - errno)      */
 /* where errno is the positive integer from errno.h      */
-const int NPT_ERROR_BASE_ERRNO          = NPT_ERROR_BASE-2000;
-#define NPT_ERROR_ERRNO(e)              (NPT_ERROR_BASE_ERRNO - (e))
+#define NPT_ERROR_BASE_ERRNO          (NPT_ERROR_BASE-2000)
+#define NPT_ERROR_ERRNO(e)            (NPT_ERROR_BASE_ERRNO - (e))
 
 /*----------------------------------------------------------------------
 |   functions

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptRingBuffer.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptRingBuffer.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptSimpleMessageQueue.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptSimpleMessageQueue.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptSockets.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptSockets.h Changed

@@ -60,6 +60,9 @@
 const int NPT_ERROR_ADDRESS_IN_USE        = NPT_ERROR_BASE_SOCKET - 12;
 const int NPT_ERROR_NETWORK_DOWN          = NPT_ERROR_BASE_SOCKET - 13;
 const int NPT_ERROR_NETWORK_UNREACHABLE   = NPT_ERROR_BASE_SOCKET - 14;
+const int NPT_ERROR_NOT_CONNECTED         = NPT_ERROR_BASE_SOCKET - 15;
+
+const unsigned int NPT_SOCKET_FLAG_CANCELLABLE = 1; // make the socket cancellable
 
 /*----------------------------------------------------------------------
 |   forward references
@@ -123,14 +126,13 @@
     // interface methods
     virtual NPT_Result Bind(const NPT_SocketAddress& address, bool reuse_address = true) = 0;
     virtual NPT_Result Connect(const NPT_SocketAddress& address, NPT_Timeout timeout) = 0;
-    virtual NPT_Result Disconnect() = 0;
     virtual NPT_Result WaitForConnection(NPT_Timeout timeout) = 0;
     virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream) = 0;
     virtual NPT_Result GetOutputStream(NPT_OutputStreamReference& stream) = 0;
     virtual NPT_Result GetInfo(NPT_SocketInfo& info) = 0;
-    virtual NPT_Result SetBlockingMode(bool blocking) = 0;
     virtual NPT_Result SetReadTimeout(NPT_Timeout timeout) = 0;
     virtual NPT_Result SetWriteTimeout(NPT_Timeout timeout) = 0;
+    virtual NPT_Result Cancel(bool shutdown=true) = 0;
 };
 
 /*----------------------------------------------------------------------
@@ -144,8 +146,8 @@
     // methods
     virtual NPT_Result Send(const NPT_DataBuffer&    packet, 
                             const NPT_SocketAddress* address = NULL) = 0;
-    virtual NPT_Result Receive(NPT_DataBuffer&     packet, 
-                               NPT_SocketAddress*  address = NULL) = 0;
+    virtual NPT_Result Receive(NPT_DataBuffer&    packet, 
+                               NPT_SocketAddress* address = NULL) = 0;
 };
 
 /*----------------------------------------------------------------------
@@ -176,7 +178,8 @@
     // interface methods
     virtual NPT_Result Listen(unsigned int max_clients) = 0;
     virtual NPT_Result WaitForNewClient(NPT_Socket*& client, 
-                                        NPT_Timeout  timeout) = 0;
+                                        NPT_Timeout  timeout,
+                                        NPT_Flags    flags) = 0;
 };
 
 /*----------------------------------------------------------------------
@@ -186,8 +189,7 @@
 {
 public:
     // constructor and destructor
-    NPT_Socket(NPT_SocketInterface* delegate) :
-        m_SocketDelegate(delegate) {}
+    explicit NPT_Socket(NPT_SocketInterface* delegate) : m_SocketDelegate(delegate) {}
     virtual ~NPT_Socket();
 
     // delegate NPT_SocketInterface methods
@@ -197,10 +199,7 @@
     NPT_Result Connect(const NPT_SocketAddress& address,            
                        NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
        return m_SocketDelegate->Connect(address, timeout);                 
-    }       
-    NPT_Result Disconnect() {
-       return m_SocketDelegate->Disconnect();                 
-    }  
+    }                                                               
     NPT_Result WaitForConnection(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
         return m_SocketDelegate->WaitForConnection(timeout);                 
     } 
@@ -213,15 +212,15 @@
     NPT_Result GetInfo(NPT_SocketInfo& info) {                      
         return m_SocketDelegate->GetInfo(info);                            
     }                                                               
-    NPT_Result SetBlockingMode(bool blocking) {                      
-        return m_SocketDelegate->SetBlockingMode(blocking);                            
-    }                                                          
     NPT_Result SetReadTimeout(NPT_Timeout timeout) {                      
         return m_SocketDelegate->SetReadTimeout(timeout);                            
     }                                                          
     NPT_Result SetWriteTimeout(NPT_Timeout timeout) {                      
         return m_SocketDelegate->SetWriteTimeout(timeout);                            
     }                                                          
+    NPT_Result Cancel(bool shutdown=true) {                      
+        return m_SocketDelegate->Cancel(shutdown);                            
+    }                                                          
 
 protected:
     // constructor
@@ -241,7 +240,7 @@
 {
  public:
     // constructor and destructor
-             NPT_UdpSocket();
+             NPT_UdpSocket(NPT_Flags flags=NPT_SOCKET_FLAG_CANCELLABLE);
     virtual ~NPT_UdpSocket();
 
     // delegate NPT_UdpSocketInterface methods
@@ -270,7 +269,7 @@
 {
 public:
     // constructor and destructor
-             NPT_UdpMulticastSocket();
+             NPT_UdpMulticastSocket(NPT_Flags flags=NPT_SOCKET_FLAG_CANCELLABLE);
     virtual ~NPT_UdpMulticastSocket();
 
     // delegate NPT_UdpMulticastSocketInterface methods
@@ -303,7 +302,7 @@
 {
 public:
     // constructors and destructor
-             NPT_TcpClientSocket();
+             NPT_TcpClientSocket(NPT_Flags flags=NPT_SOCKET_FLAG_CANCELLABLE);
     virtual ~NPT_TcpClientSocket();
 };
 
@@ -315,7 +314,7 @@
 {
 public:
     // constructors and destructor
-             NPT_TcpServerSocket();
+             NPT_TcpServerSocket(NPT_Flags flags=NPT_SOCKET_FLAG_CANCELLABLE);
     virtual ~NPT_TcpServerSocket();
 
     // delegate NPT_TcpServerSocketInterface methods
@@ -323,8 +322,9 @@
         return m_TcpServerSocketDelegate->Listen(max_clients);
     }
     NPT_Result WaitForNewClient(NPT_Socket*& client, 
-                                NPT_Timeout  timeout = NPT_TIMEOUT_INFINITE) {
-        return m_TcpServerSocketDelegate->WaitForNewClient(client, timeout);
+                                NPT_Timeout  timeout = NPT_TIMEOUT_INFINITE,
+                                NPT_Flags    flags = 0) {
+        return m_TcpServerSocketDelegate->WaitForNewClient(client, timeout, flags);
     }
 
 protected:

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptStack.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptStack.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptStreams.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptStreams.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptStrings.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptStrings.h Changed

@@ -42,7 +42,9 @@
 #include "NptTypes.h"
 #include "NptConstants.h"
 #include "NptList.h"
+#include "NptArray.h"
 #include "NptDebug.h"
+#include "NptHash.h"
 
 /*----------------------------------------------------------------------
 |   constants
@@ -64,10 +66,9 @@
     NPT_String(const NPT_String& str);
     NPT_String(const char* str);
     NPT_String(const char* str, NPT_Size length);
-    NPT_String(const char* str, NPT_Ordinal first, NPT_Size length);
     NPT_String(char c, NPT_Cardinal repeat = 1);
     NPT_String() : m_Chars(NULL) {}
-   ~NPT_String() { if (m_Chars) delete GetBuffer(); }
+   ~NPT_String() { if (m_Chars) GetBuffer()->Destroy(); }
 
     // string info and manipulations
     bool       IsEmpty() const { return m_Chars == NULL || GetBuffer()->GetLength() == 0; }
@@ -96,11 +97,16 @@
                SubString(GetLength()-length, length);
     }
     NPT_List<NPT_String> Split(const char* separator) const;
+    NPT_Array<NPT_String> SplitAny(const char* separator) const;
     static NPT_String Join(NPT_List<NPT_String>& args, const char* separator);
     
     // buffer management
     void       Reserve(NPT_Size length);
 
+    // hashing
+    NPT_UInt32 GetHash32() const;
+    NPT_UInt64 GetHash64() const;
+
     // conversions
     NPT_String ToLowercase() const;
     NPT_String ToUppercase() const;
@@ -117,30 +123,32 @@
     // processing
     void MakeLowercase();
     void MakeUppercase();
-    void Replace(char a, char b);
-    void Replace(char a, const char* b);
+    const NPT_String& Replace(char a, char b);
+    const NPT_String& Replace(char a, const char* b);
 
     // search
     int  Find(char c, NPT_Ordinal start = 0, bool ignore_case = false) const;
     int  Find(const char* s, NPT_Ordinal start = 0, bool ignore_case = false) const;
+    int  FindAny(const char* s, NPT_Ordinal start, bool ignore_case = false) const;
     int  ReverseFind(char c, NPT_Ordinal start = 0, bool ignore_case = false) const;
     int  ReverseFind(const char* s, NPT_Ordinal start = 0, bool ignore_case = false) const;
     bool StartsWith(const char* s, bool ignore_case = false) const;
     bool EndsWith(const char* s, bool ignore_case = false) const;
 
     // editing
-    void Insert(const char* s, NPT_Ordinal where = 0);
-    void Erase(NPT_Ordinal start, NPT_Cardinal count = 1);
-    void Replace(NPT_Ordinal start, NPT_Cardinal count, const char* s);
-    void TrimLeft();
-    void TrimLeft(char c);
-    void TrimLeft(const char* chars);
-    void TrimRight();
-    void TrimRight(char c);
-    void TrimRight(const char* chars);
-    void Trim();
-    void Trim(char c);
-    void Trim(const char* chars);
+    const NPT_String& Insert(const char* s, NPT_Ordinal where = 0);
+    const NPT_String& Erase(NPT_Ordinal start, NPT_Cardinal count = 1);
+    const NPT_String& Replace(const char* before, const char* after);
+    // void Replace(NPT_Ordinal start, NPT_Cardinal count, const char* s);
+    const NPT_String& TrimLeft();
+    const NPT_String& TrimLeft(char c);
+    const NPT_String& TrimLeft(const char* chars);
+    const NPT_String& TrimRight();
+    const NPT_String& TrimRight(char c);
+    const NPT_String& TrimRight(const char* chars);
+    const NPT_String& Trim();
+    const NPT_String& Trim(char c);
+    const NPT_String& Trim(const char* chars);
 
     // type casting
     operator char*() const        { return m_Chars ? m_Chars: &EmptyString; }
@@ -225,13 +233,14 @@
         NPT_Size GetLength() const      { return m_Length; }
         void SetLength(NPT_Size length) { m_Length = length; }
         NPT_Size GetAllocated() const   { return m_Allocated; }
-
+        void Destroy() { ::operator delete((void*)this); }
+        
     private:
         // methods
         Buffer(NPT_Size allocated, NPT_Size length = 0) : 
             m_Length(length),
             m_Allocated(allocated) {}
-
+        
         // members
         NPT_Cardinal m_Length;
         NPT_Cardinal m_Allocated;
@@ -336,4 +345,14 @@
     return s2.Compare(s1) <= 0; 
 }
 
+/*----------------------------------------------------------------------
+|   hashing
++---------------------------------------------------------------------*/
+template <>
+struct NPT_Hash<NPT_String>
+{
+    NPT_UInt32 operator()(const NPT_String& s) const { return s.GetHash32(); }
+};
+
+
 #endif // _NPT_STRINGS_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptSystem.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptSystem.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptThreads.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptThreads.h Changed

@@ -46,6 +46,19 @@
 const int NPT_ERROR_CALLBACK_NOTHING_PENDING  = NPT_ERROR_BASE_THREADS-1;
 
 /*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+const int NPT_THREAD_PRIORITY_MIN           = -15;
+const int NPT_THREAD_PRIORITY_IDLE          = -15;
+const int NPT_THREAD_PRIORITY_LOWEST        =  -2;
+const int NPT_THREAD_PRIORITY_BELOW_NORMAL  =  -1;
+const int NPT_THREAD_PRIORITY_NORMAL        =   0;
+const int NPT_THREAD_PRIORITY_ABOVE_NORMAL  =   1;
+const int NPT_THREAD_PRIORITY_HIGHEST       =   2;
+const int NPT_THREAD_PRIORITY_TIME_CRITICAL =  15;
+const int NPT_THREAD_PRIORITY_MAX           =  15;
+
+/*----------------------------------------------------------------------
 |   NPT_MutexInterface
 +---------------------------------------------------------------------*/
 class NPT_MutexInterface
@@ -103,6 +116,20 @@
 };
 
 /*----------------------------------------------------------------------
+|   NPT_SingletonLock
++---------------------------------------------------------------------*/
+class NPT_SingletonLock
+{
+public:
+    static NPT_Mutex& GetInstance() {
+        return Instance;
+    }
+    
+private:
+    static NPT_Mutex Instance;
+};
+
+/*----------------------------------------------------------------------
 |   NPT_SharedVariableInterface
 +---------------------------------------------------------------------*/
 class NPT_SharedVariableInterface
@@ -195,7 +222,9 @@
     // methods
     virtual           ~NPT_ThreadInterface() {}
     virtual NPT_Result Start() = 0;
-    virtual NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE)  = 0;
+    virtual NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) = 0;
+    virtual NPT_Result SetPriority(int /*priority*/) { return NPT_SUCCESS; } 
+    virtual NPT_Result GetPriority(int& priority) = 0;
 };
 
 /*----------------------------------------------------------------------
@@ -209,6 +238,8 @@
 
     // class methods
     static ThreadId GetCurrentThreadId();
+    static NPT_Result SetCurrentThreadPriority(int priority);
+    static NPT_Result GetCurrentThreadPriority(int& priority);
 
     // methods
     explicit NPT_Thread(bool detached = false);
@@ -222,14 +253,18 @@
     NPT_Result Wait(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE)  { 
         return m_Delegate->Wait(timeout);  
     }
+    NPT_Result SetPriority(int priority) {
+        return m_Delegate->SetPriority(priority);
+    }    
+    NPT_Result GetPriority(int& priority) {
+        return m_Delegate->GetPriority(priority);
+    }
 
     // NPT_Runnable methods
     virtual void Run() {}
 
     // NPT_Interruptible methods
-    virtual NPT_Result Interrupt() { 
-        return m_Delegate->Interrupt(); 
-    }
+    virtual NPT_Result Interrupt() { return m_Delegate->Interrupt(); }
 
  private:
     // members

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptTime.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptTime.h Changed

@@ -36,6 +36,13 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "NptTypes.h"
+#include "NptStrings.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+#define NPT_DATETIME_YEAR_MIN 1901
+#define NPT_DATETIME_YEAR_MAX 2262
 
 /*----------------------------------------------------------------------
 |   NPT_TimeStamp
@@ -44,26 +51,36 @@
 {
  public:
     // methods
-    NPT_TimeStamp(unsigned long seconds = 0, unsigned long nano_seconds = 0) :
-        m_Seconds(seconds), m_NanoSeconds(nano_seconds) {}
-    NPT_TimeStamp(float seconds);
-    operator float() const;
+    NPT_TimeStamp(const NPT_TimeStamp& timestamp);
+    NPT_TimeStamp() : m_NanoSeconds(0) {}
+    NPT_TimeStamp(NPT_Int64 nanoseconds) : m_NanoSeconds(nanoseconds) {}
+    NPT_TimeStamp(double seconds);
     NPT_TimeStamp& operator+=(const NPT_TimeStamp& time_stamp);
     NPT_TimeStamp& operator-=(const NPT_TimeStamp& time_stamp);
-    bool operator==(const NPT_TimeStamp& time_stamp) const;
-    bool operator!=(const NPT_TimeStamp& time_stamp) const;
-    bool operator>(const NPT_TimeStamp& time_stamp) const;
-    bool operator<(const NPT_TimeStamp& time_stamp) const;
-    bool operator>=(const NPT_TimeStamp& time_stamp) const;
-    bool operator<=(const NPT_TimeStamp& time_stamp) const;
-
-    // friend operators
-    friend NPT_TimeStamp operator+(const NPT_TimeStamp& timestamp, long seconds);
-    friend NPT_TimeStamp operator-(const NPT_TimeStamp& timestamp, long seconds);
+    bool operator==(const NPT_TimeStamp& t) const { return m_NanoSeconds == t.m_NanoSeconds; }
+    bool operator!=(const NPT_TimeStamp& t) const { return m_NanoSeconds != t.m_NanoSeconds; }
+    bool operator> (const NPT_TimeStamp& t) const { return m_NanoSeconds >  t.m_NanoSeconds; }
+    bool operator< (const NPT_TimeStamp& t) const { return m_NanoSeconds <  t.m_NanoSeconds; }
+    bool operator>=(const NPT_TimeStamp& t) const { return m_NanoSeconds >= t.m_NanoSeconds; }
+    bool operator<=(const NPT_TimeStamp& t) const { return m_NanoSeconds <= t.m_NanoSeconds; }
 
+    // accessors
+    void SetNanos(NPT_Int64 nanoseconds) { m_NanoSeconds = nanoseconds;          }
+    void SetMicros(NPT_Int64 micros)     { m_NanoSeconds = micros  * 1000;       }
+    void SetMillis(NPT_Int64 millis)     { m_NanoSeconds = millis  * 1000000;    }
+    void SetSeconds(NPT_Int64 seconds)   { m_NanoSeconds = seconds * 1000000000; }
+        
+    // conversion
+    operator double() const               { return (double)m_NanoSeconds/1E9; }
+    void FromNanos(NPT_Int64 nanoseconds) { m_NanoSeconds = nanoseconds;      }
+    NPT_Int64 ToNanos() const             { return m_NanoSeconds;             }
+    NPT_Int64 ToMicros() const            { return m_NanoSeconds/1000;        }
+    NPT_Int64 ToMillis() const            { return m_NanoSeconds/1000000;     }
+    NPT_Int64 ToSeconds() const           { return m_NanoSeconds/1000000000;  }
+    
+private:
     // members
-    long m_Seconds;
-    long m_NanoSeconds;
+    NPT_Int64 m_NanoSeconds;
 };
 
 /*----------------------------------------------------------------------
@@ -96,55 +113,44 @@
 /*----------------------------------------------------------------------
 |   NPT_DateTime
 +---------------------------------------------------------------------*/
-typedef struct {
-    NPT_Int32 year;
-    NPT_Int32 month;
-    NPT_Int32 day;
-    NPT_Int32 hours;
-    NPT_Int32 minutes;
-    NPT_Int32 seconds;
-    NPT_Int32 milliseconds;
-} NPT_DateTime;
-
-typedef NPT_Int32 NPT_TimeZone; /* minutes westward of GMT */
-typedef NPT_DateTime NPT_LocalDate;
-
-/*----------------------------------------------------------------------
-|   NPT_Date
-+---------------------------------------------------------------------*/
-typedef struct {
-    NPT_LocalDate local;
-    NPT_TimeZone  timezone;
-} NPT_Date;
-
-/*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define NPT_TIME_MIN_YEAR 1970
-#define NPT_TIME_MAX_YEAR 2106
-
-/*----------------------------------------------------------------------
-|   NPT_Time
-+---------------------------------------------------------------------*/
-class NPT_Time
-{
+class NPT_DateTime {
 public:
+    // types
+    enum Format {
+        FORMAT_ANSI,
+        FORMAT_W3C,
+        FORMAT_RFC_1123,  // RFC 822 updated by RFC 1123
+        FORMAT_RFC_1036   // RFC 850 updated by RFC 1036
+    };
+    
+    enum FormatFlags {
+        FLAG_EMIT_FRACTION      = 1,
+        FLAG_EXTENDED_PRECISION = 2
+    };
+    
+    // class methods
+    NPT_Int32 GetLocalTimeZone();
+    
+    // constructors
+    NPT_DateTime();
+    NPT_DateTime(const NPT_TimeStamp& timestamp, bool local=false);
+    
     // methods
-    static NPT_Result GetGMTDateFromTimeStamp(const NPT_TimeStamp& timestamp, 
-                                              NPT_Date&            date);
-    static NPT_Result GetLocalDate(NPT_LocalDate& today, NPT_TimeStamp& now);
-
-    // helper functions
-    static NPT_Result FormatDate(const NPT_Date& date, 
-                                 char*           output, 
-                                 NPT_Size        size);
-    static NPT_Result GetDateFromString(const char* input, 
-                                        NPT_Date&   date);
-    static NPT_Result ParseANSIDate(const char* ansi_date, 
-                                    NPT_Date&   date,
-                                    bool        relaxed = true);
-    static NPT_Result ParseRFC850Date(const char* rfc850_date, 
-                                      NPT_Date&   date);
+    NPT_Result ChangeTimeZone(NPT_Int32 timezone);
+    NPT_Result FromTimeStamp(const NPT_TimeStamp& timestamp, bool local=false);
+    NPT_Result ToTimeStamp(NPT_TimeStamp& timestamp) const;
+    NPT_Result FromString(const char* date, Format format = FORMAT_ANSI);
+    NPT_String ToString(Format format = FORMAT_ANSI, NPT_Flags flags=0) const;
+    
+    // members
+    NPT_Int32 m_Year;        // year
+    NPT_Int32 m_Month;       // month of the year (1-12)
+    NPT_Int32 m_Day;         // day of the month (1-31)
+    NPT_Int32 m_Hours;       // hours (0-23)
+    NPT_Int32 m_Minutes;     // minutes (0-59)
+    NPT_Int32 m_Seconds;     // seconds (0-59)
+    NPT_Int32 m_NanoSeconds; // nanoseconds (0-999999999)
+    NPT_Int32 m_TimeZone;    // minutes offset from GMT
 };
 
 #endif // _NPT_TIME_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptTls.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptTls.h Changed

@@ -37,19 +37,42 @@
 +---------------------------------------------------------------------*/
 #include "NptConfig.h"
 #include "NptStreams.h"
+#include "NptTime.h"
+#include "NptHttp.h"
 
 /*----------------------------------------------------------------------
 |   error codes
 +---------------------------------------------------------------------*/
-const NPT_Result NPT_ERROR_INVALID_PASSWORD             = (NPT_ERROR_BASE_TLS-1);
-const NPT_Result NPT_ERROR_TLS_INVALID_HANDSHAKE        = (NPT_ERROR_BASE_TLS-2);
-const NPT_Result NPT_ERROR_TLS_INVALID_PROTOCOL_MESSAGE = (NPT_ERROR_BASE_TLS-3);
-const NPT_Result NPT_ERROR_TLS_INVALID_HMAC             = (NPT_ERROR_BASE_TLS-4);
-const NPT_Result NPT_ERROR_TLS_INVALID_VERSION          = (NPT_ERROR_BASE_TLS-5);
-const NPT_Result NPT_ERROR_TLS_INVALID_SESSION          = (NPT_ERROR_BASE_TLS-6);
-const NPT_Result NPT_ERROR_TLS_NO_CIPHER                = (NPT_ERROR_BASE_TLS-7);
-const NPT_Result NPT_ERROR_TLS_BAD_CERTIFICATE          = (NPT_ERROR_BASE_TLS-8);
-const NPT_Result NPT_ERROR_INVALID_KEY                  = (NPT_ERROR_BASE_TLS-9);
+const NPT_Result NPT_ERROR_INVALID_PASSWORD                     = (NPT_ERROR_BASE_TLS-1);
+const NPT_Result NPT_ERROR_TLS_INVALID_HANDSHAKE                = (NPT_ERROR_BASE_TLS-2);
+const NPT_Result NPT_ERROR_TLS_INVALID_PROTOCOL_MESSAGE         = (NPT_ERROR_BASE_TLS-3);
+const NPT_Result NPT_ERROR_TLS_INVALID_HMAC                     = (NPT_ERROR_BASE_TLS-4);
+const NPT_Result NPT_ERROR_TLS_INVALID_VERSION                  = (NPT_ERROR_BASE_TLS-5);
+const NPT_Result NPT_ERROR_TLS_INVALID_SESSION                  = (NPT_ERROR_BASE_TLS-6);
+const NPT_Result NPT_ERROR_TLS_NO_CIPHER                        = (NPT_ERROR_BASE_TLS-7);
+const NPT_Result NPT_ERROR_TLS_BAD_CERTIFICATE                  = (NPT_ERROR_BASE_TLS-8);
+const NPT_Result NPT_ERROR_TLS_INVALID_KEY                      = (NPT_ERROR_BASE_TLS-9);
+const NPT_Result NPT_ERROR_TLS_NO_CLIENT_RENEGOTIATION          = (NPT_ERROR_BASE_TLS-10);
+const NPT_Result NPT_ERROR_TLS_INVALID_FINISHED_MESSAGE         = (NPT_ERROR_BASE_TLS-11);
+const NPT_Result NPT_ERROR_TLS_NO_CERTIFICATE_DEFINED           = (NPT_ERROR_BASE_TLS-12);
+const NPT_Result NPT_ERROR_TLS_ALERT_HANDSHAKE_FAILED           = (NPT_ERROR_BASE_TLS-13); 
+const NPT_Result NPT_ERROR_TLS_ALERT_BAD_CERTIFICATE            = (NPT_ERROR_BASE_TLS-14);
+const NPT_Result NPT_ERROR_TLS_ALERT_INVALID_VERSION            = (NPT_ERROR_BASE_TLS-15);
+const NPT_Result NPT_ERROR_TLS_ALERT_BAD_RECORD_MAC             = (NPT_ERROR_BASE_TLS-16);
+const NPT_Result NPT_ERROR_TLS_ALERT_DECODE_ERROR               = (NPT_ERROR_BASE_TLS-17);
+const NPT_Result NPT_ERROR_TLS_ALERT_DECRYPT_ERROR              = (NPT_ERROR_BASE_TLS-18);
+const NPT_Result NPT_ERROR_TLS_ALERT_ILLEGAL_PARAMETER          = (NPT_ERROR_BASE_TLS-19);
+const NPT_Result NPT_ERROR_TLS_ALERT_UNEXPECTED_MESSAGE         = (NPT_ERROR_BASE_TLS-20);
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_FAILURE              = (NPT_ERROR_BASE_TLS-21);
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_NO_TRUST_ANCHOR      = (NPT_ERROR_BASE_TLS-22);
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_BAD_SIGNATURE        = (NPT_ERROR_BASE_TLS-23);      
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_NOT_YET_VALID        = (NPT_ERROR_BASE_TLS-24);
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_EXPIRED              = (NPT_ERROR_BASE_TLS-25);
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_SELF_SIGNED          = (NPT_ERROR_BASE_TLS-26);
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_INVALID_CHAIN        = (NPT_ERROR_BASE_TLS-27);
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_UNSUPPORTED_DIGEST   = (NPT_ERROR_BASE_TLS-28);
+const NPT_Result NPT_ERROR_TLS_CERTIFICATE_INVALID_PRIVATE_KEY  = (NPT_ERROR_BASE_TLS-29);
+const NPT_Result NPT_ERROR_TLS_DNS_NAME_MISMATCH                = (NPT_ERROR_BASE_TLS-30);
 
 /*----------------------------------------------------------------------
 |   constants
@@ -75,87 +98,209 @@
     NPT_TLS_KEY_FORMAT_PKCS12
 } NPT_TlsKeyFormat;
 
+struct NPT_TlsTrustAnchorData {
+    const unsigned char* cert_data;
+    unsigned int         cert_size;
+};
+
+/*----------------------------------------------------------------------
+|   NPT_Tls
++---------------------------------------------------------------------*/
+class NPT_Tls
+{
+public:
+    static const NPT_TlsTrustAnchorData* GetDefaultTrustAnchors(NPT_Ordinal indx=0);
+    static bool MatchDnsNames(const char*                 hostname,
+                              const NPT_List<NPT_String>& dns_names);
+    static bool MatchDnsName(const char* hostname, const char* dns_name);
+                              
+private:
+    NPT_Tls() {}; // don't instantiate 
+};
+
 /*----------------------------------------------------------------------
 |   NPT_TlsContext
 +---------------------------------------------------------------------*/
-class NPT_TlsContext
+class NPT_TlsContext : public NPT_AutomaticCleaner::Singleton
 {
 public:
-    NPT_TlsContext();
+    enum {
+        OPTION_VERIFY_LATER               = 1,
+        OPTION_REQUIRE_CLIENT_CERTIFICATE = 2,
+        OPTION_ADD_DEFAULT_TRUST_ANCHORS  = 4,
+        OPTION_NO_SESSION_CACHE           = 8
+    };
+    NPT_TlsContext(NPT_Flags options=0);
    ~NPT_TlsContext();
    
-   // methods
-   NPT_Result LoadKey(NPT_TlsKeyFormat     key_format, 
-                      const unsigned char* key_data,
-                      NPT_Size             key_data_size,
-                      const char*          password);
-                   
+    // methods
+    NPT_Result LoadKey(NPT_TlsKeyFormat     key_format, 
+                       const unsigned char* key_data,
+                       NPT_Size             key_data_size,
+                       const char*          password);
       
+    NPT_Result SelfSignCertificate(const char* common_name,
+                                   const char* organization,
+                                   const char* organizational_name);
+                                   
+    /** 
+     * Add one trust anchor
+     */
+    NPT_Result AddTrustAnchor(const unsigned char* ta_data,
+                              NPT_Size             ta_data_size);
+    /**
+     * Add one or more trust anchors, from a list
+     * @param anchors Array of trust anchor data
+     * @param anchor_count Number of anchors in the array, or 0 if the array
+     * is terminated by a 'sentinel' (an anchor data with the field cert_data set
+     * to NULL and the field cert_size set to 0).
+     */
+    NPT_Result AddTrustAnchors(const NPT_TlsTrustAnchorData* anchors, 
+                               NPT_Cardinal                  anchor_count = 0);
+
 protected:
     NPT_TlsContextImpl* m_Impl;
     
     // friends
+    friend class NPT_TlsSession;
     friend class NPT_TlsClientSession;
     friend class NPT_TlsServerSession;
 };
 
-typedef NPT_Reference<NPT_TlsContext> NPT_TlsContextReference;
-
 /*----------------------------------------------------------------------
 |   NPT_TlsCertificateInfo
 +---------------------------------------------------------------------*/
 struct NPT_TlsCertificateInfo
 {
-    struct {
+    struct _subject {
         NPT_String common_name;
         NPT_String organization;
         NPT_String organizational_name;
     } subject;
-    struct {
+    struct _issuer {
         NPT_String common_name;
         NPT_String organization;
         NPT_String organizational_name;
     } issuer;
-    struct {
+    struct _fingerprint {
         unsigned char sha1[20];
         unsigned char md5[16];
     } fingerprint;
+    NPT_DateTime issue_date;
+    NPT_DateTime expiration_date;
+    NPT_List<NPT_String> alternate_names;
 };
 
 /*----------------------------------------------------------------------
-|   NPT_TlsClientSession
+|   NPT_TlsSession
 +---------------------------------------------------------------------*/
-class NPT_TlsClientSession
+class NPT_TlsSession
 {
 public:
-    NPT_TlsClientSession(NPT_TlsContextReference&   context,
-                         NPT_InputStreamReference&  input,
-                         NPT_OutputStreamReference& output);
-   ~NPT_TlsClientSession();
-    NPT_Result Handshake();
-    NPT_Result GetSessionId(NPT_DataBuffer& session_id);
-    NPT_UInt32 GetCipherSuiteId();
-    NPT_Result GetPeerCertificateInfo(NPT_TlsCertificateInfo& info);
-    NPT_Result GetInputStream(NPT_InputStreamReference& stream);
-    NPT_Result GetOutputStream(NPT_OutputStreamReference& stream);
+    virtual ~NPT_TlsSession();
+    virtual NPT_Result Handshake();
+    virtual NPT_Result GetHandshakeStatus();
+    virtual NPT_Result GetPeerCertificateInfo(NPT_TlsCertificateInfo& info, NPT_Ordinal position=0);
+    virtual NPT_Result VerifyPeerCertificate();
+    virtual NPT_Result VerifyDnsNameMatch(const char* hostname);
+    virtual NPT_Result GetSessionId(NPT_DataBuffer& session_id);
+    virtual NPT_UInt32 GetCipherSuiteId();
+    virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream);
+    virtual NPT_Result GetOutputStream(NPT_OutputStreamReference& stream);
     
 protected:
-    NPT_TlsContextReference           m_Context;
+    NPT_TlsSession(NPT_TlsContext&     context, 
+                   NPT_TlsSessionImpl* impl);
+
+    NPT_TlsContext&                   m_Context;
     NPT_Reference<NPT_TlsSessionImpl> m_Impl;
+    NPT_InputStreamReference          m_InputStream;
+    NPT_OutputStreamReference         m_OutputStream;
+};
+
+/*----------------------------------------------------------------------
+|   NPT_TlsClientSession
++---------------------------------------------------------------------*/
+class NPT_TlsClientSession : public NPT_TlsSession
+{
+public:
+    NPT_TlsClientSession(NPT_TlsContext&            context,
+                         NPT_InputStreamReference&  input,
+                         NPT_OutputStreamReference& output);
 };
 
 /*----------------------------------------------------------------------
 |   NPT_TlsServerSession
 +---------------------------------------------------------------------*/
-class NPT_TlsServerSession
+class NPT_TlsServerSession : public NPT_TlsSession
 {
 public:
-    NPT_TlsServerSession(NPT_TlsContext&           context,
-                         NPT_InputStreamReference  input,
-                         NPT_OutputStreamReference output);
+    NPT_TlsServerSession(NPT_TlsContext&            context,
+                         NPT_InputStreamReference&  input,
+                         NPT_OutputStreamReference& output);
+};
 
-protected:
-    NPT_TlsSessionImpl* m_Impl;
+/*----------------------------------------------------------------------
+|   NPT_HttpTlsConnector
++---------------------------------------------------------------------*/
+#if defined(NPT_CONFIG_ENABLE_TLS)
+class NPT_HttpTlsConnector : public NPT_HttpClient::Connector
+{
+public:
+    enum {
+        OPTION_ACCEPT_SELF_SIGNED_CERTS = 1,
+        OPTION_ACCEPT_HOSTNAME_MISMATCH = 2
+    };
+    NPT_HttpTlsConnector(NPT_Flags options = 0);
+    NPT_HttpTlsConnector(NPT_TlsContext& tls_context, NPT_Flags options = 0);
+    virtual ~NPT_HttpTlsConnector() {}
+    NPT_TlsContext& GetTlsContext() { return m_TlsContext; }
+    
+    virtual NPT_Result VerifyPeer(NPT_TlsClientSession& session,
+                                  const char*           hostname);
+    
+    //  NPT_HttpClient::Connector methods
+    virtual NPT_Result Connect(const NPT_HttpUrl&           url,
+                               NPT_HttpClient&              client,
+                               const NPT_HttpProxyAddress*  proxy,
+                               bool                         reuse,
+                               NPT_HttpClient::Connection*& connection);
+
+private:
+    // class methods
+    static NPT_TlsContext& GetDefaultTlsContext();
+    
+    // class members
+    static NPT_TlsContext* DefaultTlsContext;
+    
+    // members
+    NPT_TlsContext& m_TlsContext;
+    NPT_Flags       m_Options;
 };
+#else
+class NPT_HttpTlsConnector : public NPT_HttpClient::Connector
+{
+public:
+    virtual ~NPT_HttpTlsConnector() {}
+    virtual NPT_Result Connect(const NPT_HttpUrl&           url,
+                               NPT_HttpClient&              client,
+                               const NPT_HttpProxyAddress*  proxy,
+                               bool                         reuse,
+                               NPT_HttpClient::Connection*& connection);
+};
+#endif
+
+/*----------------------------------------------------------------------
+|   Trust Anchors
++-----------------------------------------------------------------*/
+/** 
+ * Arrays of trust anchors (each array element is of type NPT_TlsTrustAnchorData
+ * and the last element is a terminator element: the cert_data field is NULL
+ * and the cert_size field is 0
+ */ 
+#if defined(NPT_CONFIG_ENABLE_TLS)
+#include "NptTlsDefaultTrustAnchorsBase.h"
+#include "NptTlsDefaultTrustAnchorsExtended.h"
+#endif
 
 #endif // _NPT_TLS_H_

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptTlsDefaultTrustAnchorsBase.h Added

@@ -0,0 +1,583 @@
+/*****************************************************************
+|
+|   Neptune - Trust Anchors
+|
+|   This file is automatically generated by a script, do not edit!
+|
+| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
+| All rights reserved.
+|
+| Redistribution and use in source and binary forms, with or without
+| modification, are permitted provided that the following conditions are met:
+|     * Redistributions of source code must retain the above copyright
+|       notice, this list of conditions and the following disclaimer.
+|     * Redistributions in binary form must reproduce the above copyright
+|       notice, this list of conditions and the following disclaimer in the
+|       documentation and/or other materials provided with the distribution.
+|     * Neither the name of Axiomatic Systems nor the
+|       names of its contributors may be used to endorse or promote products
+|       derived from this software without specific prior written permission.
+|
+| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
+| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
+| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+|
+ ****************************************************************/
+
+ /* This file is automatically generated by GenTrustAnchorsTables.py, do not edit */
+
+#include "NptTls.h"
+
+extern const NPT_TlsTrustAnchorData NptTlsDefaultTrustAnchorsBase[137];
+
+/* Verisign/RSA Secure Server CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0000_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0000_Data[];
+
+/* GTE CyberTrust Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0001_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0001_Data[];
+
+/* GTE CyberTrust Global Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0002_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0002_Data[];
+
+/* Thawte Personal Basic CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0003_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0003_Data[];
+
+/* Thawte Personal Premium CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0004_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0004_Data[];
+
+/* Thawte Personal Freemail CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0005_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0005_Data[];
+
+/* Thawte Server CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0006_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0006_Data[];
+
+/* Thawte Premium Server CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0007_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0007_Data[];
+
+/* Equifax Secure CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0008_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0008_Data[];
+
+/* Digital Signature Trust Co. Global CA 1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0009_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0009_Data[];
+
+/* Digital Signature Trust Co. Global CA 3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0010_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0010_Data[];
+
+/* Digital Signature Trust Co. Global CA 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0011_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0011_Data[];
+
+/* Digital Signature Trust Co. Global CA 4 */
+extern const unsigned int NptTlsTrustAnchor_Base_0012_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0012_Data[];
+
+/* Verisign Class 1 Public Primary Certification Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0013_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0013_Data[];
+
+/* Verisign Class 2 Public Primary Certification Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0014_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0014_Data[];
+
+/* Verisign Class 3 Public Primary Certification Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0015_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0015_Data[];
+
+/* Verisign Class 1 Public Primary Certification Authority - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0016_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0016_Data[];
+
+/* Verisign Class 2 Public Primary Certification Authority - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0017_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0017_Data[];
+
+/* Verisign Class 3 Public Primary Certification Authority - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0018_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0018_Data[];
+
+/* Verisign Class 4 Public Primary Certification Authority - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0019_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0019_Data[];
+
+/* GlobalSign Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0020_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0020_Data[];
+
+/* GlobalSign Root CA - R2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0021_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0021_Data[];
+
+/* ValiCert Class 1 VA */
+extern const unsigned int NptTlsTrustAnchor_Base_0022_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0022_Data[];
+
+/* ValiCert Class 2 VA */
+extern const unsigned int NptTlsTrustAnchor_Base_0023_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0023_Data[];
+
+/* RSA Root Certificate 1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0024_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0024_Data[];
+
+/* Verisign Class 1 Public Primary Certification Authority - G3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0025_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0025_Data[];
+
+/* Verisign Class 2 Public Primary Certification Authority - G3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0026_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0026_Data[];
+
+/* Verisign Class 3 Public Primary Certification Authority - G3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0027_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0027_Data[];
+
+/* Verisign Class 4 Public Primary Certification Authority - G3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0028_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0028_Data[];
+
+/* Entrust.net Secure Server CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0029_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0029_Data[];
+
+/* Entrust.net Secure Personal CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0030_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0030_Data[];
+
+/* Entrust.net Premium 2048 Secure Server CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0031_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0031_Data[];
+
+/* Baltimore CyberTrust Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0032_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0032_Data[];
+
+/* Equifax Secure Global eBusiness CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0033_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0033_Data[];
+
+/* Equifax Secure eBusiness CA 1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0034_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0034_Data[];
+
+/* Equifax Secure eBusiness CA 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0035_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0035_Data[];
+
+/* Visa International Global Root 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0036_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0036_Data[];
+
+/* AddTrust Low-Value Services Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0037_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0037_Data[];
+
+/* AddTrust External Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0038_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0038_Data[];
+
+/* AddTrust Public Services Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0039_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0039_Data[];
+
+/* AddTrust Qualified Certificates Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0040_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0040_Data[];
+
+/* Verisign Time Stamping Authority CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0041_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0041_Data[];
+
+/* Thawte Time Stamping CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0042_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0042_Data[];
+
+/* Entrust.net Global Secure Server CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0043_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0043_Data[];
+
+/* Entrust.net Global Secure Personal CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0044_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0044_Data[];
+
+/* Entrust Root Certification Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0045_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0045_Data[];
+
+/* AOL Time Warner Root Certification Authority 1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0046_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0046_Data[];
+
+/* AOL Time Warner Root Certification Authority 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0047_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0047_Data[];
+
+/* beTRUSTed Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0048_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0048_Data[];
+
+/* beTRUSTed Root CA-Baltimore Implementation */
+extern const unsigned int NptTlsTrustAnchor_Base_0049_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0049_Data[];
+
+/* beTRUSTed Root CA - Entrust Implementation */
+extern const unsigned int NptTlsTrustAnchor_Base_0050_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0050_Data[];
+
+/* beTRUSTed Root CA - RSA Implementation */
+extern const unsigned int NptTlsTrustAnchor_Base_0051_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0051_Data[];
+
+/* RSA Security 2048 v3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0052_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0052_Data[];
+
+/* RSA Security 1024 v3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0053_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0053_Data[];
+
+/* GeoTrust Global CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0054_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0054_Data[];
+
+/* GeoTrust Global CA 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0055_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0055_Data[];
+
+/* GeoTrust Universal CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0056_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0056_Data[];
+
+/* GeoTrust Universal CA 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0057_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0057_Data[];
+
+/* UTN-USER First-Network Applications */
+extern const unsigned int NptTlsTrustAnchor_Base_0058_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0058_Data[];
+
+/* America Online Root Certification Authority 1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0059_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0059_Data[];
+
+/* America Online Root Certification Authority 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0060_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0060_Data[];
+
+/* Visa eCommerce Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0061_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0061_Data[];
+
+/* TC TrustCenter, Germany, Class 2 CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0062_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0062_Data[];
+
+/* TC TrustCenter, Germany, Class 3 CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0063_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0063_Data[];
+
+/* Certum Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0064_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0064_Data[];
+
+/* Comodo AAA Services root */
+extern const unsigned int NptTlsTrustAnchor_Base_0065_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0065_Data[];
+
+/* Comodo Secure Services root */
+extern const unsigned int NptTlsTrustAnchor_Base_0066_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0066_Data[];
+
+/* Comodo Trusted Services root */
+extern const unsigned int NptTlsTrustAnchor_Base_0067_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0067_Data[];
+
+/* IPS Chained CAs root */
+extern const unsigned int NptTlsTrustAnchor_Base_0068_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0068_Data[];
+
+/* IPS CLASE1 root */
+extern const unsigned int NptTlsTrustAnchor_Base_0069_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0069_Data[];
+
+/* IPS CLASE3 root */
+extern const unsigned int NptTlsTrustAnchor_Base_0070_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0070_Data[];
+
+/* IPS CLASEA1 root */
+extern const unsigned int NptTlsTrustAnchor_Base_0071_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0071_Data[];
+
+/* IPS CLASEA3 root */
+extern const unsigned int NptTlsTrustAnchor_Base_0072_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0072_Data[];
+
+/* IPS Servidores root */
+extern const unsigned int NptTlsTrustAnchor_Base_0073_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0073_Data[];
+
+/* IPS Timestamping root */
+extern const unsigned int NptTlsTrustAnchor_Base_0074_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0074_Data[];
+
+/* QuoVadis Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0075_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0075_Data[];
+
+/* QuoVadis Root CA 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0076_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0076_Data[];
+
+/* QuoVadis Root CA 3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0077_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0077_Data[];
+
+/* Security Communication Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0078_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0078_Data[];
+
+/* Sonera Class 1 Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0079_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0079_Data[];
+
+/* Sonera Class 2 Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0080_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0080_Data[];
+
+/* Staat der Nederlanden Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0081_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0081_Data[];
+
+/* TDC Internet Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0082_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0082_Data[];
+
+/* TDC OCES Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0083_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0083_Data[];
+
+/* UTN DATACorp SGC Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0084_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0084_Data[];
+
+/* UTN USERFirst Email Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0085_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0085_Data[];
+
+/* UTN USERFirst Hardware Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0086_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0086_Data[];
+
+/* UTN USERFirst Object Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0087_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0087_Data[];
+
+/* Camerfirma Chambers of Commerce Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0088_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0088_Data[];
+
+/* Camerfirma Global Chambersign Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0089_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0089_Data[];
+
+/* NetLock Qualified (Class QA) Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0090_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0090_Data[];
+
+/* NetLock Notary (Class A) Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0091_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0091_Data[];
+
+/* NetLock Business (Class B) Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0092_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0092_Data[];
+
+/* NetLock Express (Class C) Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0093_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0093_Data[];
+
+/* XRamp Global CA Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0094_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0094_Data[];
+
+/* Go Daddy Class 2 CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0095_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0095_Data[];
+
+/* Starfield Class 2 CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0096_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0096_Data[];
+
+/* StartCom Ltd. */
+extern const unsigned int NptTlsTrustAnchor_Base_0097_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0097_Data[];
+
+/* StartCom Certification Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0098_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0098_Data[];
+
+/* Firmaprofesional Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0099_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0099_Data[];
+
+/* Wells Fargo Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0100_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0100_Data[];
+
+/* Swisscom Root CA 1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0101_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0101_Data[];
+
+/* DigiCert Assured ID Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0102_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0102_Data[];
+
+/* DigiCert Global Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0103_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0103_Data[];
+
+/* DigiCert High Assurance EV Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0104_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0104_Data[];
+
+/* Certplus Class 2 Primary CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0105_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0105_Data[];
+
+/* DST Root CA X3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0106_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0106_Data[];
+
+/* DST ACES CA X6 */
+extern const unsigned int NptTlsTrustAnchor_Base_0107_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0107_Data[];
+
+/* SwissSign Platinum CA - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0108_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0108_Data[];
+
+/* SwissSign Gold CA - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0109_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0109_Data[];
+
+/* SwissSign Silver CA - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0110_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0110_Data[];
+
+/* GeoTrust Primary Certification Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0111_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0111_Data[];
+
+/* thawte Primary Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0112_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0112_Data[];
+
+/* VeriSign Class 3 Public Primary Certification Authority - G5 */
+extern const unsigned int NptTlsTrustAnchor_Base_0113_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0113_Data[];
+
+/* SecureTrust CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0114_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0114_Data[];
+
+/* Secure Global CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0115_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0115_Data[];
+
+/* COMODO Certification Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0116_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0116_Data[];
+
+/* DigiNotar Root CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0117_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0117_Data[];
+
+/* Network Solutions Certificate Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0118_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0118_Data[];
+
+/* WellsSecure Public Root Certificate Authority */
+extern const unsigned int NptTlsTrustAnchor_Base_0119_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0119_Data[];
+
+/* IGC/A */
+extern const unsigned int NptTlsTrustAnchor_Base_0120_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0120_Data[];
+
+/* Security Communication EV RootCA1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0121_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0121_Data[];
+
+/* TC TrustCenter Class 2 CA II */
+extern const unsigned int NptTlsTrustAnchor_Base_0122_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0122_Data[];
+
+/* TC TrustCenter Class 3 CA II */
+extern const unsigned int NptTlsTrustAnchor_Base_0123_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0123_Data[];
+
+/* TC TrustCenter Universal CA I */
+extern const unsigned int NptTlsTrustAnchor_Base_0124_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0124_Data[];
+
+/* Deutsche Telekom Root CA 2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0125_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0125_Data[];
+
+/* ComSign CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0126_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0126_Data[];
+
+/* ComSign Secured CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0127_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0127_Data[];
+
+/* Cybertrust Global Root */
+extern const unsigned int NptTlsTrustAnchor_Base_0128_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0128_Data[];
+
+/* Buypass Class 2 CA 1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0129_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0129_Data[];
+
+/* Buypass Class 3 CA 1 */
+extern const unsigned int NptTlsTrustAnchor_Base_0130_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0130_Data[];
+
+/* certSIGN ROOT CA */
+extern const unsigned int NptTlsTrustAnchor_Base_0131_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0131_Data[];
+
+/* ApplicationCA - Japanese Government */
+extern const unsigned int NptTlsTrustAnchor_Base_0132_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0132_Data[];
+
+/* GeoTrust Primary Certification Authority - G3 */
+extern const unsigned int NptTlsTrustAnchor_Base_0133_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0133_Data[];
+
+/* thawte Primary Root CA - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0134_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0134_Data[];
+
+/* GeoTrust Primary Certification Authority - G2 */
+extern const unsigned int NptTlsTrustAnchor_Base_0135_Size;
+extern const unsigned char NptTlsTrustAnchor_Base_0135_Data[];
+

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptTlsDefaultTrustAnchorsExtended.h Added

@@ -0,0 +1,91 @@
+/*****************************************************************
+|
+|   Neptune - Trust Anchors
+|
+|   This file is automatically generated by a script, do not edit!
+|
+| Copyright (c) 2002-2010, Axiomatic Systems, LLC.
+| All rights reserved.
+|
+| Redistribution and use in source and binary forms, with or without
+| modification, are permitted provided that the following conditions are met:
+|     * Redistributions of source code must retain the above copyright
+|       notice, this list of conditions and the following disclaimer.
+|     * Redistributions in binary form must reproduce the above copyright
+|       notice, this list of conditions and the following disclaimer in the
+|       documentation and/or other materials provided with the distribution.
+|     * Neither the name of Axiomatic Systems nor the
+|       names of its contributors may be used to endorse or promote products
+|       derived from this software without specific prior written permission.
+|
+| THIS SOFTWARE IS PROVIDED BY AXIOMATIC SYSTEMS ''AS IS'' AND ANY
+| EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+| WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+| DISCLAIMED. IN NO EVENT SHALL AXIOMATIC SYSTEMS BE LIABLE FOR ANY
+| DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+| (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+| LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+| ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+| SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+|
+ ****************************************************************/
+
+ /* This file is automatically generated by GenTrustAnchorsTables.py, do not edit */
+
+#include "NptTls.h"
+
+extern const NPT_TlsTrustAnchorData NptTlsDefaultTrustAnchorsExtended[14];
+
+/* ABAecom (sub., Am. Bankers Assn.) Root CA */
+extern const unsigned int NptTlsTrustAnchor_Extended_0000_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0000_Data[];
+
+/* Taiwan GRCA */
+extern const unsigned int NptTlsTrustAnchor_Extended_0001_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0001_Data[];
+
+/* TURKTRUST Certificate Services Provider Root 1 */
+extern const unsigned int NptTlsTrustAnchor_Extended_0002_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0002_Data[];
+
+/* TURKTRUST Certificate Services Provider Root 2 */
+extern const unsigned int NptTlsTrustAnchor_Extended_0003_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0003_Data[];
+
+/* OISTE WISeKey Global Root GA CA */
+extern const unsigned int NptTlsTrustAnchor_Extended_0004_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0004_Data[];
+
+/* S-TRUST Authentication and Encryption Root CA 2005 PN */
+extern const unsigned int NptTlsTrustAnchor_Extended_0005_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0005_Data[];
+
+/* Microsec e-Szigno Root CA */
+extern const unsigned int NptTlsTrustAnchor_Extended_0006_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0006_Data[];
+
+/* Certigna */
+extern const unsigned int NptTlsTrustAnchor_Extended_0007_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0007_Data[];
+
+/* AC Ra\xC3\xADz Certic\xC3\xA1mara S.A. */
+extern const unsigned int NptTlsTrustAnchor_Extended_0008_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0008_Data[];
+
+/* ePKI Root Certification Authority */
+extern const unsigned int NptTlsTrustAnchor_Extended_0009_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0009_Data[];
+
+/* TUBITAK UEKAE Kok Sertifika Hizmet Saglayicisi - Surum 3 */
+extern const unsigned int NptTlsTrustAnchor_Extended_0010_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0010_Data[];
+
+/* CNNIC ROOT */
+extern const unsigned int NptTlsTrustAnchor_Extended_0011_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0011_Data[];
+
+/* EBG Elektronik Sertifika Hizmet Saglayicisi */
+extern const unsigned int NptTlsTrustAnchor_Extended_0012_Size;
+extern const unsigned char NptTlsTrustAnchor_Extended_0012_Data[];
+

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptTypes.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptTypes.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptUri.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptUri.h Changed

@@ -41,7 +41,9 @@
 /*----------------------------------------------------------------------
 |   constants
 +---------------------------------------------------------------------*/
-const NPT_UInt16 NPT_URL_INVALID_PORT = 0;
+const NPT_UInt16 NPT_URL_INVALID_PORT       = 0;
+const NPT_UInt16 NPT_URL_DEFAULT_HTTP_PORT  = 80;
+const NPT_UInt16 NPT_URL_DEFAULT_HTTPS_PORT = 443;
 
 /*----------------------------------------------------------------------
 |   NPT_Uri
@@ -51,7 +53,8 @@
     // types
     typedef enum {
         SCHEME_ID_UNKNOWN,
-        SCHEME_ID_HTTP
+        SCHEME_ID_HTTP,
+        SCHEME_ID_HTTPS
     } SchemeId;
 
     // constants. use as a parameter to Encode()
@@ -95,8 +98,7 @@
     
     // types
     struct Field {
-        Field(const char* name, const char* value) :
-            m_Name(name), m_Value(value) {}
+        Field(const char* name, const char* value, bool encoded);
         NPT_String m_Name;
         NPT_String m_Value;
     };
@@ -110,8 +112,8 @@
 
     // methods
     NPT_Result  Parse(const char* query);
-    NPT_Result  SetField(const char* name, const char* value);
-    NPT_Result  AddField(const char* name, const char* value);
+    NPT_Result  SetField(const char* name, const char* value, bool encoded=false);
+    NPT_Result  AddField(const char* name, const char* value, bool encoded=false);
     const char* GetField(const char* name);
     NPT_String  ToString();
 
@@ -125,11 +127,34 @@
 +---------------------------------------------------------------------*/
 class NPT_Url : public NPT_Uri {
 public:
-    // constructors and destructor
+    /**
+     * Default constructor. This does not construct a valid URL, but an
+     * uninitialized one that can later be initialized to a valid URL by
+     * parsing or setting some of its fields.
+     */
     NPT_Url();
-    NPT_Url(const char* url, 
-            SchemeId    expected_scheme = SCHEME_ID_UNKNOWN, 
-            NPT_UInt16  default_port = NPT_URL_INVALID_PORT);
+    
+    /**
+     * Construct a URL by parsing an input string in its fully encoded form.
+     * If an error occurs during parsing (such as an invalid syntax), the
+     * URL will be in an invalid state (a call to IsValid() will return false).
+     *
+     * @param url The URL string in its encoded form
+     * @param default_port The default port number, or 0 if not specified
+     */
+    NPT_Url(const char* url, NPT_UInt16  default_port = 0);
+    
+    /**
+     * Construct a URL from its components. When constructing a URL from
+     * components, the components are assumed to be passed in their non-encoded
+     * form, and will thus be encoded automatically.
+     *
+     * @param scheme The URL scheme
+     * @param port The port number
+     * @param path The path
+     * @param query The query, if any, or NULL
+     * @param fragment The fragment, if any, or NULL
+     */
     NPT_Url(const char* scheme,
             const char* host, 
             NPT_UInt16  port, 
@@ -137,23 +162,148 @@
             const char* query = NULL,
             const char* fragment = NULL);
 
-    // methods
-    const NPT_String&  GetHost() const     { return m_Host;     }
-    NPT_UInt16         GetPort() const     { return m_Port;     }
-    const NPT_String&  GetPath() const     { return m_Path;     }
-    const NPT_String&  GetQuery() const    { return m_Query;    }
-    const NPT_String&  GetFragment() const { return m_Fragment; }
-    virtual bool       IsValid() const;
-    bool               HasQuery()    const { return m_HasQuery;    } 
-    bool               HasFragment() const { return m_HasFragment; }
-    NPT_Result         SetHost(const char*  host);
-    NPT_Result         SetPort(NPT_UInt16 port);
-    NPT_Result         SetPath(const char* path);
-    NPT_Result         SetPathPlus(const char* path_plus);
-    NPT_Result         SetQuery(const char* query);
-    NPT_Result         SetFragment(const char* fragment);
+    /**
+     * Parse a URL from its fully encoded form.
+     *
+     * @param url The URL string in its encoded form
+     * @param default port The defautl port number, or 0 if not specified
+     */
+    NPT_Result Parse(const char* url, NPT_UInt16  default_port = 0);
+    
+    /**
+     * Parse just the path plus optional query and fragment from a fully encoded form.
+     *
+     * @param path_plus The URL path plus optional query and fragment
+     */
+    NPT_Result ParsePathPlus(const char* path_plus);
+    
+    /**
+     * Returns the host part of the URL, in its encoded form
+     */
+    const NPT_String& GetHost() const { return m_Host;     }
+    
+    /**
+     * Returns the port number of the URL.
+     */
+    NPT_UInt16 GetPort() const { return m_Port;     }
+
+    /**
+     * Returns the path part of the URL, in its encoded form
+     */
+    const NPT_String& GetPath() const { return m_Path; }
+    
+    /**
+     * Returns the path part of the URL, in its encoded or decoded form
+     */
+    NPT_String GetPath(bool decoded) const { return decoded?NPT_Uri::PercentDecode(m_Path):m_Path;}
+
+    /**
+     * Returns the query part of the URL, in its encoded form
+     */
+    const NPT_String& GetQuery() const { return m_Query; }
+    
+    /**
+     * Returns the fragment part of the URL, in its encoded form
+     */
+    const NPT_String& GetFragment() const { return m_Fragment; }
+    
+    /**
+     * Returns whether the URL is valid or not. Invalid URLs are uninitialized or
+     * not fully initialized URLs.
+     *
+     * @return true if the URL is valid, false if it is not.
+     */
+    virtual bool IsValid() const;
+    
+    /**
+     * Resets a URL to an uninitialized state.
+     */
+    void Reset();
+    
+    /**
+     * Returns whether the URL has a query part or not.
+     *
+     * @return true if the URL has a query part, false if it does not.
+     */
+    bool HasQuery() const { return m_HasQuery; } 
+
+    /**
+     * Returns whether the URL has a fragment part or not.
+     *
+     * @return true if the URL has a fragment part, false if it does not.
+     */
+    bool HasFragment() const { return m_HasFragment; }
+
+    /**
+     * Sets the host part of the URL.
+     *
+     * @param host The host part of the URL
+     */
+    NPT_Result SetHost(const char* host);
+    
+    /**
+     * Sets the port number of the URL.
+     *
+     * @param port The port number of the URL
+     */
+    NPT_Result SetPort(NPT_UInt16 port);
+    
+    /**
+     * Sets the path part of the URL.
+     *
+     * @param path The path part of the URL
+     * @param encoded Boolean flag indicating whether the path parameter is
+     * already encoded or not. If it is not already encoded, it will be
+     * automatically encoded.
+     */
+    NPT_Result SetPath(const char* path, bool encoded=false);
+    
+    /**
+     * Sets the query part of the URL.
+     * 
+     * @param query The query part of the URL
+     * @param encoded Boolean flag indicating whether the query parameter is
+     * already encoded or not. If it is not already encoded, it will be
+     * automatically encoded.
+     */     
+    NPT_Result SetQuery(const char* query, bool encoded=false);
+
+    /**
+     * Sets the fragment part of the URL.
+     * 
+     * @param query The fragment part of the URL
+     * @param encoded Boolean flag indicating whether the fragment parameter is
+     * already encoded or not. If it is not already encoded, it will be
+     * automatically encoded.
+     */     
+    NPT_Result SetFragment(const char* fragment, bool encoded=false);
+
+    /**
+     * Return the string representation of the URL in a way that can be used in 
+     * an HTTP request (i.e just the portion of the URL starting with the path)
+     *
+     * @param with_fragment Boolean flag specifiying whether the fragment part of 
+     * the URL should be included in the returned string or not.
+     */
     virtual NPT_String ToRequestString(bool with_fragment = false) const;
+
+    /**
+     * Return the string representation of the URL.
+     *
+     * @param default_port default port number for the scheme. If the port number of
+     * the URL is not equal to the default port, then port number is explicitely 
+     * included in the string representation of the URL. 
+     * @param with_fragment Boolean flag specifiying whether the fragment part of 
+     * the URL should be included in the returned string or not.
+     */
     virtual NPT_String ToStringWithDefaultPort(NPT_UInt16 default_port, bool with_fragment = true) const;
+
+    /**
+     * Return the string representation of the URL.
+     *
+     * @param with_fragment Boolean flag specifiying whether the fragment part of 
+     * the URL should be included in the returned string or not.
+     */
     virtual NPT_String ToString(bool with_fragment = true) const;
 
 protected:

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptUtils.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptUtils.h Changed

@@ -39,6 +39,8 @@
 #include "NptTypes.h"
 #include "NptStrings.h"
 #include "NptMap.h"
+#include "NptDataBuffer.h"
+#include "NptHash.h"
 
 #if defined (NPT_CONFIG_HAVE_STDIO_H)
 #include <stdio.h>
@@ -119,6 +121,7 @@
 
 void NPT_ByteToHex(NPT_Byte b, char* buffer, bool uppercase=false);
 NPT_Result NPT_HexToByte(const char* buffer, NPT_Byte& b);
+NPT_Result NPT_HexToBytes(const char* hex, NPT_DataBuffer& bytes);
 NPT_String NPT_HexString(const unsigned char* data, 
                          NPT_Size             data_size,
                          const char*          separator = NULL,
@@ -136,7 +139,13 @@
 /*----------------------------------------------------------------------
 |    environment variables
 +---------------------------------------------------------------------*/
-NPT_Result NPT_GetEnvironment(const char* name, NPT_String& value);
+class NPT_Environment {
+public:
+    static NPT_Result Get(const char* name, NPT_String& value);
+    static NPT_Result Set(const char* name, const char* value);
+};
+// compat for older APIs
+#define NPT_GetEnvironment(_x,_y) NPT_Environment::Get(_x,_y)
 
 /*----------------------------------------------------------------------
 |   string utils

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptVersion.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptVersion.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptXml.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptXml.h Changed

@@ -45,6 +45,8 @@
 +---------------------------------------------------------------------*/
 const int NPT_ERROR_XML_INVALID_NESTING = NPT_ERROR_BASE_XML - 0;
 const int NPT_ERROR_XML_TAG_MISMATCH    = NPT_ERROR_BASE_XML - 1;
+const int NPT_ERROR_XML_NO_ROOT         = NPT_ERROR_BASE_XML - 2;
+const int NPT_ERROR_XML_MULTIPLE_ROOTS  = NPT_ERROR_BASE_XML - 3;
 
 #define NPT_XML_ANY_NAMESPACE "*"
 #define NPT_XML_NO_NAMESPACE  NULL
@@ -266,7 +268,7 @@
 
  private:
     // members  
-    TokenType  m_TokenType;
+//    TokenType  m_TokenType;
     NPT_String m_Text;
 };
 
@@ -304,10 +306,13 @@
 
     // members
     NPT_XmlProcessor*   m_Processor;
-    NPT_XmlElementNode* m_Tree;
+    NPT_XmlElementNode* m_Root;
     NPT_XmlElementNode* m_CurrentElement;
     bool                m_KeepWhitespace;
 
+private:
+    void Reset();
+    
     // friends
     friend class NPT_XmlProcessor;
 };
@@ -322,7 +327,7 @@
                        NPT_XmlSerializer(NPT_OutputStream* output,
                                          NPT_Cardinal      indentation = 0,
                                          bool              shrink_empty_elements = true,
-										 bool			   add_header = true);
+                                         bool              add_xml_decl = false);
     virtual           ~NPT_XmlSerializer();
     virtual NPT_Result StartDocument();
     virtual NPT_Result EndDocument();
@@ -348,7 +353,7 @@
     NPT_String        m_IndentationPrefix;
     bool              m_ElementHasText;
     bool              m_ShrinkEmptyElements;
-	bool			  m_AddHeader;
+    bool              m_AddXmlDecl;
 };
 
 /*----------------------------------------------------------------------
@@ -361,9 +366,9 @@
     explicit NPT_XmlWriter(NPT_Cardinal indentation = 0) : m_Indentation(indentation) {}
 
     // methods
-	NPT_Result Serialize(NPT_XmlNode&	   node, 
-						 NPT_OutputStream& stream, 
-						 bool			   add_header = true);
+    NPT_Result Serialize(NPT_XmlNode&      node, 
+                         NPT_OutputStream& stream, 
+                         bool              add_xml_decl = false);
 
 private:
     // members
@@ -377,9 +382,9 @@
 {
 public:
     // methods
-	NPT_Result Serialize(NPT_XmlNode&      node, 
-						 NPT_OutputStream& stream, 
-						 bool			   add_header = true);
+    NPT_Result Serialize(NPT_XmlNode&      node, 
+                         NPT_OutputStream& stream, 
+                         bool              add_xml_decl = false);
 };
 
 #endif // _NPT_XML_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/NptZip.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/NptZip.h Changed

@@ -37,6 +37,7 @@
 +---------------------------------------------------------------------*/
 #include "NptConfig.h"
 #include "NptStreams.h"
+#include "NptFile.h"
 
 /*----------------------------------------------------------------------
 |   class references
@@ -77,7 +78,16 @@
      * Inflate (i.e decompress) a buffer
      */
     static NPT_Result Inflate(const NPT_DataBuffer& in,
-                              NPT_DataBuffer&       out);                       
+                              NPT_DataBuffer&       out);   
+    
+    /**
+     * Deflate (i.e compress) a file
+     */
+    static NPT_Result Deflate(NPT_File& in,
+                              NPT_File& out,
+                              int       compression_level = NPT_ZIP_COMPRESSION_LEVEL_DEFAULT,
+                              Format    format = GZIP);
+    
 };
 
 /*----------------------------------------------------------------------
@@ -138,7 +148,29 @@
 };
 
 /*----------------------------------------------------------------------
-|   NPT_ZipDeflatingInputStream
+|   NPT_ZipDeflatingOutputStream
 +---------------------------------------------------------------------*/
+/*class NPT_ZipDeflatingOutputStream : public NPT_OutputStream 
+{
+public:
+    NPT_ZipDeflatingOutputStream(NPT_OutputStreamReference& source,
+                                 int                        compression_level = NPT_ZIP_COMPRESSION_LEVEL_DEFAULT,
+                                 NPT_Zip::Format            format = NPT_Zip::ZLIB);
+   NPT_ZipDeflatingOutputStream();
+   
+    // NPT_OutputStream methods
+    virtual NPT_Result Write(void*     buffer, 
+                             NPT_Size  bytes_to_write, 
+                             NPT_Size* bytes_written = NULL);
+    virtual NPT_Result Seek(NPT_Position offset);
+    virtual NPT_Result Tell(NPT_Position& offset);
+
+private:
+    NPT_OutputStreamReference m_Output;
+    NPT_Position              m_Position;
+    bool                      m_Eos;
+    NPT_ZipDeflateState*      m_State;
+    NPT_DataBuffer            m_Buffer;
+}; */
 
 #endif // _NPT_ZIP_H_

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/Platinum.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/Platinum.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Top Level Include
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,6 +17,7 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
 | 
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,6 +31,37 @@
 | http://www.gnu.org/licenses/gpl-2.0.html
 |
  ****************************************************************/
+/** @file
+ Master Header file included by Platinum client applications.
+ 
+ Client Applications should only need to include this file, as it 
+ includes all the more specific include files required to use the API
+ */
+
+/** 
+@mainpage Platinum UPnP SDK
+
+@section intro Introduction
+
+The Platinum SDK contains all the software components necessary to 
+build and use the Platinum UPnP Framework. This includes
+the Platinum framework and the Neptune C++ runtime
+library.
+
+@section architecture Architecture
+
+The Platinum framework consists of a core framework that implements the UPnP
+core specifications including GENA, SOAP and SSDP. Building on top of that, the 
+Platinum framework provides the foundation for UPnP AV Media Server and 
+Media Renderer compliant implementations.
+ 
+The Platinum framework leverages the Neptune C++ runtime library which offers an 
+elegant platform abstraction layer for multithreading, file system and 
+network operations. Additionally, it provides support for XML parsing, string and time
+manipulation, template based linked-lists, stacks and arrays, and a configurable 
+cross-platform logging system.
+ 
+*/
 
 #ifndef _PLATINUM_H_
 #define _PLATINUM_H_
@@ -42,14 +74,45 @@
 #include "PltDeviceData.h"
 #include "PltHttpServer.h"
 #include "PltVersion.h"
-#include "PltSvnVersion.h"
-#include "PltTime.h"
 
-#ifdef PLT_DEVICE_HEADERS_INCLUDE
+#include "PltMimeType.h"
+#include "PltProtocolInfo.h"
+#include "PltAction.h"
+#include "PltArgument.h"
+#include "PltConstants.h"
+#include "PltCtrlPointTask.h"
+#include "PltDatagramStream.h"
+#include "PltDeviceHost.h"
+#include "PltEvent.h"
+#include "PltHttp.h"
+#include "PltHttpClientTask.h"
+#include "PltHttpServer.h"
+#include "PltHttpServerTask.h"
+#include "PltService.h"
+#include "PltSsdp.h"
+#include "PltStateVariable.h"
+#include "PltTaskManager.h"
+#include "PltThreadTask.h"
+#include "PltUtilities.h"
+
 #include "PltMediaServer.h"
 #include "PltMediaBrowser.h"
 #include "PltMediaRenderer.h"
 #include "PltMediaController.h"
-#endif
+#include "PltDidl.h"
+#include "PltFileMediaServer.h"
+#include "PltMediaCache.h"
+#include "PltMediaItem.h"
+#include "PltSyncMediaBrowser.h"
+
+#include "PltXbox360.h"
+#include "PltMediaConnect.h"
+
+#include "PltDownloader.h"
+#include "PltStreamPump.h"
+#include "PltFrameBuffer.h"
+#include "PltFrameServer.h"
+#include "PltFrameStream.h"
+#include "PltRingBufferStream.h"
 
 #endif /* _PLATINUM_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltAction.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltAction.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Service Action
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+   UPnP Service Action
+ */
+
 #ifndef _PLT_ACTION_H_
 #define _PLT_ACTION_H_
 
@@ -49,19 +54,51 @@
 /*----------------------------------------------------------------------
 |   PLT_ActionDesc
 +---------------------------------------------------------------------*/
+/**
+ The PLT_ActionDesc class provides information about a UPnP Service given action.
+ This description has a name, a set of arguments and is associated to a service.
+ */
 class PLT_ActionDesc
 {
 public:
+    /**
+     Constructor
+     @param name the action name
+     @param service the UPnP service the action is associated with
+     */
     PLT_ActionDesc(const char* name, PLT_Service* service);
    ~PLT_ActionDesc();
 
+    /**
+     Return an array of arguments
+     @return array of arguments
+     */
     NPT_Array<PLT_ArgumentDesc*>& GetArgumentDescs() { 
         return m_ArgumentDescs; 
     }
 
+    /**
+     Return the action name.
+     @return action name.
+     */
     const NPT_String& GetName() const { return m_Name;}
+    
+    /**
+     Look for an argument given a name.
+     @param name argument name
+     @return PLT_ArgumentDesc pointer
+     */
     PLT_ArgumentDesc* GetArgumentDesc(const char* name);
+    
+    /**
+     Serialize action information to xml into an existing xml tree
+     @param node the xml Element to serialize action information
+     */
     NPT_Result        GetSCPDXML(NPT_XmlElementNode* node);
+    
+    /**
+     Return the service the action is associated with
+     */
     PLT_Service*      GetService();
 
 protected:
@@ -74,42 +111,150 @@
 /*----------------------------------------------------------------------
 |   PLT_Action
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_Action class provides a mechanism to call or verify the validity of a
+ specific UPNP service action.
+ Given a service, a UPnP Control Point would use this class to serialize a soap
+ request. On the other side, a UPnP Device would use this class to verify
+ a soap request and the validity of the action arguments.
+ */
 class PLT_Action
 {
 public:
-   ~PLT_Action();
+    /**
+     Constructor
+     @param action_desc the action description
+     If you intend to send an action, you need to use the second constructor
+     and pass the root device of the device you wish to control.
+     */
+    PLT_Action(PLT_ActionDesc& action_desc);
+    
+    /**
+     Constructor
+     @param action_desc the action description
+     @param root_device a reference to the root device of the service the action
+     is associated with. This insures that the device won't be deleted if it goes 
+     away while we're waiting for a response for this action. This is important because
+     we only keep a reference to the PLT_ActionDesc which is own by the service operated
+     by the device (or embedded device).
+     */
+    PLT_Action(PLT_ActionDesc& action_desc, PLT_DeviceDataReference& root_device);
+    ~PLT_Action();
 
+    /**
+     Return the action description
+     @return the action description
+     */
     PLT_ActionDesc& GetActionDesc() { return m_ActionDesc; }
     
-    NPT_Result    GetArgumentValue(const char* name, NPT_String& value);
-    NPT_Result    GetArgumentValue(const char* name, NPT_UInt32& value);
-    NPT_Result    GetArgumentValue(const char* name, NPT_Int32& value);
-	NPT_Result    GetArgumentValue(const char* name, bool& value);
-    NPT_Result    VerifyArgumentValue(const char* name, const char* value);
-    NPT_Result    VerifyArguments(bool input);
-    NPT_Result    SetArgumentOutFromStateVariable(const char* name);
-    NPT_Result    SetArgumentsOutFromStateVariable();
-    NPT_Result    SetArgumentValue(const char* name, const char* value);
+    /**
+     Retrieve the string value of an argument given an argument name.
+     @param name the argument name
+     @param value the string value to retrieve
+     @return error if the argument is not found or if the type does not correspond.
+     */
+    NPT_Result GetArgumentValue(const char* name, NPT_String& value);
+    
+    /**
+     Retrieve the value of an argument given an argument name.
+     @param name the argument name
+     @param value the unsigned int value to retrieve
+     @return error if the argument is not found or if the type does not correspond.
+     */
+    NPT_Result GetArgumentValue(const char* name, NPT_UInt32& value);
+    
+    /**
+     Retrieve the value of an argument given an argument name.
+     @param name the argument name
+     @param value the int value to retrieve
+     @return error if the argument is not found or if the type does not correspond.
+     */
+    NPT_Result GetArgumentValue(const char* name, NPT_Int32& value);
+    
+    /**
+     Retrieve the value of an argument given an argument name.
+     @param name the argument name
+     @param value the bool value to retrieve
+     @return error if the argument is not found or if the type does not correspond.
+     */
+	NPT_Result GetArgumentValue(const char* name, bool& value);
+    
+    /**
+     Verify a value is valid for a given argument.
+     @param name the argument name
+     @param value the value to verify
+     */
+    NPT_Result VerifyArgumentValue(const char* name, const char* value);
+    
+    /**
+     Verify that all required arguments are set.
+     @param input boolean indicating whether input or output parameters 
+     should be verified
+     */
+    NPT_Result VerifyArguments(bool input);
+    
+    /**
+     Set the output argument value from the associated current state variable value.
+     @param name the state variable name
+     */
+    NPT_Result SetArgumentOutFromStateVariable(const char* name);
+    
+    /**
+     Set all the output argument values associated with state variables.
+     */
+    NPT_Result SetArgumentsOutFromStateVariable();
+    
+    /**
+     Set an argument value
+     @param name the argument name
+     @param value the argument value
+     */
+    NPT_Result SetArgumentValue(const char* name, const char* value);
 
-    NPT_Result    SetError(unsigned int code, const char* description);
-    const char*   GetError(unsigned int& code);
-    unsigned int  GetErrorCode();
+    /** 
+     Set the error code and description in case of failure.
+     @param code the code for the error
+     @param description a short description
+     */
+    NPT_Result SetError(unsigned int code, const char* description);
     
+    /**
+     Return the error description and code for the failed action.
+     @param code optional pointer to receive the code
+     @return the error short description
+     */
+    const char* GetError(unsigned int* code = NULL);
+    
+    /**
+     Return the error code for the failed action.
+     @return the error code.
+     */
+    unsigned int GetErrorCode();
+    
+    /**
+     Called by a control point when serializing an action.
+     @param stream the stream to serialize the action to
+     */
     NPT_Result    FormatSoapRequest(NPT_OutputStream& stream);
+    
+    /**
+     Called by a device when serializing a response to an action.
+     @param stream the stream to serialize the action to
+     */
     NPT_Result    FormatSoapResponse(NPT_OutputStream& stream);
 
+    /**
+     Helper method for a device to serialize an action invocation error.
+     @param code optional pointer to receive the code
+     @param desc the error short description
+     @param stream the stream to serialize to
+     */
     static NPT_Result FormatSoapError(unsigned int      code, 
                                       NPT_String        desc, 
                                       NPT_OutputStream& stream);
 
 private:
-    // only PLT_DeviceHost and PLT_CtrlPoint can instantiate those directly
-    friend class PLT_DeviceHost;
-    friend class PLT_CtrlPoint;
-    PLT_Action(PLT_ActionDesc& action_desc);
-    PLT_Action(PLT_ActionDesc& action_desc, PLT_DeviceDataReference& root_device);
-
-private:
+    // methods
     NPT_Result    SetArgumentOutFromStateVariable(PLT_ArgumentDesc* arg_desc);
     PLT_Argument* GetArgument(const char* name);
 
@@ -119,7 +264,8 @@
     PLT_Arguments           m_Arguments;
     unsigned int            m_ErrorCode;
     NPT_String              m_ErrorDescription;
-    // keep reference to device to prevent it 
+    
+    // keep reference of service root device to prevent it 
     // from being released during action lifetime
 	PLT_DeviceDataReference m_RootDevice;
 };
@@ -129,6 +275,10 @@
 /*----------------------------------------------------------------------
 |   PLT_GetSCPDXMLIterator
 +---------------------------------------------------------------------*/
+/**
+ The PLT_GetSCPDXMLIterator class provides a recursive way to serialize 
+ an SCPD into an xml tree.
+ */
 template <class T>
 class PLT_GetSCPDXMLIterator
 {
@@ -147,12 +297,16 @@
 /*----------------------------------------------------------------------
 |   PLT_ActionDescNameFinder
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_ActionDescNameFinder class provides a mechanism to find a PLT_ActionDesc 
+ given an action name.
+ */
 class PLT_ActionDescNameFinder
 {
 public:
     // methods
-    PLT_ActionDescNameFinder(PLT_Service* service, const char* name) : 
-        m_Service(service), m_Name(name) {}
+    PLT_ActionDescNameFinder(const char* name) : 
+        m_Name(name) {}
     virtual ~PLT_ActionDescNameFinder() {}
 
     bool operator()(const PLT_ActionDesc* const & action_desc) const {
@@ -161,7 +315,6 @@
 
 private:
     // members
-    PLT_Service* m_Service;
     NPT_String   m_Name;
 };

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltArgument.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltArgument.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Action Argument
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP Service Action Argument
+ */
+
 #ifndef _PLT_ARGUMENT_H_
 #define _PLT_ARGUMENT_H_
 
@@ -50,6 +55,12 @@
 /*----------------------------------------------------------------------
 |   PLT_ArgumentDesc
 +---------------------------------------------------------------------*/
+/**
+ The PLT_ArgumentDesc class provides information about a given argument of a 
+ UPnP Service given action.
+ It has a name, a position, a direction (in/out), a PLT_StateVariable state 
+ variable association and whether it is the return value of the action or not.
+ */
 class PLT_ArgumentDesc
 {
 public:
@@ -65,7 +76,7 @@
     const NPT_String&  GetDirection() const { return m_Direction; }
     NPT_Ordinal        GetPosition() { return m_Position; }
     PLT_StateVariable* GetRelatedStateVariable() { return m_RelatedStateVariable; }
-    bool               HasRetValue() { return m_HasReturnValue; }
+    bool               HasReturnValue() { return m_HasReturnValue; }
 
 protected:
     NPT_String         m_Name;
@@ -78,6 +89,13 @@
 /*----------------------------------------------------------------------
 |   PLT_Argument
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_Argument class provides a mechanism to set or verify the validity of a
+ specific UPNP service action argument.
+ Typically, only a PLT_Action uses this class. Since an argument can be
+ associated to a state variable, the argument is automatically updated when
+ the associated state variable is changed 
+ */
 class PLT_Argument
 {
 public:
@@ -106,6 +124,10 @@
 /*----------------------------------------------------------------------
 |   PLT_ArgumentNameFinder
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_ArgumentNameFinder class provides a mechanism to find a PLT_Argument given
+ an argument name.
+ */
 class PLT_ArgumentNameFinder
 {
 public:
@@ -124,6 +146,10 @@
 /*----------------------------------------------------------------------
 |   PLT_ArgumentDescNameFinder
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_ArgumentDescNameFinder class provides a mechanism to find a PLT_ArgumentDesc given
+ an argument name.
+ */
 class PLT_ArgumentDescNameFinder
 {
 public:

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltConstants.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltConstants.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - UPnP Constants
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP Constants
+ */
+
 #ifndef _PLT_UPNP_CONSTANTS_H_
 #define _PLT_UPNP_CONSTANTS_H_
 
@@ -42,6 +47,10 @@
 /*----------------------------------------------------------------------
 |   PLT_Constants
 +---------------------------------------------------------------------*/
+/**
+ The PLT_Constants class provides a way to globally set or get certain 
+ UPnP constants.
+ */
 class PLT_Constants
 {
 public:
@@ -51,9 +60,28 @@
     PLT_Constants();
     ~PLT_Constants() {};
     
+    void SetDefaultDeviceLease(NPT_TimeInterval lease) { m_DefaultDeviceLease = new NPT_TimeInterval(lease); }
+    NPT_Reference<NPT_TimeInterval> GetDefaultDeviceLease() { return m_DefaultDeviceLease; }
+  
+    void SetDefaultSubscribeLease(NPT_TimeInterval lease) { m_DefaultSubscribeLease = new NPT_TimeInterval(lease); }
+    NPT_Reference<NPT_TimeInterval> GetDefaultSubscribeLease() { return m_DefaultSubscribeLease; }
+    
+    void SetDefaultUserAgent(const char* agent) { m_DefaultUserAgent = new NPT_String(agent); }
+    NPT_Reference<NPT_String> GetDefaultUserAgent() { return m_DefaultUserAgent; }
+    
+    void SetSearchMulticastTimeToLive(NPT_UInt32 ttl) { m_SearchMulticastTimeToLive = ttl; }
+    NPT_UInt32 GetSearchMulticastTimeToLive() { return m_SearchMulticastTimeToLive; }
+
+    void SetAnnounceMulticastTimeToLive(NPT_UInt32 ttl) { m_AnnounceMulticastTimeToLive = ttl; }
+    NPT_UInt32 GetAnnounceMulticastTimeToLive() { return m_AnnounceMulticastTimeToLive; }
+
+private:
     // members
-    NPT_TimeInterval m_DefaultDeviceLease;
-    NPT_TimeInterval m_DefaultSubscribeLease;
+    NPT_Reference<NPT_TimeInterval> m_DefaultDeviceLease;
+    NPT_Reference<NPT_TimeInterval> m_DefaultSubscribeLease;
+    NPT_Reference<NPT_String>       m_DefaultUserAgent;
+    NPT_UInt32                      m_SearchMulticastTimeToLive;
+    NPT_UInt32                      m_AnnounceMulticastTimeToLive;
 };
 
 #endif /* _PLT_UPNP_CONSTANTS_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltCtrlPoint.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltCtrlPoint.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Control Point
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP ControlPoint
+ */
+
 #ifndef _PLT_CONTROL_POINT_H_
 #define _PLT_CONTROL_POINT_H_
 
@@ -39,8 +44,7 @@
 +---------------------------------------------------------------------*/
 #include "Neptune.h"
 #include "PltService.h"
-#include "PltHttpServerListener.h"
-#include "PltSsdpListener.h"
+#include "PltSsdp.h"
 #include "PltDeviceData.h"
 
 /*----------------------------------------------------------------------
@@ -50,11 +54,17 @@
 class PLT_CtrlPointHouseKeepingTask;
 class PLT_SsdpSearchTask;
 class PLT_SsdpListenTask;
+class PLT_CtrlPointGetSCPDsTask;
 class PLT_CtrlPointGetSCPDRequest;
 
 /*----------------------------------------------------------------------
 |   PLT_CtrlPointListener class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_CtrlPointListener class is an interface used to receive notifications when
+ devices are found or removed from the network, actions responses and events
+ are being received.
+ */
 class PLT_CtrlPointListener
 {
 public:
@@ -71,101 +81,140 @@
 /*----------------------------------------------------------------------
 |   PLT_CtrlPoint class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_CtrlPoint class implements the base functionality of a UPnP ControlPoint.
+ It searches and inpects devices, invoke actions on services and subscribes to 
+ events. 
+ */
 class PLT_CtrlPoint : public PLT_SsdpPacketListener,
-                      public PLT_SsdpSearchResponseListener
+                      public PLT_SsdpSearchResponseListener,
+                      public NPT_HttpRequestHandler
 {
 public:
     PLT_CtrlPoint(const char* search_criteria = "upnp:rootdevice"); // pass NULL to prevent repeated automatic search
-
+    virtual ~PLT_CtrlPoint();
+    
+    /**
+     Returns the port used by the internal HTTP server for all incoming event notifications.
+     @return port
+     */
+    virtual NPT_Result GetPort(NPT_UInt16& port);
+    
     // delegation
-    NPT_Result AddListener(PLT_CtrlPointListener* listener);
-    NPT_Result RemoveListener(PLT_CtrlPointListener* listener);
+    virtual NPT_Result AddListener(PLT_CtrlPointListener* listener);
+    virtual NPT_Result RemoveListener(PLT_CtrlPointListener* listener);
 
     // discovery
-    void       IgnoreUUID(const char* uuid);
-    NPT_Result InspectDevice(const char* location, 
-                             const char* uuid, 
-                             NPT_Timeout leasetime = PLT_Constants::GetInstance().m_DefaultDeviceLease);
-    NPT_Result Search(const NPT_HttpUrl& url = NPT_HttpUrl("239.255.255.250", 1900, "*"), 
-                      const char*        target = "upnp:rootdevice", 
-                      NPT_Cardinal       mx = 5,
-                      NPT_Timeout        frequency = 50000); // pass 0 for one time only
-    NPT_Result Discover(const NPT_HttpUrl& url = NPT_HttpUrl("239.255.255.250", 1900, "*"), 
-                        const char*        target = "ssdp:all", 
-                        NPT_Cardinal       mx = 5,
-                        NPT_Timeout        frequency = 50000); // pass 0 for one time only
+    virtual void IgnoreUUID(const char* uuid);
+    virtual NPT_Result Search(const NPT_HttpUrl& url = NPT_HttpUrl("239.255.255.250", 1900, "*"), 
+                              const char*        target = "upnp:rootdevice", 
+                              NPT_Cardinal       mx = 5,
+                              NPT_TimeInterval   frequency = NPT_TimeInterval(50.), // pass NPT_TimeInterval(0.) for one time only
+                              NPT_TimeInterval   initial_delay = NPT_TimeInterval(0.));
+    virtual NPT_Result Discover(const NPT_HttpUrl& url = NPT_HttpUrl("239.255.255.250", 1900, "*"),
+                                const char*        target = "ssdp:all", 
+                                NPT_Cardinal       mx = 5,
+                                NPT_TimeInterval   frequency = NPT_TimeInterval(50.), // pass NPT_TimeInterval(0.) for one time only
+                                NPT_TimeInterval   initial_delay = NPT_TimeInterval(0.));
+    virtual NPT_Result InspectDevice(const NPT_HttpUrl& location,
+                                     const char*        uuid,
+                                     NPT_TimeInterval   leasetime = *PLT_Constants::GetInstance().GetDefaultDeviceLease());
 
     // actions
-    NPT_Result FindActionDesc(PLT_DeviceDataReference& device, 
-                              const char*              service_type,
-                              const char*              action_name,
-                              PLT_ActionDesc*&         action_desc);
-    NPT_Result CreateAction(PLT_DeviceDataReference& device, 
-                            const char*              service_type,
-                            const char*              action_name,
-                            PLT_ActionReference&     action);
-    NPT_Result InvokeAction(PLT_ActionReference& action, void* userdata = NULL);
+    virtual NPT_Result FindActionDesc(PLT_DeviceDataReference& device, 
+                                  const char*              service_type,
+                                  const char*              action_name,
+                                  PLT_ActionDesc*&         action_desc);
+    virtual NPT_Result CreateAction(PLT_DeviceDataReference& device,
+                                const char*              service_type,
+                                const char*              action_name,
+                                PLT_ActionReference&     action);
+    virtual NPT_Result InvokeAction(PLT_ActionReference& action,
+                                    void*                userdata = NULL);
 
     // events
-    NPT_Result Subscribe(PLT_Service* service, 
-                         bool         cancel = false, 
-                         void*        userdata = NULL);
+    virtual NPT_Result Subscribe(PLT_Service* service, 
+                                 bool         cancel = false, 
+                                 void*        userdata = NULL);
 
     // NPT_HttpRequestHandler methods
-    virtual NPT_Result ProcessHttpRequest(NPT_HttpRequest&              request,
-                                          const NPT_HttpRequestContext& context,
-                                          NPT_HttpResponse&             response);
+    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request,
+                                     const NPT_HttpRequestContext& context,
+                                     NPT_HttpResponse&             response);
 
     // PLT_SsdpSearchResponseListener methods
     virtual NPT_Result ProcessSsdpSearchResponse(NPT_Result                    res, 
                                                  const NPT_HttpRequestContext& context,
                                                  NPT_HttpResponse*             response);
     // PLT_SsdpPacketListener method
-    virtual NPT_Result OnSsdpPacket(NPT_HttpRequest&              request, 
+    virtual NPT_Result OnSsdpPacket(const NPT_HttpRequest&        request, 
                                     const NPT_HttpRequestContext& context);
 
 protected:
-    virtual ~PLT_CtrlPoint();
 
-    NPT_Result   Start(PLT_SsdpListenTask* task);
-    NPT_Result   Stop(PLT_SsdpListenTask* task);
-
-    NPT_Result   ProcessSsdpNotify(NPT_HttpRequest&              request, 
-                                   const NPT_HttpRequestContext& context);
-    NPT_Result   ProcessSsdpMessage(NPT_HttpMessage*              message, 
-                                    const NPT_HttpRequestContext& context,  
-                                    NPT_String&                   uuid);
-    NPT_Result   ProcessGetDescriptionResponse(NPT_Result                    res, 
-                                               const NPT_HttpRequestContext& context,
-                                               NPT_HttpResponse*             response,
-                                               PLT_DeviceDataReference&      root_device);
-    NPT_Result   ProcessGetSCPDResponse(NPT_Result                   res, 
-                                        PLT_CtrlPointGetSCPDRequest* request,
-                                        NPT_HttpResponse*            response,
-                                        PLT_DeviceDataReference&     root_device);
-    NPT_Result   ProcessActionResponse(NPT_Result               res, 
-                                       NPT_HttpResponse*        response,
-                                       PLT_ActionReference&     action,
-                                       void*                    userdata);
-    NPT_Result   ProcessSubscribeResponse(NPT_Result         res, 
-                                          NPT_HttpResponse*  response,
-                                          PLT_Service*       service,
-                                          void*              userdata);
-    NPT_Result   ProcessHttpNotify(NPT_HttpRequest&              request,
-                                   const NPT_HttpRequestContext& context,
-                                   NPT_HttpResponse&             response);
+    // State Variable Handling
+    virtual NPT_Result DecomposeLastChangeVar(NPT_List<PLT_StateVariable*>& vars);
+
+    // methods
+    virtual NPT_Result Start(PLT_SsdpListenTask* task);
+    virtual NPT_Result Stop(PLT_SsdpListenTask* task);
+
+    // SSDP & HTTP Notifications handling
+    virtual NPT_Result ProcessSsdpNotify(const NPT_HttpRequest&        request,
+                                         const NPT_HttpRequestContext& context);
+    virtual NPT_Result ProcessSsdpMessage(const NPT_HttpMessage&        message,
+                                          const NPT_HttpRequestContext& context,  
+                                          NPT_String&                   uuid);
+    virtual NPT_Result ProcessGetDescriptionResponse(NPT_Result                    res,
+                                                     const NPT_HttpRequest&        request, 
+                                                     const NPT_HttpRequestContext& context,
+                                                     NPT_HttpResponse*             response,
+                                                     NPT_TimeInterval              leasetime,
+                                                     NPT_String                    uuid);
+    virtual NPT_Result ProcessGetSCPDResponse(NPT_Result                    res,
+                                              const NPT_HttpRequest&        request,
+                                              const NPT_HttpRequestContext& context,
+                                              NPT_HttpResponse*             response,
+                                              PLT_DeviceDataReference&      device);
+    virtual NPT_Result ProcessActionResponse(NPT_Result                    res,
+                                             const NPT_HttpRequest&        request,
+                                             const NPT_HttpRequestContext& context,
+                                             NPT_HttpResponse*             response,
+                                             PLT_ActionReference&          action,
+                                             void*                         userdata);
+    virtual NPT_Result ProcessSubscribeResponse(NPT_Result                    res,
+                                                const NPT_HttpRequest&        request, 
+                                                const NPT_HttpRequestContext& context, 
+                                                NPT_HttpResponse*             response,
+                                                PLT_Service*                  service,
+                                                void*                         userdata);
+    virtual NPT_Result ProcessHttpNotify(const NPT_HttpRequest&        request,
+                                         const NPT_HttpRequestContext& context,
+                                         NPT_HttpResponse&             response);
+
+    // Device management
+    virtual NPT_Result AddDevice(PLT_DeviceDataReference& data);
+    virtual NPT_Result RemoveDevice(PLT_DeviceDataReference& data);
+    
 private:
     // methods
-    NPT_Result RenewSubscribers();
-    NPT_Result RenewSubscriber(PLT_EventSubscriber& subscriber);
+    NPT_Result      RenewSubscribers();
+    PLT_ThreadTask* RenewSubscriber(PLT_EventSubscriberReference subscriber);
+    
+    NPT_Result AddPendingEventNotification(PLT_EventNotification *notification);
+    NPT_Result ProcessPendingEventNotifications();
+    NPT_Result ProcessEventNotification(PLT_EventSubscriberReference subscriber,
+                                        PLT_EventNotification*       notification,
+                                        NPT_List<PLT_StateVariable*> &vars);
+    
     NPT_Result DoHouseKeeping();
-    NPT_Result FetchDeviceSCPDs(PLT_HttpClientSocketTask& task,
-                                PLT_DeviceDataReference&  device, 
-                                NPT_Cardinal              level);
+    NPT_Result FetchDeviceSCPDs(PLT_CtrlPointGetSCPDsTask* task,
+                                PLT_DeviceDataReference&   device, 
+                                NPT_Cardinal               level);
+
+    // Device management
     NPT_Result FindDevice(const char* uuid, PLT_DeviceDataReference& device, bool return_root = false);
-    NPT_Result AddDevice(PLT_DeviceDataReference& data);
     NPT_Result NotifyDeviceReady(PLT_DeviceDataReference& data);
-    NPT_Result RemoveDevice(PLT_DeviceDataReference& data);
     NPT_Result NotifyDeviceRemoved(PLT_DeviceDataReference& data);
     NPT_Result CleanupDevice(PLT_DeviceDataReference& data);
     
@@ -173,7 +222,7 @@
     PLT_SsdpSearchTask* CreateSearchTask(const NPT_HttpUrl&   url, 
                                          const char*          target, 
                                          NPT_Cardinal         mx, 
-                                         NPT_Timeout          frequency,
+                                         NPT_TimeInterval     frequency,
                                          const NPT_IpAddress& address);
     
 private:
@@ -183,19 +232,22 @@
     friend class PLT_UPnP_CtrlPointStopIterator;
     friend class PLT_EventSubscriberRemoverIterator;
     friend class PLT_CtrlPointGetDescriptionTask;
-    friend class PLT_CtrlPointGetSCPDTask;
+    friend class PLT_CtrlPointGetSCPDsTask;
     friend class PLT_CtrlPointInvokeActionTask;
     friend class PLT_CtrlPointHouseKeepingTask;
     friend class PLT_CtrlPointSubscribeEventTask;
 
     NPT_List<NPT_String>                         m_UUIDsToIgnore;
-    NPT_Lock<PLT_CtrlPointListenerList>          m_ListenerList;
+    PLT_CtrlPointListenerList                    m_ListenerList;
     PLT_HttpServer*                              m_EventHttpServer;
-    NPT_HttpRequestHandler*                      m_EventHttpServerHandler;
     PLT_TaskManager                              m_TaskManager;
-    NPT_Lock<NPT_List<PLT_DeviceDataReference> > m_Devices;
-    NPT_Lock<NPT_List<PLT_EventSubscriber*> >    m_Subscribers;
+    NPT_Mutex                                    m_Lock;
+    NPT_List<PLT_DeviceDataReference>            m_RootDevices;
+    NPT_List<PLT_EventSubscriberReference>       m_Subscribers;
     NPT_String                                   m_SearchCriteria;
+    bool                                         m_Aborted;
+    NPT_List<PLT_EventNotification *>            m_PendingNotifications;
+    NPT_List<NPT_String>                         m_PendingInspections;
 };
 
 typedef NPT_Reference<PLT_CtrlPoint> PLT_CtrlPointReference;

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltCtrlPointTask.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltCtrlPointTask.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Control Point Tasks
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP ControlPoint Tasks
+ */
+
 #ifndef _PLT_CONTROL_POINT_TASK_H_
 #define _PLT_CONTROL_POINT_TASK_H_
 
@@ -51,56 +56,80 @@
 /*----------------------------------------------------------------------
 |   PLT_CtrlPointGetDescriptionTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_CtrlPointGetDescriptionTask class fetches the description xml document
+ from a UPnP device
+ */
 class PLT_CtrlPointGetDescriptionTask : public PLT_HttpClientSocketTask
 {
 public:
-    PLT_CtrlPointGetDescriptionTask(const NPT_HttpUrl&       url,
-                                    PLT_CtrlPoint*           ctrl_point, 
-                                    PLT_DeviceDataReference& root_device);
+    PLT_CtrlPointGetDescriptionTask(const NPT_HttpUrl& url,
+                                    PLT_CtrlPoint*     ctrl_point,
+                                    NPT_TimeInterval   leasetime,
+                                    NPT_String         uuid);
     virtual ~PLT_CtrlPointGetDescriptionTask();
 
 protected:
     // PLT_HttpClientSocketTask methods
     NPT_Result ProcessResponse(NPT_Result                    res, 
-                               NPT_HttpRequest*              request, 
+                               const NPT_HttpRequest&        request, 
                                const NPT_HttpRequestContext& context, 
                                NPT_HttpResponse*             response);
 
 protected:
-    PLT_CtrlPoint*          m_CtrlPoint;
-    PLT_DeviceDataReference m_RootDevice;
+    PLT_CtrlPoint*   m_CtrlPoint;
+    NPT_TimeInterval m_LeaseTime;
+    NPT_String       m_UUID;
 };
 
 /*----------------------------------------------------------------------
 |   PLT_CtrlPointGetSCPDRequest class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_CtrlPointGetSCPDRequest class is used by a PLT_CtrlPointGetSCPDsTask task
+ to fetch a specific SCPD xml document for a given service of a given device.
+ */
 class PLT_CtrlPointGetSCPDRequest : public NPT_HttpRequest
 {
 public:
-    PLT_CtrlPointGetSCPDRequest(const char* url,
-                                const char* method,
-                                const char* protocol) : 
-      NPT_HttpRequest(url, method, protocol) {}
-    ~PLT_CtrlPointGetSCPDRequest() {}
+    PLT_CtrlPointGetSCPDRequest(PLT_DeviceDataReference& device,
+                                const char*              url,
+                                const char*              method = "GET",
+                                const char*              protocol = NPT_HTTP_PROTOCOL_1_1) : // 1.1 for pipelining
+        NPT_HttpRequest(url, method, protocol), m_Device(device) {}
+    virtual ~PLT_CtrlPointGetSCPDRequest() {}
 
     // members
-    PLT_Service* m_Service;
+    PLT_DeviceDataReference m_Device;
 };
 
 /*----------------------------------------------------------------------
-|   PLT_CtrlPointGetSCPDTask class
+|   PLT_CtrlPointGetSCPDsTask class
 +---------------------------------------------------------------------*/
-class PLT_CtrlPointGetSCPDTask : public PLT_HttpClientSocketTask
+/**
+ The PLT_CtrlPointGetSCPDsTask class fetches the SCPD xml document of one or more
+ services for a given device. 
+ */
+class PLT_CtrlPointGetSCPDsTask : public PLT_HttpClientSocketTask
 {
 public:
-    PLT_CtrlPointGetSCPDTask(PLT_CtrlPoint*           ctrl_point, 
-                             PLT_DeviceDataReference& root_device);
-    virtual ~PLT_CtrlPointGetSCPDTask();
+    PLT_CtrlPointGetSCPDsTask(PLT_CtrlPoint* ctrl_point, PLT_DeviceDataReference& root_device);
+    virtual ~PLT_CtrlPointGetSCPDsTask() {}
+
+    NPT_Result AddSCPDRequest(PLT_CtrlPointGetSCPDRequest* request) {
+        return PLT_HttpClientSocketTask::AddRequest((NPT_HttpRequest*)request);
+    }
+
+    // override to prevent calling this directly
+    NPT_Result AddRequest(NPT_HttpRequest*) {
+        // only queuing PLT_CtrlPointGetSCPDRequest allowed
+        return NPT_ERROR_NOT_SUPPORTED;
+    }
 
 protected:
     // PLT_HttpClientSocketTask methods
     NPT_Result ProcessResponse(NPT_Result                    res, 
-                               NPT_HttpRequest*              request, 
+                               const NPT_HttpRequest&        request, 
                                const NPT_HttpRequestContext& context, 
                                NPT_HttpResponse*             response);   
 
@@ -112,6 +141,10 @@
 /*----------------------------------------------------------------------
 |   PLT_CtrlPointInvokeActionTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_CtrlPointInvokeActionTask class is used by a PLT_CtrlPoint to invoke
+ a specific action of a given service for a given device.
+ */
 class PLT_CtrlPointInvokeActionTask : public PLT_HttpClientSocketTask
 {
 public:
@@ -124,7 +157,7 @@
 protected:
     // PLT_HttpClientSocketTask methods
     NPT_Result ProcessResponse(NPT_Result                    res, 
-                               NPT_HttpRequest*              request, 
+                               const NPT_HttpRequest&        request, 
                                const NPT_HttpRequestContext& context, 
                                NPT_HttpResponse*             response);   
 
@@ -137,11 +170,15 @@
 /*----------------------------------------------------------------------
 |   PLT_CtrlPointHouseKeepingTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_CtrlPointHouseKeepingTask class is used by a PLT_CtrlPoint to keep 
+ track of expired devices and autmatically renew event subscribers. 
+ */
 class PLT_CtrlPointHouseKeepingTask : public PLT_ThreadTask
 {
 public:
     PLT_CtrlPointHouseKeepingTask(PLT_CtrlPoint*   ctrl_point, 
-                                  NPT_TimeInterval timer = NPT_TimeInterval(5, 0));
+                                  NPT_TimeInterval timer = NPT_TimeInterval(5.));
 
 protected:
     ~PLT_CtrlPointHouseKeepingTask() {}
@@ -157,20 +194,24 @@
 /*----------------------------------------------------------------------
 |   PLT_CtrlPointSubscribeEventTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_CtrlPointSubscribeEventTask class is used to subscribe, renew or cancel
+ a subscription for a given service of a given device.
+ */
 class PLT_CtrlPointSubscribeEventTask : public PLT_HttpClientSocketTask
 {
 public:
-    PLT_CtrlPointSubscribeEventTask(NPT_HttpRequest* request,
-                                    PLT_CtrlPoint*   ctrl_point, 
-									PLT_DeviceDataReference &device,
-                                    PLT_Service*     service,
-                                    void*            userdata = NULL);
+    PLT_CtrlPointSubscribeEventTask(NPT_HttpRequest*         request,
+                                    PLT_CtrlPoint*           ctrl_point, 
+									PLT_DeviceDataReference& device,
+                                    PLT_Service*             service,
+                                    void*                    userdata = NULL);
     virtual ~PLT_CtrlPointSubscribeEventTask();
     
 protected:
     // PLT_HttpClientSocketTask methods
     NPT_Result ProcessResponse(NPT_Result                    res, 
-                               NPT_HttpRequest*              request, 
+                               const NPT_HttpRequest&        request, 
                                const NPT_HttpRequestContext& context, 
                                NPT_HttpResponse*             response);

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltDatagramStream.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltDatagramStream.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Datagram Stream
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ Datagram Input/Output Neptune streams
+ */
+
 #ifndef _PLT_DATAGRAM_H_
 #define _PLT_DATAGRAM_H_
 
@@ -42,11 +47,17 @@
 /*----------------------------------------------------------------------
 |   PLT_InputDatagramStream
 +---------------------------------------------------------------------*/
+/**
+ The PLT_InputDatagramStream class is a simple buffered input stream 
+ used when reading SSDP packets on a UDP socket. It allows to use Neptune
+ HTTP parsing as if reading on a TCP socket.
+ */
 class PLT_InputDatagramStream : public NPT_InputStream
 {
 public:
     // methods
-    PLT_InputDatagramStream(NPT_UdpSocket* socket);
+    PLT_InputDatagramStream(NPT_UdpSocket* socket,
+                            NPT_Size       buffer_size = 2000);
     virtual ~PLT_InputDatagramStream();
     
     NPT_Result GetInfo(NPT_SocketInfo& info);
@@ -65,6 +76,8 @@
 protected:
     NPT_UdpSocket*      m_Socket;
     NPT_SocketInfo      m_Info;
+    NPT_DataBuffer      m_Buffer;
+    NPT_Position        m_BufferOffset;
 };
 
 typedef NPT_Reference<PLT_InputDatagramStream> PLT_InputDatagramStreamReference;
@@ -72,6 +85,11 @@
 /*----------------------------------------------------------------------
 |   PLT_OutputDatagramStream
 +---------------------------------------------------------------------*/
+/**
+ The PLT_OutputDatagramStream class is a simple buffered output stream 
+ used when writing SSDP packets on a UDP socket. It allows to use Neptune
+ HTTP client as if writing on a TCP socket.
+ */
 class PLT_OutputDatagramStream : public NPT_OutputStream
 {
 public:

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltDeviceData.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltDeviceData.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Device Data
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP Device information
+ */
+
 #ifndef _PLT_DEVICE_DATA_H_
 #define _PLT_DEVICE_DATA_H_
 
@@ -52,6 +57,9 @@
 /*----------------------------------------------------------------------
 |   PLT_DeviceIcon class
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_DeviceIcon class represents a given instance of a UPnP device icon.
+ */
 class PLT_DeviceIcon
 {
 public:
@@ -77,19 +85,24 @@
 /*----------------------------------------------------------------------
 |   PLT_DeviceData class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_DeviceData class holds information about a device being advertised or
+ found by a control point. It maintains a list of services and 
+ embedded devices if any.
+ */
 class PLT_DeviceData
 {
 public:
     PLT_DeviceData(
-        NPT_HttpUrl      description_url = NPT_HttpUrl(NULL, 0, "/"), 
+        NPT_HttpUrl      description_url = NPT_HttpUrl(NULL, 0, "/description.xml"), 
         const char*      uuid = "",
-        NPT_TimeInterval lease_time = PLT_Constants::GetInstance().m_DefaultDeviceLease,
+        NPT_TimeInterval lease_time = *PLT_Constants::GetInstance().GetDefaultDeviceLease(),
         const char*      device_type = "",
         const char*      friendly_name = "");
 
-    /* Getters */
+    /* methods */
     virtual NPT_Result  GetDescription(NPT_String& desc);
-    virtual NPT_String  GetDescriptionUrl(const char* bind_addr = NULL);
+    virtual NPT_String  GetDescriptionUrl(const char* ip_address = NULL);
     virtual NPT_HttpUrl GetURLBase();
     virtual NPT_HttpUrl NormalizeURL(const NPT_String& url);
     virtual NPT_Result  GetDescription(NPT_XmlElementNode* parent, NPT_XmlElementNode** device = NULL);
@@ -101,7 +114,8 @@
     const NPT_String&   GetType()             const { return m_DeviceType;       }
     const NPT_String&   GetModelDescription() const { return m_ModelDescription; }
     const NPT_String&   GetParentUUID()       const { return m_ParentUUID;       }
-    bool                IsRoot()              { return m_ParentUUID.IsEmpty(); }
+    bool                IsRoot()              { return m_ParentUUID.IsEmpty();   }
+    const NPT_IpAddress& GetLocalIP()          const { return m_LocalIfaceIp;     }
 
     const NPT_Array<PLT_Service*>&            GetServices()        const { return m_Services; }
     const NPT_Array<PLT_DeviceDataReference>& GetEmbeddedDevices() const { return m_EmbeddedDevices; }
@@ -110,7 +124,8 @@
     NPT_Result FindEmbeddedDeviceByType(const char* type, PLT_DeviceDataReference& device);
     NPT_Result FindServiceById(const char* id, PLT_Service*& service);
     NPT_Result FindServiceByType(const char* type, PLT_Service*& service);
-    NPT_Result FindServiceBySCPDURL(const char* url, PLT_Service*& service);
+	NPT_Result FindServiceByName(const char* name, PLT_Service*& service);
+    NPT_Result FindServiceBySCPDURL(const char* url, PLT_Service*& service, bool recursive = false);
     NPT_Result FindServiceByControlURL(const char* url, PLT_Service*& service, bool recursive = false);
     NPT_Result FindServiceByEventSubURL(const char* url, PLT_Service*& service, bool recursive = false);
 
@@ -118,6 +133,7 @@
     NPT_Result AddEmbeddedDevice(PLT_DeviceDataReference& device);
     NPT_Result RemoveEmbeddedDevice(PLT_DeviceDataReference& device);
     NPT_Result AddService(PLT_Service* service);
+	NPT_Result RemoveService(PLT_Service* service);
 
     operator const char* ();
 
@@ -125,15 +141,24 @@
     virtual ~PLT_DeviceData();
     virtual void       Cleanup();
     virtual NPT_Result OnAddExtraInfo(NPT_XmlElementNode* /*device_node*/) { return NPT_SUCCESS; }
+    NPT_Result         SetLeaseTime(NPT_TimeInterval lease_time, NPT_TimeStamp lease_time_last_update = 0.);
 
 private:
-    /* called by PLT_CtrlPoint when new device is discovered */
+    /* called by PLT_CtrlPoint when an existing device location is updated */
+    NPT_Result    SetDescriptionUrl(NPT_HttpUrl& url);
+
     NPT_Result    SetURLBase(NPT_HttpUrl& url_base);
     NPT_TimeStamp GetLeaseTimeLastUpdate();
-    NPT_Result    SetLeaseTime(NPT_TimeInterval lease_time);
-    NPT_Result    SetDescription(const char*          szDescription, 
-                                 const NPT_IpAddress& local_iface_ip);
-    NPT_Result    SetDescriptionDevice(NPT_XmlElementNode* device_node);
+    
+    /* class methods */
+    static NPT_Result SetDescription(PLT_DeviceDataReference&      root_device,
+                                     NPT_TimeInterval              leasetime,
+                                     NPT_HttpUrl                   description_url,
+                                     const char*                   description, 
+                                     const NPT_HttpRequestContext& context);
+    static NPT_Result SetDescriptionDevice(PLT_DeviceDataReference&      device,
+                                           NPT_XmlElementNode*           device_node, 
+                                           const NPT_HttpRequestContext& context);
 
 public:
     NPT_String m_Manufacturer;
@@ -177,6 +202,10 @@
 /*----------------------------------------------------------------------
 |   PLT_DeviceDataFinder
 +---------------------------------------------------------------------*/
+/**
+ The PLT_DeviceDataFinder class returns a PLT_DeviceData instance given
+ a device UUID.
+ */
 class PLT_DeviceDataFinder
 {
 public:
@@ -196,6 +225,10 @@
 /*----------------------------------------------------------------------
 |   PLT_DeviceDataFinderByType
 +---------------------------------------------------------------------*/
+/**
+ The PLT_DeviceDataFinderByType class returns a PLT_DeviceData instance 
+ given a device type.
+ */
 class PLT_DeviceDataFinderByType
 {
 public:

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltDeviceHost.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltDeviceHost.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Device Host
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP Device
+ */
+
 #ifndef _PLT_DEVICE_HOST_H_
 #define _PLT_DEVICE_HOST_H_
 
@@ -39,8 +44,7 @@
 +---------------------------------------------------------------------*/
 #include "Neptune.h"
 #include "PltDeviceData.h"
-#include "PltHttpServerListener.h"
-#include "PltSsdpListener.h"
+#include "PltSsdp.h"
 #include "PltTaskManager.h"
 #include "PltAction.h"
 #include "PltHttp.h"
@@ -56,10 +60,30 @@
 /*----------------------------------------------------------------------
 |   PLT_DeviceHost class
 +---------------------------------------------------------------------*/
+/**
+ UPnP Device Host.
+ The PLT_DeviceHost class is a base class for implementing a UPnP Device. It handles 
+ network announcements and responses to searches from ControlPoints. ControlPoint
+ action invocations are also received and delegated to derived classes. A 
+ PLT_DeviceHost also takes care of eventing when services state variables change.
+ */
 class PLT_DeviceHost : public PLT_DeviceData,
-                       public PLT_SsdpPacketListener
+                       public PLT_SsdpPacketListener,
+                       public NPT_HttpRequestHandler
 {
 public:
+    /**
+     Creates a new instance of UPnP Device Host.
+     @param description_path Relative path for description url
+     @param uuid UPnP device unique id
+     @param device_type UPnP device type
+     @param friendly_name Name advertised for UPnP device
+     @param show_ip Flag to indicate if device IP should be appended to friendly name
+     @param port local port for the device host internal HTTP server, 0 for randomly
+     selected.
+     @param port_rebind Flag to indicate if device host should automatically try to look 
+     for another port if failing to choose the one passed.
+     */
     PLT_DeviceHost(const char*  description_path = "/",
                    const char*  uuid = "",
                    const char*  device_type = "",
@@ -67,80 +91,229 @@
                    bool         show_ip = false,
                    NPT_UInt16   port = 0,
                    bool         port_rebind = false);
-
-    // public methods
-    virtual void       SetBroadcast(bool broadcast) { m_Broadcast = broadcast; }
+    virtual ~PLT_DeviceHost();
+    
+    virtual void SetBroadcast(bool broadcast) { m_Broadcast = broadcast; }
+     
+    /**
+     When a UPnP device comes up, the specifications require that a SSDP bye-bye
+     sequence is sent to force the removal of the device in case it wasn't sent
+     properly during the last shutdown.
+     @param bye_bye_first Boolean to indicate that SSDP bye-bye sequence should 
+     be sent first or not.
+     */
+    virtual void SetByeByeFirst(bool bye_bye_first) { m_ByeByeFirst = bye_bye_first; }
+    
+    /**
+     Returns the port used by the internal HTTP server for all incoming requests.
+     @return port
+     */
     virtual NPT_UInt16 GetPort() { return m_Port; };
-
-    // NPT_HttpRequestHandler forward for control/event requests
-    virtual NPT_Result ProcessHttpRequest(NPT_HttpRequest&              request,
-                                          const NPT_HttpRequestContext& context,
-                                          NPT_HttpResponse&             response);
     
-    // PLT_SsdpDeviceAnnounceTask & PLT_SsdpDeviceAnnounceUnicastTask
-    virtual NPT_Result Announce(PLT_DeviceData*  device, 
+    /**
+     Sets the lease time.
+     @param lease_time Lease Time
+     */
+    NPT_Result SetLeaseTime(NPT_TimeInterval lease_time) { return PLT_DeviceData::SetLeaseTime(lease_time); }
+
+protected:
+    /**
+     NPT_HttpRequestHandler method for setting up the response of an incoming
+     HTTP request.
+     @param request the request received
+     @param context the context of the request
+     @param response the response to set up
+     */
+    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request,
+                                     const NPT_HttpRequestContext& context,
+                                     NPT_HttpResponse&             response);
+
+    /**
+     Static method similar to Announce.
+     @param device the device to announce
+     @param request the SSDP pre formatted request
+     @param socket the network socket to use to send the request
+     @param byebye boolean indicating if the announce is a SSDP bye-bye or alive.
+     */
+    static NPT_Result Announce(PLT_DeviceData*  device, 
                                 NPT_HttpRequest& request, 
                                 NPT_UdpSocket&   socket, 
                                 bool             byebye);
-
-    virtual NPT_Result Announce(NPT_HttpRequest& request, 
-                                NPT_UdpSocket&   socket, 
-                                bool             byebye) {
+    /**
+     Called during SSDP announce. The HTTP request is already configured with
+     the right method and host.
+     @param request the SSDP pre formatted request
+     @param socket the network socket to use to send the request
+     @param byebye boolean indicating if the announce is a SSDP bye-bye or alive.
+     */
+    NPT_Result Announce(NPT_HttpRequest& request, 
+                        NPT_UdpSocket&   socket, 
+                        bool             byebye) {
         return Announce(this, request, socket, byebye);
     }
 
-    // PLT_SsdpPacketListener method
-    virtual NPT_Result OnSsdpPacket(NPT_HttpRequest&              request, 
+    /**
+     PLT_SsdpPacketListener method called when a M-SEARCH SSDP packet is received.
+     @param request SSDP packet
+     @param context the context of the request
+     */
+    virtual NPT_Result OnSsdpPacket(const NPT_HttpRequest&        request, 
                                     const NPT_HttpRequestContext& context);
 
-    // PLT_SsdpDeviceSearchListenTask
-    virtual NPT_Result ProcessSsdpSearchRequest(NPT_HttpRequest&              request, 
-                                                const NPT_HttpRequestContext& context);
-
-    // PLT_SsdpDeviceSearchResponseTask
-    virtual NPT_Result SendSsdpSearchResponse(PLT_DeviceData*   device, 
-                                              NPT_HttpResponse& response, 
-                                              NPT_UdpSocket&    socket, 
-                                              const char*       st,
-                                              const NPT_SocketAddress* addr  = NULL);
-    virtual NPT_Result SendSsdpSearchResponse(NPT_HttpResponse& response, 
-                                              NPT_UdpSocket&    socket, 
-                                              const char*       ST,
+    /**
+     Static method similar to SendSsdpSearchResponse.
+     @param device the device to announce
+     @param response the SSDP pre formatted response
+     @param socket the network socket to use to send the request
+     @param st the original request search target
+     @param addr the remote address to send the response back to in case the socket
+     is not already connected.
+     */
+    static NPT_Result SendSsdpSearchResponse(PLT_DeviceData*          device, 
+                                             NPT_HttpResponse&        response, 
+                                             NPT_UdpSocket&           socket, 
+                                             const char*              st,
+                                             const NPT_SocketAddress* addr  = NULL);
+    /**
+     Called by PLT_SsdpDeviceSearchResponseTask when responding to a M-SEARCH
+     SSDP request.
+     @param response the SSDP pre formatted response
+     @param socket the network socket to use to send the request
+     @param st the original request search target
+     @param addr the remote address to send the response back to in case the socket
+     is not already connected.
+     */
+    virtual NPT_Result SendSsdpSearchResponse(NPT_HttpResponse&        response, 
+                                              NPT_UdpSocket&           socket, 
+                                              const char*              st,
                                               const NPT_SocketAddress* addr = NULL) {
-        return SendSsdpSearchResponse(this, response, socket, ST, addr);
+        return SendSsdpSearchResponse(this, response, socket, st, addr);
     }
     
-protected:
-    virtual ~PLT_DeviceHost();
-
-    // pure methods
-    virtual NPT_Result SetupServices(PLT_DeviceData& data) = 0;
-    
-    // setup methods
-    virtual NPT_Result SetupIcons();
-    virtual NPT_Result SetupDevice();
-    
-    // overridable methods
+public:
+    /**
+     Add UPnP icon information to serve from file system.
+     @param icon the icon information including url path
+     @param fileroot the file system root path 
+     @param urlroot the url root path of the icon url to match to fileroot
+     Note: As an exemple, if the icon url path is "/images/icon1.jpg", the fileroot
+     is "/Users/joe/www" and the urlroot is "/", when a request is made for
+     "/images/icon1.jpg", the file is expected to be found at 
+     "/Users/joe/www/images/icon1.jpg". If the urlroot were "/images", the file 
+     would be expected to be found at "/Users/joe/www/icon1.jpg".
+     */
     virtual NPT_Result AddIcon(const PLT_DeviceIcon& icon, 
-                               const char*           filepath);
+                               const char*           fileroot,
+                               const char*           urlroot = "/");
+    
+    /**
+     Add UPnP icon information to serve using static image.
+     @param icon the icon information including url path
+     @param data the image data
+     @param size the image data size
+     @param copy boolean to indicate the data should be copied internally
+     */
     virtual NPT_Result AddIcon(const PLT_DeviceIcon& icon, 
                                const void*           data, 
                                NPT_Size              size, 
                                bool                  copy = true);
+
+protected:
+    /**
+     Required method for setting up UPnP services of device host 
+     (and any embedded). Called when device starts.
+     */
+    virtual NPT_Result SetupServices() = 0;
+    
+    /**
+     Default implementation for registering device icon resources. Override to 
+     use different ones. Called when device starts.
+     */
+    virtual NPT_Result SetupIcons();
+    
+    /** 
+     Default implementation for setting up device host. This calls SetupServices
+     and SetupIcons when device starts.
+     */
+    virtual NPT_Result SetupDevice();
+    
+    /**
+     Called by PLT_TaskManager when the device is started.
+     @param task the SSDP listening task to attach to for receiving 
+     SSDP M-SEARCH messages.
+     */
     virtual NPT_Result Start(PLT_SsdpListenTask* task);
+    
+    /**
+     Called by PLT_TaskManager when the device is stoped.
+     @param task the SSDP listening task to detach from to stop receiving 
+     SSDP M-SEARCH messages.
+     */
     virtual NPT_Result Stop(PLT_SsdpListenTask* task);
-    virtual NPT_Result SetupServiceSCPDHandler(PLT_Service* service);
+    
+    /**
+     This mehod is called when an action performed by a control point has been 
+     received and needs to be answered.
+     @param action the action information to answer
+     @param context the context information including the HTTP request and
+     local and remote socket information (IP & port).
+     */
     virtual NPT_Result OnAction(PLT_ActionReference&          action, 
                                 const PLT_HttpRequestContext& context);
+    
+    /**
+     This method is called when a control point is requesting the device
+     description.
+     @param request the HTTP request
+     @param context the context information including local and remote socket information.
+     @param response the response to setup.
+     */
     virtual NPT_Result ProcessGetDescription(NPT_HttpRequest&              request,
                                              const NPT_HttpRequestContext& context,
                                              NPT_HttpResponse&             response);
+    
+    /**
+     This method is called when a control point is requesting a service SCPD.
+     @param service the service
+     @param request the HTTP request
+     @param context the context information including local and remote socket information.
+     @param response the response to setup.
+     */
+    virtual NPT_Result ProcessGetSCPD(PLT_Service*                  service,
+                                      NPT_HttpRequest&              request,
+                                      const NPT_HttpRequestContext& context,
+                                      NPT_HttpResponse&             response);
+    
+    /**
+     This method is called when a "GET" request for a resource other than the device
+     description, SCPD, or icons has been received.
+     @param request the HTTP request
+     @param context the context information including local and remote socket information.
+     @param response the response to setup.
+     */
     virtual NPT_Result ProcessHttpGetRequest(NPT_HttpRequest&              request,
                                              const NPT_HttpRequestContext& context,
                                              NPT_HttpResponse&             response);
+    
+    /**
+     This method is called when a "POST" request has been received. This is usually
+     an UPnP service action invocation. This will deserialize the request and call
+     the OnAction method.
+     @param request the HTTP request
+     @param context the context information including local and remote socket information.
+     @param response the response to setup.
+     */
     virtual NPT_Result ProcessHttpPostRequest(NPT_HttpRequest&              request,
                                               const NPT_HttpRequestContext& context,
                                               NPT_HttpResponse&             response);
+    
+    /**
+     This method is called when a request from a subscriber has been received. This is
+     for any new subscritions, existing subscrition renewal or cancellation.
+     @param request the HTTP request
+     @param context the context information including local and remote socket information.
+     @param response the response to setup.
+     */
     virtual NPT_Result ProcessHttpSubscriberRequest(NPT_HttpRequest&              request,
                                                     const NPT_HttpRequestContext& context,
                                                     NPT_HttpResponse&             response);
@@ -151,14 +324,16 @@
     friend class PLT_UPnP_DeviceStopIterator;
     friend class PLT_Service;
     friend class NPT_Reference<PLT_DeviceHost>;
+    friend class PLT_SsdpDeviceSearchResponseInterfaceIterator;
+    friend class PLT_SsdpDeviceSearchResponseTask;
+    friend class PLT_SsdpAnnounceInterfaceIterator;
 
-private:
-    PLT_TaskManager                   m_TaskManager;
-    PLT_HttpServer*                   m_HttpServer;
-    bool                              m_Broadcast;
-    NPT_UInt16                        m_Port;
-    bool                              m_PortRebind;
-    NPT_List<NPT_HttpRequestHandler*> m_RequestHandlers;
+    PLT_TaskManager m_TaskManager;
+    PLT_HttpServer* m_HttpServer;
+    bool            m_Broadcast;
+    NPT_UInt16      m_Port;
+    bool            m_PortRebind;
+    bool            m_ByeByeFirst;
 };
 
 typedef NPT_Reference<PLT_DeviceHost> PLT_DeviceHostReference;

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltDidl.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltDidl.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - DIDL handling
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP AV Didl
+ */
+
 #ifndef _PLT_DIDL_H_
 #define _PLT_DIDL_H_
 
@@ -57,6 +62,10 @@
 #define PLT_FILTER_MASK_ACTOR                       0x00000200
 #define PLT_FILTER_MASK_AUTHOR                      0x00000400
 #define PLT_FILTER_MASK_DATE                        0x00000800
+#define PLT_FILTER_MASK_PROGRAMTITLE                0x00001000
+#define PLT_FILTER_MASK_SERIESTITLE                 0x00002000
+#define PLT_FILTER_MASK_EPISODE                     0x00004000
+#define PLT_FILTER_MASK_TITLE                       0x00008000
 
 #define PLT_FILTER_MASK_RES                         0x00010000
 #define PLT_FILTER_MASK_RES_DURATION                0x00020000
@@ -68,8 +77,14 @@
 #define PLT_FILTER_MASK_RES_NRAUDIOCHANNELS			0x00800000
 #define PLT_FILTER_MASK_RES_SAMPLEFREQUENCY			0x01000000
 
+#define PLT_FILTER_MASK_LONGDESCRIPTION             0x02000000
+#define PLT_FILTER_MASK_ICON                        0x04000000
+
 #define PLT_FILTER_MASK_TOC							0x02000000
+#define PLT_FILTER_MASK_SEARCHCLASS					0x04000000
+#define PLT_FILTER_MASK_REFID                       0x08000000
 
+#define PLT_FILTER_FIELD_TITLE                      "dc:title"
 #define PLT_FILTER_FIELD_CREATOR                    "dc:creator"
 #define PLT_FILTER_FIELD_DATE                       "dc:date"
 #define PLT_FILTER_FIELD_ARTIST                     "upnp:artist"
@@ -78,15 +93,24 @@
 #define PLT_FILTER_FIELD_ALBUM                      "upnp:album"
 #define PLT_FILTER_FIELD_GENRE                      "upnp:genre"
 #define PLT_FILTER_FIELD_ALBUMARTURI                "upnp:albumArtURI"
-#define PLT_FILTER_FIELD_DESCRIPTION                "upnp:longDescription"
+#define PLT_FILTER_FIELD_ALBUMARTURI_DLNAPROFILEID  "upnp:albumArtURI@dlna:profileID"
+#define PLT_FILTER_FIELD_DESCRIPTION                "dc:description"
+#define PLT_FILTER_FIELD_LONGDESCRIPTION            "upnp:longDescription"
+#define PLT_FILTER_FIELD_ICON                       "upnp:icon"
 #define PLT_FILTER_FIELD_ORIGINALTRACK              "upnp:originalTrackNumber"
+#define PLT_FILTER_FIELD_PROGRAMTITLE               "upnp:programTitle"
+#define PLT_FILTER_FIELD_SERIESTITLE                "upnp:seriesTitle"
+#define PLT_FILTER_FIELD_EPISODE                    "upnp:episodeNumber"
+#define PLT_FILTER_FIELD_SEARCHCLASS				"upnp:searchClass"
 #define PLT_FILTER_FIELD_SEARCHABLE                 "@searchable"
 #define PLT_FILTER_FIELD_CHILDCOUNT                 "@childcount"
 #define PLT_FILTER_FIELD_CONTAINER_CHILDCOUNT       "container@childCount"
 #define PLT_FILTER_FIELD_CONTAINER_SEARCHABLE       "container@searchable"
+#define PLT_FILTER_FIELD_REFID                      "@refID"
 
 #define PLT_FILTER_FIELD_RES                        "res"
 #define PLT_FILTER_FIELD_RES_DURATION               "res@duration"
+#define PLT_FILTER_FIELD_RES_DURATION_SHORT         "@duration"
 #define PLT_FILTER_FIELD_RES_SIZE                   "res@size"
 #define PLT_FILTER_FIELD_RES_PROTECTION             "res@protection"
 #define PLT_FILTER_FIELD_RES_RESOLUTION             "res@resolution"
@@ -99,32 +123,36 @@
 extern const char* didl_footer;
 extern const char* didl_namespace_dc;
 extern const char* didl_namespace_upnp;
+extern const char* didl_namespace_dlna;
 
 /*----------------------------------------------------------------------
-|   PLT_Didl class
+|   PLT_Didl
 +---------------------------------------------------------------------*/
+/**
+ DIDL manipulation.
+ The PLT_Didl class provides a mechanism to (de)serialize a PLT_MediaObject or
+ list of PLT_MediaObject (PLT_MediaObjectList).
+ */
 class PLT_Didl
 {
 public:
-    static NPT_Result  ToDidl(PLT_MediaObject& object, 
-                              NPT_String       filter, 
-                              NPT_String&      didl);
+    static NPT_Result  ToDidl(PLT_MediaObject&  object, 
+                              const NPT_String& filter, 
+                              NPT_String&       didl);
     static NPT_Result  FromDidl(const char* didl, 
                                 PLT_MediaObjectListReference& objects);
-
     static void        AppendXmlEscape(NPT_String& out, const char* in);
     static void        AppendXmlUnEscape(NPT_String& out, const char* in);
-    static NPT_Result  ParseTimeStamp(NPT_String timestamp, NPT_UInt32& seconds);
-    static void        FormatTimeStamp(NPT_String& out, NPT_UInt32 seconds);
-
-    static NPT_Result  ParseTimeStamp(NPT_String in, NPT_TimeStamp& timestamp) {
+    static NPT_Result  ParseTimeStamp(const NPT_String& timestamp, NPT_UInt32& seconds);
+    static NPT_String  FormatTimeStamp(NPT_UInt32 seconds);
+    static NPT_Result  ParseTimeStamp(const NPT_String& in, NPT_TimeStamp& timestamp) {
         NPT_UInt32 seconds;
         NPT_Result res = ParseTimeStamp(in, seconds);
-        timestamp = NPT_TimeStamp(seconds, 0);
+        timestamp = NPT_TimeStamp((double)seconds);
         return res;
     }
 
-    static NPT_UInt32  ConvertFilterToMask(NPT_String filter);
+    static NPT_UInt32  ConvertFilterToMask(const NPT_String& filter);
 };
 
 #endif /* _PLT_DIDL_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltDownloader.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltDownloader.h Changed

@@ -1,7 +1,8 @@
 /*****************************************************************
 |
-||
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+|   Platinum - Downloader
+|
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -16,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -47,8 +49,6 @@
 /*----------------------------------------------------------------------
 |   types
 +---------------------------------------------------------------------*/
-typedef PLT_HttpClientTask<PLT_Downloader> PLT_HttpDownloadTask;
-
 typedef enum {
     PLT_DOWNLOADER_IDLE,
     PLT_DOWNLOADER_STARTED,
@@ -60,31 +60,29 @@
 /*----------------------------------------------------------------------
 |   PLT_Downloader class
 +---------------------------------------------------------------------*/
-class PLT_Downloader
+class PLT_Downloader : public PLT_HttpClientSocketTask
 {
 public:
-    PLT_Downloader(PLT_TaskManager*           task_manager, 
-                   const char*                url, 
+    PLT_Downloader(NPT_HttpUrl&               url, 
                    NPT_OutputStreamReference& output);
     virtual ~PLT_Downloader();
-
-    NPT_Result Start();
-    NPT_Result Stop();
+    
     Plt_DowloaderState GetState() { return m_State; }
 
     // PLT_HttpClientTask method
     NPT_Result ProcessResponse(NPT_Result                    res, 
-                               NPT_HttpRequest*              request, 
+                               const NPT_HttpRequest&        request, 
                                const NPT_HttpRequestContext& context, 
                                NPT_HttpResponse*             response);
 
-
+protected:
+    virtual void DoRun();
+    virtual void DoAbort();
+    
 private:
     // members
-    NPT_String                m_URL;
+    NPT_HttpUrl               m_URL;
     NPT_OutputStreamReference m_Output;
-    PLT_TaskManager*          m_TaskManager;
-    PLT_HttpDownloadTask*     m_Task;
     Plt_DowloaderState        m_State;
 };

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltEvent.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltEvent.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Event
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP Eventing
+ */
+
 #ifndef _PLT_EVENT_H_
 #define _PLT_EVENT_H_
 
@@ -50,15 +55,46 @@
 class PLT_CtrlPoint;
 
 /*----------------------------------------------------------------------
+|   PLT_EventNotification class
++---------------------------------------------------------------------*/
+/**
+ The PLT_EventNotification class represents an event notification for a given
+ service to a given subscriber 
+ */
+class PLT_EventNotification
+{
+public:
+    ~PLT_EventNotification() {}
+
+    static PLT_EventNotification* Parse(const NPT_HttpRequest&        request,
+                                        const NPT_HttpRequestContext& context,
+                                        NPT_HttpResponse&             response);
+
+
+    NPT_TimeStamp                 m_ReceptionTime;
+    NPT_HttpUrl                   m_RequestUrl;
+    NPT_String                    m_SID;
+    NPT_Ordinal                   m_EventKey;
+    NPT_String                    m_XmlBody;
+    
+protected:
+    PLT_EventNotification() {}
+};
+
+/*----------------------------------------------------------------------
 |   PLT_EventSubscriber class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_EventSubscriber class represents an event subscription for a given service
+ from a UPnP ControlPoint.
+ */
 class PLT_EventSubscriber
 {
 public:
     PLT_EventSubscriber(PLT_TaskManager* task_manager, 
                         PLT_Service*     service,
                         const char*      sid,
-                        int              timeout = -1);
+                        NPT_Timeout      timeout_secs = -1);
     ~PLT_EventSubscriber();
 
     PLT_Service*      GetService();
@@ -67,7 +103,7 @@
     NPT_SocketAddress GetLocalIf();
     NPT_Result        SetLocalIf(NPT_SocketAddress value);
     NPT_TimeStamp     GetExpirationTime();
-    NPT_Result        SetTimeout(NPT_Cardinal timeout);
+    NPT_Result        SetTimeout(NPT_Timeout seconds = -1);
     const NPT_String& GetSID() const { return m_SID; }
     NPT_Result        FindCallbackURL(const char* callback_url);
     NPT_Result        AddCallbackURL(const char* callback_url);
@@ -85,16 +121,22 @@
     NPT_TimeStamp             m_ExpirationTime;
 };
 
+typedef NPT_Reference<PLT_EventSubscriber> PLT_EventSubscriberReference;
+
 /*----------------------------------------------------------------------
 |   PLT_EventSubscriberFinderBySID
 +---------------------------------------------------------------------*/
+/**
+ The PLT_EventSubscriberFinderBySID class returns an instance of a PLT_EventSubscriber
+ given its subscriber ID.
+ */
 class PLT_EventSubscriberFinderBySID
 {
 public:
     // methods
     PLT_EventSubscriberFinderBySID(const char* sid) : m_SID(sid) {}
 
-    bool operator()(PLT_EventSubscriber* const & sub) const {
+    bool operator()(PLT_EventSubscriberReference const & sub) const {
         return m_SID.Compare(sub->GetSID(), true) ? false : true;
     }
 
@@ -106,6 +148,10 @@
 /*----------------------------------------------------------------------
 |   PLT_EventSubscriberFinderByCallbackURL
 +---------------------------------------------------------------------*/
+/**
+ The PLT_EventSubscriberFinderByCallbackURL class returns an instance of a 
+ PLT_EventSubscriber given its subscriber callback url.
+ */
 class PLT_EventSubscriberFinderByCallbackURL
 {
 public:
@@ -113,7 +159,7 @@
     PLT_EventSubscriberFinderByCallbackURL(const char* callback_url) : 
       m_CallbackURL(callback_url) {}
 
-    bool operator()(PLT_EventSubscriber* const & sub) const {
+    bool operator()(PLT_EventSubscriberReference const & sub) const {
         return NPT_SUCCEEDED(sub->FindCallbackURL(m_CallbackURL));
     }
 
@@ -125,13 +171,17 @@
 /*----------------------------------------------------------------------
 |   PLT_EventSubscriberFinderByService
 +---------------------------------------------------------------------*/
+/**
+ The PLT_EventSubscriberFinderByService class returns an instance of a 
+ PLT_EventSubscriber given a UPnP service.
+ */
 class PLT_EventSubscriberFinderByService
 {
 public:
     // methods
     PLT_EventSubscriberFinderByService(PLT_Service* service) : m_Service(service) {}
     virtual ~PLT_EventSubscriberFinderByService() {}
-    bool operator()(PLT_EventSubscriber* const & eventSub) const;
+    bool operator()(PLT_EventSubscriberReference const & eventSub) const;
 
 private:
     // members

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltFileMediaServer.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltFileMediaServer.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - File Media Server
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP AV Filesystem based Media Server sample implementation 
+ */
+
 #ifndef _PLT_FILE_MEDIA_SERVER_H_
 #define _PLT_FILE_MEDIA_SERVER_H_
 
@@ -39,71 +44,42 @@
 +---------------------------------------------------------------------*/
 #include "Neptune.h"
 #include "PltMediaServer.h"
+#include "PltMediaCache.h"
 
 /*----------------------------------------------------------------------
-|   constants
-+---------------------------------------------------------------------*/
-#define MAX_PATH_LENGTH 1024
-#define ALBUMART_QUERY  "aa"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_MetadataHandler;
-
-/*----------------------------------------------------------------------
-|   PLT_FileMediaServer class
+|   PLT_FileMediaServerDelegate
 +---------------------------------------------------------------------*/
-class PLT_FileMediaServer : public PLT_MediaServer
+/**
+ File Media Server Delegate.
+ The PLT_FileMediaServerDelegate class is an example of a PLT_MediaServerDelegate
+ implementation for a file system backed Media Server.
+ */
+class PLT_FileMediaServerDelegate : public PLT_MediaServerDelegate
 {
 public:
     // class methods
     static NPT_String BuildSafeResourceUri(const NPT_HttpUrl& base_uri, 
                                            const char*        host, 
                                            const char*        file_path);
-
-    // constructor
-    PLT_FileMediaServer(const char*  path, 
-                        const char*  friendly_name,
-                        bool         show_ip = false,
-                        const char*  uuid = NULL,
-                        NPT_UInt16   port = 0,
-                        bool         port_rebind = false);
-
-    // overridable
-    virtual NPT_Result AddMetadataHandler(PLT_MetadataHandler* handler);
-    virtual NPT_Result ExtractResourcePath(const NPT_HttpUrl& url, NPT_String& file_path);
-    virtual NPT_String BuildResourceUri(const NPT_HttpUrl& base_uri, const char* host, const char* file_path);
-
+    // constructor & destructor
+    PLT_FileMediaServerDelegate(const char* url_root, const char* file_root, bool use_cache = false);
+    virtual ~PLT_FileMediaServerDelegate();
+    
 protected:
-    virtual ~PLT_FileMediaServer();
-
-    // overridable
-    virtual NPT_Result ProcessFileRequest(NPT_HttpRequest&              request, 
-                                          const NPT_HttpRequestContext& context,
-                                          NPT_HttpResponse&             response);
-    // PLT_DeviceHost methods
-    virtual NPT_Result SetupDevice();
-    virtual NPT_Result ProcessHttpGetRequest(NPT_HttpRequest&              request, 
-                                             const NPT_HttpRequestContext& context,
-                                             NPT_HttpResponse&             response);
-    virtual NPT_Result ProcessGetDescription(NPT_HttpRequest&              request,
-                                             const NPT_HttpRequestContext& context,
-                                             NPT_HttpResponse&             response);
-    // PLT_MediaServer methods
+    // PLT_MediaServerDelegate methods
     virtual NPT_Result OnBrowseMetadata(PLT_ActionReference&          action, 
                                         const char*                   object_id, 
                                         const char*                   filter,
                                         NPT_UInt32                    starting_index,
                                         NPT_UInt32                    requested_count,
-                                        const NPT_List<NPT_String>&   sort_criteria,
+                                        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 NPT_List<NPT_String>&   sort_criteria,
+                                              const char*                   sort_criteria,
                                               const PLT_HttpRequestContext& context);
     virtual NPT_Result OnSearchContainer(PLT_ActionReference&          action, 
                                          const char*                   object_id, 
@@ -111,33 +87,65 @@
                                          const char*                   filter,
                                          NPT_UInt32                    starting_index,
                                          NPT_UInt32                    requested_count,
-                                         const NPT_List<NPT_String>&   sort_criteria, 
+                                         const char*                   sort_criteria, 
                                          const PLT_HttpRequestContext& context);
-                                
-    virtual NPT_Result ServeFile(NPT_HttpRequest&              request, 
+    virtual NPT_Result ProcessFileRequest(NPT_HttpRequest&              request, 
+                                          const NPT_HttpRequestContext& context,
+                                          NPT_HttpResponse&             response);
+    
+    // overridable methods
+    virtual NPT_Result ExtractResourcePath(const NPT_HttpUrl& url, NPT_String& file_path);
+    virtual NPT_String BuildResourceUri(const NPT_HttpUrl& base_uri, const char* host, const char* file_path);
+    virtual NPT_Result ServeFile(const NPT_HttpRequest&        request, 
                                  const NPT_HttpRequestContext& context,
                                  NPT_HttpResponse&             response,
                                  const NPT_String&             file_path);
-    virtual NPT_Result OnAlbumArtRequest(NPT_HttpResponse& response, 
-                                         NPT_String        file_path);
     virtual NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
-    virtual bool       ProcessFile(const NPT_String&) { return true;}
+    virtual bool       ProcessFile(const NPT_String&, const char* filter = NULL) { NPT_COMPILER_UNUSED(filter); return true;}
     virtual PLT_MediaObject* BuildFromFilePath(const NPT_String&             filepath, 
                                                const PLT_HttpRequestContext& context,
                                                bool                          with_count = true,
-                                               bool                          keep_extension_in_title = false);
-
-public:
-    NPT_UInt16 m_FileServerPort;
-
+                                               bool                          keep_extension_in_title = false,
+                                               bool                          allip = false);
+    
 protected:
     friend class PLT_MediaItem;
+    
+    NPT_String  m_UrlRoot;
+    NPT_String  m_FileRoot;
+    bool        m_FilterUnknownOut;
+    bool        m_UseCache;
+    
+    PLT_MediaCache<NPT_Reference<NPT_List<NPT_String> >, NPT_TimeStamp> m_DirCache;
+};
 
-    NPT_String                     m_Path;
-    NPT_HttpUrl                    m_FileBaseUri;
-    NPT_HttpUrl                    m_AlbumArtBaseUri;
-    NPT_List<PLT_MetadataHandler*> m_MetadataHandlers;
-    bool                           m_FilterUnknownOut;
+/*----------------------------------------------------------------------
+|   PLT_FileMediaServer
++---------------------------------------------------------------------*/
+/**
+ File Media Server.
+ The PLT_FileMediaServer class is an example of a PLT_MediaServer implementation
+ for a file system backed Media Server.
+ */
+class PLT_FileMediaServer : public PLT_MediaServer,
+                            public PLT_FileMediaServerDelegate
+{
+public:    // constructor
+    PLT_FileMediaServer(const char*  file_root,
+                        const char*  friendly_name,
+                        bool         show_ip = false,
+                        const char*  uuid = NULL,
+                        NPT_UInt16   port = 0,
+                        bool         port_rebind = false) :
+        PLT_MediaServer(friendly_name, 
+                        show_ip,
+                        uuid, 
+                        port,
+                        port_rebind),
+        PLT_FileMediaServerDelegate("/", file_root) {SetDelegate(this);}
+
+protected:
+    virtual ~PLT_FileMediaServer() {}
 };
 
 #endif /* _PLT_FILE_MEDIA_SERVER_H_ */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltFrameBuffer.h Added

@@ -0,0 +1,76 @@
+/*****************************************************************
+|
+|   Platinum - Frame Buffer
+|
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
+| All rights reserved.
+| http://www.plutinosoft.com
+|
+| This program is free software; you can redistribute it and/or
+| modify it under the terms of the GNU General Public License
+| as published by the Free Software Foundation; either version 2
+| of the License, or (at your option) any later version.
+|
+| OEMs, ISVs, VARs and other distributors that combine and 
+| distribute commercially licensed software with Platinum software
+| and do not wish to distribute the source code for the commercially
+| licensed software under version 2, or (at your option) any later
+| version, of the GNU General Public License (the "GPL") must enter
+| into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
+|  
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; see the file LICENSE.txt. If not, write to
+| the Free Software Foundation, Inc., 
+| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+| http://www.gnu.org/licenses/gpl-2.0.html
+|
+****************************************************************/
+
+#ifndef _PLT_FRAME_BUFFER_H_
+#define _PLT_FRAME_BUFFER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Neptune.h"
+
+/*----------------------------------------------------------------------
+|   PLT_FrameBuffer
++---------------------------------------------------------------------*/
+class PLT_FrameBuffer 
+{
+ public:
+    // constructor & destructor
+    PLT_FrameBuffer(const char* mime_type);
+    virtual ~PLT_FrameBuffer();
+    
+    void Reset();
+    void Abort();
+    void AddReader()    { m_Readers.Increment(); }
+    void RemoveReader() { m_Readers.Decrement(); }
+    int  GetNbReaders() { return m_Readers.GetValue(); }
+    const char* GetMimeType() { return m_MimeType; }
+
+    // data buffer handling methods
+    virtual NPT_Result SetNextFrame(const NPT_Byte* buffer, NPT_Size bufferSize);
+    virtual NPT_Result GetNextFrame(NPT_UInt32&     last_frame_index, 
+                                    NPT_DataBuffer& buffer, 
+                                    NPT_Timeout     timeout = NPT_TIMEOUT_INFINITE);
+
+ protected:
+    // members
+    NPT_String         m_MimeType;
+    bool               m_Aborted;
+    NPT_SharedVariable m_FrameIndex;
+    NPT_DataBuffer     m_Frame;
+    NPT_Mutex          m_FrameLock;
+    NPT_AtomicVariable m_Readers;
+};
+
+#endif // _PLT_FRAME_BUFFER_H_

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltFrameServer.h Added

@@ -0,0 +1,103 @@
+/*****************************************************************
+|
+|   Platinum - Frame Server
+|
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
+| All rights reserved.
+| http://www.plutinosoft.com
+|
+| This program is free software; you can redistribute it and/or
+| modify it under the terms of the GNU General Public License
+| as published by the Free Software Foundation; either version 2
+| of the License, or (at your option) any later version.
+|
+| OEMs, ISVs, VARs and other distributors that combine and 
+| distribute commercially licensed software with Platinum software
+| and do not wish to distribute the source code for the commercially
+| licensed software under version 2, or (at your option) any later
+| version, of the GNU General Public License (the "GPL") must enter
+| into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
+|  
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; see the file LICENSE.txt. If not, write to
+| the Free Software Foundation, Inc., 
+| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+| http://www.gnu.org/licenses/gpl-2.0.html
+|
+****************************************************************/
+
+#ifndef _PLT_FRAME_SERVER_H_
+#define _PLT_FRAME_SERVER_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Neptune.h"
+#include "PltHttpServer.h"
+#include "PltFrameBuffer.h"
+
+/*----------------------------------------------------------------------
+|   forward declarations
++---------------------------------------------------------------------*/
+class PLT_SocketPolicyServer;
+
+/*----------------------------------------------------------------------
+|   PLT_StreamValidator class
++---------------------------------------------------------------------*/
+class PLT_StreamValidator
+{
+public:
+    virtual ~PLT_StreamValidator() {}
+    virtual bool OnNewRequestAccept(const NPT_HttpRequest&          request, 
+                                    const NPT_HttpRequestContext&   context,
+                                    NPT_HttpResponse&               response, 
+                                    NPT_Reference<PLT_FrameBuffer>& buffer) = 0;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_HttpStreamRequestHandler
++---------------------------------------------------------------------*/
+class PLT_HttpStreamRequestHandler : public NPT_HttpRequestHandler
+{
+public:
+    // constructor
+    PLT_HttpStreamRequestHandler(PLT_StreamValidator& stream_validator) :
+        m_StreamValidator(stream_validator) {}
+
+    // NPT_HttpRequestHandler methods
+    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request, 
+                                     const NPT_HttpRequestContext& context,
+                                     NPT_HttpResponse&             response);
+
+private:
+    PLT_StreamValidator& m_StreamValidator;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_FrameServer class
++---------------------------------------------------------------------*/
+class PLT_FrameServer : public PLT_HttpServer
+{
+public:
+    PLT_FrameServer(const char*          resource_name,
+                    PLT_StreamValidator& stream_validator,
+                    NPT_IpAddress        address = NPT_IpAddress::Any,
+                    NPT_UInt16           port = 0,
+                    bool                 policy_server_enabled = false);
+    virtual ~PLT_FrameServer();
+    
+    virtual NPT_Result Start();
+
+protected:
+    PLT_SocketPolicyServer* m_PolicyServer;
+    PLT_StreamValidator&    m_StreamValidator;
+    bool                    m_PolicyServerEnabled;
+};
+
+#endif /* _PLT_FRAME_SERVER_H_ */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltFrameStream.h Added

@@ -0,0 +1,79 @@
+/*****************************************************************
+|
+|   Platinum - Frame Stream
+|
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
+| All rights reserved.
+| http://www.plutinosoft.com
+|
+| This program is free software; you can redistribute it and/or
+| modify it under the terms of the GNU General Public License
+| as published by the Free Software Foundation; either version 2
+| of the License, or (at your option) any later version.
+|
+| OEMs, ISVs, VARs and other distributors that combine and 
+| distribute commercially licensed software with Platinum software
+| and do not wish to distribute the source code for the commercially
+| licensed software under version 2, or (at your option) any later
+| version, of the GNU General Public License (the "GPL") must enter
+| into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
+|  
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; see the file LICENSE.txt. If not, write to
+| the Free Software Foundation, Inc., 
+| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+| http://www.gnu.org/licenses/gpl-2.0.html
+|
+****************************************************************/
+
+#ifndef _PLT_FRAMESTREAM_H_
+#define _PLT_FRAMESTREAM_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Neptune.h"
+#include "PltFrameBuffer.h"
+
+/*----------------------------------------------------------------------
+|   PLT_InputFrameStream
++---------------------------------------------------------------------*/
+class PLT_InputFrameStream : public NPT_InputStream
+{
+public:
+    // methods
+    PLT_InputFrameStream(NPT_Reference<PLT_FrameBuffer>& frame_buffer,
+                         const char*                     boundary);
+    virtual ~PLT_InputFrameStream();
+
+    // NPT_InputStream methods
+    NPT_Result Read(void*     buffer, 
+                    NPT_Size  bytes_to_read, 
+                    NPT_Size* bytes_read = 0);
+
+    NPT_Result Seek(NPT_Position offset)      { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+    NPT_Result Skip(NPT_Size offset)          { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+    NPT_Result Tell(NPT_Position& offset)     { NPT_COMPILER_UNUSED(offset); return NPT_FAILURE; }
+    NPT_Result GetSize(NPT_LargeSize& size)   { NPT_COMPILER_UNUSED(size);   return NPT_FAILURE; }
+    NPT_Result GetAvailable(NPT_LargeSize& available);
+        
+private:
+    NPT_Result FillBuffer();
+
+protected:
+    NPT_Reference<PLT_FrameBuffer> m_FrameBuffer;
+    NPT_MemoryStream               m_Part;
+    NPT_UInt32                     m_LastFrameIndex;
+    NPT_String                     m_Boundary;
+    bool                           m_Eos;
+};
+
+typedef NPT_Reference<PLT_InputFrameStream> PLT_InputFrameStreamReference;
+
+#endif /* _PLT_FRAMESTREAM_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltHttp.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltHttp.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - HTTP Helper
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ HTTP utilities
+ */
+
 #ifndef _PLT_HTTP_H_
 #define _PLT_HTTP_H_
 
@@ -38,98 +43,129 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "Neptune.h"
+#include "PltVersion.h"
+
+/*----------------------------------------------------------------------
+|   constants
++---------------------------------------------------------------------*/
+#if !defined(PLT_HTTP_DEFAULT_USER_AGENT)
+#define PLT_HTTP_DEFAULT_USER_AGENT "UPnP/1.0 DLNADOC/1.50 Platinum/" PLT_PLATINUM_SDK_VERSION_STRING
+#endif
+
+#if !defined(PLT_HTTP_DEFAULT_SERVER)
+#define PLT_HTTP_DEFAULT_SERVER "UPnP/1.0 DLNADOC/1.50 Platinum/" PLT_PLATINUM_SDK_VERSION_STRING
+#endif
+
+/*----------------------------------------------------------------------
+|   types
++---------------------------------------------------------------------*/
+typedef enum {
+	PLT_DEVICE_UNKNOWN,
+	PLT_DEVICE_XBOX,
+	PLT_DEVICE_PS3,
+	PLT_DEVICE_WMP,
+    PLT_DEVICE_SONOS,
+    PLT_DEVICE_MAC,
+    PLT_DEVICE_WINDOWS,
+    PLT_DEVICE_VLC
+} PLT_DeviceSignature;
 
 /*----------------------------------------------------------------------
 |   PLT_HttpHelper
 +---------------------------------------------------------------------*/
+/**
+ The PLT_HttpHelper class is a set of utility functions for manipulating 
+ HTTP headers, entities and messages.
+ */
 class PLT_HttpHelper {
- public:
+public:
     static bool         IsConnectionKeepAlive(NPT_HttpMessage& message);
     static bool         IsBodyStreamSeekable(NPT_HttpMessage& message);
 
-    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, NPT_HttpRequest* request);
-    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, NPT_HttpResponse* response);
+    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, const char* prefix, NPT_HttpRequest* request);
+    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, const char* prefix, const NPT_HttpRequest& request);
+    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, const char* prefix, NPT_HttpResponse* response);
+    static NPT_Result   ToLog(NPT_LoggerReference logger, int level, const char* prefix, const NPT_HttpResponse& response);
 
-    static NPT_Result   GetContentType(NPT_HttpMessage& message, NPT_String& type);
-    static     void     SetContentType(NPT_HttpMessage& message, const char* type);
-    static NPT_Result   GetContentLength(NPT_HttpMessage& message, NPT_LargeSize& len);
-    static void         SetContentLength(NPT_HttpMessage& message, NPT_LargeSize len);
+    static NPT_Result   GetContentType(const NPT_HttpMessage& message, NPT_String& type);
+    static NPT_Result   GetContentLength(const NPT_HttpMessage& message, NPT_LargeSize& len);
 
-    static NPT_Result   GetHost(NPT_HttpRequest& request, NPT_String& value);
+    static NPT_Result   GetHost(const NPT_HttpRequest& request, NPT_String& value);
     static void         SetHost(NPT_HttpRequest& request, const char* host);
-    static NPT_Result   GetRange(NPT_HttpRequest& request, NPT_Position& start, NPT_Position& end);
-    static void         SetRange(NPT_HttpRequest& request, NPT_Position start, NPT_Position end = (NPT_Position)-1);
-
-    static NPT_Result   GetContentRange(NPT_HttpResponse& response, NPT_Position& start, NPT_Position& end, NPT_LargeSize& length);
-    static NPT_Result   SetContentRange(NPT_HttpResponse& response, NPT_Position start, NPT_Position end, NPT_LargeSize length);
+	static PLT_DeviceSignature GetDeviceSignature(const NPT_HttpRequest& request);
 
-    static NPT_Result   SetBody(NPT_HttpMessage& message, NPT_String& body);
-    static NPT_Result   SetBody(NPT_HttpMessage& message, const char* body, NPT_Size len);
-    static NPT_Result   SetBody(NPT_HttpMessage& message, NPT_InputStreamReference& stream, NPT_LargeSize len = 0);
+    static NPT_Result   SetBody(NPT_HttpMessage& message, NPT_String& text, NPT_HttpEntity** entity = NULL);
+    static NPT_Result   SetBody(NPT_HttpMessage& message, const char* text, NPT_HttpEntity** entity = NULL);
+    static NPT_Result   SetBody(NPT_HttpMessage& message, const void* body, NPT_LargeSize len, NPT_HttpEntity** entity = NULL);
+    static NPT_Result   SetBody(NPT_HttpMessage& message, NPT_InputStreamReference stream, NPT_HttpEntity** entity = NULL);
+    static NPT_Result   GetBody(const NPT_HttpMessage& message, NPT_String& body);
+    static NPT_Result   ParseBody(const NPT_HttpMessage& message, NPT_XmlElementNode*& xml);
 
-
-    static NPT_Result   GetBody(NPT_HttpMessage& message, NPT_String& body);
-    static NPT_Result   ParseBody(NPT_HttpMessage& message, NPT_XmlElementNode*& xml);
-
-    static NPT_Result   Connect(NPT_Socket&      connection,
-                                NPT_HttpRequest& request,
-                                NPT_Timeout      timeout = NPT_TIMEOUT_INFINITE);
-	static void			SetBasicAuthorization(NPT_HttpRequest& request, const char* login, const char* password);
+	static void			SetBasicAuthorization(NPT_HttpRequest& request, const char* username, const char* password);
 };
 
 /*----------------------------------------------------------------------
 |   PLT_HttpRequestContext
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_HttpRequestContext class holds information about the request sent, the
+ local & remote ip addresses and ports associated with a connection. It is used
+ mostly when processing a HTTP response.
+ */
 class PLT_HttpRequestContext : public NPT_HttpRequestContext {
 public:
     // constructors and destructor
-    PLT_HttpRequestContext(NPT_HttpRequest& request) : 
+    PLT_HttpRequestContext(const NPT_HttpRequest& request) : 
         m_Request(request) {}
-    PLT_HttpRequestContext(NPT_HttpRequest& request, const NPT_HttpRequestContext& context) :
+    PLT_HttpRequestContext(const NPT_HttpRequest& request, const NPT_HttpRequestContext& context) :
         NPT_HttpRequestContext(&context.GetLocalAddress(), &context.GetRemoteAddress()),
         m_Request(request) {}
     virtual ~PLT_HttpRequestContext() {}
     
-    NPT_HttpRequest& GetRequest() const { return m_Request; }
+    const NPT_HttpRequest& GetRequest() const { return m_Request; }
+	PLT_DeviceSignature GetDeviceSignature() { return PLT_HttpHelper::GetDeviceSignature(m_Request); }
     
 private:
-    NPT_HttpRequest& m_Request;
+    const NPT_HttpRequest& m_Request;
 };
 
 /*----------------------------------------------------------------------
 |   macros
 +---------------------------------------------------------------------*/
 #if defined(NPT_CONFIG_ENABLE_LOGGING)
-#define PLT_LOG_HTTP_MESSAGE_L(_logger, _level, _msg) \
-    PLT_HttpHelper::ToLog((_logger), (_level), (_msg))
-#define PLT_LOG_HTTP_MESSAGE(_level, _msg) \
-	PLT_HttpHelper::ToLog((_NPT_LocalLogger), (_level), (_msg))
+#define PLT_LOG_HTTP_MESSAGE_L(_logger, _level, _prefix, _msg) \
+    PLT_HttpHelper::ToLog((_logger), (_level), (_prefix), (_msg))
+#define PLT_LOG_HTTP_MESSAGE(_level, _prefix, _msg) \
+	PLT_HttpHelper::ToLog((_NPT_LocalLogger), (_level), (_prefix), (_msg))
 
 #else /* NPT_CONFIG_ENABLE_LOGGING */
-#define PLT_LOG_HTTP_MESSAGE_L(_logger, _level, _msg)
-#define PLT_LOG_HTTP_MESSAGE(_level, _msg)
+#define PLT_LOG_HTTP_MESSAGE_L(_logger, _level, _prefix, _msg)
+#define PLT_LOG_HTTP_MESSAGE(_level, _prefix, _msg)
 #endif /* NPT_CONFIG_ENABLE_LOGGING */
 
 /*----------------------------------------------------------------------
 |   PLT_HttpRequestHandler
 +---------------------------------------------------------------------*/
-template <class T>
+/**
+ The PLT_HttpRequestHandler class delegates the handling of the response of a
+ received HTTP request by a HTTP Server.
+ */
 class PLT_HttpRequestHandler : public NPT_HttpRequestHandler
 {
 public:
-    PLT_HttpRequestHandler<T>(T* data) : m_Data(data) {}
-    virtual ~PLT_HttpRequestHandler<T>() {}
+    PLT_HttpRequestHandler(NPT_HttpRequestHandler* delegate) : 
+        m_Delegate(delegate) {}
+    virtual ~PLT_HttpRequestHandler() {}
 
     // NPT_HttpRequestHandler methods
     NPT_Result SetupResponse(NPT_HttpRequest&              request, 
                              const NPT_HttpRequestContext& context,
                              NPT_HttpResponse&             response) {
-        return m_Data->ProcessHttpRequest(request, context, response);
+        return m_Delegate->SetupResponse(request, context, response);
     }
 
 private:
-    T* m_Data;
+    NPT_HttpRequestHandler* m_Delegate;
 };
 
-
 #endif /* _PLT_HTTP_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltHttpClientTask.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltHttpClientTask.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - HTTP Client Tasks
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ HTTP Client tasks
+ */
+
 #ifndef _PLT_HTTP_CLIENT_TASK_H_
 #define _PLT_HTTP_CLIENT_TASK_H_
 
@@ -42,37 +47,14 @@
 #include "PltThreadTask.h"
 
 /*----------------------------------------------------------------------
-|   PLT_HttpTcpConnector
-+---------------------------------------------------------------------*/
-class PLT_HttpTcpConnector : public NPT_HttpClient::Connector
-{
-public:
-    PLT_HttpTcpConnector();
-    virtual ~PLT_HttpTcpConnector();
-    virtual NPT_Result Connect(const char*                   hostname, 
-                               NPT_UInt16                    port, 
-                               NPT_Timeout                   connection_timeout,
-                               NPT_Timeout                   io_timeout,
-                               NPT_Timeout                   name_resolver_timeout,
-                               NPT_InputStreamReference&     input_stream, 
-                               NPT_OutputStreamReference&    output_stream);
-
-public:
-    void    GetInfo(NPT_SocketInfo& info) { info = m_SocketInfo;}
-    void    Abort() { if (!m_Socket.IsNull()) m_Socket->Disconnect(); }
-
-private:
-    NPT_String                 m_HostName;
-    NPT_UInt16                 m_Port;
-    NPT_InputStreamReference   m_InputStream;
-    NPT_OutputStreamReference  m_OutputStream;
-    NPT_SocketInfo             m_SocketInfo;
-    NPT_Reference<NPT_Socket>  m_Socket;
-};
-
-/*----------------------------------------------------------------------
 |   PLT_HttpClientSocketTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_HttpClientSocketTask class is the base class used to send a HTTP request
+ asynchronously using a task (thread). It supports persistent connections
+ and HTTP pipelining with automatic fallback and reconnection when HTTP 1.0 
+ is used.
+ */
 class PLT_HttpClientSocketTask : public PLT_ThreadTask
 {
 friend class PLT_ThreadTask;
@@ -82,42 +64,45 @@
                              bool             wait_forever = false);
 
     virtual NPT_Result AddRequest(NPT_HttpRequest* request);
+    virtual NPT_Result SetHttpClientConfig(const NPT_HttpClient::Config& config);
 
 protected:
     virtual ~PLT_HttpClientSocketTask();
 
 protected:
-    virtual NPT_Result SetConnector(PLT_HttpTcpConnector* connector);
-    
     // PLT_ThreadTask methods
     virtual void DoAbort();
     virtual void DoRun();
 
     virtual NPT_Result ProcessResponse(NPT_Result                    res, 
-                                       NPT_HttpRequest*              request, 
+                                       const NPT_HttpRequest&        request, 
                                        const NPT_HttpRequestContext& context,
                                        NPT_HttpResponse*             response);
 
 private:
-    NPT_Result GetNextRequest(NPT_HttpRequest*& request, NPT_Timeout timeout);
+    NPT_Result GetNextRequest(NPT_HttpRequest*& request, NPT_Timeout timeout_ms);
 
 protected:
     NPT_HttpClient              m_Client;
     bool                        m_WaitForever;
     NPT_Queue<NPT_HttpRequest>  m_Requests;
-    NPT_Mutex                   m_ConnectorLock;
-    PLT_HttpTcpConnector*       m_Connector;
 };
 
 /*----------------------------------------------------------------------
 |   PLT_HttpClientTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_HttpClientTask class is a templatized version of PLT_HttpClientSocketTask
+ to support arbitrary delegation of HTTP response handling.
+ */
 template <class T>
 class PLT_HttpClientTask : public PLT_HttpClientSocketTask
 {
 public:
     PLT_HttpClientTask<T>(const NPT_HttpUrl& url, T* data) : 
-        PLT_HttpClientSocketTask(new NPT_HttpRequest(url, "GET", NPT_HTTP_PROTOCOL_1_1)), 
+        PLT_HttpClientSocketTask(new NPT_HttpRequest(url, 
+                                                     "GET", 
+                                                     NPT_HTTP_PROTOCOL_1_1)), 
                                  m_Data(data) {}
  protected:
     virtual ~PLT_HttpClientTask<T>() {}
@@ -125,7 +110,7 @@
 protected:
     // PLT_HttpClientSocketTask method
     NPT_Result ProcessResponse(NPT_Result                    res, 
-                               NPT_HttpRequest*              request, 
+                               const NPT_HttpRequest&        request, 
                                const NPT_HttpRequestContext& context, 
                                NPT_HttpResponse*             response) {
         return m_Data->ProcessResponse(res, request, context, response);
@@ -135,24 +120,4 @@
     T* m_Data;
 };
 
-/*----------------------------------------------------------------------
-|   PLT_FileHttpClientTask class
-+---------------------------------------------------------------------*/
-class PLT_FileHttpClientTask : public PLT_HttpClientSocketTask
-{
-public:
-    PLT_FileHttpClientTask(const NPT_HttpUrl& url) : 
-        PLT_HttpClientSocketTask(new NPT_HttpRequest(url, "GET", NPT_HTTP_PROTOCOL_1_1)) {}
-
-protected:
-    virtual ~PLT_FileHttpClientTask() {}
-
-protected:
-    // PLT_HttpClientSocketTask method
-    NPT_Result ProcessResponse(NPT_Result                    res, 
-                               NPT_HttpRequest*              request, 
-                               const NPT_HttpRequestContext& context, 
-                               NPT_HttpResponse*             response);
-};
-
 #endif /* _PLT_HTTP_CLIENT_TASK_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltHttpServer.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltHttpServer.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - HTTP Server
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ HTTP Server
+ */
+
 #ifndef _PLT_HTTP_SERVER_H_
 #define _PLT_HTTP_SERVER_H_
 
@@ -38,61 +43,54 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "Neptune.h"
-#include "PltHttpServerListener.h"
 #include "PltHttpServerTask.h"
 
 /*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_HttpServerStartIterator;
-
-/*----------------------------------------------------------------------
 |   PLT_HttpServer class
 +---------------------------------------------------------------------*/
-class PLT_HttpServer : public PLT_HttpServerListener,
+/**
+ The PLT_HttpServer class provides an asynchronous way to handle multiple HTTP requests
+ concurrently. Pipelining requests and keep-alive connections are supported.
+ */
+class PLT_HttpServer : public NPT_HttpRequestHandler,
                        public NPT_HttpServer
 {
-    friend class PLT_HttpServerTask<class PLT_HttpServer>;
-    friend class PLT_HttpServerStartIterator;
-
 public:
-    PLT_HttpServer(unsigned int port = 0,
-                   bool         port_rebind = false,
-                   NPT_Cardinal max_clients = 0,
-                   bool         reuse_address = false);
+    PLT_HttpServer(NPT_IpAddress address = NPT_IpAddress::Any,
+                   NPT_IpPort    port = 0,
+                   bool          allow_random_port_on_bind_failure = false,
+                   NPT_Cardinal  max_clients = 50,
+                   bool          reuse_address = false);
     virtual ~PLT_HttpServer();
+    
+    // class methods
+    static NPT_Result ServeFile(const NPT_HttpRequest&        request, 
+                                const NPT_HttpRequestContext& context,
+                                NPT_HttpResponse&             response, 
+                                NPT_String                    file_path);
+    static NPT_Result ServeStream(const NPT_HttpRequest&        request, 
+                                  const NPT_HttpRequestContext& context,
+                                  NPT_HttpResponse&             response,
+                                  NPT_InputStreamReference&     stream, 
+                                  const char*                   content_type);
 
-    // PLT_HttpServerListener method
-    virtual NPT_Result ProcessHttpRequest(NPT_HttpRequest&              request, 
-                                          const NPT_HttpRequestContext& context,
-                                          NPT_HttpResponse*&            response,
-                                          bool&                         headers_only);
+    // NPT_HttpRequestHandler methods
+    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request,
+                                     const NPT_HttpRequestContext& context,
+                                     NPT_HttpResponse&             response);
 
+    // methods
     virtual NPT_Result   Start();
     virtual NPT_Result   Stop();
     virtual unsigned int GetPort() { return m_Port; }
 
 private:
-    PLT_TaskManager*          m_TaskManager;
-    unsigned int              m_Port;
-    bool                      m_PortRebind;
-    bool                      m_ReuseAddress;
-    PLT_HttpServerListenTask* m_HttpListenTask;
-};
-
-/*----------------------------------------------------------------------
-|   PLT_FileServer class
-+---------------------------------------------------------------------*/
-class PLT_FileServer
-{
-public:
-    // class methods
-    static NPT_Result ServeFile(NPT_HttpResponse& response, 
-                                NPT_String        file_path, 
-                                NPT_Position      start = (NPT_Position)-1, 
-                                NPT_Position      end = (NPT_Position)-1,
-                                bool              request_is_head = false);
-    static const char* GetMimeType(const NPT_String& filename);
+    PLT_TaskManager*    m_TaskManager;
+    NPT_IpAddress       m_Address;
+    NPT_IpPort          m_Port;
+    bool                m_AllowRandomPortOnBindFailure;
+    bool                m_ReuseAddress;
+    bool                m_Aborted;
 };
 
 #endif /* _PLT_HTTP_SERVER_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltHttpServerTask.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltHttpServerTask.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - HTTP Server Tasks
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ HTTP Server Tasks
+ */
+
 #ifndef _PLT_HTTP_SERVER_TASK_H_
 #define _PLT_HTTP_SERVER_TASK_H_
 
@@ -43,15 +48,14 @@
 #include "PltThreadTask.h"
 
 /*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-template <class T> class PLT_HttpListenTask;
-class PLT_HttpServerListener; 
-typedef PLT_HttpListenTask<PLT_HttpServerListener> PLT_HttpServerListenTask;
-
-/*----------------------------------------------------------------------
 |   PLT_HttpServerSocketTask class
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_HttpServerSocketTask class is a task used for handling one or more HTTP 
+ requests from a client. It is created by a PLT_HttpListenTask instance upon
+ receiving a connection request. A PLT_HttpServer will handle the delegation for
+ setting up the HTTP response.
+ */
 class PLT_HttpServerSocketTask : public PLT_ThreadTask
 {
     friend class PLT_ThreadTask;
@@ -64,17 +68,16 @@
 
 protected:
     // Request callback handler
-    virtual NPT_Result ProcessRequest(NPT_HttpRequest&              request, 
-                                      const NPT_HttpRequestContext& context,
-                                      NPT_HttpResponse*&            response,
-                                      bool&                         headers_only) = 0;
+    virtual NPT_Result SetupResponse(NPT_HttpRequest&              request, 
+                                     const NPT_HttpRequestContext& context,
+                                     NPT_HttpResponse&             response) = 0;
 
     // overridables
     virtual NPT_Result GetInputStream(NPT_InputStreamReference& stream);
     virtual NPT_Result GetInfo(NPT_SocketInfo& info);
 
     // PLT_ThreadTask methods
-    virtual void DoAbort() { m_Socket->Disconnect(); }
+    virtual void DoAbort() { if (m_Socket) m_Socket->Cancel(); }
     virtual void DoRun();
 
 private:
@@ -84,6 +87,14 @@
     virtual NPT_Result Write(NPT_HttpResponse* response, 
                              bool&             keep_alive, 
                              bool              headers_only = false);
+    virtual NPT_Result RespondToClient(NPT_HttpRequest&              request, 
+                                       const NPT_HttpRequestContext& context,
+                                       NPT_HttpResponse*&            response);
+    virtual NPT_Result SendResponseHeaders(NPT_HttpResponse* response,
+                                           NPT_OutputStream& output_stream,
+                                           bool&             keep_alive);
+    virtual NPT_Result SendResponseBody(NPT_HttpResponse* response,
+                                        NPT_OutputStream& output_stream);
 
 protected:
     NPT_Socket*         m_Socket;
@@ -93,71 +104,60 @@
 /*----------------------------------------------------------------------
 |   PLT_HttpServerTask class
 +---------------------------------------------------------------------*/
-template <class T>
+/**
+ The PLT_HttpServerTask class is a version of PLT_HttpServerSocketTask that supports 
+ delegation of HTTP request handling.
+ */
 class PLT_HttpServerTask : public PLT_HttpServerSocketTask
 {
 public:
-    PLT_HttpServerTask<T>(T*          data, 
-                          NPT_Socket* socket, 
-                          bool        keep_alive = false) : 
-        PLT_HttpServerSocketTask(socket, keep_alive), m_Data(data) {}
+    PLT_HttpServerTask(NPT_HttpRequestHandler* handler, 
+                       NPT_Socket*             socket, 
+                       bool                    keep_alive = false) : 
+        PLT_HttpServerSocketTask(socket, keep_alive), m_Handler(handler) {}
 
 protected:
-    virtual ~PLT_HttpServerTask<T>() {}
+    virtual ~PLT_HttpServerTask() {}
 
-protected:
-    NPT_Result ProcessRequest(NPT_HttpRequest&              request, 
-                              const NPT_HttpRequestContext& context,
-                              NPT_HttpResponse*&            response,
-                              bool&                         headers_only) {
-        return m_Data->ProcessHttpRequest(request, context, response, headers_only);
+    NPT_Result SetupResponse(NPT_HttpRequest&              request, 
+                             const NPT_HttpRequestContext& context,
+                             NPT_HttpResponse&             response) {
+        return m_Handler->SetupResponse(request, context, response);
     }
 
 protected:
-    T* m_Data;
+    NPT_HttpRequestHandler* m_Handler;
 };
 
 /*----------------------------------------------------------------------
 |   PLT_HttpListenTask class
 +---------------------------------------------------------------------*/
-template <class T>
+/**
+ The PLT_HttpListenTask class is used by a PLT_HttpServer to listen for incoming
+ connections and spawn a new task for handling each request.
+ */
 class PLT_HttpListenTask : public PLT_ThreadTask
 {
 public:
-    PLT_HttpListenTask<T>(T* data, NPT_TcpServerSocket* socket, bool cleanup_socket = true) : 
-        m_Data(data), m_Socket(socket), m_CleanupSocket(cleanup_socket) {}
+    PLT_HttpListenTask(NPT_HttpRequestHandler* handler, 
+                       NPT_TcpServerSocket*    socket, 
+                       bool                    owns_socket = true) : 
+        m_Handler(handler), m_Socket(socket), m_OwnsSocket(owns_socket) {}
 
 protected:
-    virtual ~PLT_HttpListenTask<T>() { 
-        if (m_CleanupSocket) delete m_Socket;
+    virtual ~PLT_HttpListenTask() { 
+        if (m_OwnsSocket && m_Socket) delete m_Socket;
     }
 
 protected:
     // PLT_ThreadTask methods
-    virtual void DoAbort() { m_Socket->Disconnect(); }
-    virtual void DoRun() {
-        while (!IsAborting(0)) {
-            NPT_Socket* client = NULL;
-            NPT_Result  result = m_Socket->WaitForNewClient(client, 5000);
-            if (NPT_FAILED(result) && result != NPT_ERROR_TIMEOUT) {
-                if (client) delete client;
-                //NPT_LOG_WARNING_2("PLT_HttpListenTask exiting with %d (%s)", result, NPT_ResultText(result));
-                break;
-            }
-
-            if (NPT_SUCCEEDED(result)) {
-                PLT_ThreadTask* task = new PLT_HttpServerTask<T>(m_Data, client);
-                if (NPT_FAILED(m_TaskManager->StartTask(task))) {
-                    task->Kill();
-                }
-            }
-        }
-    }
+    virtual void DoAbort() { if (m_Socket) m_Socket->Cancel(); }
+    virtual void DoRun();
 
 protected:
-    T*                   m_Data;
-    NPT_TcpServerSocket* m_Socket;
-    bool                 m_CleanupSocket;
+    NPT_HttpRequestHandler* m_Handler;
+    NPT_TcpServerSocket*    m_Socket;
+    bool                    m_OwnsSocket;
 };
 
 #endif /* _PLT_HTTP_SERVER_TASK_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltLeaks.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltLeaks.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltMediaBrowser.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMediaBrowser.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - AV Media Browser (Media Server Control Point)
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP AV Media Controller implementation.
+ */
+
 #ifndef _PLT_MEDIA_BROWSER_H_
 #define _PLT_MEDIA_BROWSER_H_
 
@@ -43,17 +48,26 @@
 /*----------------------------------------------------------------------
 |   PLT_BrowseInfo
 +---------------------------------------------------------------------*/
-struct PLT_BrowseInfo {
+/**
+ The PLT_BrowseInfo struct is used to marshall Browse or Search action 
+ response results across different threads of execution.
+ */
+typedef struct {
     NPT_String                   object_id;
     PLT_MediaObjectListReference items;
+    NPT_UInt32                   si;
     NPT_UInt32                   nr;
     NPT_UInt32                   tm;
     NPT_UInt32                   uid;
-};
+} PLT_BrowseInfo;
 
 /*----------------------------------------------------------------------
-|   PLT_MediaBrowserDelegate class
+|   PLT_MediaBrowserDelegate
 +---------------------------------------------------------------------*/
+/**
+ The PLT_MediaBrowserDelegate class is an interface for receiving PLT_MediaBrowser
+ events or action responses.
+ */
 class PLT_MediaBrowserDelegate
 {
 public:
@@ -80,8 +94,11 @@
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaBrowser class
+|   PLT_MediaBrowser
 +---------------------------------------------------------------------*/
+/**
+ The PLT_MediaBrowser class implements a UPnP AV Media Server control point.
+ */
 class PLT_MediaBrowser : public PLT_CtrlPointListener
 {
 public:
@@ -95,7 +112,7 @@
                               NPT_UInt32               start_index,
                               NPT_UInt32               count = 30, // DLNA recommendations
                               bool                     browse_metadata = false,
-                              const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:album,upnp:artist,upnp:author", // explicitely specify res otherwise WMP won't return a URL!
+                              const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:originalTrackNumber,upnp:album,upnp:artist,upnp:author", // explicitely specify res otherwise WMP won't return a URL!
                               const char*              sort_criteria = "",
                               void*                    userdata = NULL);
 
@@ -104,9 +121,8 @@
 							  const char*              search_criteria,
 				              NPT_UInt32               start_index,
 					          NPT_UInt32               count = 30, // DLNA recommendations
-						      const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:album,upnp:artist,upnp:author", // explicitely specify res otherwise WMP won't return a URL!
+                              const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:originalTrackNumber,upnp:album,upnp:artist,upnp:author", // explicitely specify res otherwise WMP won't return a URL!
 						  	  void*                    userdata = NULL);
-	//BBMOD END
 
     // methods
     virtual const NPT_Lock<PLT_DeviceDataReferenceList>& GetMediaServers() { return m_MediaServers; }

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltMediaCache.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMediaCache.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - AV Media Cache
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ Simple Object Caching utility.
+ */
+
 #ifndef _PLT_MEDIA_CACHE_H_
 #define _PLT_MEDIA_CACHE_H_
 
@@ -38,38 +43,161 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "Neptune.h"
-#include "PltMediaItem.h"
-#include "PltDeviceData.h"
 
 /*----------------------------------------------------------------------
-|   forward declarations
+|   PLT_MediaCache
 +---------------------------------------------------------------------*/
+/**
+ The PLT_MediaCache template provides a way to hold references to object in 
+ memory. 
+ */ 
+template <typename T, typename U>
+class PLT_MediaCache
+{
+public:
+    typedef typename NPT_Map<NPT_String,T>::Entry ElementEntry;
+    typedef typename NPT_List<ElementEntry*>::Iterator ElementIterator;
+
+    PLT_MediaCache<T,U>() {}
+    virtual ~PLT_MediaCache<T,U>() {}
+
+    NPT_Result Put(const char* root, const char* key, T& value, U* tag = NULL);
+    NPT_Result Get(const char* root, const char* key, T& value, U* tag = NULL);
+    NPT_Result Clear(const char* root, const char* key);
+    NPT_Result Clear(const char* root = NULL);
+
+private:
+    // methods
+    NPT_String GenerateKey(const char* root, const char* key);
+
+private:
+    // members
+    NPT_Mutex              m_Mutex;
+    NPT_Map<NPT_String, T> m_Items;
+    NPT_Map<NPT_String, U> m_Tags;
+};
 
 /*----------------------------------------------------------------------
-|   typedefs
+|   PLT_MediaCache::GenerateKey
 +---------------------------------------------------------------------*/
-typedef NPT_Map<NPT_String, PLT_MediaObjectListReference>::Entry PLT_MediaCacheEntry;
+template <typename T, typename U>
+inline
+NPT_String
+PLT_MediaCache<T,U>::GenerateKey(const char* root, const char* key)
+{
+    // TODO: There could be collision
+    NPT_String result = root;
+    result += "/";
+    result += key;
+    return result;
+}
 
 /*----------------------------------------------------------------------
-|   PLT_MediaCache class
+|   PLT_MediaCache::Put
 +---------------------------------------------------------------------*/
-class PLT_MediaCache
+template <typename T, typename U>
+inline
+NPT_Result
+PLT_MediaCache<T,U>::Put(const char* root,
+                         const char* key, 
+                         T&          value,
+                         U*          tag)
 {
-public:
-    PLT_MediaCache();
-    virtual ~PLT_MediaCache();
+    NPT_AutoLock lock(m_Mutex);
 
-    NPT_Result Put(const char* device_uuid, const char* item_id, PLT_MediaObjectListReference& list);
-    NPT_Result Get(const char* device_uuid, const char* item_id, PLT_MediaObjectListReference& list);
-    NPT_Result Clear(const char* device_uuid, const char* item_id);
-    NPT_Result Clear(const char* device_uuid = NULL);
+    NPT_String fullkey = GenerateKey(root, key);
+    if (fullkey.GetLength() == 0) return NPT_ERROR_INVALID_PARAMETERS;
 
-private:
-    NPT_String GenerateKey(const char* device_uuid, const char* item_id);
+    m_Items.Erase(fullkey);
+    NPT_CHECK(m_Items.Put(fullkey, value));
+    
+    if (tag) NPT_CHECK(m_Tags.Put(fullkey, *tag));
+    
+    return NPT_SUCCESS;
+}
 
-private:
-    NPT_Mutex m_Mutex;
-    NPT_Map<NPT_String, PLT_MediaObjectListReference> m_Items;
-};
+/*----------------------------------------------------------------------
+|   PLT_MediaCache::Get
++---------------------------------------------------------------------*/
+template <typename T, typename U>
+inline
+NPT_Result
+PLT_MediaCache<T,U>::Get(const char* root,
+                         const char* key,
+                         T&          value,
+                         U*          tag /* = NULL */)
+{
+    NPT_AutoLock lock(m_Mutex);
+
+    NPT_String fullkey = GenerateKey(root, key);
+    if (fullkey.GetLength() == 0) return NPT_ERROR_INVALID_PARAMETERS;
+    
+    T* _value = NULL;
+    NPT_CHECK(m_Items.Get(fullkey, _value));
+    
+    U* _tag;
+    if (tag) {
+        m_Tags.Get(fullkey, _tag);
+        if (_tag) *tag = *_tag;
+    }
+
+    value = *_value;
+    return NPT_SUCCESS;
+}
+
+/*----------------------------------------------------------------------
+|   PLT_MediaCache::Clear
++---------------------------------------------------------------------*/
+template <typename T, typename U>
+inline
+NPT_Result 
+PLT_MediaCache<T,U>::Clear(const char* root, const char* key) 
+{
+    NPT_AutoLock lock(m_Mutex);
+
+    NPT_String fullkey = GenerateKey(root, key);
+    if (fullkey.GetLength() == 0) return NPT_ERROR_INVALID_PARAMETERS;
+
+    ElementIterator entries = m_Items.GetEntries().GetFirstItem();
+    ElementIterator entry;
+    while (entries) {
+        entry = entries++;
+        if ((*entry)->GetKey() == (fullkey)) {
+            m_Items.Erase(fullkey);
+            m_Tags.Erase(fullkey);
+            return NPT_SUCCESS;
+        }
+    }
+
+    return NPT_ERROR_NO_SUCH_ITEM;
+}
+
+/*----------------------------------------------------------------------
+|   PLT_MediaCache::Clear
++---------------------------------------------------------------------*/
+template <typename T, typename U>
+inline
+NPT_Result
+PLT_MediaCache<T,U>::Clear(const char* root)
+{
+    NPT_AutoLock lock(m_Mutex);
+
+    if (!root || root[0]=='\0') 
+        return m_Items.Clear();
+
+    NPT_String key = GenerateKey(root, "");
+    ElementIterator entries = m_Items.GetEntries().GetFirstItem();
+    ElementIterator entry;
+    while (entries) {
+        entry = entries++;
+        NPT_String entry_key = (*entry)->GetKey();
+        if (entry_key.StartsWith(key)) {
+            m_Items.Erase(entry_key);
+            m_Tags.Erase(entry_key);
+        }
+    }
+
+    return NPT_SUCCESS;
+}
 
 #endif /* _PLT_MEDIA_CACHE_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltMediaConnect.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMediaConnect.h Changed

@@ -2,7 +2,7 @@
 |
 |      Platinum - AV Media Connect Device
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,9 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -41,76 +43,68 @@
 #include "PltFileMediaServer.h"
 
 /*----------------------------------------------------------------------
-|   PLT_MediaConnectInfo
-+---------------------------------------------------------------------*/
-class PLT_MediaConnectInfo
-{
-public:
-    PLT_MediaConnectInfo(bool authorized = false) : 
-        m_Authorized(authorized), m_Validated(false) {}
-
-    bool       m_Authorized;
-    bool       m_Validated;
-    NPT_String m_UDN;
-};
-
-/*----------------------------------------------------------------------
-|   defines
-+---------------------------------------------------------------------*/
-typedef NPT_Map<NPT_String, PLT_MediaConnectInfo>        PLT_MediaConnectDeviceInfoMap;
-typedef NPT_Map<NPT_String, PLT_MediaConnectInfo>::Entry PLT_MediaConnectDeviceInfoMapEntry;
-typedef NPT_Map<NPT_String, NPT_String>                  PLT_UDNtoMACMap;
-typedef NPT_Map<NPT_String, NPT_String>::Entry           PLT_UDNtoMACMapEntry;
-
-/*----------------------------------------------------------------------
 |   PLT_MediaConnect
 +---------------------------------------------------------------------*/
-class PLT_MediaConnect : public PLT_FileMediaServer
+class PLT_MediaConnect : public PLT_MediaServer
 {
 public:
-    PLT_MediaConnect(const char*  path, 
-                     const char*  friendly_name,
-                     bool         show_ip = false,
+    // class methods
+    static NPT_Result GetMappedObjectId(const char* object_id, 
+                                        NPT_String& mapped_object_id);
+    
+    // constructor
+    PLT_MediaConnect(const char*  friendly_name,
+                     bool         add_hostname = true,
                      const char*  udn = NULL,
                      NPT_UInt16   port = 0,
                      bool         port_rebind = false);
 
-    NPT_Result Authorize(PLT_MediaConnectInfo* info, bool state);
-    NPT_Result Validate(PLT_MediaConnectInfo* info, bool state);
-
 protected:
     virtual ~PLT_MediaConnect();
-
-
+    
     // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices(PLT_DeviceData& data);
+    virtual NPT_Result SetupServices();
     virtual NPT_Result OnAction(PLT_ActionReference&          action, 
                                 const PLT_HttpRequestContext& context);
     virtual NPT_Result ProcessGetDescription(NPT_HttpRequest&              request,
                                              const NPT_HttpRequestContext& context,
                                              NPT_HttpResponse&             response);
-
-    // PLT_FileMediaServer methods
-    virtual NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
+    virtual NPT_Result ProcessGetSCPD(PLT_Service*                  service,
+                                      NPT_HttpRequest&              request,
+                                      const NPT_HttpRequestContext& context,
+                                      NPT_HttpResponse&             response);
 
     // X_MS_MediaReceiverRegistrar
-    virtual NPT_Result OnIsAuthorized(PLT_ActionReference&  action, 
-                                      PLT_MediaConnectInfo* mediaConnectInfo);
-    virtual NPT_Result OnRegisterDevice(PLT_ActionReference&  action, 
-                                        PLT_MediaConnectInfo* mediaConnectInfo);
-    virtual NPT_Result OnIsValidated(PLT_ActionReference&  action, 
-                                     PLT_MediaConnectInfo* mediaConnectInfo);
-
-private:
-    NPT_Result LookUpMediaConnectInfo(NPT_String             deviceID, 
-                                      PLT_MediaConnectInfo*& mediaConnectInfo);
+    virtual NPT_Result OnIsAuthorized(PLT_ActionReference&  action);
+    virtual NPT_Result OnRegisterDevice(PLT_ActionReference&  action);
+    virtual NPT_Result OnIsValidated(PLT_ActionReference&  action);
 
 protected:
-    PLT_MediaConnectDeviceInfoMap m_MediaConnectDeviceInfoMap;
-    PLT_UDNtoMACMap               m_MediaConnectUDNMap;
+	NPT_Mutex   m_Lock;
+    bool        m_AddHostname;
+};
 
-private:
-    PLT_Service*                  m_RegistrarService;
+/*----------------------------------------------------------------------
+ |   PLT_FileMediaConnectDelegate class
+ +---------------------------------------------------------------------*/
+class PLT_FileMediaConnectDelegate : public PLT_FileMediaServerDelegate
+{
+public:
+    // constructor & destructor
+    PLT_FileMediaConnectDelegate(const char* url_root, const char* file_root) :
+        PLT_FileMediaServerDelegate(url_root, file_root) {}
+    virtual ~PLT_FileMediaConnectDelegate() {}
+    
+    // PLT_FileMediaServerDelegate methods
+    virtual NPT_Result GetFilePath(const char* object_id, NPT_String& filepath);
+    virtual NPT_Result OnSearchContainer(PLT_ActionReference&          action, 
+                                         const char*                   object_id, 
+                                         const char*                   search_criteria,
+                                         const char*                   filter,
+                                         NPT_UInt32                    starting_index,
+                                         NPT_UInt32                    requested_count,
+                                         const char*                   sort_criteria, 
+                                         const PLT_HttpRequestContext& context);
 };
 
 #endif /* _PLT_MEDIA_CONNECT_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltMediaController.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMediaController.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - AV Media Controller (Media Renderer Control Point)
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,6 +17,7 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
 | 
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -45,13 +46,13 @@
 +---------------------------------------------------------------------*/
 typedef NPT_List<NPT_String> PLT_StringList;
 
-struct PLT_DeviceCapabilities {
+typedef struct {
     PLT_StringList play_media;
     PLT_StringList rec_media;
     PLT_StringList rec_quality_modes;
-};
+} PLT_DeviceCapabilities;
 
-struct PLT_MediaInfo {
+typedef struct {
     NPT_UInt32    num_tracks;
     NPT_TimeStamp media_duration;
     NPT_String    cur_uri;
@@ -61,9 +62,9 @@
     NPT_String    play_medium;
     NPT_String    rec_medium;
     NPT_String    write_status;
-};
+} PLT_MediaInfo;
 
-struct PLT_PositionInfo {
+typedef struct {
     NPT_UInt32    track;
     NPT_TimeStamp track_duration;
     NPT_String    track_metadata;
@@ -72,20 +73,20 @@
     NPT_TimeStamp abs_time;
     NPT_Int32     rel_count;
     NPT_Int32     abs_count;
-};
+} PLT_PositionInfo;
 
-struct PLT_TransportInfo {
+typedef struct {
     NPT_String cur_transport_state;
     NPT_String cur_transport_status;
     NPT_String cur_speed;
-};
+} PLT_TransportInfo;
 
-struct PLT_TransportSettings {
+typedef struct {
     NPT_String play_mode;
     NPT_String rec_quality_mode;
-};
+} PLT_TransportSettings;
 
-struct PLT_ConnectionInfo {
+typedef struct {
     NPT_UInt32 rcs_id;
     NPT_UInt32 avtransport_id;
     NPT_String protocol_info;
@@ -93,10 +94,10 @@
     NPT_UInt32 peer_connection_id;
     NPT_String direction;
     NPT_String status;
-};
+} PLT_ConnectionInfo;
 
 /*----------------------------------------------------------------------
-|   PLT_MediaControllerDelegate class
+|   PLT_MediaControllerDelegate
 +---------------------------------------------------------------------*/
 class PLT_MediaControllerDelegate
 {
@@ -232,7 +233,7 @@
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaController class
+|   PLT_MediaController
 +---------------------------------------------------------------------*/
 class PLT_MediaController : public PLT_CtrlPointListener
 {
@@ -264,7 +265,9 @@
     NPT_Result Play(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String speed, void* userdata);
     NPT_Result Previous(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
     NPT_Result Seek(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String unit, NPT_String target, void* userdata);
+    bool       CanSetNextAVTransportURI(PLT_DeviceDataReference& device);
     NPT_Result SetAVTransportURI(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* uri, const char* metadata, void* userdata);
+    NPT_Result SetNextAVTransportURI(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* next_uri, const char* next_metadata, void* userdata);
     NPT_Result SetPlayMode(PLT_DeviceDataReference&  device, NPT_UInt32 instance_id, NPT_String new_play_mode, void* userdata);
     NPT_Result Stop(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, void* userdata);
 
@@ -279,17 +282,18 @@
 	NPT_Result SetVolume(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* channel, int volume, void* userdata);
 	NPT_Result GetVolume(PLT_DeviceDataReference& device, NPT_UInt32 instance_id, const char* channel, void* userdata);	
 
-    // methods    
+    // VariableStates    
+    virtual NPT_Result GetProtocolInfoSink(const NPT_String& device_uuid, NPT_List<NPT_String>& sinks);
+    virtual NPT_Result GetTransportState(const NPT_String&  device_uuid, NPT_String& state);
+    virtual NPT_Result GetVolumeState(const NPT_String&  device_uuid, NPT_UInt32& volume);
+    
+    // methods
     virtual NPT_Result FindRenderer(const char* uuid, PLT_DeviceDataReference& device);
-    virtual NPT_Result GetProtocolInfoSink(PLT_DeviceDataReference& device, NPT_List<NPT_String>& sinks);
-    virtual NPT_Result FindMatchingProtocolInfo(NPT_List<NPT_String>& sinks,
-                                                const char*           protocol_info);
+    virtual NPT_Result FindMatchingProtocolInfo(NPT_List<NPT_String>& sinks, const char* protocol_info);
     virtual NPT_Result FindBestResource(PLT_DeviceDataReference& device, PLT_MediaObject& item, NPT_Cardinal& resource_index);
 
 private:
-    NPT_Result InvokeActionWithInstance(PLT_ActionReference& action,
-        NPT_UInt32               instance_id,
-        void*                    userdata = NULL);
+    NPT_Result InvokeActionWithInstance(PLT_ActionReference& action, NPT_UInt32 instance_id, void* userdata = NULL);
 
     NPT_Result OnGetCurrentTransportActionsResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
     NPT_Result OnGetDeviceCapabilitiesResponse(NPT_Result res, PLT_DeviceDataReference& device, PLT_ActionReference& action, void* userdata);
@@ -335,4 +339,6 @@
     NPT_Lock<PLT_DeviceDataReferenceList> m_MediaRenderers;
 };
 
+typedef NPT_Reference<PLT_MediaController> PLT_MediaControllerReference;
+
 #endif /* _PLT_MEDIA_CONTROLLER_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltMediaItem.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMediaItem.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - AV Media Item
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP AV Media Object reprensentation.
+ */
+
 #ifndef _PLT_MEDIA_ITEM_H_
 #define _PLT_MEDIA_ITEM_H_
 
@@ -39,15 +44,14 @@
 +---------------------------------------------------------------------*/
 #include "Neptune.h"
 #include "PltHttp.h"
-
-/*----------------------------------------------------------------------
-|   forward declarations
-+---------------------------------------------------------------------*/
-class PLT_MediaServer;
+#include "PltProtocolInfo.h"
 
 /*----------------------------------------------------------------------
 |   typedefs
 +---------------------------------------------------------------------*/
+/**
+ The PLT_ObjectClass struct is used to assign a type to a PLT_MediaObject.
+ */
 typedef struct { 
     NPT_String type;
     NPT_String friendly_name;
@@ -86,16 +90,16 @@
     PLT_PersonRoles artists;
     PLT_PersonRoles actors;
     PLT_PersonRoles authors;
-    NPT_String      producer;
-    NPT_String      director;
-    NPT_String      publisher;
-    NPT_String      contributor; // should match m_Creator (dc:creator)
+    NPT_String      producer; //TODO: can be multiple
+    NPT_String      director; //TODO: can be multiple
+    NPT_String      publisher; //TODO: can be multiple
+    NPT_String      contributor; // should match m_Creator (dc:creator) //TODO: can be multiple
 } PLT_PeopleInfo;
 
 typedef struct {
-    NPT_List<NPT_String> genre;
-    NPT_String album;
-    NPT_String playlist; // dc:title of the playlist item the content belongs too
+    NPT_List<NPT_String> genres;
+    NPT_String album; //TODO: can be multiple
+    NPT_String playlist; // dc:title of the playlist item the content belongs too //TODO: can be multiple
 } PLT_AffiliationInfo;
 
 typedef struct {
@@ -104,92 +108,46 @@
     NPT_String icon_uri;
     NPT_String region;
     NPT_String rating;
-    NPT_String rights;
+    NPT_String rights; //TODO: can be multiple
     NPT_String date;
     NPT_String language;
 } PLT_Description;
 
 typedef struct {
-    NPT_String album_art_uri;
-    NPT_String album_art_uri_dlna_profile;
+    NPT_String uri;
+    NPT_String dlna_profile;
+} PLT_AlbumArtInfo;
+
+typedef struct {
+    NPT_List<PLT_AlbumArtInfo> album_arts;
     NPT_String artist_discography_uri;
     NPT_String lyrics_uri;
-    NPT_List<NPT_String> relation; // dc:relation
+    NPT_List<NPT_String> relations; // dc:relation
 } PLT_ExtraInfo;
 
 typedef struct {
     NPT_UInt32 dvdregioncode;
     NPT_UInt32 original_track_number;
     NPT_String toc;
-    NPT_String user_annotation;
+    NPT_String user_annotation; //TODO: can be multiple
 } PLT_MiscInfo;
 
 typedef struct {
-    int         total;
-    int         used;
-    int         free;
-    int         max_partition;
-    NPT_String  medium;
+    NPT_UInt64 total;
+    NPT_UInt64 used;
+    NPT_UInt64 free;
+    NPT_UInt64 max_partition;
+    NPT_UInt64 medium;
 } PLT_StorageInfo;
 
-/*----------------------------------------------------------------------
-|   PLT_ProtocolInfo class
-+---------------------------------------------------------------------*/
-class PLT_ProtocolInfo
-{
-public:
-    class FieldEntry {
-    public:
-        FieldEntry(const char* key, const char* value) :
-          m_Key(key), m_Value(value) {}
-        NPT_String m_Key;
-        NPT_String m_Value;
-    };
-
-    PLT_ProtocolInfo();
-    PLT_ProtocolInfo(const char* protocol_info);
-    PLT_ProtocolInfo(const char* protocol,
-                     const char* mask,
-                     const char* content_type,
-                     const char* extra);
-    const NPT_String& GetProtocol()     const { return m_Protocol;  }
-    const NPT_String& GetMask()         const { return m_Mask; }
-    const NPT_String& GetContentType()  const { return m_ContentType;  }
-    const NPT_String& GetExtra()        const { return m_Extra; }
-
-    const NPT_String& GetDLNA_PN()      const { return m_DLNA_PN; }
-
-    bool IsValid() { return m_Valid; }
-    NPT_String ToString() const;
-
-    bool Match(const PLT_ProtocolInfo& other) const;
-
-private:
-    NPT_Result ValidateField(const char*  val, 
-                        const char*  valid_chars, 
-                        NPT_Cardinal num_chars = 0); // 0 means variable number of chars
-    NPT_Result ParseExtra(NPT_List<FieldEntry>& entries);
-    NPT_Result ValidateExtra();
-
-private:
-    NPT_String m_Protocol;
-    NPT_String m_Mask;
-    NPT_String m_ContentType;
-    NPT_String m_Extra;
-
-    NPT_String m_DLNA_PN;
-    NPT_String m_DLNA_OP;
-    NPT_String m_DLNA_PS;
-    NPT_String m_DLNA_CI;
-    NPT_String m_DLNA_FLAGS;
-    NPT_String m_DLNA_MAXSP;
-
-    NPT_List<FieldEntry> m_DLNA_OTHER;
-    bool       m_Valid;
-};
+typedef struct {
+    NPT_String program_title;
+    NPT_String series_title;
+    NPT_UInt32 episode_number;
+} PLT_RecordedInfo;
 
 /*----------------------------------------------------------------------
-|   PLT_MediaItemResource class
+|   PLT_MediaItemResource
 +---------------------------------------------------------------------*/
 class PLT_MediaItemResource
 {
@@ -211,30 +169,30 @@
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaObject class
+|   PLT_MediaObject
 +---------------------------------------------------------------------*/
+/**
+ The PLT_MediaObject class is any data entity that can be returned by a
+ ContentDirectory Service from a browsing or searching action. This is the
+ base class from which PLT_MediaItem and PLT_MediaContainer derive.
+ */
 class PLT_MediaObject
 {
-public:
+protected:
+    NPT_IMPLEMENT_DYNAMIC_CAST(PLT_MediaObject)
+
     PLT_MediaObject() {}
+
+public:
     virtual ~PLT_MediaObject() {}
 
     bool IsContainer() { return m_ObjectClass.type.StartsWith("object.container"); }
 
-    static const char* GetMimeType(const NPT_String& filename, 
-                                   const PLT_HttpRequestContext* context = NULL);
-    static const char* GetMimeTypeFromExtension(const NPT_String& extension, 
-                                                const PLT_HttpRequestContext* context = NULL);
-    static NPT_String  GetProtocolInfo(const char* filename, 
-                                       bool with_dlna_extension = true, 
-                                       const PLT_HttpRequestContext* context = NULL);
-	static NPT_String  GetMimeTypeFromProtocolInfo(const char* protocol_info);
     static const char* GetUPnPClass(const char* filename, 
                                     const PLT_HttpRequestContext* context = NULL);
-    static const char* GetDlnaExtension(const char* mime_type, 
-                                        const PLT_HttpRequestContext* context = NULL);
 
     virtual NPT_Result Reset();
+    virtual NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl);
     virtual NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
     virtual NPT_Result FromDidl(NPT_XmlElementNode* entry);
 
@@ -243,6 +201,7 @@
     PLT_ObjectClass     m_ObjectClass;
     NPT_String          m_ObjectID;
     NPT_String          m_ParentID;
+    NPT_String          m_ReferenceID;
 
     /* metadata */
     NPT_String          m_Title;
@@ -251,6 +210,7 @@
     PLT_PeopleInfo      m_People;
     PLT_AffiliationInfo m_Affiliation;
     PLT_Description     m_Description;
+    PLT_RecordedInfo    m_Recorded;
 
     /* properties */
     bool m_Restricted;
@@ -269,30 +229,45 @@
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaItem class
+|   PLT_MediaItem
 +---------------------------------------------------------------------*/
+/**
+ The PLT_MediaItem class represents a first-level class derived directly from
+ PLT_MediaObject. It most often represents a single piece of AV data. 
+ */
 class PLT_MediaItem : public PLT_MediaObject
 {
 public:
+    NPT_IMPLEMENT_DYNAMIC_CAST_D(PLT_MediaItem, PLT_MediaObject)
+
     PLT_MediaItem();
     virtual ~PLT_MediaItem();
 
     // PLT_MediaObject methods
+    NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl);
     NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
     NPT_Result FromDidl(NPT_XmlElementNode* entry);
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaContainer class
+|   PLT_MediaContainer
 +---------------------------------------------------------------------*/
+/**
+ The PLT_MediaContainer class represents a first-level class derived directly
+ from PLT_MediaObject. A PLT_MediaContainer represents a collection of 
+ PLT_MediaObject instances.
+ */
 class PLT_MediaContainer : public PLT_MediaObject
 {
 public:
+    NPT_IMPLEMENT_DYNAMIC_CAST_D(PLT_MediaContainer, PLT_MediaObject)
+
     PLT_MediaContainer();
     virtual ~PLT_MediaContainer();
 
     // PLT_MediaObject methods
     NPT_Result Reset();
+    NPT_Result ToDidl(const NPT_String& filter, NPT_String& didl);
     NPT_Result ToDidl(NPT_UInt32 mask, NPT_String& didl);
     NPT_Result FromDidl(NPT_XmlElementNode* entry);
 
@@ -303,12 +278,16 @@
     bool m_Searchable;
 
     /* container info related */
-    NPT_Int32 m_ChildrenCount;    
+    NPT_Int32  m_ChildrenCount;    
+    NPT_UInt32 m_ContainerUpdateID;
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaObjectList class
+|   PLT_MediaObjectList
 +---------------------------------------------------------------------*/
+/**
+ The PLT_MediaObjectList class is a list of PLT_MediaObject instances.
+ */
 class PLT_MediaObjectList : public NPT_List<PLT_MediaObject*>
 {
 public:
@@ -322,5 +301,4 @@
 typedef NPT_Reference<PLT_MediaObjectList> PLT_MediaObjectListReference;
 typedef NPT_Reference<PLT_MediaObject> PLT_MediaObjectReference;
 
-
 #endif /* _PLT_MEDIA_ITEM_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltMediaRenderer.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMediaRenderer.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - AV Media Renderer Device
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,6 +17,7 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
 | 
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -40,12 +41,12 @@
 #include "PltDeviceHost.h"
 
 /*----------------------------------------------------------------------
-|   PLT_MediaRenderer class
+|   PLT_MediaRendererDelegate
 +---------------------------------------------------------------------*/
-class PLT_MediaRendererInterface
+class PLT_MediaRendererDelegate
 {
 public:
-    virtual ~PLT_MediaRendererInterface() {}
+    virtual ~PLT_MediaRendererDelegate() {}
 
     // ConnectionManager
     virtual NPT_Result OnGetCurrentConnectionInfo(PLT_ActionReference& action) = 0;
@@ -62,14 +63,15 @@
 
     // RenderingControl
     virtual NPT_Result OnSetVolume(PLT_ActionReference& action) = 0;
+    virtual NPT_Result OnSetVolumeDB(PLT_ActionReference& action) = 0;
+    virtual NPT_Result OnGetVolumeDBRange(PLT_ActionReference& action) = 0;
     virtual NPT_Result OnSetMute(PLT_ActionReference& action) = 0;
 };
 
 /*----------------------------------------------------------------------
-|   PLT_MediaRenderer class
+|   PLT_MediaRenderer
 +---------------------------------------------------------------------*/
-class PLT_MediaRenderer : public PLT_DeviceHost,
-                          public PLT_MediaRendererInterface
+class PLT_MediaRenderer : public PLT_DeviceHost
 {
 public:
     PLT_MediaRenderer(const char*  friendly_name,
@@ -77,9 +79,11 @@
                       const char*  uuid = NULL,
                       unsigned int port = 0,
                       bool         port_rebind = false);
+    // methods
+    virtual void SetDelegate(PLT_MediaRendererDelegate* delegate) { m_Delegate = delegate; }
 
     // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices(PLT_DeviceData& data);
+    virtual NPT_Result SetupServices();
     virtual NPT_Result OnAction(PLT_ActionReference&          action, 
                                 const PLT_HttpRequestContext& context);
 
@@ -105,6 +109,9 @@
     virtual NPT_Result OnSetVolumeDB(PLT_ActionReference &action);
     virtual NPT_Result OnGetVolumeDBRange(PLT_ActionReference &action);
     virtual NPT_Result OnSetMute(PLT_ActionReference& action);
+
+private:
+    PLT_MediaRendererDelegate* m_Delegate;
 };
 
 #endif /* _PLT_MEDIA_RENDERER_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltMediaServer.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMediaServer.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - AV Media Server Device
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP AV Media Server.
+ */
+
 #ifndef _PLT_MEDIA_SERVER_H_
 #define _PLT_MEDIA_SERVER_H_
 
@@ -46,40 +51,91 @@
 +---------------------------------------------------------------------*/
 #define MAX_PATH_LENGTH 1024
 
-/* BrowseFlags */
-enum BrowseFlags {
-    BROWSEMETADATA,
-    BROWSEDIRECTCHILDREN
-};
-
 /*----------------------------------------------------------------------
-|   forward declarations
+|   PLT_MediaServerDelegate
 +---------------------------------------------------------------------*/
-extern const char* BrowseFlagsStr[];
-class PLT_HttpFileServerHandler;
+/** 
+ The PLT_MediaServerDelegate class is an interface for delegating the handling 
+ of the required UPnP AV ContentDirectory service actions. It also handles 
+ resource HTTP requests (downloading).
+ */
+class PLT_MediaServerDelegate
+{
+public:
+    PLT_MediaServerDelegate() {}
+    virtual ~PLT_MediaServerDelegate() {}
+    
+    virtual NPT_Result OnBrowseMetadata(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*/) = 0;
+    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*/) = 0;
+    virtual NPT_Result OnSearchContainer(PLT_ActionReference&          /*action*/, 
+                                         const char*                   /*container_id*/, 
+                                         const char*                   /*search_criteria*/,
+ 										 const char*                   /*filter*/,
+                                         NPT_UInt32                    /*starting_index*/,
+                                         NPT_UInt32                    /*requested_count*/,
+                                         const char*                   /*sort_criteria*/, 
+                                         const PLT_HttpRequestContext& /*context*/) = 0;
+    virtual NPT_Result ProcessFileRequest(NPT_HttpRequest&              /*request*/,
+                                          const NPT_HttpRequestContext& /*context*/,
+                                          NPT_HttpResponse&             /*response*/) = 0;
+};
 
 /*----------------------------------------------------------------------
-|   PLT_MediaServer class
+|   PLT_MediaServer
 +---------------------------------------------------------------------*/
+/**
+ The PLT_MediaServer class implements the base class for a UPnP AV 
+ Media Server device.
+ */
 class PLT_MediaServer : public PLT_DeviceHost
 {
 public:
+    /* BrowseFlags */
+    enum BrowseFlags {
+        BROWSEMETADATA,
+        BROWSEDIRECTCHILDREN
+    };
+    
+    // class methods
+    static NPT_Result ParseBrowseFlag(const char* str, BrowseFlags& flag);
+    static NPT_Result ParseSort(const NPT_String& sort, NPT_List<NPT_String>& list);
+
+    // constructor
     PLT_MediaServer(const char*  friendly_name,
                     bool         show_ip = false,
                     const char*  uuid = NULL,
                     NPT_UInt16   port = 0,
                     bool         port_rebind = false);
+    
+    // methods
+    virtual void SetDelegate(PLT_MediaServerDelegate* delegate) { m_Delegate = delegate; }
+    PLT_MediaServerDelegate* GetDelegate() { return m_Delegate; }
+    virtual void UpdateSystemUpdateID(NPT_UInt32 update);
+    virtual void UpdateContainerUpdateID(const char* id, NPT_UInt32 update);
+    
+protected:
     virtual ~PLT_MediaServer();
-
+    
     // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices(PLT_DeviceData& data);
+    virtual NPT_Result SetupServices();
     virtual NPT_Result OnAction(PLT_ActionReference&          action, 
                                 const PLT_HttpRequestContext& context);
-
-    // class methods
-    static NPT_Result  GetBrowseFlag(const char* str, BrowseFlags& flag);
-
-protected:
+    virtual NPT_Result ProcessHttpGetRequest(NPT_HttpRequest&              request, 
+                                             const NPT_HttpRequestContext& context,
+                                             NPT_HttpResponse&             response);
+    
     // ConnectionManager
     virtual NPT_Result OnGetCurrentConnectionIDs(PLT_ActionReference&          action, 
                                                  const PLT_HttpRequestContext& context);
@@ -106,14 +162,14 @@
                                         const char*                   filter,
                                         NPT_UInt32                    starting_index,
                                         NPT_UInt32                    requested_count,
-                                        const NPT_List<NPT_String>&   sort_criteria,
+                                        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 NPT_List<NPT_String>&   sort_criteria, 
+                                              const char*                   sort_criteria, 
                                               const PLT_HttpRequestContext& context);
     virtual NPT_Result OnSearchContainer(PLT_ActionReference&          action, 
                                          const char*                   container_id, 
@@ -121,11 +177,11 @@
  										 const char*                   filter,
                                          NPT_UInt32                    starting_index,
                                          NPT_UInt32                    requested_count,
-                                         const NPT_List<NPT_String>&   sort_criteria, 
+                                         const char*                   sort_criteria, 
                                          const PLT_HttpRequestContext& context);
-                                
-    // methods
-    virtual NPT_Result ParseSort(const NPT_String& sort, NPT_List<NPT_String>& list);
+    
+private:
+    PLT_MediaServerDelegate* m_Delegate;
 };
 
 #endif /* _PLT_MEDIA_SERVER_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltMetadataHandler.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMetadataHandler.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Metadata Handler
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -50,11 +51,11 @@
     // metadata overridables
     virtual bool HandleExtension(const char* extension) = 0;
     virtual NPT_Result  Load(NPT_InputStream&  stream, 
-                             NPT_TimeInterval  sleeptime = NPT_TimeInterval(0, 10000), 
-                             NPT_TimeInterval  timeout = NPT_TimeInterval(30, 0)) = 0;
+                             NPT_TimeInterval  sleeptime = NPT_TimeInterval(.01), 
+                             NPT_TimeInterval  timeout = NPT_TimeInterval(30.)) = 0;
     virtual NPT_Result  Save(NPT_OutputStream& stream,
-                             NPT_TimeInterval  sleeptime = NPT_TimeInterval(0, 10000), 
-                             NPT_TimeInterval  timeout = NPT_TimeInterval(30, 0)) = 0;
+                             NPT_TimeInterval  sleeptime = NPT_TimeInterval(.01), 
+                             NPT_TimeInterval  timeout = NPT_TimeInterval(30.)) = 0;
 
     virtual const char* GetLicenseData(NPT_String& licenseData) = 0;
     virtual NPT_Result  GetCoverArtData(char*& caData, int& len) = 0;

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltMimeType.h Added

@@ -0,0 +1,75 @@
+/*****************************************************************
+|
+|   Platinum - AV Media MimeType
+|
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
+| All rights reserved.
+| http://www.plutinosoft.com
+|
+| This program is free software; you can redistribute it and/or
+| modify it under the terms of the GNU General Public License
+| as published by the Free Software Foundation; either version 2
+| of the License, or (at your option) any later version.
+|
+| OEMs, ISVs, VARs and other distributors that combine and 
+| distribute commercially licensed software with Platinum software
+| and do not wish to distribute the source code for the commercially
+| licensed software under version 2, or (at your option) any later
+| version, of the GNU General Public License (the "GPL") must enter
+| into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
+|  
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; see the file LICENSE.txt. If not, write to
+| the Free Software Foundation, Inc., 
+| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+| http://www.gnu.org/licenses/gpl-2.0.html
+|
+****************************************************************/
+
+/** @file
+ UPnP AV Media MimeType.
+ */
+
+#ifndef _PLT_MIMETYPE_H_
+#define _PLT_MIMETYPE_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Neptune.h"
+#include "PltHttp.h"
+/*----------------------------------------------------------------------
+|   forward declarations
++---------------------------------------------------------------------*/
+class PLT_HttpRequestContext;
+
+/*----------------------------------------------------------------------
+|   PLT_MimeType
++---------------------------------------------------------------------*/
+class PLT_MimeType
+{
+public:
+    virtual ~PLT_MimeType() {}
+
+    static const char* GetMimeType(const NPT_String&             filename, 
+                                   const PLT_HttpRequestContext* context = NULL);
+    static const char* GetMimeType(const NPT_String&   filename,
+                                   PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
+    
+    static const char* GetMimeTypeFromExtension(const NPT_String&             extension, 
+                                                const PLT_HttpRequestContext* context = NULL);
+    static const char* GetMimeTypeFromExtension(const NPT_String&   extension,
+                                                PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
+
+private:
+    PLT_MimeType() {}
+
+};
+
+#endif /* _PLT_MIMETYPE_H_ */

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltProtocolInfo.h Added

@@ -0,0 +1,158 @@
+/*****************************************************************
+|
+|   Platinum - AV Media Protocol Info
+|
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
+| All rights reserved.
+| http://www.plutinosoft.com
+|
+| This program is free software; you can redistribute it and/or
+| modify it under the terms of the GNU General Public License
+| as published by the Free Software Foundation; either version 2
+| of the License, or (at your option) any later version.
+|
+| OEMs, ISVs, VARs and other distributors that combine and 
+| distribute commercially licensed software with Platinum software
+| and do not wish to distribute the source code for the commercially
+| licensed software under version 2, or (at your option) any later
+| version, of the GNU General Public License (the "GPL") must enter
+| into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
+| 
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; see the file LICENSE.txt. If not, write to
+| the Free Software Foundation, Inc., 
+| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+| http://www.gnu.org/licenses/gpl-2.0.html
+|
+****************************************************************/
+
+/** @file
+ UPnP AV Media Object Protocol Info.
+ */
+
+#ifndef _PLT_PROTOCOL_INFO_H_
+#define _PLT_PROTOCOL_INFO_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Neptune.h"
+#include "PltHttp.h"
+
+/*----------------------------------------------------------------------
+|   forward declarations
++---------------------------------------------------------------------*/
+class PLT_HttpRequestContext;
+
+/*----------------------------------------------------------------------
+|   typedefs
++---------------------------------------------------------------------*/
+typedef struct PLT_HttpFileRequestHandler_DefaultDlnaExtMapEntry {
+    const char* mime_type;
+    const char* dlna_ext;
+} PLT_HttpFileRequestHandler_DefaultDlnaExtMapEntry ;
+
+/*----------------------------------------------------------------------
+|   PLT_ProtocolInfo
++---------------------------------------------------------------------*/
+/**
+ The PLT_ProtocolInfo class holds information about the protocol info of a 
+ given UPnP Media Item resource.
+ */
+class PLT_ProtocolInfo
+{
+public:
+    class FieldEntry {
+    public:
+        FieldEntry(const char* key, const char* value) :
+            m_Key(key), m_Value(value) {}
+        NPT_String m_Key;
+        NPT_String m_Value;
+    };
+
+    // class methods
+    static NPT_String  GetMimeTypeFromProtocolInfo(const char* protocol_info);
+    
+    static const char* GetDlnaExtension(const char* mime_type, 
+                                        const PLT_HttpRequestContext* context = NULL);
+    static const char* GetDlnaExtension(const char* mime_type, 
+                                        PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
+    
+    static PLT_ProtocolInfo GetProtocolInfo(const char* filename, 
+                                            bool with_dlna_extension = true, 
+                                            const PLT_HttpRequestContext* context = NULL);
+    static PLT_ProtocolInfo GetProtocolInfo(const char* filename, 
+                                            bool with_dlna_extension = true, 
+                                            PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
+    
+    static PLT_ProtocolInfo GetProtocolInfoFromMimeType(const char* mime_type, 
+                                                        bool with_dlna_extension = true, 
+                                                        const PLT_HttpRequestContext* context = NULL);
+    static PLT_ProtocolInfo GetProtocolInfoFromMimeType(const char* mime_type, 
+                                                        bool with_dlna_extension = true, 
+                                                        PLT_DeviceSignature signature = PLT_DEVICE_UNKNOWN);
+
+    // methods
+    PLT_ProtocolInfo();
+    //PLT_ProtocolInfo(NPT_String protocol_info);
+    PLT_ProtocolInfo(const char* protocol_info);
+    PLT_ProtocolInfo(const char* protocol,
+                     const char* mask,
+                     const char* content_type,
+                     const char* extra);
+    const NPT_String& GetProtocol()     const { return m_Protocol;  }
+    const NPT_String& GetMask()         const { return m_Mask; }
+    const NPT_String& GetContentType()  const { return m_ContentType;  }
+    const NPT_String& GetExtra()        const { return m_Extra; }
+    
+    const NPT_String& GetDLNA_PN()      const { return m_DLNA_PN; }
+
+    bool IsValid() { return m_Valid; }
+
+    NPT_String ToString() const;
+
+    bool Match(const PLT_ProtocolInfo& other) const;
+
+private:
+	typedef enum {
+		PLT_PROTINFO_PARSER_STATE_START,
+		PLT_PROTINFO_PARSER_STATE_PN,
+		PLT_PROTINFO_PARSER_STATE_OP,
+		PLT_PROTINFO_PARSER_STATE_PS,
+		PLT_PROTINFO_PARSER_STATE_CI,
+		PLT_PROTINFO_PARSER_STATE_FLAGS,
+		PLT_PROTINFO_PARSER_STATE_MAXSP,
+		PLT_PROTINFO_PARSER_STATE_OTHER
+	} PLT_ProtocolInfoParserState;
+
+    NPT_Result SetProtocolInfo(const char* protocol_info);
+    NPT_Result ValidateField(const char*  val, 
+                        const char*  valid_chars, 
+                        NPT_Cardinal num_chars = 0); // 0 means variable number of chars
+    NPT_Result ParseExtra(NPT_List<FieldEntry>& entries);
+    NPT_Result ValidateExtra();
+
+private:
+    NPT_String           m_Protocol;
+    NPT_String           m_Mask;
+    NPT_String           m_ContentType;
+    NPT_String           m_Extra;
+    
+    NPT_String           m_DLNA_PN;    // DLNA.ORG_PN Parameter (pn-param)
+    NPT_String           m_DLNA_OP;    // Operations Parameter (op-param)
+    NPT_String           m_DLNA_PS;    // Server-Side PlaySpeeds Parameter (ps-param)
+    NPT_String           m_DLNA_CI;    // Conversion Indicator Flag (ci-param)
+    NPT_String           m_DLNA_FLAGS; // Flags Parameter (flags-param)
+    NPT_String           m_DLNA_MAXSP; // Maximum RTSP Speed Header value (maxsp-param)
+    NPT_List<FieldEntry> m_DLNA_OTHER; // Vendor-defined 4th field Parameters (other-param)
+    
+    bool                 m_Valid;
+};
+
+#endif /* _PLT_PROTOCOL_INFO_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltRingBufferStream.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltRingBufferStream.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Ring buffer stream
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -51,16 +52,21 @@
     PLT_RingBufferStream(NPT_Size buffer_size = 4096, bool blocking = true);
     PLT_RingBufferStream(NPT_RingBufferReference& buffer, bool blocking = true);
     virtual ~PLT_RingBufferStream();
-
-    void SetEos() {m_Eos = true;}
-
+    
+    // methods
+    bool IsAborted() { return m_Aborted; }
+    
     // NPT_InputStream methods
     NPT_Result Read(void*     buffer, 
                     NPT_Size  bytes_to_read, 
                     NPT_Size* bytes_read = NULL);
-    NPT_Result GetSize(NPT_LargeSize& size)  { 
+    NPT_Result GetSize(NPT_LargeSize& size)  {
+        NPT_COMPILER_UNUSED(size);
+        return NPT_ERROR_NOT_SUPPORTED;
+    }
+    NPT_Result GetSpace(NPT_LargeSize& space) { 
         NPT_AutoLock autoLock(m_Lock);
-        size = m_TotalBytesWritten;  
+        space = m_RingBuffer->GetSpace();
         return NPT_SUCCESS;
     }
     NPT_Result GetAvailable(NPT_LargeSize& available) { 
@@ -74,13 +80,14 @@
                      NPT_Size    bytes_to_write, 
                      NPT_Size*   bytes_written = NULL);
     NPT_Result Flush();
-    NPT_Result Close() { m_RingBuffer->Close(); return NPT_SUCCESS; }
+    NPT_Result SetEOS();
+    NPT_Result Abort();
 
 protected:
     // NPT_DelegatingInputStream methods
     NPT_Result InputSeek(NPT_Position offset) {
         NPT_COMPILER_UNUSED(offset);
-        return NPT_FAILURE;
+        return NPT_ERROR_NOT_SUPPORTED;
     }
     NPT_Result InputTell(NPT_Position& offset) { 
         NPT_AutoLock autoLock(m_Lock);
@@ -91,7 +98,7 @@
     // NPT_DelegatingOutputStream methods
     NPT_Result OutputSeek(NPT_Position offset) {
         NPT_COMPILER_UNUSED(offset);
-        return NPT_FAILURE;
+        return NPT_ERROR_NOT_SUPPORTED;
     }
     NPT_Result OutputTell(NPT_Position& offset) {
         NPT_AutoLock autoLock(m_Lock);
@@ -100,12 +107,13 @@
     }
 
 private:
-    NPT_RingBufferReference     m_RingBuffer;
-    NPT_Offset                  m_TotalBytesRead;
-    NPT_Offset                  m_TotalBytesWritten;
-    NPT_Mutex                   m_Lock;
-    bool                        m_Eos;
-    bool                        m_Blocking;
+    NPT_RingBufferReference m_RingBuffer;
+    NPT_Offset              m_TotalBytesRead;
+    NPT_Offset              m_TotalBytesWritten;
+    NPT_Mutex               m_Lock;
+    bool                    m_Blocking;
+    bool                    m_Eos;
+    bool                    m_Aborted;
 };
 
 typedef NPT_Reference<PLT_RingBufferStream> PLT_RingBufferStreamReference;

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltService.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltService.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Service
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP Service
+ */
+
 #ifndef _PLT_SERVICE_H_
 #define _PLT_SERVICE_H_
 
@@ -51,24 +56,55 @@
 /*----------------------------------------------------------------------
 |    PLT_Service class
 +---------------------------------------------------------------------*/
+/**
+ UPnP Service.
+ The PLT_Service class holds information about a UPnP service of a given device.
+ It maintains a list of actions and state variables. A PLT_DeviceData instance can own 
+ one or more PLT_Service instances. When a PLT_Service is advertised as part of a
+ a UPnP Device (PLT_DeviceHost), it also maintains a list of subscribers to nofify when
+ state variables change.
+ */
 class PLT_Service
 {
 public:
     // methods
+    /**
+     Create an instance of a UPnP Service either hosted or discovered.
+     @param device Pointer to the PLT_DeviceData the service is associated to
+     @param type String representing the UPnP service type
+     @param id String representing the UPnP service id
+     @param name A String to create unique service SCPD, control and eventing urls
+     @param last_change_namespace A String for the LastChange state variable namespace if any
+     */
     PLT_Service(PLT_DeviceData* device,
-                const char*     type = NULL, 
-                const char*     id = NULL,
+                const char*     type, 
+                const char*     id,
+                const char*     name,
                 const char*     last_change_namespace = NULL);
-    ~PLT_Service();
+    virtual ~PLT_Service();
     
-    // class methods
-    NPT_Result  InitURLs(const char* service_name, const char* device_uuid);
-    bool        IsInitted() {
-        return (m_ActionDescs.GetItemCount() > 0);
-    }
-    NPT_Result  PauseEventing(bool paused = true);
+    // methods
+    /**
+     When service is hosted by a PLT_DeviceHost, this setups the SCPD, control and event urls.
+     @param service_name the service name used to format unique urls
+     */
+    NPT_Result InitURLs(const char* service_name);
+    
+    /**
+     Verify the service has been properly initialized or is a valid discovered service.
+     @return true if valid.
+     */
+    bool IsValid() {  return (m_ActionDescs.GetItemCount() > 0); }
+    
+    /**
+     When a PLT_DeviceHost needs to change more than one state variables at a time
+     but would rather send only one event with all state variable changes, this can be 
+     used to pause and resume the automatic eventing.
+     @param pause Flag to indicate if eventing should be paused or resumed 
+     */
+    NPT_Result PauseEventing(bool pause = true);
 
-    // static methods
+    // class methods
     static bool IsTrue(const NPT_String& value) {
         if (value.Compare("1", true)    && 
             value.Compare("true", true) && 
@@ -79,70 +115,239 @@
     }
 
     // accessor methods
-    NPT_String          GetSCPDURL(bool absolute = false);
-    NPT_String          GetControlURL(bool absolute = false);
-    NPT_String          GetEventSubURL(bool absolute = false);
-    const NPT_String&   GetServiceID()    const   { return m_ServiceID;   }
-    const NPT_String&   GetServiceType()  const   { return m_ServiceType; }    
-    PLT_DeviceData*     GetDevice()               { return m_Device;      }
-    NPT_Result          ForceVersion(NPT_Cardinal version);
-
-    // XML
-    NPT_Result          GetSCPDXML(NPT_String& xml);
-    NPT_Result          SetSCPDXML(const char* xml);
-    NPT_Result          GetDescription(NPT_XmlElementNode* parent, NPT_XmlElementNode** service = NULL);
-
-    // State Variables
-    NPT_Result          SetStateVariable(const char* name, const char* value);
-    NPT_Result          SetStateVariableRate(const char* name, NPT_TimeInterval rate);
-	NPT_Result          SetStateVariableExtraAttribute(const char* name, 
-                                                       const char* key,
-                                                       const char* value);
-    NPT_Result          IncStateVariable(const char* name);
-    PLT_StateVariable*  FindStateVariable(const char* name);
-    NPT_Result          GetStateVariableValue(const char* name, NPT_String& value);
-    bool                IsSubscribable();
-
-    // Actions
-    PLT_ActionDesc*     FindActionDesc(const char* name);
+    /**
+     Set the SCPD url for control points to be able to fetch the SCPD xml document.
+     @param url relative path of SCPD url
+     */
+    NPT_Result SetSCPDURL(const char* url)     { m_SCPDURL = url; return NPT_SUCCESS; }
+    
+    /*
+     Set the Service Control url for control points to be able to invoke actions.
+     @param url relative path of control url
+     */
+    NPT_Result SetControlURL(const char* url)  { m_ControlURL = url; return NPT_SUCCESS; };
+    
+    /**
+     Set the Service Event subscription url for control points to be able to subscribe
+     to events.
+     @param url relative path of even url
+     */
+    NPT_Result SetEventSubURL(const char* url) { m_EventSubURL = url; return NPT_SUCCESS; };
+    
+    /**
+     Return the SCPD url associated with this service.
+     @param absolute flag to indicate if absolute url including ip and port should
+     be returned
+     @return SCPD url
+     */
+    NPT_String GetSCPDURL(bool absolute = false);
+    
+    /**
+     Return the Control url associated with this service.
+     @param absolute flag to indicate if absolute url including ip and port should
+     be returned
+     @return Control url
+     */
+    NPT_String GetControlURL(bool absolute = false);
+    
+    /**
+     Return the Event subscription url associated with this service.
+     @param absolute flag to indicate if absolute url including ip and port should
+     be returned
+     @return Event url
+     */
+    NPT_String GetEventSubURL(bool absolute = false);
+    
+    /**
+     Return the service id.
+     @return service id
+     */
+    const NPT_String& GetServiceID() const { return m_ServiceID;   }
+    
+    /**
+     Return the service type.
+     @return service type
+     */
+    const NPT_String& GetServiceType() const { return m_ServiceType; }
+
+    /**
+     Return the service friendly name.
+     @return service name
+     */
+    const NPT_String& GetServiceName() const { return m_ServiceName; } 
+
+    /**
+     Return the PLT_DeviceData* the service is associated with.
+     @return PLT_DeviceData pointer
+     */
+    PLT_DeviceData* GetDevice() { return m_Device;      }
+    
+    /**
+     When a control point discover a new service with a higher version number
+     than it can work with, a lower version can be set to force backward 
+     compatibility.
+     @param version Integer specifying the version to use
+     */
+    NPT_Result ForceVersion(NPT_Cardinal version);
+
+    /**
+     Return the service SCPD xml document.
+     @param xml String to receive document
+     */
+    NPT_Result GetSCPDXML(NPT_String& xml);
+    
+    /**
+     Set the service SCPD xml document.
+     @param xml String SCPD xml document
+     */
+    NPT_Result SetSCPDXML(const char* xml);
+    
+    /**
+     Populate the UPnP Device description document with service information.
+     @param parent XML Element where to insert the service XML Element
+     @param service Pointer to service XML Element node newly created so it can be
+     extended with additional non standard information.
+     */
+    NPT_Result GetDescription(NPT_XmlElementNode* parent, NPT_XmlElementNode** service = NULL);
+
+    /**
+     Set a new value for a given state variable. The service keeps track of which
+     state variables have changed and events are being triggered by a PLT_ServiceEventTask
+     when necessary.
+     @param name state variable name
+     @param value new State Variable value.
+     */
+    NPT_Result SetStateVariable(const char* name, const char* value);
+    
+    /**
+     Certain state variables notifications must not be sent faster than a certain 
+     rate according to the UPnP specs. This sets the rate for a given state variable.
+     @param name state variable name
+     @param rate a time interval specifying the minimum interval allowed between
+     notifications.
+     */
+    NPT_Result SetStateVariableRate(const char* name, NPT_TimeInterval rate);
+    
+    /**
+     Certain state variables require extra xml attributes when serialized.
+     @param name state variable name
+     @param key the attribute name
+     @param value the attribute value
+     */
+	NPT_Result SetStateVariableExtraAttribute(const char* name, const char* key, const char* value);
+    
+    /**
+     Helper function to increment a state variable representing a number.
+     @param name state variable name
+     */
+    NPT_Result IncStateVariable(const char* name);
+    
+    /**
+     Return the PLT_StateVariable pointer given a state variable name.
+     @param name state variable name
+     @return PLT_StateVariable pointer
+     */
+    PLT_StateVariable* FindStateVariable(const char* name);
+    
+    /**
+     Return the state variable value given a state variable name.
+     @param name state variable name
+     @param value state variable value output
+     */
+    NPT_Result GetStateVariableValue(const char* name, NPT_String& value);
+    
+    /**
+     Return whether a service is capable of sending events.
+     @return true if sending events
+     */
+    bool IsSubscribable();
+    
+    /**
+     Return the list of state variables.
+     @return list of state variable pointers.
+     */
+    const NPT_List<PLT_StateVariable*>& GetStateVariables() const { return m_StateVars; }
+
+    /**
+     Return the PLT_ActionDesc given an action name
+     @param name action name
+     @return PLT_ActioDesc pointer
+     */
+    PLT_ActionDesc* FindActionDesc(const char* name);
+    
+    /**
+     Return an array of actions descriptions PLT_ActionDesc.
+     @return array of PLT_ActionDesc pointers.
+     */
+    const NPT_Array<PLT_ActionDesc*>& GetActionDescs() const { return m_ActionDescs; }
 
 private:    
-    void                Cleanup();
-    NPT_Result          AddChanged(PLT_StateVariable* var);
-    NPT_Result          UpdateLastChange(NPT_List<PLT_StateVariable*>& vars);
-    NPT_Result          NotifyChanged();
-
-
-    /*----------------------------------------------------------------------
-    |    PLT_ServiceEventTask
-    +---------------------------------------------------------------------*/
-    class PLT_ServiceEventTask : public PLT_ThreadTask
-    {
+    /**
+     A task to send events.
+     The PLT_ServiceEventTask is started when receiving a first subscription. It
+     monitors if some state variables have changed and sends events to all
+     subscribers if so.
+     */
+    class PLT_ServiceEventTask : public PLT_ThreadTask {
     public:
         PLT_ServiceEventTask(PLT_Service* service) : m_Service(service) {}
-
+        
         void DoRun() { 
             while (!IsAborting(100)) m_Service->NotifyChanged();
         }
-
+        
     private:
         PLT_Service* m_Service;
     };
+    
+    // methods
+    void Cleanup();
+    
+    /**
+     Called by a PLT_StateVariable to keep track of what events need to be 
+     sent by the PLT_ServiceEventTask task.
+     @param var PLT_StateVariable pointer
+     */
+    NPT_Result AddChanged(PLT_StateVariable* var);
+    
+    /**
+     Certain UPnP services combine state variable changes into one single
+     state variable called "LastChange". This function updates the LastChange
+     state variable by looking through the list passed for state variables that
+     are not individually evented.
+     */
+    NPT_Result UpdateLastChange(NPT_List<PLT_StateVariable*>& vars);
+    
+    /**
+     Send state variable change events to all subscribers.
+     */
+    NPT_Result NotifyChanged();
 
     // Events
+    /**
+     Called by PLT_DeviceHost when it receives a request for a new subscription.
+     */
     NPT_Result ProcessNewSubscription(
         PLT_TaskManager*         task_manager,
         const NPT_SocketAddress& addr, 
         const NPT_String&        callback_urls, 
         int                      timeout, 
         NPT_HttpResponse&        response);
-
+    
+    /**
+     Called by PLT_DeviceHost when it receives a request renewing an existing
+     subscription.
+     */
     NPT_Result ProcessRenewSubscription(
         const NPT_SocketAddress& addr, 
         const NPT_String&        sid, 
         int                      timeout,
         NPT_HttpResponse&        response);
     
+    /**
+     Called by PLT_DeviceHost when it receives a request to cancel an existing
+     subscription.
+     */
     NPT_Result ProcessCancelSubscription(
         const NPT_SocketAddress& addr, 
         const NPT_String&        sid, 
@@ -150,32 +355,36 @@
 
 
 protected:
-    friend class PLT_StateVariable; // so that we can call AddChanged from StateVariable
-    friend class PLT_DeviceHost;
-    friend class PLT_DeviceData;
+    // friends that need to call private functions
+    friend class PLT_StateVariable; // AddChanged
+    friend class PLT_DeviceHost;    // ProcessXXSubscription
     
     //members
-    PLT_DeviceData* m_Device;
-    NPT_String      m_ServiceType;
-    NPT_String      m_ServiceID;
-    NPT_String      m_SCPDURL;
-    NPT_String      m_ControlURL;
-    NPT_String      m_EventSubURL;
-
-    PLT_ServiceEventTask*           m_EventTask;
-    NPT_Array<PLT_ActionDesc*>      m_ActionDescs;
-    NPT_List<PLT_StateVariable*>    m_StateVars;
-    NPT_Mutex                       m_Lock;
-    NPT_List<PLT_StateVariable*>    m_StateVarsChanged;
-    NPT_List<PLT_StateVariable*>    m_StateVarsToPublish;
-    NPT_List<PLT_EventSubscriber*>  m_Subscribers;
-    bool                            m_EventingPaused;
-    NPT_String                      m_LastChangeNamespace;
+    PLT_DeviceData*                         m_Device;
+    NPT_String                              m_ServiceType;
+    NPT_String                              m_ServiceID;
+	NPT_String                              m_ServiceName;
+    NPT_String                              m_SCPDURL;
+    NPT_String                              m_ControlURL;
+    NPT_String                              m_EventSubURL;
+    PLT_ServiceEventTask*                   m_EventTask;
+    NPT_Array<PLT_ActionDesc*>              m_ActionDescs;
+    NPT_List<PLT_StateVariable*>            m_StateVars;
+    NPT_Mutex                               m_Lock;
+    NPT_List<PLT_StateVariable*>            m_StateVarsChanged;
+    NPT_List<PLT_StateVariable*>            m_StateVarsToPublish;
+    NPT_List<PLT_EventSubscriberReference>  m_Subscribers;
+    bool                                    m_EventingPaused;
+    NPT_String                              m_LastChangeNamespace;
 };
 
 /*----------------------------------------------------------------------
 |    PLT_ServiceSCPDURLFinder
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_ServiceSCPDURLFinder class returns an instance of a PLT_Service given a 
+ service SCPD url.
+ */
 class PLT_ServiceSCPDURLFinder
 {
 public:
@@ -192,6 +401,10 @@
 /*----------------------------------------------------------------------
 |    PLT_ServiceControlURLFinder
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_ServiceControlURLFinder class returns an instance of a PLT_Service 
+ given a service control url.
+ */
 class PLT_ServiceControlURLFinder
 {
 public:
@@ -208,6 +421,10 @@
 /*----------------------------------------------------------------------
 |    PLT_ServiceEventSubURLFinder
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_ServiceEventSubURLFinder class returns an instance of a PLT_Service 
+ given a service event subscription url.
+ */
 class PLT_ServiceEventSubURLFinder
 {
 public:
@@ -224,6 +441,10 @@
 /*----------------------------------------------------------------------
 |    PLT_ServiceIDFinder
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_ServiceIDFinder class returns an instance of a PLT_Service given a 
+ service id.
+ */
 class PLT_ServiceIDFinder
 {
 public:
@@ -240,6 +461,10 @@
 /*----------------------------------------------------------------------
 |    PLT_ServiceTypeFinder
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_ServiceTypeFinder class returns an instance of a PLT_Service given a 
+ service type.
+ */
 class PLT_ServiceTypeFinder
 {
 public:
@@ -254,8 +479,32 @@
 };
 
 /*----------------------------------------------------------------------
+|    PLT_ServiceNameFinder
++---------------------------------------------------------------------*/
+/** 
+ The PLT_ServiceNameFinder class returns an instance of a PLT_Service given a 
+ service name.
+ */
+class PLT_ServiceNameFinder
+{
+public:
+    // methods
+    PLT_ServiceNameFinder(const char* name) : m_Name(name) {}
+    virtual ~PLT_ServiceNameFinder() {}
+    bool operator()(PLT_Service* const & service) const;
+
+private:
+    // members
+    NPT_String m_Name;
+};
+
+/*----------------------------------------------------------------------
 |    PLT_LastChangeXMLIterator
 +---------------------------------------------------------------------*/
+/**
+ The PLT_LastChangeXMLIterator class is used to serialize the LastChange variable
+ changes into xml given a list of state variables.
+ */
 class PLT_LastChangeXMLIterator
 {
 public:

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltSsdp.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltSsdp.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - SSDP
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP SSDP
+ */
+
 #ifndef _PLT_SSDP_H_
 #define _PLT_SSDP_H_
 
@@ -38,7 +43,6 @@
 |   includes
 +---------------------------------------------------------------------*/
 #include "Neptune.h"
-#include "PltSsdpListener.h"
 #include "PltThreadTask.h"
 #include "PltHttpServerTask.h"
 
@@ -48,8 +52,42 @@
 class PLT_DeviceHost;
 
 /*----------------------------------------------------------------------
+|   PLT_SsdpPacketListener class
++---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpPacketListener class is an interface for handling SSDP packets
+ (M-SEARCH and NOTIFY).
+ */
+class PLT_SsdpPacketListener
+{
+public:
+    virtual ~PLT_SsdpPacketListener() {}
+    virtual NPT_Result OnSsdpPacket(const NPT_HttpRequest&        request, 
+                                    const NPT_HttpRequestContext& context) = 0;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_SsdpSearchResponseListener class
++---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpSearchResponseListener class is an interface for handling SSDP M-SEARCH 
+ responses.
+ */
+class PLT_SsdpSearchResponseListener
+{
+public:
+    virtual ~PLT_SsdpSearchResponseListener() {}
+    virtual NPT_Result ProcessSsdpSearchResponse(NPT_Result                    res,  
+                                                 const NPT_HttpRequestContext& context,
+                                                 NPT_HttpResponse*             response) = 0;
+};
+
+/*----------------------------------------------------------------------
 |   PLT_SsdpSender class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpSender class provides a mechanism to format and send SSDP packets.
+ */
 class PLT_SsdpSender
 {
 public:
@@ -78,6 +116,10 @@
 /*----------------------------------------------------------------------
 |   PLT_SsdpDeviceSearchResponseInterfaceIterator class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpDeviceSearchResponseInterfaceIterator class looks for the best network
+ interface to use then sends a SSDP M-SEARCH response.
+ */
 class PLT_SsdpDeviceSearchResponseInterfaceIterator
 {
 public:
@@ -98,6 +140,10 @@
 /*----------------------------------------------------------------------
 |   PLT_SsdpDeviceSearchResponseTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpDeviceSearchResponseTask class is used by a PLT_DeviceHost to respond
+ to SSDP M-SEARCH requests from UPnP ControlPoints.
+ */
 class PLT_SsdpDeviceSearchResponseTask : public PLT_ThreadTask
 {
 public:
@@ -121,6 +167,10 @@
 /*----------------------------------------------------------------------
 |   PLT_SsdpAnnounceInterfaceIterator class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpAnnounceInterfaceIterator class is used to send SSDP announcements 
+ given a list of network interaces. 
+ */
 class PLT_SsdpAnnounceInterfaceIterator
 {
 public:
@@ -138,6 +188,10 @@
 /*----------------------------------------------------------------------
 |   PLT_SsdpInitMulticastIterator class
 +---------------------------------------------------------------------*/
+/** 
+ The PLT_SsdpInitMulticastIterator class is used to join a multicast group 
+ given a list of IP addresses.
+ */
 class PLT_SsdpInitMulticastIterator
 {
 public:
@@ -147,6 +201,9 @@
     NPT_Result operator()(NPT_IpAddress& if_addr) const {
         NPT_IpAddress addr;
         addr.ResolveName("239.255.255.250");
+        // OSX bug, since we're reusing the socket, we need to leave group first
+        // before joining it
+        m_Socket->LeaveGroup(addr, if_addr);
         return m_Socket->JoinGroup(addr, if_addr);
     }
 
@@ -157,16 +214,20 @@
 /*----------------------------------------------------------------------
 |   PLT_SsdpDeviceAnnounceTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpDeviceAnnounceTask class is a task to send UPnP Device SSDP announcements
+ (alive or byebye). It can be setup to automatically repeat after an interval.
+ */
 class PLT_SsdpDeviceAnnounceTask : public PLT_ThreadTask
 {
 public:
     PLT_SsdpDeviceAnnounceTask(PLT_DeviceHost*  device, 
                                NPT_TimeInterval repeat,
                                bool             is_byebye_first = false,
-                               bool             broadcast = false) : 
+                               bool             extra_broadcast = false) : 
         m_Device(device), 
         m_Repeat(repeat), m_IsByeByeFirst(is_byebye_first), 
-        m_IsBroadcast(broadcast) {}
+        m_ExtraBroadcast(extra_broadcast) {}
 
 protected:
     virtual ~PLT_SsdpDeviceAnnounceTask() {}
@@ -178,12 +239,16 @@
     PLT_DeviceHost*             m_Device;
     NPT_TimeInterval            m_Repeat;
     bool                        m_IsByeByeFirst;
-    bool                        m_IsBroadcast;
+    bool                        m_ExtraBroadcast;
 };
 
 /*----------------------------------------------------------------------
 |   PLT_NetworkInterfaceAddressSearchIterator class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_NetworkInterfaceAddressSearchIterator class returns the network interface
+ given an IP address.
+ */
 class PLT_NetworkInterfaceAddressSearchIterator
 {
 public:
@@ -204,6 +269,10 @@
 /*----------------------------------------------------------------------
 |   PLT_SsdpPacketListenerIterator class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpPacketListenerIterator class iterates through a list of 
+ PLT_SsdpPacketListener instances to notify of a new SSDP incoming packet.
+ */
 class PLT_SsdpPacketListenerIterator
 {
 public:
@@ -223,14 +292,23 @@
 /*----------------------------------------------------------------------
 |   PLT_SsdpListenTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpListenTask class is used to listen for incoming SSDP packets and 
+ keep track of a list of PLT_SsdpPacketListener listeners to notify when a new 
+ SSDP packet has arrived.
+ */
 class PLT_SsdpListenTask : public PLT_HttpServerSocketTask
 {
 public:
-    PLT_SsdpListenTask(NPT_Socket* socket, 
-                       bool multicast = true,
-                       bool join_hard = false) : 
-        PLT_HttpServerSocketTask(socket, true), 
-        m_Multicast(multicast), m_JoinHard(join_hard) {}
+    PLT_SsdpListenTask(NPT_Socket* socket) : 
+        PLT_HttpServerSocketTask(socket, true) {
+        // Change read time out for UDP because iPhone 3.0 seems to hang
+        // after reading everything from the socket even though
+        // more stuff arrived
+#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
+        m_Socket->SetReadTimeout(10000);
+#endif
+    }
 
     NPT_Result AddListener(PLT_SsdpPacketListener* listener) {
         NPT_AutoLock lock(m_Mutex);
@@ -243,25 +321,22 @@
         m_Listeners.Remove(listener);
         return NPT_SUCCESS;
     }
+    
+    // PLT_Task methods
+    void DoAbort();
 
 protected:
     virtual ~PLT_SsdpListenTask() {}
 
-    // PLT_ThreadTask methods
-    virtual void DoInit();
-
     // PLT_HttpServerSocketTask methods
     NPT_Result GetInputStream(NPT_InputStreamReference& stream);
     NPT_Result GetInfo(NPT_SocketInfo& info);
-    NPT_Result ProcessRequest(NPT_HttpRequest&              request, 
-                              const NPT_HttpRequestContext& context,
-                              NPT_HttpResponse*&            response,
-                              bool&                         headers_only);
+    NPT_Result SetupResponse(NPT_HttpRequest&              request, 
+                             const NPT_HttpRequestContext& context,
+                             NPT_HttpResponse&             response);
 
 protected:
     PLT_InputDatagramStreamReference  m_Datagram;
-    bool                              m_Multicast;
-    bool                              m_JoinHard;
     NPT_List<PLT_SsdpPacketListener*> m_Listeners;
     NPT_Mutex                         m_Mutex;
 };
@@ -269,13 +344,17 @@
 /*----------------------------------------------------------------------
 |   PLT_SsdpSearchTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_SsdpSearchTask class is a task used by a PLT_CtrlPoint to issue a SSDP
+ M-SEARCH request. It can be set to repeat at a certain frequencey.
+ */
 class PLT_SsdpSearchTask : public PLT_ThreadTask
 {
 public:
     PLT_SsdpSearchTask(NPT_UdpSocket*                  socket,
                        PLT_SsdpSearchResponseListener* listener, 
                        NPT_HttpRequest*                request,
-                       NPT_Timeout                     frequency); // pass 0 for one time
+                       NPT_TimeInterval                frequency = NPT_TimeInterval(0.)); // pass 0 for one time
 
 protected:
     virtual ~PLT_SsdpSearchTask();
@@ -285,14 +364,14 @@
     virtual void DoRun();
 
     virtual NPT_Result ProcessResponse(NPT_Result                    res, 
-                                       NPT_HttpRequest*              request,  
+                                       const NPT_HttpRequest&        request,  
                                        const NPT_HttpRequestContext& context,
                                        NPT_HttpResponse*             response);
 
 private:
     PLT_SsdpSearchResponseListener* m_Listener;
     NPT_HttpRequest*                m_Request;
-    NPT_Timeout                     m_Timeout;
+    NPT_TimeInterval                m_Frequency;
     bool                            m_Repeat;
     NPT_UdpSocket*                  m_Socket;
 };

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltStateVariable.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltStateVariable.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Service State Variable
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP State Variable
+ */
+
 #ifndef _PLT_STATE_VARIABLE_H_
 #define _PLT_STATE_VARIABLE_H_
 
@@ -46,8 +51,12 @@
 class PLT_Service;
 
 /*----------------------------------------------------------------------
-|   NPT_AllowedValueRange class
+|   NPT_AllowedValueRange struct
 +---------------------------------------------------------------------*/
+/**
+ The NPT_AllowedValueRange struct holds the min, max and step value allowed of
+ a UPnP Service state variable.
+ */
 typedef struct {
     NPT_Int32 min_value;
     NPT_Int32 max_value;
@@ -57,35 +66,120 @@
 /*----------------------------------------------------------------------
 |   PLT_StateVariable class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_StateVariable class maintains the state of a UPnP Service state variable. 
+ It is used by a PLT_DeviceHost instance to notify subscribers of a change or by a
+ subscriber (PLT_CtrlPoint) when a service state variable change notification
+ has been received.
+ */
 class PLT_StateVariable
 {
 public:
     PLT_StateVariable(PLT_Service* service);
     ~PLT_StateVariable();
 
-    NPT_Result   GetSCPDXML(NPT_XmlElementNode* node);
+    /**
+     Populate the SCPD xml document with state variable information.
+     @param node XML Element where to insert the state variable XML Element
+     */
+    NPT_Result GetSCPDXML(NPT_XmlElementNode* node);
+    
+    /**
+     Return the PLT_Service that this state variable is associated with.
+     @return PLT_Service pointer.
+     */
     PLT_Service* GetService();
-    bool         IsSendingEvents(bool indirectly = false);
-    void         DisableIndirectEventing();
-    NPT_Result   SetRate(NPT_TimeInterval rate);
-    NPT_Result   SetValue(const char* value);
-    NPT_Result   ValidateValue(const char* value);
-	NPT_Result   Serialize(NPT_XmlElementNode& node);
-	NPT_Result   SetExtraAttribute(const char* name, const char* value);
-
+    
+    /**
+     Return whether the state variable is eventable directly or indirectly. A state
+     variable sends events indirectly when part of the "LastChange" state variable.
+     @param indirectly Boolean to test if the state variable is sending events indirectly
+     @return Whether the state variable sends events according to the input flag specified.
+     */
+    bool IsSendingEvents(bool indirectly = false);
+    
+    /**
+     Force the state variable to send events directly.
+     */
+    void DisableIndirectEventing();
+    
+    /**
+     Certain state variables notifications must not be sent faster than a certain 
+     rate according to the UPnP specs. This sets the rate for a given state variable.
+     @param rate time interval to respect between notifications.
+     */
+    NPT_Result SetRate(NPT_TimeInterval rate);
+    
+    /**
+     Set the state variable value. The value is first validated to make sure
+     it is an allowed value. Once the value is validated, it is marked for eventing by
+     calling the PLT_Service AddChanged function.
+     @param value new state variable value. Can be a comma separated list of values.
+     */
+    NPT_Result SetValue(const char* value);
+    
+    /**
+     Validate the new value of the state variable.
+     @param value new state variable value. Can be a comma separated list of values.
+     */
+    NPT_Result ValidateValue(const char* value);
+    
+    /**
+     Certain state variables require extra xml attributes when serialized.
+     @param name the attribute name
+     @param value the attribute value
+     */
+	NPT_Result SetExtraAttribute(const char* name, const char* value);
+
+    /**
+     Return the state variable name.
+     @return state variable name.
+     */
     const NPT_String& GetName()     const { return m_Name;     }
+    
+    /**
+     Return the current state variable value.
+     @return state variable current value.
+     */
     const NPT_String& GetValue()    const { return m_Value;    }
+    
+    /**
+     Return the state variable data type.
+     @return state variable data type.
+     */
     const NPT_String& GetDataType() const { return m_DataType; }
+    
+    /**
+     Return the state variable allowed value range if any.
+     @return state variable value range pointer or null if none.
+     */
 	const NPT_AllowedValueRange* GetAllowedValueRange() const { return m_AllowedValueRange; }
 
+    /**
+     Helper function to return a state variable given a list of state variables
+     and a state variable name.
+     @param vars list of state variables
+     @param name state variable name to look for
+     @return PLT_StateVariable pointer.
+     */
     static PLT_StateVariable* Find(NPT_List<PLT_StateVariable*>& vars, 
                                    const char*                   name);
 
 protected:
-    bool         IsReadyToPublish();
+    /**
+     Return whether the state variable value changed and subscribers need to
+     be notified.
+     */
+    bool IsReadyToPublish();
+    
+    /**
+     Serialize the state variable into xml.
+     */
+	NPT_Result Serialize(NPT_XmlElementNode& node);
 
 protected:
     friend class PLT_Service;
+    friend class PLT_LastChangeXMLIterator;
 
     //members
     PLT_Service*            m_Service;
@@ -106,6 +200,10 @@
 /*----------------------------------------------------------------------
 |   PLT_StateVariableNameFinder
 +---------------------------------------------------------------------*/
+/**
+ The PLT_StateVariableNameFinder class returns the PLT_StateVariable instance
+ given a state variable name.
+ */
 class PLT_StateVariableNameFinder 
 {
 public:
@@ -122,23 +220,4 @@
     NPT_String   m_Name;
 };
 
-/*----------------------------------------------------------------------
-|   PLT_ListStateVariableNameFinder
-+---------------------------------------------------------------------*/
-class PLT_ListStateVariableNameFinder
-{
-public:
-    // methods
-    PLT_ListStateVariableNameFinder(const char* name) : m_Name(name) {}
-    virtual ~PLT_ListStateVariableNameFinder() {}
-
-    bool operator()(const PLT_StateVariable* const & state_variable) const {
-        return state_variable->GetName().Compare(m_Name, true) ? false : true;
-    }
-
-private:
-    // members
-    NPT_String   m_Name;
-};
-
 #endif /* _PLT_STATE_VARIABLE_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltStreamPump.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltStreamPump.h Changed

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltSyncMediaBrowser.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltSyncMediaBrowser.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Synchronous Media Browser
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP AV Media Controller synchronous implementation.
+ */
+
 #ifndef _PLT_SYNC_MEDIA_BROWSER_
 #define _PLT_SYNC_MEDIA_BROWSER_
 
@@ -113,7 +118,7 @@
                           NPT_Int32                index, 
                           NPT_Int32                count,
                           bool                     browse_metadata = false,
-                          const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:album,upnp:artist,upnp:author", // explicitely specify res otherwise WMP won't return a URL!
+                          const char*              filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:album,upnp:artist,upnp:author,searchable,childCount", // explicitely specify res otherwise WMP won't return a URL!
                           const char*              sort = "");
 private:
     NPT_Result Find(const char* ip, PLT_DeviceDataReference& device);
@@ -123,7 +128,7 @@
     NPT_Lock<PLT_DeviceMap>              m_MediaServers;
     PLT_MediaContainerChangesListener*   m_ContainerListener;
     bool                                 m_UseCache;
-    PLT_MediaCache                       m_Cache;
+    PLT_MediaCache<PLT_MediaObjectListReference,NPT_String> m_Cache;
 };
 
 /*----------------------------------------------------------------------

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltTaskManager.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltTaskManager.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Task Manager
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ Runnable Tasks Manager
+ */
+
 #ifndef _PLT_TASKMANAGER_H_
 #define _PLT_TASKMANAGER_H_
 
@@ -47,26 +52,46 @@
 /*----------------------------------------------------------------------
 |   PLT_TaskManager class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_TaskManager class maintains a list of runnable tasks. During shutdown, it
+ can stop all running tasks. Additionally, it can limit the number of
+ tasks that can run at any given time.
+ */
 class PLT_TaskManager
 {
-    friend class PLT_ThreadTask;
-    friend class PLT_ThreadTaskCallback;
-
 public:
-	PLT_TaskManager(NPT_Cardinal max_items = 0);
+    /**
+     Create a new Task Manager.
+     @param max_tasks Maximum number of concurrent tasks that the task manager
+     will allow. When the value is reached, a thread calling AddTask will block until
+     a task has finished.
+     */
+	PLT_TaskManager(NPT_Cardinal max_tasks = 0);
 	virtual ~PLT_TaskManager();
 
-    // tasks related methods
+    /**
+     Start a new new task and associates it with this task manager.
+     @param task new task
+     @param delay optional time interval to wait before launching the new task
+     @param auto_destroy a flag to indicate if the task is owned by someone else
+     and thus should not destroy itself when done.
+     */
     virtual NPT_Result StartTask(PLT_ThreadTask*   task, 
                                  NPT_TimeInterval* delay = NULL,
                                  bool              auto_destroy = true);
 
-    // methods
+    /**
+     Stop all tasks associated with this task manager.
+     */
     NPT_Result StopAllTasks();
 
+    /**
+     Returns the max number of concurrent tasks allowed. 0 for no limit.
+     */
+    NPT_Cardinal GetMaxTasks() { return m_MaxTasks; }
+
 private:
-    // called by PLT_ThreadTaskCallback
-    NPT_Mutex& GetCallbackLock() { return m_CallbackLock; }
+    friend class PLT_ThreadTask;
 
     // called by PLT_ThreadTask
     NPT_Result AddTask(PLT_ThreadTask* task);
@@ -77,6 +102,9 @@
     NPT_Mutex                  m_TasksLock;
     NPT_Mutex                  m_CallbackLock;
     NPT_Queue<int>*            m_Queue;
+    NPT_Cardinal               m_MaxTasks;
+    NPT_Cardinal               m_RunningTasks;
+    bool                       m_Stopping;
 };
 
 #endif /* _PLT_TASKMANAGER_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltThreadTask.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltThreadTask.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Thread Tasks
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ Runnable Task
+ */
+
 #ifndef _PLT_THREADTASK_H_
 #define _PLT_THREADTASK_H_
 
@@ -43,35 +48,79 @@
 /*----------------------------------------------------------------------
 |   PLT_ThreadTask class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_ThreadTask class is a base class for executing a given task in a worker
+ thread. A PLT_ThreadTask is usually always associated to a PLT_TaskManager 
+ which maintains a list to stop and destroy tasks when finished.
+ */
 class PLT_ThreadTask : public NPT_Runnable
 {
 public:
     friend class PLT_TaskManager;
 
-    PLT_ThreadTask();
-
+    /**
+     When a task is not managed by a PLT_TaskManager, the owner must call
+     this to stop and destroy it.
+     */
     NPT_Result Kill();
-
-    virtual bool IsAborting(NPT_Timeout timeout = NPT_TIMEOUT_INFINITE) {
+    
+protected:
+    /**
+     Return whether this task is in the process of stopping.
+     @param timeout number of milliseconds to wait
+     @return boolean indicating if the task is stopping
+     */
+    virtual bool IsAborting(NPT_Timeout timeout) {
         return NPT_SUCCEEDED(m_Abort.WaitUntilEquals(1, timeout));
     }
-
-protected:
+    
+    /**
+     Start a task by associating it with a task manager.
+     @param task_manager PLT_TaskManager pointer
+     @param delay optional time interval to wait before launching the new task
+     @param auto_destroy a flag to indicate if the task is owned by someone else
+     and thus should not destroy itself when done.
+     */
     NPT_Result Start(PLT_TaskManager*  task_manager = NULL, 
                      NPT_TimeInterval* delay = NULL,
                      bool              auto_destroy = true);
+    /**
+     Stop the task. This is either called by a task manager or the Kill method.
+     @param blocking Whether the method should block until the task has finished.
+     */
     NPT_Result Stop(bool blocking = true);
-
-    // overridable
+    
+    /**
+     This method to override in derived classes is called when the task is about
+     to start. 
+     */
+    virtual void DoInit()    {}
+    
+    /**
+     This method to override in derived classes is called when the task is about
+     to stop.
+     */
     virtual void DoAbort()   {}
+    
+    /**
+     This method to override in derived classes is the main task loop.
+     */
     virtual void DoRun()     {}
-    virtual void DoInit()    {}
-
-    // the task manager will destroy the task when finished
-    // if m_AutoDestroy is set otherwise use Kill 
+    
+    /**
+     A PLT_ThreadTask base class is never instantiated directly.
+     */
+    PLT_ThreadTask();
+    
+    /**
+     The task manager will destroy the task when finished if m_AutoDestroy is 
+     true otherwise the owner of this task must use the Kill method.
+     */
     virtual ~PLT_ThreadTask();
     
-private:
+private:    
+    NPT_Result StartThread();
+    
     // NPT_Thread methods
     void Run();
 
@@ -81,28 +130,11 @@
 
 private:
     // members
+    NPT_SharedVariable  m_Started;
     NPT_SharedVariable  m_Abort;
     NPT_Thread*         m_Thread;
     bool                m_AutoDestroy;
     NPT_TimeInterval    m_Delay;
 };
 
-/*----------------------------------------------------------------------
-|   PLT_ThreadTaskCallback class
-+---------------------------------------------------------------------*/
-class PLT_ThreadTaskCallback
-{
-public:
-    PLT_ThreadTaskCallback(NPT_Mutex& lock) : m_Lock(lock) {}
-    virtual ~PLT_ThreadTaskCallback() {};
-
-    NPT_Result Callback();
-
-protected:
-    virtual NPT_Result DoCallback() = 0;
-
-protected:
-    NPT_Mutex& m_Lock;
-};
-
 #endif /* _PLT_THREADTASK_H_ */

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltUPnP.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltUPnP.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - UPnP Engine
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,7 +17,8 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
-| 
+| licensing@plutinosoft.com
+|  
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -31,6 +32,10 @@
 |
 ****************************************************************/
 
+/** @file
+ UPnP Devices and ControlPoints Manager
+ */
+
 #ifndef _PLT_UPNP_H_
 #define _PLT_UPNP_H_
 
@@ -40,12 +45,13 @@
 #include "PltTaskManager.h"
 #include "PltCtrlPoint.h"
 #include "PltDeviceHost.h"
-#include "PltUPnPHelper.h"
+#include "PltUtilities.h"
 
 /*----------------------------------------------------------------------
 |   constants
 +---------------------------------------------------------------------*/
-#define PLT_DLNA_SSDP_DELAY 0.02f
+#define PLT_DLNA_SSDP_DELAY       0.05f
+#define PLT_DLNA_SSDP_DELAY_GROUP 0.2f
 
 /*----------------------------------------------------------------------
 |   forward definitions
@@ -55,22 +61,69 @@
 /*----------------------------------------------------------------------
 |   PLT_UPnP class
 +---------------------------------------------------------------------*/
+/**
+ The PLT_UPnP class maintains a list of devices (PLT_DeviceHost) to advertise and/or 
+ control points (PLT_CtrlPoint).
+ */
 class PLT_UPnP
 {
 public:
-    PLT_UPnP(NPT_UInt32 ssdp_port = 1900, bool multicast = true);
+    /**
+     Create a UPnP instance.
+     */
+    PLT_UPnP();
     ~PLT_UPnP();
 
+    /**
+     Add and start a device inside this UPnP context.
+     @param device device to start.
+     */
     NPT_Result AddDevice(PLT_DeviceHostReference& device);
+    
+    /**
+     Add and start a control point inside this UPnP context.
+     @param ctrlpoint control point to start.
+     */
     NPT_Result AddCtrlPoint(PLT_CtrlPointReference& ctrlpoint);
 
+    /**
+     Remove an existing device from this UPnP context.
+     @param device device to stop.
+     */
     NPT_Result RemoveDevice(PLT_DeviceHostReference& device);
+    
+    /**
+     Remove an existing control point from this UPnP context.
+     @param ctrlpoint control point to stop.
+     */
     NPT_Result RemoveCtrlPoint(PLT_CtrlPointReference& ctrlpoint);
 
+    /**
+     Start the UPnP context and all existing devices and control points
+     associated with it.
+     */
     NPT_Result Start();
+    
+    /**
+     Stop the UPnP context and all existing devices and control points
+     associated with it.
+     */
     NPT_Result Stop();
+    
+    /**
+     Return the UPnP Engine state.
+     @return True if the UPnP engine is running.
+     */
+    bool IsRunning() { return m_Started; }
 
-	void       SetIgnoreLocalUUIDs(bool ignore) { m_IgnoreLocalUUIDs = ignore; }
+    /**
+     When a device and a control point are added to the same UPnP context, it is
+     desired that the device be not discovered by the control point. For example when
+     creating a combo UPnP Renderer/CtrlPoint. This methods tells the control point
+     to ignore devices associated with the same UPnP context.
+     @param ignore boolean to ignore devices in context
+     */
+	void SetIgnoreLocalUUIDs(bool ignore) { m_IgnoreLocalUUIDs = ignore; }
 
 private:
     // members
@@ -79,12 +132,10 @@
     NPT_List<PLT_CtrlPointReference>    m_CtrlPoints;
     PLT_TaskManager                     m_TaskManager;
 
-    // since we can only have one socket listening on port 1900, 
+    // Since we can only have one socket listening on port 1900, 
     // we create it in here and we will attach every control points
     // and devices to it when they're added
     bool                                m_Started;
-    NPT_UInt32                          m_Port;
-    bool                                m_Multicast;
     PLT_SsdpListenTask*                 m_SsdpListenTask; 
 	bool								m_IgnoreLocalUUIDs;
 };

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltUtilities.h Added

@@ -0,0 +1,724 @@
+/*****************************************************************
+|
+|   Platinum - Utilities
+|
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
+| All rights reserved.
+| http://www.plutinosoft.com
+|
+| This program is free software; you can redistribute it and/or
+| modify it under the terms of the GNU General Public License
+| as published by the Free Software Foundation; either version 2
+| of the License, or (at your option) any later version.
+|
+| OEMs, ISVs, VARs and other distributors that combine and 
+| distribute commercially licensed software with Platinum software
+| and do not wish to distribute the source code for the commercially
+| licensed software under version 2, or (at your option) any later
+| version, of the GNU General Public License (the "GPL") must enter
+| into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
+|  
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; see the file LICENSE.txt. If not, write to
+| the Free Software Foundation, Inc., 
+| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+| http://www.gnu.org/licenses/gpl-2.0.html
+|
+****************************************************************/
+
+#ifndef _PLT_UTILITIES_H_
+#define _PLT_UTILITIES_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "Neptune.h"
+
+/*----------------------------------------------------------------------
+|   PLT_XmlAttributeFinder
++---------------------------------------------------------------------*/
+/**
+ The PLT_XmlAttributeFinder class is used to determine if an attribute 
+ exists given an xml element node, an attribute name and namespace.
+ */
+class PLT_XmlAttributeFinder
+{
+public:
+    // if 'namespc' is NULL, we're looking for ANY namespace
+    // if 'namespc' is '\0', we're looking for NO namespace
+    // if 'namespc' is non-empty, look for that SPECIFIC namespace
+    PLT_XmlAttributeFinder(const NPT_XmlElementNode& element, 
+                           const char*               name, 
+                           const char*               namespc) : 
+      m_Element(element), m_Name(name), m_Namespace(namespc) {}
+
+    bool operator()(const NPT_XmlAttribute* const & attribute) const {
+        if (attribute->GetName() == m_Name) {
+            if (m_Namespace) {
+                const NPT_String& prefix = attribute->GetPrefix();
+                if (m_Namespace[0] == '\0') {
+                    // match if the attribute has NO namespace
+                    return prefix.IsEmpty();
+                } else {
+                    // match if the attribute has the SPECIFIC namespace
+                    // we're looking for
+                    const NPT_String* namespc = m_Element.GetNamespaceUri(prefix);
+                    return namespc && *namespc == m_Namespace;
+                }
+            } else {
+                // ANY namespace will match
+                return true;
+            }
+        } else {
+            return false;
+        }
+    }
+
+private:
+    const NPT_XmlElementNode& m_Element;
+    const char*               m_Name;
+    const char*               m_Namespace;
+};
+
+/*----------------------------------------------------------------------
+|   PLT_XmlHelper
++---------------------------------------------------------------------*/
+/**
+ The PLT_XmlHelper class is a set of utility functions for manipulating 
+ xml documents and DOM trees.
+ */
+class PLT_XmlHelper
+{
+public:
+
+    // static methods
+
+    static NPT_Result Parse(const NPT_String&    xml,
+                            NPT_XmlElementNode*& tree) {
+        // reset tree
+        tree = NULL;
+
+        // parse body
+        NPT_XmlParser parser;
+        NPT_XmlNode*  node;
+        NPT_Result result = parser.Parse(xml, node);
+        if (NPT_FAILED(result)) {
+            //NPT_LOG_FINEST_1("Failed to parse %s", xml.IsEmpty()?"(empty string)":xml.GetChars());
+            NPT_CHECK(result);
+        }
+
+        tree = node->AsElementNode();
+        if (!tree) {
+            delete node;
+            return NPT_FAILURE;
+        }
+        
+        return NPT_SUCCESS;
+    }
+
+    static NPT_Result GetChildText(NPT_XmlElementNode* node, 
+                                   const char*         tag, 
+                                   NPT_String&         value,
+                                   const char*         namespc = "",
+                                   NPT_Cardinal        max_size = 1024) {
+        value = "";
+
+        if (!node) return NPT_FAILURE;
+
+        // special case "" means we look for the same namespace as the parent
+        if (namespc && namespc[0] == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
+
+        NPT_XmlElementNode* child = node->GetChild(tag, namespc);
+        if (!child) return NPT_FAILURE;
+
+        const NPT_String* text = child->GetText();
+        // DLNA 7.3.17
+        value = text?text->SubString(0, max_size):"";
+        return NPT_SUCCESS;
+    }
+                                   
+    static NPT_Result RemoveAttribute(NPT_XmlElementNode* node, 
+                                      const char*         name,
+                                      const char*         namespc = "") {
+        if (!node) return NPT_FAILURE;
+
+        // special case "" means we look for the same namespace as the parent
+        if (namespc && namespc[0] == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
+
+        NPT_List<NPT_XmlAttribute*>::Iterator attribute;
+        attribute = node->GetAttributes().Find(PLT_XmlAttributeFinder(*node, name, namespc));
+        if (!attribute) return NPT_FAILURE;
+
+        delete *attribute;
+        NPT_CHECK(node->GetAttributes().Erase(attribute));
+
+        return NPT_SUCCESS;
+    }
+                                   
+    static NPT_Result GetAttribute(NPT_XmlElementNode* node, 
+                                   const char*         name,
+                                   NPT_XmlAttribute*&  attr,
+                                   const char*         namespc = "") {
+        attr = NULL;
+
+        if (!node) return NPT_FAILURE;
+
+        // special case "" means we look for the same namespace as the parent
+        if (namespc && namespc[0] == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
+
+        NPT_List<NPT_XmlAttribute*>::Iterator attribute;
+        attribute = node->GetAttributes().Find(PLT_XmlAttributeFinder(*node, name, namespc));
+        if (!attribute) {
+            //NPT_Debug("Failed to find attribute [%s]:%s", namespc, name);
+            return NPT_FAILURE;
+        }
+
+        attr = (*attribute);
+        return NPT_SUCCESS;
+    }
+
+    static NPT_Result GetAttribute(NPT_XmlElementNode* node, 
+                                   const char*         name,
+                                   NPT_String&         value,
+                                   const char*         namespc = "",
+                                   NPT_Cardinal        max_size = 1024) {
+        value = "";
+        
+        NPT_XmlAttribute* attribute = NULL;
+        NPT_Result result = GetAttribute(node, name, attribute, namespc);
+        if (NPT_FAILED(result)) return result;
+        
+        if (!attribute) return NPT_FAILURE;
+        // DLNA 7.3.17 truncate to 1024 bytes
+        value = attribute->GetValue().SubString(0, max_size);
+        return NPT_SUCCESS;
+    }
+
+    static NPT_Result SetAttribute(NPT_XmlElementNode* node, 
+                                   const char*         name,
+                                   NPT_String&         value,
+                                   const char*         namespc = "") {
+        NPT_XmlAttribute* attribute = NULL;
+        NPT_CHECK(GetAttribute(node, name, attribute, namespc));
+        if (!attribute) return NPT_FAILURE;
+
+        attribute->SetValue(value);
+        return NPT_SUCCESS;
+    }
+
+    static NPT_Result AddChildText(NPT_XmlElementNode* node,
+                                   const char*         tag,
+                                   const char*         text,
+                                   const char*         prefix = NULL) {
+        if (!node) return NPT_FAILURE;
+        NPT_XmlElementNode* child = new NPT_XmlElementNode(prefix, tag);
+        child->AddText(text);
+        return node->AddChild(child);
+    }
+
+    static bool IsMatch(const NPT_XmlNode* const & node, const char* tag, const char* namespc_mapped) {
+        // if m_Namespace is NULL, we're looking for ANY namespace
+        // if m_Namespace is '\0', we're looking for NO namespace
+        // if m_Namespace is non-empty, look for that SPECIFIC namespace
+        
+        const NPT_XmlElementNode* element = node->AsElementNode();
+        // is tag the same (case sensitive)?
+        if (element && element->GetTag() == tag) {
+            if (namespc_mapped) {
+                // look for a SPECIFIC namespace or NO namespace
+                const NPT_String* namespc = element->GetNamespace();
+                if (namespc) {
+                    // the element has a namespace, match if it is equal to
+                    // what we're looking for
+                    return *namespc == namespc_mapped;
+                } else {
+                    // the element does not have a namespace, match if we're
+                    // looking for NO namespace
+                    return namespc_mapped[0] == '\0';
+                }
+            } else {
+                // ANY namespace will match
+                return true;
+            }
+        }
+        return false;
+    } 
+
+    static NPT_Result GetChildren(NPT_XmlElementNode*              node,
+                                  NPT_Array<NPT_XmlElementNode*>&  children,
+                                  const char*                      tag,
+                                  const char*                      namespc = "") {
+        if (!node) return NPT_FAILURE;
+
+        // special case "" means we look for the same namespace as the parent
+        if (namespc && namespc[0] == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
+
+        const char* namespc_mapped = (namespc==NULL)?"":(namespc[0]=='*' && namespc[1]=='\0')?NULL:namespc;
+
+        // get all children first
+        NPT_List<NPT_XmlNode*>& allchildren = node->GetChildren();
+
+        // iterate through children and add only elements with matching tag
+        NPT_List<NPT_XmlNode*>::Iterator child = allchildren.GetFirstItem();
+        while  (child) {
+            if (IsMatch(*child, tag, namespc_mapped)) {
+                children.Add((*child)->AsElementNode());
+            }
+            ++child;
+        }
+        return NPT_SUCCESS;
+    }
+
+    static NPT_XmlElementNode* GetChild(NPT_XmlElementNode* node,
+                                        const char*         tag,
+                                        const char*         namespc = "") {
+        if (!node) return NULL;
+
+        // special case "" means we look for the same namespace as the parent
+        if (namespc && namespc[0] == '\0') namespc = node->GetNamespace()?node->GetNamespace()->GetChars():NPT_XML_NO_NAMESPACE;
+
+        return node->GetChild(tag, namespc);
+    }
+
+    static NPT_Result GetChild(NPT_XmlElementNode*  parent,
+                               NPT_XmlElementNode*& child,
+                               NPT_Ordinal          n = 0) {
+        if (!parent) return NPT_FAILURE;
+
+        // reset child
+        child = NULL;
+
+        // get all children first
+        NPT_List<NPT_XmlNode*>::Iterator children = parent->GetChildren().GetFirstItem();
+        while  (children) {
+            if ((*children)->AsElementNode() && n-- == 0) {
+                child = (*children)->AsElementNode();
+                return NPT_SUCCESS;
+            }
+            children++;
+        }
+
+        return NPT_FAILURE;
+    }
+
+    static NPT_Result Serialize(NPT_XmlNode& node, NPT_String& xml, bool add_header = true, NPT_Int8 indentation = 0) {
+        NPT_XmlWriter writer(indentation);
+        NPT_StringOutputStreamReference stream(new NPT_StringOutputStream(&xml));
+        NPT_CHECK(writer.Serialize(node, *stream, add_header));
+        return NPT_SUCCESS;
+    }
+
+	static NPT_String Serialize(NPT_XmlNode& node, bool add_header = true, NPT_Int8 indentation = 0) {
+		NPT_XmlWriter writer(indentation);
+		NPT_String xml;
+		NPT_StringOutputStreamReference stream(new NPT_StringOutputStream(&xml));
+		if (NPT_FAILED(writer.Serialize(node, *stream, add_header))) {
+			NPT_Debug("Failed to serialize xml node");
+			return "";
+		}
+
+		return xml;
+	}
+private:
+    // members
+};
+
+/*----------------------------------------------------------------------
+|   NPT_StringFinder
++---------------------------------------------------------------------*/
+/**
+ The NPT_StringFinder class is used to determine if a string is found 
+ as part of a list of strings.
+ */
+class NPT_StringFinder
+{
+public:
+    // methods
+    NPT_StringFinder(const char* value, bool ignore_case = false) : 
+        m_Value(value), m_IgnoreCase(ignore_case) {}
+    virtual ~NPT_StringFinder() {}
+    bool operator()(const NPT_String* const & value) const {
+        return value->Compare(m_Value, m_IgnoreCase) ? false : true;
+    }
+    bool operator()(const NPT_String& value) const {
+        return value.Compare(m_Value, m_IgnoreCase) ? false : true;
+    }
+    
+private:
+    // members
+    NPT_String   m_Value;
+    bool         m_IgnoreCase;
+};
+
+/*----------------------------------------------------------------------
+|   NPT_IpAddressFinder
++---------------------------------------------------------------------*/
+/**
+ The NPT_IpAddressFinder class is used to determine if a IP Address is found 
+ as part of a list of IP Addresses.
+ */
+class NPT_IpAddressFinder
+{
+public:
+    // methods
+    NPT_IpAddressFinder(NPT_IpAddress ip) : m_Value(ip) {}
+    virtual ~NPT_IpAddressFinder() {}
+    
+    bool operator()(const NPT_IpAddress* const & value) const {
+        return *value == m_Value;
+    }
+    bool operator()(const NPT_IpAddress& value) const {
+        return value == m_Value;
+    }
+    
+private:
+    // members
+    NPT_IpAddress m_Value;
+};
+
+
+/*----------------------------------------------------------------------
+|   PLT_UPnPMessageHelper class
++---------------------------------------------------------------------*/
+/**
+ The PLT_UPnPMessageHelper class is a set of utility functions for manipulating 
+ specific UPnP HTTP headers.
+ */
+class PLT_UPnPMessageHelper
+{
+public:
+    // methods
+    static const NPT_String* GetST(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue("ST"); 
+    }
+    static NPT_Result SetST(NPT_HttpMessage& message, 
+                            const char*      st) { 
+        return message.GetHeaders().SetHeader("ST", st); 
+    }
+    static const NPT_String* GetNT(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue("NT"); 
+    }
+    static NPT_Result SetNT(NPT_HttpMessage& message, 
+                            const char*      nt) { 
+        return message.GetHeaders().SetHeader("NT", nt); 
+    }
+    static const NPT_String* GetNTS(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue("NTS"); 
+    }
+    static NPT_Result SetNTS(NPT_HttpMessage& message, 
+                             const char*      nts) { 
+        return message.GetHeaders().SetHeader("NTS", nts); 
+    }
+    static const NPT_String* GetMAN(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue("MAN"); 
+    }
+    static NPT_Result SetMAN(NPT_HttpMessage& message, 
+                             const char*      man) { 
+        return message.GetHeaders().SetHeader("MAN", man); 
+    }
+    static const NPT_String* GetLocation(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue("Location"); 
+    }
+    static NPT_Result SetLocation(NPT_HttpMessage& message, 
+                                  const char*      location) { 
+        return message.GetHeaders().SetHeader("Location", location); 
+    }
+    static const NPT_String* GetServer(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue(NPT_HTTP_HEADER_SERVER); 
+    }
+    static NPT_Result SetServer(NPT_HttpMessage& message, 
+                                const char*      server, 
+                                bool             replace = true) { 
+        return message.GetHeaders().SetHeader(
+                                              NPT_HTTP_HEADER_SERVER, 
+                                              server, 
+                                              replace); 
+    }
+    static const NPT_String* GetUSN(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue("USN"); 
+    }
+    static NPT_Result SetUSN(NPT_HttpMessage& message, 
+                             const char*      usn) { 
+        return message.GetHeaders().SetHeader("USN", usn); 
+    }
+    static const NPT_String* GetCallbacks(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue("CALLBACK"); 
+    }
+    static NPT_Result SetCallbacks(NPT_HttpMessage& message, 
+                                   const char*      callbacks) { 
+        return message.GetHeaders().SetHeader("CALLBACK", callbacks); 
+    }
+    static const NPT_String* GetSID(const NPT_HttpMessage& message) { 
+        return message.GetHeaders().GetHeaderValue("SID"); 
+    }
+    static NPT_Result SetSID(NPT_HttpMessage& message, 
+                             const char*      sid) { 
+        return message.GetHeaders().SetHeader("SID", sid); 
+    }
+    static NPT_Result GetLeaseTime(const NPT_HttpMessage& message, 
+                                   NPT_TimeInterval&      lease) { 
+        const NPT_String* cc = 
+        message.GetHeaders().GetHeaderValue("Cache-Control");
+        NPT_CHECK_POINTER(cc);
+        return ExtractLeaseTime(*cc, lease);
+    }
+    static NPT_Result SetLeaseTime(NPT_HttpMessage&        message, 
+                                   const NPT_TimeInterval& lease) { 
+        return message.GetHeaders().SetHeader(
+                                              "Cache-Control", 
+                                              "max-age="+NPT_String::FromInteger(lease.ToSeconds())); 
+    }
+    static NPT_Result GetTimeOut(const NPT_HttpMessage& message, 
+                                 NPT_Int32&             seconds) { 
+        seconds = 0;
+        const NPT_String* timeout = 
+        message.GetHeaders().GetHeaderValue("TIMEOUT"); 
+        NPT_CHECK_POINTER(timeout);
+        return ExtractTimeOut(*timeout, seconds); 
+    }
+    static NPT_Result SetTimeOut(NPT_HttpMessage& message, 
+                                 const NPT_Int32  seconds) { 
+        if (seconds >= 0) {
+            return message.GetHeaders().SetHeader(
+                                                  "TIMEOUT", 
+                                                  "Second-"+NPT_String::FromInteger(seconds)); 
+        } else {
+            return message.GetHeaders().SetHeader(
+                                                  "TIMEOUT", 
+                                                  "Second-infinite"); 
+        }
+    }
+    static NPT_Result SetDate(NPT_HttpMessage& message) { 
+        NPT_TimeStamp now;
+        NPT_System::GetCurrentTimeStamp(now);
+        NPT_DateTime date(now);
+        
+        return message.GetHeaders().SetHeader("Date", date.ToString(NPT_DateTime::FORMAT_RFC_1123)); 
+    }
+    static NPT_Result GetIfModifiedSince(const NPT_HttpMessage& message,
+                                         NPT_DateTime&          date) {
+        
+        const NPT_String* value = 
+        message.GetHeaders().GetHeaderValue("If-Modified-Since");
+        if (!value) return NPT_FAILURE;
+        
+        // Try RFC 1123, RFC 1036, then ANSI
+        if (NPT_SUCCEEDED(date.FromString(*value, NPT_DateTime::FORMAT_RFC_1123))) 
+            return NPT_SUCCESS;
+        if (NPT_SUCCEEDED(date.FromString(*value, NPT_DateTime::FORMAT_RFC_1036)))
+            return NPT_SUCCESS;
+        return date.FromString(*value, NPT_DateTime::FORMAT_ANSI);
+    }            
+    static NPT_Result SetIfModifiedSince(NPT_HttpMessage&    message,
+                                         const NPT_DateTime& date) {
+        return message.GetHeaders().SetHeader(
+                                              "If-Modified-Since",
+                                              date.ToString(NPT_DateTime::FORMAT_RFC_1123));
+    }
+    static NPT_Result GetMX(const NPT_HttpMessage& message, 
+                            NPT_UInt32&            value) { 
+        value = 0;
+        const NPT_String* mx = 
+        message.GetHeaders().GetHeaderValue("MX");
+        NPT_CHECK_POINTER(mx);
+        return NPT_ParseInteger32(*mx, value, false); // no relax to be UPnP compliant
+    }
+    static NPT_Result SetMX(NPT_HttpMessage& message, 
+                            const NPT_UInt32 mx) {
+        return message.GetHeaders().SetHeader(
+                                              "MX", 
+                                              NPT_String::FromInteger(mx)); 
+    }
+    static NPT_Result GetSeq(const NPT_HttpMessage& message,  
+                             NPT_UInt32&      value) { 
+        value = 0;
+        const NPT_String* seq = 
+        message.GetHeaders().GetHeaderValue("SEQ");
+        NPT_CHECK_POINTER(seq);
+        return NPT_ParseInteger32(*seq, value);
+    }
+    static NPT_Result SetSeq(NPT_HttpMessage& message, 
+                             const NPT_UInt32 seq) {
+        return message.GetHeaders().SetHeader(
+                                              "SEQ", 
+                                              NPT_String::FromInteger(seq)); 
+    }
+    static const char* GenerateUUID(int         count, 
+                                    NPT_String& uuid) {   
+        uuid = "";
+        for (int i=0;i<(count<100?count:100);i++) {
+            int random = NPT_System::GetRandomInteger();
+            uuid += (char)((random % 25) + 66);
+        }
+        return uuid;
+    }
+    
+    static const char* GenerateSerialNumber(NPT_String& sn, int count = 40) {
+        sn = "{";
+        for (int i=0;i<count;i++) {
+            char nibble = (char)(NPT_System::GetRandomInteger() % 16);
+            sn += (nibble < 10) ? ('0' + nibble) : ('a' + (nibble-10));
+        }
+        sn += "}";
+        return sn;
+    }
+    static const char* GenerateGUID(NPT_String& guid) {   
+        guid = "";
+        for (int i=0;i<32;i++) {
+            char nibble = (char)(NPT_System::GetRandomInteger() % 16);
+            guid += (nibble < 10) ? ('0' + nibble) : ('a' + (nibble-10));
+            if (i == 7 || i == 11 || i == 15 || i == 19) {
+                guid += '-';
+            }
+        }
+        return guid;
+    }
+    static NPT_Result ExtractLeaseTime(const NPT_String& cache_control, 
+                                       NPT_TimeInterval& lease) {
+        NPT_Int32 value;
+        if (cache_control.StartsWith("max-age=", true) &&
+            NPT_SUCCEEDED(NPT_ParseInteger32(cache_control.GetChars()+8, 
+                                             value))) {
+            lease.SetSeconds(value);
+            return NPT_SUCCESS;
+        }
+        return NPT_FAILURE;
+    }
+    static NPT_Result ExtractTimeOut(const char* timeout, 
+                                     NPT_Int32&  len) {
+        NPT_String temp = timeout;
+        if (temp.CompareN("Second-", 7, true)) {
+            return NPT_ERROR_INVALID_FORMAT;
+        }
+        
+        if (temp.Compare("Second-infinite", true) == 0) {
+            len = NPT_TIMEOUT_INFINITE;
+            return NPT_SUCCESS;
+        }
+        return temp.SubString(7).ToInteger(len);
+    }
+    static NPT_Result GetIPAddresses(NPT_List<NPT_IpAddress>& ips, 
+                                     bool with_localhost = false) {
+        NPT_List<NPT_NetworkInterface*> if_list;
+        NPT_CHECK(GetNetworkInterfaces(if_list, with_localhost));
+        
+        NPT_List<NPT_NetworkInterface*>::Iterator iface = if_list.GetFirstItem();
+        while (iface) {
+            NPT_IpAddress ip = (*(*iface)->GetAddresses().GetFirstItem()).GetPrimaryAddress();
+            if (ip.ToString().Compare("0.0.0.0") && 
+                (with_localhost || ip.ToString().Compare("127.0.0.1"))) {
+                ips.Add(ip);
+            }
+            ++iface;
+        }
+        
+        if (with_localhost && !ips.Find(NPT_IpAddressFinder(NPT_IpAddress(127, 0, 0, 1)))) {
+            NPT_IpAddress localhost;
+            localhost.Parse("127.0.0.1");
+            ips.Add(localhost);
+        }
+        
+        if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
+        return NPT_SUCCESS;
+    }
+    
+    static NPT_Result GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& if_list, 
+                                           bool with_localhost = false) {
+        NPT_CHECK(_GetNetworkInterfaces(if_list, with_localhost, false));
+        
+        // if no valid interfaces or if requested, add localhost interface
+        if (if_list.GetItemCount() == 0) {
+            NPT_CHECK(_GetNetworkInterfaces(if_list, true, true));
+        }
+        return NPT_SUCCESS;
+    }
+    
+	static NPT_Result GetMACAddresses(NPT_List<NPT_String>& addresses) {
+        NPT_List<NPT_NetworkInterface*> if_list;
+        NPT_CHECK(GetNetworkInterfaces(if_list));
+        
+        NPT_List<NPT_NetworkInterface*>::Iterator iface = if_list.GetFirstItem();
+        while (iface) {
+            NPT_String ip = (*(*iface)->GetAddresses().GetFirstItem()).GetPrimaryAddress().ToString();
+            if (ip.Compare("0.0.0.0") && ip.Compare("127.0.0.1")) {
+				addresses.Add((*iface)->GetMacAddress().ToString());
+            }
+            ++iface;
+        }
+        
+        if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
+        return NPT_SUCCESS;
+    }
+    
+    
+	static bool IsLocalNetworkAddress(const NPT_IpAddress& address) {
+		if (address.ToString() == "127.0.0.1") return true;
+        
+		NPT_List<NPT_NetworkInterface*> if_list;
+        NPT_NetworkInterface::GetNetworkInterfaces(if_list);
+        
+		NPT_List<NPT_NetworkInterface*>::Iterator iface = if_list.GetFirstItem();
+        while (iface) {
+			if((*iface)->IsAddressInNetwork(address)) return true;
+            ++iface;
+        }
+        
+		if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
+		return false;
+	}
+    
+private:
+    
+    static NPT_Result _GetNetworkInterfaces(NPT_List<NPT_NetworkInterface*>& if_list,
+                                            bool include_localhost = false,
+                                            bool only_localhost = false) {
+        NPT_List<NPT_NetworkInterface*> _if_list;
+        NPT_CHECK(NPT_NetworkInterface::GetNetworkInterfaces(_if_list));
+        
+        NPT_NetworkInterface* iface;
+        while (NPT_SUCCEEDED(_if_list.PopHead(iface))) {
+            // only interested in non PTP & multicast capable interfaces
+            if ((iface->GetAddresses().GetItemCount() == 0) ||
+                !(iface->GetFlags() & NPT_NETWORK_INTERFACE_FLAG_MULTICAST) ||
+                 (iface->GetFlags() & NPT_NETWORK_INTERFACE_FLAG_POINT_TO_POINT)) {
+                delete iface;
+                continue;
+            }
+            
+            NPT_String ip = iface->GetAddresses().GetFirstItem()->GetPrimaryAddress().ToString();
+            
+            if (iface->GetFlags() & NPT_NETWORK_INTERFACE_FLAG_LOOPBACK) {
+                if (include_localhost || only_localhost) {
+                    if_list.Add(iface);
+                    continue;
+                }
+            } else if (ip.Compare("0.0.0.0") && !only_localhost) {
+                if_list.Add(iface);
+                continue;
+            }
+            
+            delete iface;
+        }
+        
+        // cleanup any remaining items in list if we breaked early
+        _if_list.Apply(NPT_ObjectDeleter<NPT_NetworkInterface>());
+        return NPT_SUCCESS;
+    }
+};
+
+#endif // _PLT_UTILITIES_H_
+
+
+
+
+
+
+
+
+

gpac-0.5.0.svn4668.tar.bz2/extra_lib/include/platinum/PltVersion.h -> gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltVersion.h Changed

@@ -2,7 +2,7 @@
 |
 |   Platinum - Version Info
 |
-| Copyright (c) 2004-2008, Plutinosoft, LLC.
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
 | All rights reserved.
 | http://www.plutinosoft.com
 |
@@ -17,6 +17,7 @@
 | licensed software under version 2, or (at your option) any later
 | version, of the GNU General Public License (the "GPL") must enter
 | into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
 | 
 | This program is distributed in the hope that it will be useful,
 | but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,14 +36,9 @@
 #define _PLT_VERSION_H_
 
 /*----------------------------------------------------------------------
-|   includes
-+---------------------------------------------------------------------*/
-#include "PltSvnVersion.h"
-
-/*----------------------------------------------------------------------
 |   constants
 +---------------------------------------------------------------------*/
-#define PLT_PLATINUM_SDK_VERSION            0x00050400
-#define PLT_PLATINUM_SDK_VERSION_STRING     "0.5.4.0"
+#define PLT_PLATINUM_SDK_VERSION            0x00010411
+#define PLT_PLATINUM_SDK_VERSION_STRING     "1.0.4.11"
 
 #endif // _PLT_VERSION_H_

gpac-0.5.0.svn5178.tar.bz2/extra_lib/include/platinum/PltXbox360.h Added

@@ -0,0 +1,73 @@
+/*****************************************************************
+|
+|   Platinum - XBox 360
+|
+| Copyright (c) 2004-2010, Plutinosoft, LLC.
+| All rights reserved.
+| http://www.plutinosoft.com
+|
+| This program is free software; you can redistribute it and/or
+| modify it under the terms of the GNU General Public License
+| as published by the Free Software Foundation; either version 2
+| of the License, or (at your option) any later version.
+|
+| OEMs, ISVs, VARs and other distributors that combine and 
+| distribute commercially licensed software with Platinum software
+| and do not wish to distribute the source code for the commercially
+| licensed software under version 2, or (at your option) any later
+| version, of the GNU General Public License (the "GPL") must enter
+| into a commercial license agreement with Plutinosoft, LLC.
+| licensing@plutinosoft.com
+| 
+| This program is distributed in the hope that it will be useful,
+| but WITHOUT ANY WARRANTY; without even the implied warranty of
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+| GNU General Public License for more details.
+|
+| You should have received a copy of the GNU General Public License
+| along with this program; see the file LICENSE.txt. If not, write to
+| the Free Software Foundation, Inc., 
+| 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+| http://www.gnu.org/licenses/gpl-2.0.html
+|
+****************************************************************/
+
+#ifndef _PLT_XBOX360_H_
+#define _PLT_XBOX360_H_
+
+/*----------------------------------------------------------------------
+|   includes
++---------------------------------------------------------------------*/
+#include "PltMediaRenderer.h"
+
+class PLT_Xbox360 : public PLT_MediaRenderer
+{
+public:
+    PLT_Xbox360(const char*  uuid        = NULL, 
+                unsigned int port        = 0,
+                bool         port_rebind = false);
+
+protected:
+    // PLT_DeviceHost methods
+    virtual NPT_Result SetupServices();
+    virtual NPT_Result SetupIcons();
+    virtual NPT_Result InitServiceURLs(PLT_Service* service, const char* service_name);
+    
+    virtual NPT_Result Announce(PLT_DeviceData*  device, 
+                                NPT_HttpRequest& request, 
+                                NPT_UdpSocket&   socket, 
+                                bool             byebye);
+
+    // PLT_DeviceData methods
+    virtual NPT_Result GetDescription(NPT_String& desc) { return PLT_MediaRenderer::GetDescription(desc); }
+    virtual NPT_Result GetDescription(NPT_XmlElementNode*  parent, 
+                                      NPT_XmlElementNode** device = NULL);
+
+protected:
+    virtual ~PLT_Xbox360();
+
+    virtual NPT_Result AnnouncePresence(NPT_UdpSocket& socket, 
+                                        const char*    serial_number);
+};
+
+#endif /* _PLT_XBOX360_H_ */

gpac-0.5.0.svn5178.tar.bz2/fixEOL.sh Added

gpac-0.5.0.svn4668.tar.bz2/gui/gui.bt -> gpac-0.5.0.svn5178.tar.bz2/gui/gui.bt Changed

gpac-0.5.0.svn4668.tar.bz2/gui/gui.js -> gpac-0.5.0.svn5178.tar.bz2/gui/gui.js Changed

@@ -31,6 +31,17 @@
 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 = [];
 
@@ -60,8 +71,10 @@
 
 function on_movie_time(value)
 {
+  var diff = current_time - value;
+  if (diff<0) diff = -diff;
   /*filter out every 1/2 seconds*/
-  if (current_time+0.5 > value) return;
+  if (diff < 0.5) return;
   current_time = value;
   player_control.set_time(value);
   if (UPnP_Enabled) UPnP.MovieTime = value;
@@ -229,7 +242,9 @@
 {
    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;
@@ -268,11 +283,16 @@
 
     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].addEventListener('gpac_scene_attached', movie.children[0].on_size, 0);
 
     movie.children[0].on_media_progress = function(evt) {
      if (!current_duration) return;
@@ -281,13 +301,22 @@
      var percent_playback = 100.0 * current_time / current_duration;
      //alert('URL data ' + percent_dload + ' - ' + percent_playback + ' playback');     
     }
-    movie.children[0].addEventListener('progress', movie.children[0].on_media_progress, 0);
 
     movie.children[0].on_media_playing = function(evt) {
-     alert('URL is now paying');     
+     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');     
@@ -414,7 +443,6 @@
       if (url.indexOf('://')<0) set_movie_url('gpac://'+url);
       else set_movie_url(url);
     } else {
-//     show_dock(true);
         player_control.show();
   }
 }
@@ -437,7 +465,7 @@
     test_resource.on_attached = function(evt) {
 
       this.callback_done = true;
-      var current_url = this.url[0];
+      current_url = this.url[0];
       
       /*process the error or connect service*/
       if (evt.error) {
@@ -445,17 +473,13 @@
         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;
 
-        if (!movie_connected) {
-          if (!gpac.fullscreen) {
-           compute_movie_size(evt.width, evt.height);
-          }
-          movie_connected = true;
-          gpac.set_3d(evt.type3d ? 1 : 0);
-        }
+        movie.children[0].on_size(evt);
       }
       /*destroy the resource node*/
       this.url.length = 0;
@@ -464,6 +488,7 @@
       this.on_attached = null;
       
     }
+
     /*get notified when service loads or fails*/
     test_resource.addEventListener('gpac_scene_attached', test_resource.on_attached, 0);
 
@@ -495,8 +520,10 @@
 //performs layout on all contents
 function layout() 
 {
-  var i, list, start_x;
-  player_control.set_size(display_width, player_control.height);
+  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);
@@ -587,76 +614,106 @@
     wnd.snd_low = null;
     wnd.snd_ctrl = null;
   }
-
-  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;
-  } 
   
-  if (1) {
-    wnd.stop = gw_new_icon_button(wnd.infobar, 'icons/media-playback-stop.svg', 'Stop', 'icon');
-    wnd.stop.on_click = function() {
-     player_control.stoped_url = ''+current_url;
+  
+  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; 
-     player_control.media_line.set_value(0);
-     player_control.play.switch_icon(1);
-    }
-    wnd.stop.set_size(small_control_icon_size, small_control_icon_size);
-  } else {
-    wnd.stop = 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.play.state = 0;
-  wnd.play.add_icon('icons/media-playback-pause.svg');
-  wnd.play.on_click = function() {
-   if (!movie_connected && !controlled_renderer) return;
-   if (player_control.stoped_url) {
+     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(player_control.stoped_url);
+     set_movie_url(this.stoped_url);
     }
-    player_control.stoped_url = null;
-    this.state = 0;
-    movie_ctrl.mediaStartTime = -1; 
-   } else if (movie_ctrl.mediaSpeed != 1) {
-     this.state = 0;
-   } else {
-    this.state = this.state ? 0 : 1;
+    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; 
    }
-   this.switch_icon(this.state);
-   if (this.state) {
-    if (controlled_renderer) controlled_renderer.Pause();
-    movie_ctrl.mediaSpeed = 0; 
-   } else {
+   
+  
+   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);
   }
-  wnd.play.on_long_click = function () { 
-    var cur_url = current_url;
-    set_movie_url(''); 
-    set_movie_url(cur_url); 
+  
+  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;
+     }
+    }
+    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;
@@ -667,15 +724,24 @@
    }
    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;
    }   
@@ -693,26 +759,22 @@
   wnd.time.set_size(control_icon_size, control_icon_size);
   wnd.time.set_width(4*wnd.time.font_size() );
   
-  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) {
-      movie_ctrl.mediaSpeed = 2*movie_ctrl.mediaSpeed;
-     }
+  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;
     }
-    wnd.forward.set_size(small_control_icon_size, small_control_icon_size);
+    wnd.loop.set_size(small_control_icon_size, small_control_icon_size);
   } else {
-    wnd.forward = null;
+    wnd.loop = null;
   }
-  if (1) {
-    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);
-  } else {
-    wnd.view = 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');
@@ -763,12 +825,12 @@
    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) min_w += this.exit.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;
@@ -776,21 +838,32 @@
 
    if (this.view) {
      this.view.hide();
-     if (movie_connected && (gpac.navigation_type!= GF_NAVIGATE_TYPE_NONE) ) {
+     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.stop) full_w+= this.stop.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();
+    }
+   } 
+
    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);
@@ -800,8 +873,9 @@
      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 (this.stop) this.stop.show();
      if (wnd.fullscreen) wnd.fullscreen.show();
   	 
      if (this.remote) {
@@ -812,7 +886,7 @@
       }
   	 }
   	 
-     if (this.view && movie_connected && (gpac.navigation_type!= GF_NAVIGATE_TYPE_NONE) ) {
+     if (this.view && !dynamic_scene && movie_connected && (gpac.navigation_type!= GF_NAVIGATE_TYPE_NONE) ) {
       this.view.show();
      }
    } else {
@@ -822,6 +896,7 @@
      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();
   	 
@@ -853,25 +928,29 @@
   wnd.duration = 0;
   wnd.set_duration = function(value) { 
     this.duration = value; 
-    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 (!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 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() );
+      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);
   }
@@ -923,17 +1002,25 @@
   filebrowse.browse(gpac.last_working_directory);  
   
   filebrowse.on_browse = function(value, directory) {
-    if (directory) gpac.last_working_directory = directory;
-    set_movie_url(value);
-    show_dock(false);
+    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);
+    }
  }
+ 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);
 
- filebrowse.set_size(display_width, display_height);
+ player_control.hide();
  gpacui_show_window(filebrowse);
 
-  set_movie_url('');
-//	filebrowse.set_alpha(0.8);
-
+ filebrowse.prev_state = player_control.state;
+ player_control.set_state(GF_STATE_PAUSE);
 }
 
 urldlg = null;

gpac-0.5.0.svn4668.tar.bz2/gui/gwlib.js -> gpac-0.5.0.svn5178.tar.bz2/gui/gwlib.js Changed

@@ -420,7 +420,7 @@
 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.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);
@@ -1822,8 +1822,11 @@
      }
      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 = 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;
@@ -1856,6 +1859,10 @@
     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  ) {
@@ -1920,6 +1927,11 @@
    }
   }
 
+  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() {

gpac-0.5.0.svn4668.tar.bz2/gui/mpegu-core.js -> gpac-0.5.0.svn5178.tar.bz2/gui/mpegu-core.js Changed

@@ -851,7 +851,7 @@
 // if yes, remove it from the list
 //
 function wmjs_standard_service_remove(device) {
-    var service = device.FindService("urn:mpeg:mpeg-u:standard-service:widget-manager:1");
+    var service = device.FindService("urn:mpeg-u:service:widget-manager:1");
     if (service != null) {
         var i = WidgetManager.MPEGUStandardServiceProviders.indexOf(device);
         if (i >= 0) {
@@ -865,7 +865,7 @@
 // add a migration service provider to the list and remember the service in the device
 //
 function wmjs_standard_service_add(device) {
-    var service = device.FindService("urn:mpeg:mpeg-u:standard-service:widget-manager:1");
+    var service = device.FindService("urn:mpeg-u:service:widget-manager:1");
     if (service != null) {
         log(l_err, "migration service add "+device.Name);
         WidgetManager.MPEGUStandardServiceProviders.push(device);
@@ -894,15 +894,15 @@
     var name = "MPEG-U";
     var option = gpac.getOption('General', 'DeviceName');
     if (option) name = option;
-    WidgetManager.device = UPnP.CreateDevice("urn:mpeg:mpeg-u:standard-service:widget-manager:1", name+"@"+gpac.hostname);
+    WidgetManager.device = UPnP.CreateDevice("urn:mpeg-u:device:widget-manager:1", name+"@"+gpac.hostname);
     WidgetManager.device.enabled = 1;
     /* implement the response to a external call (messageOut of another widget) */
     WidgetManager.device.OnAction = wmjs_widget_standard_service_process_action;
     log(l_err, 'wmjs_create_standard_service');
     //log(l_inf, 'Service scpd ' + standard_service_scpd);
     /* WidgetManager.standardService = */
-    var service = WidgetManager.device.SetupService("MPEG-U_Standard_Service", "urn:mpeg:mpeg-u:standard-service:widget-manager:1",
-            "urn:mpeg:mpeg-u:standard-service:widget-manager:1.001", standard_service_scpd);
+    var service = WidgetManager.device.SetupService("MPEG-U_Standard_Service", "urn:mpeg-u:service:widget-manager:1",
+            "urn:mpeg-u:serviceId:widget-manager:1.001", standard_service_scpd);
     WidgetManager.device.Start();
     WidgetManager.MPEGUStandardServiceProviders = new Array();
     //alert("create_standard_service end");
@@ -1172,7 +1172,7 @@
     name = widget.name.replace(whiteSpaceRegExp, '_');
     if (!widget.device) {
         //log(l_inf,'creating device');
-        widget.device = UPnP.CreateDevice("urn:mpeg:mpeg-u:widget:provider:" + name + ":1", name);
+        widget.device = UPnP.CreateDevice("urn:mpeg-u:device:provider-" + name + ":1", name);
         /* remember the widget in the device */
         widget.device.widget = widget;
         widget.device.enabled = 1;

gpac-0.5.0.svn5178.tar.bz2/gui/webvtt-renderer.js Added

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

gpac-0.5.0.svn4668.tar.bz2/include/gpac/ait.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/ait.h Changed

@@ -1,242 +1,242 @@
-/* 
- * Copyright (c) TELECOM ParisTech 2011
- */
-
-#ifndef _GF_AIT_H_
-#define _GF_AIT_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/mpegts.h>
-#include <gpac/dsmcc.h>
-#include <string.h>
-#include <gpac/bitstream.h>
-
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-
-#define AIT_SECTION_LENGTH_MAX 1021
-#define APPLICATION_TYPE_HTTP_APPLICATION 16
-#define DSMCC_SECTION_LENGTH_MAX 4093
-
-typedef enum {
-	APPLICATION_DESCRIPTOR = 0x00,
-	APPLICATION_NAME_DESCRIPTOR = 0x01,
-	TRANSPORT_PROTOCOL_DESCRIPTOR = 0x02,
-	SIMPLE_APPLICATION_LOCATION_DESCRIPTOR = 0x15,
-	APPLICATION_USAGE_DESCRIPTOR = 0x16,
-	APPLICATION_BOUNDARY_DESCRIPTOR = 0x17,
-} DESCRIPTOR_TAG;
-
-enum ApplicationControlCode {
-	AUTOSTART =				0x01, 
-	PRESENT = 				0x02, 
-	DESTROY =				0x03, 
-	KILL =					0x04,
-	PREFETCH =				0x05,
-	REMOTE = 				0x06,
-	DISABLED =				0x07,
-	PLAYBACK_AUTOSTART =	0x08
-};
-
-enum TransportType {
-	BROADCAST =		0x01,
-	BROADBAND = 	0x03
-};
-
-typedef struct
-{
-	u32 pid;
-	u32 service_id;
-	u8 table_id;
-	Bool section_syntax_indicator;
-	u16 section_length;
-	Bool test_application_flag;
-	u16 application_type;
-	u8 version_number;
-	Bool current_next_indicator;
-	u8 section_number;
-	u8 last_section_number;
-	u16 common_descriptors_length;
-	GF_List * common_descriptors;
-	u16 application_loop_length;
-	GF_List * application_decoded;
-	u32 CRC_32;
-
-} GF_M2TS_AIT;
-
-
-typedef struct
-{
-	ABSTRACT_ES
-	GF_M2TS_SectionFilter *sec;	
-
-} GF_M2TS_AIT_CARRY;
-
-
-typedef struct
-{
-	u32 organisation_id;
-	u16 application_id;
-	u8 application_control_code;
-	u16 application_descriptors_loop_length;
-	GF_List * application_descriptors;
-	u8 application_descriptors_id[50];
-	u8 index_app_desc_id;
-
-}GF_M2TS_AIT_APPLICATION_DECODE;
-
-
-typedef enum {
-	FUTURE_USE = 0x00,
-	CAROUSEL = 0x01,
-	RESERVED = 0x02,
-	TRANSPORT_HTTP = 0x03,
-	DVB_USE = 0x04,
-	TO_REGISTER = 0x100,
-} PROTOCOL_ID;
-
-typedef struct
-{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	u8 application_profiles_length;
-	u16 application_profile;
-	u8 version_major;
-	u8 version_minor;
-	u8 version_micro;
-	Bool service_bound_flag;
-	u8 visibility;
-	u8 application_priority;
-	u8 transport_protocol_label[5];
-
-} GF_M2TS_APPLICATION_DESCRIPTOR;
-
-typedef struct
-{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	u8 usage_type;
-
-} GF_M2TS_APPLICATION_USAGE;
-
-typedef struct
-{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	char* initial_path_bytes;
-
-}GF_M2TS_SIMPLE_APPLICATION_LOCATION;
-
-typedef struct
-{
-	Bool remote_connection;
-	u16 original_network_id;
-	u16 transport_stream_id;
-	u16 service_id;
-	u8 component_tag;
-
-} GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE;
-
-typedef struct{
-
-	u8 URL_extension_length;
-	char* URL_extension_byte;
-
-}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_SELECTOR_BYTE;
-
-typedef struct
-{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	u16 protocol_id;
-	u8 transport_protocol_label;
-	void* selector_byte;
-
-} GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR;
-
-typedef struct
-{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	u32 ISO_639_language_code;
-	u8 application_name_length;
-	char* application_name_char;
-
-} GF_M2TS_APPLICATION_NAME_DESCRIPTOR;
-
-typedef struct
-{
-	u8 boundary_extension_length;
-	char* boundary_extension_byte;
-
-} GF_M2TS_APPLICATION_BOUNDARY_EXTENSION_INFO;
-
-typedef struct
-{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	u8 boundary_extension_count;
-	GF_M2TS_APPLICATION_BOUNDARY_EXTENSION_INFO* boundary_extension_info;
-
-} GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR;
-
-typedef struct
-{	
-	u32 application_id;
-	u8 application_control_code;
-
-	u8 priority;
-	u16 application_profile;
-
-	/* Transport mode - 1 Broadcast - 3 Broadband */
-	Bool broadcast;
-	Bool broadband;
-	char* http_url;
-	char* carousel_url;
-	Bool url_received;
-
-	/* Carousel */
-	u32 carousel_pid;
-	u32 component_tag;
-	
-
-	char* appli_name;
-
-} GF_M2TS_AIT_APPLICATION;
-
-typedef struct
-{
-	u32 service_id;
-	u32 version_number;
-	u32 ait_pid;
-	u32 nb_application;
-	GF_List *Application;	
-
-} GF_M2TS_CHANNEL_APPLICATION_INFO;
-
-void on_ait_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par);
-GF_M2TS_ES *gf_ait_section_new(u32 service_id);
-GF_M2TS_CHANNEL_APPLICATION_INFO* gf_m2ts_get_channel_application_info(GF_List* ChannelAppList, u32 ait_service_id);
-void  gf_m2ts_delete_channel_application_info(GF_M2TS_CHANNEL_APPLICATION_INFO* ChannelApp);
-
-#endif /*GPAC_DISABLE_MPEG2TS*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	//_GF_CAROUSSEL_H_
-
+/* 
+ * Copyright (c) TELECOM ParisTech 2011
+ */
+
+#ifndef _GF_AIT_H_
+#define _GF_AIT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/mpegts.h>
+#include <gpac/dsmcc.h>
+#include <string.h>
+#include <gpac/bitstream.h>
+
+
+#ifndef GPAC_DISABLE_MPEG2TS
+
+
+#define AIT_SECTION_LENGTH_MAX 1021
+#define APPLICATION_TYPE_HTTP_APPLICATION 16
+#define DSMCC_SECTION_LENGTH_MAX 4093
+
+typedef enum {
+	APPLICATION_DESCRIPTOR = 0x00,
+	APPLICATION_NAME_DESCRIPTOR = 0x01,
+	TRANSPORT_PROTOCOL_DESCRIPTOR = 0x02,
+	SIMPLE_APPLICATION_LOCATION_DESCRIPTOR = 0x15,
+	APPLICATION_USAGE_DESCRIPTOR = 0x16,
+	APPLICATION_BOUNDARY_DESCRIPTOR = 0x17,
+} DESCRIPTOR_TAG;
+
+enum ApplicationControlCode {
+	AUTOSTART =				0x01, 
+	PRESENT = 				0x02, 
+	DESTROY =				0x03, 
+	KILL =					0x04,
+	PREFETCH =				0x05,
+	REMOTE = 				0x06,
+	DISABLED =				0x07,
+	PLAYBACK_AUTOSTART =	0x08
+};
+
+enum TransportType {
+	BROADCAST =		0x01,
+	BROADBAND = 	0x03
+};
+
+typedef struct
+{
+	u32 pid;
+	u32 service_id;
+	u8 table_id;
+	Bool section_syntax_indicator;
+	u16 section_length;
+	Bool test_application_flag;
+	u16 application_type;
+	u8 version_number;
+	Bool current_next_indicator;
+	u8 section_number;
+	u8 last_section_number;
+	u16 common_descriptors_length;
+	GF_List * common_descriptors;
+	u16 application_loop_length;
+	GF_List * application_decoded;
+	u32 CRC_32;
+
+} GF_M2TS_AIT;
+
+
+typedef struct
+{
+	ABSTRACT_ES
+	GF_M2TS_SectionFilter *sec;	
+
+} GF_M2TS_AIT_CARRY;
+
+
+typedef struct
+{
+	u32 organisation_id;
+	u16 application_id;
+	u8 application_control_code;
+	u16 application_descriptors_loop_length;
+	GF_List * application_descriptors;
+	u8 application_descriptors_id[50];
+	u8 index_app_desc_id;
+
+}GF_M2TS_AIT_APPLICATION_DECODE;
+
+
+typedef enum {
+	FUTURE_USE = 0x00,
+	CAROUSEL = 0x01,
+	RESERVED = 0x02,
+	TRANSPORT_HTTP = 0x03,
+	DVB_USE = 0x04,
+	TO_REGISTER = 0x100,
+} PROTOCOL_ID;
+
+typedef struct
+{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	u8 application_profiles_length;
+	u16 application_profile;
+	u8 version_major;
+	u8 version_minor;
+	u8 version_micro;
+	Bool service_bound_flag;
+	u8 visibility;
+	u8 application_priority;
+	u8 transport_protocol_label[5];
+
+} GF_M2TS_APPLICATION_DESCRIPTOR;
+
+typedef struct
+{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	u8 usage_type;
+
+} GF_M2TS_APPLICATION_USAGE;
+
+typedef struct
+{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	char* initial_path_bytes;
+
+}GF_M2TS_SIMPLE_APPLICATION_LOCATION;
+
+typedef struct
+{
+	Bool remote_connection;
+	u16 original_network_id;
+	u16 transport_stream_id;
+	u16 service_id;
+	u8 component_tag;
+
+} GF_M2TS_OBJECT_CAROUSEL_SELECTOR_BYTE;
+
+typedef struct{
+
+	u8 URL_extension_length;
+	char* URL_extension_byte;
+
+}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_SELECTOR_BYTE;
+
+typedef struct
+{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	u16 protocol_id;
+	u8 transport_protocol_label;
+	void* selector_byte;
+
+} GF_M2TS_TRANSPORT_PROTOCOL_DESCRIPTOR;
+
+typedef struct
+{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	u32 ISO_639_language_code;
+	u8 application_name_length;
+	char* application_name_char;
+
+} GF_M2TS_APPLICATION_NAME_DESCRIPTOR;
+
+typedef struct
+{
+	u8 boundary_extension_length;
+	char* boundary_extension_byte;
+
+} GF_M2TS_APPLICATION_BOUNDARY_EXTENSION_INFO;
+
+typedef struct
+{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	u8 boundary_extension_count;
+	GF_M2TS_APPLICATION_BOUNDARY_EXTENSION_INFO* boundary_extension_info;
+
+} GF_M2TS_APPLICATION_BOUNDARY_DESCRIPTOR;
+
+typedef struct
+{	
+	u32 application_id;
+	u8 application_control_code;
+
+	u8 priority;
+	u16 application_profile;
+
+	/* Transport mode - 1 Broadcast - 3 Broadband */
+	Bool broadcast;
+	Bool broadband;
+	char* http_url;
+	char* carousel_url;
+	Bool url_received;
+
+	/* Carousel */
+	u32 carousel_pid;
+	u32 component_tag;
+	
+
+	char* appli_name;
+
+} GF_M2TS_AIT_APPLICATION;
+
+typedef struct
+{
+	u32 service_id;
+	u32 version_number;
+	u32 ait_pid;
+	u32 nb_application;
+	GF_List *Application;	
+
+} GF_M2TS_CHANNEL_APPLICATION_INFO;
+
+void on_ait_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par);
+GF_M2TS_ES *gf_ait_section_new(u32 service_id);
+GF_M2TS_CHANNEL_APPLICATION_INFO* gf_m2ts_get_channel_application_info(GF_List* ChannelAppList, u32 ait_service_id);
+void  gf_m2ts_delete_channel_application_info(GF_M2TS_CHANNEL_APPLICATION_INFO* ChannelApp);
+
+#endif /*GPAC_DISABLE_MPEG2TS*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	//_GF_CAROUSSEL_H_
+

gpac-0.5.0.svn4668.tar.bz2/include/gpac/avparse.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/avparse.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/bitstream.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/bitstream.h Changed

@@ -174,7 +174,7 @@
  *	\param bs the target bitstream 
  *	\param delimiter the stop condition
  *  \param out the resulting value
- *  \param max_lengh the maximum length of the output
+ *  \param max_length the maximum length of the output
  *	\return the number of value read.
  */
 u32 gf_bs_read_u8_until_delimiter(GF_BitStream *bs, u8 delimiter, u8* out, u32 max_length);
@@ -508,6 +508,25 @@
  *\return error if any
  */
 GF_Err gf_bs_transfer(GF_BitStream *dst, GF_BitStream *src);
+
+
+/*!
+ *\brief Flushes bitstream contet to disk
+ *
+ *Flushes bitstream contet to disk
+ *\param bs the target bitstream
+ */
+void gf_bs_flush(GF_BitStream *bs);
+
+/*!
+ *\brief Reassigns FILE object for stream-based bitstreams
+ *
+ *Reassigns FILE object for stream-based bitstreams. Automatically sets the stream position to the bitstream position
+ *\param bs the target bitstream
+ *\param stream the new stream to assign
+ */
+void gf_bs_reassign(GF_BitStream *bs, FILE *stream);
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.5.0.svn4668.tar.bz2/include/gpac/cache.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/cache.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/color.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/color.h Changed

@@ -68,6 +68,8 @@
 	char *video_buffer;
 	/*!indicates that the video data reside on systems memory or video card one*/
 	Bool is_hardware_memory;
+	/*!indicates U and V (and optionnal alpha) buffers in case of planar video with seperated component. If not set, all components are in the video_buffer pointer*/
+	char *u_ptr, *v_ptr, *a_ptr;
 } GF_VideoSurface;
 
 /*!\brief Video Window object
@@ -225,13 +227,38 @@
 	u8 high;
 } GF_ColorKey;
 
-/*!\brief not done yet
+/*!\brief stretches two video surfaces
  *
+ * Software stretch of source surface ont destination surface.
+ *\param dst destination surface
+ *\param src source surface
+ *\param dst_wnd destination rectangle. If null the entire destination surface is used
+ *\param src_wnd source rectangle. If null the entire source surface is used
+ *\param alpha blend factor of source over alpha
+ *\param flip flips the source
+ *\param colorKey makes source pixel matching the color key transparent
+ *\param cmat applies color matrix to the source
+ *\return error code if any
  */
 GF_Err gf_stretch_bits(GF_VideoSurface *dst, GF_VideoSurface *src, GF_Window *dst_wnd, GF_Window *src_wnd, u8 alpha, Bool flip, GF_ColorKey *colorKey, GF_ColorMatrix * cmat);
 
 
 
+/*!\brief copies YUV 420 10 bits to YUV destination (only YUV420 8 bits supported)
+ *
+ * Software stretch of source surface ont destination surface.
+ *\param vs_dst destination surface
+ *\param pY source Y plane
+ *\param pU source U plane. if NULL, the U plane is located after the Y plane 
+ *\param pV source V plane. if NULL, the V plane is located after the U plane 
+ *\param src_stride source stride in bytes
+ *\param src_width source width in pixels
+ *\param src_height source height in pixels
+ *\param src_wnd source rectangle. If null the entire source surface is used
+ *\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);
+
 /*! @} */

gpac-0.5.0.svn4668.tar.bz2/include/gpac/compositor.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/compositor.h Changed

@@ -55,7 +55,7 @@
 GF_Err gf_sc_set_scene(GF_Compositor *sr, GF_SceneGraph *scene_graph);
 
 /*if the compositor doesn't use its own thread for visual, this will perform a render pass*/
-Bool gf_sc_draw_frame(GF_Compositor *sr);
+Bool gf_sc_draw_frame(GF_Compositor *sr, u32 *ms_till_next);
 
 /*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);
@@ -68,6 +68,8 @@
 /*return the compositor time - this is the time every time line syncs on*/
 u32 gf_sc_get_clock(GF_Compositor *sr);
 
+//signals the node is about to be destroyed (called after the node destructor if any). If node is NULL, SG will be set to indicate the entire scene graph is about to be reset
+void gf_sc_node_destroy(GF_Compositor *compositor, GF_Node *node, GF_SceneGraph *sg);
 
 /*locks/unlocks the visual scene rendering - modification of the scene tree shall only happen when scene compositor is locked*/
 void gf_sc_lock(GF_Compositor *sr, Bool doLock);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/config_file.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/config_file.h Changed

@@ -57,7 +57,7 @@
  * 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 
  * and other default options.
- *\param fileName name of the configuration file, or NULL for default file
+ *\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
  *\return the configuration file object, NULL if the file could not be created
  */
@@ -101,7 +101,7 @@
  *Saves the configuration file if modified.
  *\param cfgFile the target configuration file
  */
-GF_Err gf_cfg_save(GF_Config *iniFile);
+GF_Err gf_cfg_save(GF_Config *cfgFile);
 /*!
  *	\brief key value query
  *
@@ -198,7 +198,7 @@
  *\param secName the target section
  *\param keyName the name of the target key
  *\param sub_index the 0-based index position of the sub key*/
-const char *gf_cfg_get_sub_key(GF_Config *iniFile, const char *secName, const char *keyName,u32 sub_index);
+const char *gf_cfg_get_sub_key(GF_Config *cfgFile, const char *secName, const char *keyName,u32 sub_index);
 
 /*!
  * Get the full filename associated with this config file
@@ -216,6 +216,16 @@
  */
 GF_Err gf_cfg_set_filename(GF_Config *iniFile, const char * fileName);
 
+
+/*!
+ * Do not save results to file
+ * \param iniFile The Configuration
+ * \return error code
+ */
+GF_Err gf_cfg_discard_changes(GF_Config *iniFile);
+
+/*! @} */
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.0.svn4668.tar.bz2/include/gpac/configuration.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/configuration.h Changed

@@ -31,20 +31,17 @@
 
 /*this file defines all common macros for libgpac compilation
   except for symbian32 which uses .mmp directives ... */
-#if defined(WIN32) || defined(_WIN32_WCE) || defined(GPAC_CONFIG_DARWIN) /*visual studio and xcode*/
 
-/*enables GPAC fixed point*/
-//#define GPAC_FIXED_POINT
+
+/*visual studio and xcode*/
+#if defined(WIN32) || defined(_WIN32_WCE) || defined(GPAC_CONFIG_DARWIN) 
 
 /*enables GPAC memory tracking in debug mode only*/
 #if defined(DEBUG) || defined(_DEBUG)
-//#define GPAC_MEMORY_TRACKING
+#define GPAC_MEMORY_TRACKING
 #endif
 
-/*platform is big endian*/
-//#define GPAC_BIG_ENDIAN
-
-/*SSL enabled*/
+/*SSL enabled - no 64 bit support yet*/
 #if defined(WIN32) && !defined(_WIN64)
 #define GPAC_HAS_SSL
 #endif
@@ -53,45 +50,48 @@
 #define GPAC_HAS_SPIDERMONKEY
 #ifdef GPAC_CONFIG_DARWIN
 #define MOZILLA_1_8_BRANCH
+#define XP_UNIX
 #endif
 
-/*zlib enabled*/
-//#define GPAC_DISABLE_ZLIB
-
 /*libjpeg enabled*/
 #define GPAC_HAS_JPEG
-
 /*pnj enabled*/
 #define GPAC_HAS_PNG
 
 /*IPv6 enabled - for win32, this is evaluated at compile time, !! do not uncomment !!*/
-//#define GPAC_HAS_IPV6
 
-/*3D compositor disabled*/
-#ifdef GPAC_CONFIG_DARWIN
-//#define GPAC_DISABLE_3D
-#endif
 
-/*use TinyGL instead of OpenGL*/
-//#define GPAC_USE_TINYGL
+//iOS compilation
+#if defined(GPAC_CONFIG_DARWIN) && defined(GPAC_IPHONE)
 
-/*use OpenGL ES instead of OpenGL*/
-#ifdef GPAC_CONFIG_DARWIN
 #define GPAC_USE_OGL_ES
 #define GPAC_FIXED_POINT
-#ifdef GPAC_IPHONE
 #define GPAC_HAS_GLU
-#endif
-#endif
-
 
 /*lazy definition of extra libs for iOS*/
-#if defined(GPAC_IPHONE)
 #define GPAC_HAS_FAAD
-#define GPAC_HAS_MAD
+//#define GPAC_HAS_MAD
+#define GPAC_HAS_SDL
+#define GPAC_HAS_FREETYPE
+
+#endif //end iOS flags
+
+
+//OSX compilation
+#if defined(GPAC_CONFIG_DARWIN) && !defined(GPAC_IPHONE)
+
+#define GPAC_HAS_IPV6
+#define GPAC_HAS_SSL
+
+#ifdef __LP64__
+#define GPAC_64_BITS
 #endif
 
+#endif  //end OSX flags
+
 
+
+//WinCE flags
 #if defined(_WIN32_WCE)
 
 #ifndef GPAC_FIXED_POINT
@@ -111,11 +111,11 @@
 #define GPAC_USE_OGL_ES
 #endif
 
-#endif /*_WIN32_WCE*/
+#endif //WinCE flags
 
 
 
-#endif /*defined(WIN32) || defined(_WIN32_WCE)*/
+#endif /*defined(WIN32) || defined(_WIN32_WCE) || defined(GPAC_CONFIG_DARWIN)*/
 
 
 #if defined(__SYMBIAN32__)
@@ -233,5 +233,8 @@
 /*disables dashclient */
 //#define GPAC_DISABLE_DASH_CLIENT
 
+/*disables Timed Text support */
+//#define GPAC_DISABLE_TTXT
+
 #endif		/*_GF_CONFIG_H_*/

gpac-0.5.0.svn4668.tar.bz2/include/gpac/constants.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/constants.h Changed

@@ -226,8 +226,10 @@
 	GF_PIXEL_YUVA		=	GF_4CC('Y', 'U', 'V', 'A'),
 
 	/*!YV12 + Depth plane*/
-	GF_PIXEL_YUVD		=	GF_4CC('Y', 'U', 'V', 'D')
+	GF_PIXEL_YUVD		=	GF_4CC('Y', 'U', 'V', 'D'),
 
+	/*!YUV planar format in 10 bits mode, all components are stored as shorts*/
+	GF_PIXEL_YV12_10		=	GF_4CC('P','0','1','0')
 } GF_PixelFormat;
 
 
@@ -274,6 +276,8 @@
 	GPAC_OTI_VIDEO_HEVC = 0x23,
 	/*!OTI for H264-SVC streams*/
 	GPAC_OTI_VIDEO_SVC = 0x24,
+	/*!OTI for HEVC layered streams*/
+	GPAC_OTI_VIDEO_SHVC = 0x25,
 	/*!OTI for MPEG-4 AAC streams*/
     GPAC_OTI_AUDIO_AAC_MPEG4 = 0x40,
 
@@ -385,6 +389,8 @@
 	GPAC_OTI_PRIVATE_SCENE_EPG = 0xC4,
 	/*!OTI for WGT dummy streams (dsi = null) - GPAC internal*/
 	GPAC_OTI_PRIVATE_SCENE_WGT = 0xC5,
+	/*!OTI for VTT dummy stream (dsi = file name) - GPAC internal*/
+	GPAC_OTI_PRIVATE_SCENE_VTT = 0xC6,
 
 	/*!OTI for streaming SVG - GPAC internal*/
 	GPAC_OTI_SCENE_SVG = 0xD0,
@@ -392,6 +398,12 @@
 	GPAC_OTI_SCENE_SVG_GZ = 0xD1,
 	/*!OTI for DIMS (dsi = 3GPP DIMS configuration) - GPAC internal*/
 	GPAC_OTI_SCENE_DIMS = 0xD2,
+	/*!OTI for streaming VTT - GPAC internal*/
+	GPAC_OTI_SCENE_VTT = 0xD3,
+	/*!OTI for streaming VTT from MP4- GPAC internal*/
+	GPAC_OTI_SCENE_VTT_MP4 = 0xD4,
+	/*!OTI for streaming simple text from MP4- GPAC internal*/
+	GPAC_OTI_SCENE_SIMPLE_TEXT_MP4 = 0xD5,
 
 /*!
  * \brief OGG ObjectTypeIndication
@@ -512,7 +524,7 @@
  */
 enum
 {
-	/*!S: is-Scene: DIMS unit contains a complete document (<svg>*/
+	/*!S: is-Scene: DIMS unit contains a complete document (svg)*/
 	GF_DIMS_UNIT_S = 1,
 	/*!M: is-RAP: DIMS unit is a random access point*/
 	GF_DIMS_UNIT_M = 1<<1,

gpac-0.5.0.svn4668.tar.bz2/include/gpac/dash.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/dash.h Changed

@@ -1,245 +1,300 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Adaptive HTTP Streaming 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_DASH_H_
-#define _GF_DASH_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/tools.h>
-
-#ifndef GPAC_DISABLE_DASH_CLIENT
-
-/*!
- * All the possible Mime-types for MPD files
- */
-static const char * GF_DASH_MPD_MIME_TYPES[] = { "application/dash+xml", "video/vnd.3gpp.mpd", "audio/vnd.3gpp.mpd", NULL };
-
-/*!
- * All the possible Mime-types for M3U8 files
- */
-static const char * GF_DASH_M3U8_MIME_TYPES[] = { "video/x-mpegurl", "audio/x-mpegurl", "application/x-mpegurl", "application/vnd.apple.mpegurl", NULL};
-
-typedef enum 
-{
-	/*event sent if an error occurs when setting up manifest*/
-	GF_DASH_EVENT_MANIFEST_INIT_ERROR,
-	/*event sent before groups first segment is fetched - user shall decide which group to select at this point*/
-	GF_DASH_EVENT_SELECT_GROUPS,
-	/*event sent if an error occurs during period setup - the download thread will exit at this point*/
-	GF_DASH_EVENT_PERIOD_SETUP_ERROR,
-	/*event sent once the first segment of each selected group is fetched - user should load playback chain(s) at this point*/
-	GF_DASH_EVENT_CREATE_PLAYBACK,
-	/*event sent when reseting groups at period switch or at exit - user should unload playback chain(s) at this point*/
-	GF_DASH_EVENT_DESTROY_PLAYBACK,
-
-	GF_DASH_EVENT_BUFFERING,
-	GF_DASH_EVENT_BUFFER_DONE,
-} GF_DASHEventType;
-
-/*structure used for all IO operations for DASH*/
-typedef struct _gf_dash_io GF_DASHFileIO;
-typedef void *GF_DASHFileIOSession;
-
-struct _gf_dash_io
-{
-	/*user private data*/
-	void *udta;
-	
-	/*signals errors or specific actions to perform*/
-	GF_Err (*on_dash_event)(GF_DASHFileIO *dashio, GF_DASHEventType evt, GF_Err setup_error);
-
-	/*called whenever a file has to be deleted*/
-	void (*delete_cache_file)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url);
-
-	/*create a file download session for the given resource - group_idx may be -1 if this is a global resource , otherwise it indicates the group/adaptationSet in which the download happens*/
-	GF_DASHFileIOSession (*create)(GF_DASHFileIO *dashio, Bool persistent, const char *url, s32 group_idx);
-	/*delete a file download session*/
-	void (*del)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*aborts downloading in the given file session*/
-	void (*abort)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*resetup the file session with a new resource to get - this allows persistent connection usage with HTTP servers*/
-	GF_Err (*setup_from_url)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url, s32 group_idx);
-	/*set download range for the file session*/
-	GF_Err (*set_range)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache);
-	/*initialize the file session - all the headers shall be fetched before returning*/
-	GF_Err (*init)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*download the content - synchronous call: all the file shall be fetched before returning*/
-	GF_Err (*run)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-
-	/*get URL of the file - 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 
-	the client request file to play*/
-	const char *(*get_cache_name)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the MIME type of the file*/
-	const char *(*get_mime)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the average download rate for the session*/
-	u32 (*get_bytes_per_sec)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-	/*get the totla size on bytes for the session*/
-	u32 (*get_total_size)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
-};
-
-typedef struct __dash_client GF_DashClient;
-
-typedef enum
-{
-	GF_DASH_SELECT_QUALITY_LOWEST,
-	GF_DASH_SELECT_QUALITY_HIGHEST,
-	GF_DASH_SELECT_BANDWIDTH_LOWEST,
-	GF_DASH_SELECT_BANDWIDTH_HIGHEST
-} GF_DASHInitialSelectionMode;
-
-/*create a new DASH client:
-	@dash_io: DASH callbacks to the user
-	@max_cache_duration: maximum duration in milliseconds for the cached media. If less than mpd@minBufferTime, mpd@minBufferTime is used
-	@auto_switch_count: forces representation switching every auto_switch_count segments
-	@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
-*/
-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);
-
-/*delete the DASH client*/
-void gf_dash_del(GF_DashClient *dash);
-
-/*open the DASH client for the specific manifest file*/
-GF_Err gf_dash_open(GF_DashClient *dash, const char *manifest_url);
-/*closes the dash client*/
-void gf_dash_close(GF_DashClient *dash);
-
-/*returns URL of the DASH manifest file*/
-const char *gf_dash_get_url(GF_DashClient *dash);
-
-/*get title and source for this MPD*/
-void gf_dash_get_info(GF_DashClient *dash, const char **title, const char **source);
-
-/*switches quality up or down*/
-void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool force_immediate_switch);
-
-/*indicates whether the DASH client is running or not. For the moment, the DASH client is always run by an internal thread*/
-Bool gf_dash_is_running(GF_DashClient *dash);
-
-/*get duration of the presentation*/
-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);
-
-
-/*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);
-/*associate user data (or NULL) with this group*/
-GF_Err gf_dash_set_group_udta(GF_DashClient *dash, u32 group_index, void *udta);
-/*returns the user data associated with this group*/
-void *gf_dash_get_group_udta(GF_DashClient *dash, u32 group_index);
-/*indicates whether a group is selected for playback or not. Currently groups cannot be selected during playback*/
-Bool gf_dash_is_group_selected(GF_DashClient *dash, u32 group_index);
-
-/*selects a group for playback. If other groups are alternate to this group (through the @group attribute), they are automatically deselected. */
-void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select);
-
-/*performs selection of representations based on language code*/
-void gf_dash_groups_set_language(GF_DashClient *dash, const char *lang_3cc);
-
-/*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. 
-If switching occured, sets switching_index to the new representation index.
-If no bitstream switching is possible, also set the url and byte range of the media file required to intialize 
-the playback of the next segment
-original_url is optional and may be used to het the URI of the segment
-*/
-GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, 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);
-
-/*same as gf_dash_group_get_next_segment_location but query the current downloaded segment*/
-GF_EXPORT
-GF_Err gf_dash_group_probe_current_download_segment_location(GF_DashClient *dash, u32 idx, const char **url, s32 *switching_index, const char **switching_url, const char **original_url);
-
-/*discards the first media resource in the queue of this group*/
-void gf_dash_group_discard_segment(GF_DashClient *dash, u32 idx);
-/*get the number of media resources available in the cache for this group*/
-u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 idx, Bool *group_is_done);
-/*get the maximum number of media resources  that can be put in the cache for this group*/
-u32 gf_dash_group_get_max_segments_in_cache(GF_DashClient *dash, u32 idx);
-/*indicates to the DASH engine that the group playback has been stopped by the user*/
-void gf_dash_set_group_done(GF_DashClient *dash, u32 idx, Bool done);
-/*gets presentationTimeOffset and timescale for the active representation*/
-GF_Err gf_dash_group_get_presentation_time_offset(GF_DashClient *dash, u32 idx, u64 *presentation_time_offset, u32 *timescale);
-
-/*returns 1 if the playback position is in the last period of the presentation*/
-Bool gf_dash_in_last_period(GF_DashClient *dash);
-/*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
-*/
-u32 gf_dash_get_period_switch_status(GF_DashClient *dash);
-/*request period switch - this is typically called when the media engine signals that no more data is available for playback*/
-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*/
-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);
-
-/*returns the start_time of the first segment in the queue (usually the one being played)*/
-Double gf_dash_group_current_segment_start_time(GF_DashClient *dash, u32 idx);
-
-/*allow reloading of MPD on the local file system - usefull for testing live generators*/
-void gf_dash_allow_local_mpd_update(GF_DashClient *dash, Bool allow_local_mpd_update);
-
-/*gets media info for representation*/
-GF_Err gf_dash_group_get_representation_info(GF_DashClient *dash, u32 idx, u32 representation_idx, u32 *width, u32 *height, u32 *audio_samplerate, u32 *bandwidth, const char **codecs);
-
-void gf_dash_get_buffer_info_buffering(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered);
-
-#endif //GPAC_DISABLE_DASH_CLIENT
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	/*_GF_DASH_H_*/
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre 
+ *			Copyright (c) Telecom ParisTech 2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Adaptive HTTP Streaming 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_DASH_H_
+#define _GF_DASH_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/tools.h>
+
+#ifndef GPAC_DISABLE_DASH_CLIENT
+
+/*!
+ * All the possible Mime-types for MPD files
+ */
+static const char * GF_DASH_MPD_MIME_TYPES[] = { "application/dash+xml", "video/vnd.3gpp.mpd", "audio/vnd.3gpp.mpd", NULL };
+
+/*!
+ * All the possible Mime-types for M3U8 files
+ */
+static const char * GF_DASH_M3U8_MIME_TYPES[] = { "video/x-mpegurl", "audio/x-mpegurl", "application/x-mpegurl", "application/vnd.apple.mpegurl", NULL};
+
+typedef enum 
+{
+	/*event sent if an error occurs when setting up manifest*/
+	GF_DASH_EVENT_MANIFEST_INIT_ERROR,
+	/*event sent before groups first segment is fetched - user shall decide which group to select at this point*/
+	GF_DASH_EVENT_SELECT_GROUPS,
+	/*event sent if an error occurs during period setup - the download thread will exit at this point*/
+	GF_DASH_EVENT_PERIOD_SETUP_ERROR,
+	/*event sent once the first segment of each selected group is fetched - user should load playback chain(s) at this point*/
+	GF_DASH_EVENT_CREATE_PLAYBACK,
+	/*event sent when reseting groups at period switch or at exit - user should unload playback chain(s) at this point*/
+	GF_DASH_EVENT_DESTROY_PLAYBACK,
+
+	GF_DASH_EVENT_BUFFERING,
+	GF_DASH_EVENT_BUFFER_DONE,
+
+	GF_DASH_EVENT_SEGMENT_AVAILABLE,
+} GF_DASHEventType;
+
+/*structure used for all IO operations for DASH*/
+typedef struct _gf_dash_io GF_DASHFileIO;
+typedef void *GF_DASHFileIOSession;
+
+struct _gf_dash_io
+{
+	/*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);
+
+	/*called whenever a file has to be deleted*/
+	void (*delete_cache_file)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url);
+
+	/*create a file download session for the given resource - group_idx may be -1 if this is a global resource , otherwise it indicates the group/adaptationSet in which the download happens*/
+	GF_DASHFileIOSession (*create)(GF_DASHFileIO *dashio, Bool persistent, const char *url, s32 group_idx);
+	/*delete a file download session*/
+	void (*del)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*aborts downloading in the given file session*/
+	void (*abort)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*resetup the file session with a new resource to get - this allows persistent connection usage with HTTP servers*/
+	GF_Err (*setup_from_url)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *url, s32 group_idx);
+	/*set download range for the file session*/
+	GF_Err (*set_range)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, u64 start_range, u64 end_range, Bool discontinue_cache);
+	/*initialize the file session - all the headers shall be fetched before returning*/
+	GF_Err (*init)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*download the content - synchronous call: all the file shall be fetched before returning*/
+	GF_Err (*run)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+
+	/*get URL of the file - 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 
+	the client request file to play*/
+	const char *(*get_cache_name)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*get the MIME type of the file*/
+	const char *(*get_mime)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*get the given hedaer value in the last HTTP response. Function is optional*/
+	const char *(*get_header_value)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *header_name);
+	/*gets the UTC time at which reply has been received. Function is optional*/
+	u64 (*get_utc_start_time)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*get the average download rate for the session*/
+	u32 (*get_bytes_per_sec)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*get the total size on bytes for the session*/
+	u32 (*get_total_size)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+	/*get the total size on bytes for the session*/
+	u32 (*get_bytes_done)(GF_DASHFileIO *dashio, GF_DASHFileIOSession session);
+};
+
+typedef struct __dash_client GF_DashClient;
+
+typedef enum
+{
+	GF_DASH_SELECT_QUALITY_LOWEST,
+	GF_DASH_SELECT_QUALITY_HIGHEST,
+	GF_DASH_SELECT_BANDWIDTH_LOWEST,
+	GF_DASH_SELECT_BANDWIDTH_HIGHEST
+} GF_DASHInitialSelectionMode;
+
+/*create a new DASH client:
+	@dash_io: DASH callbacks to the user
+	@max_cache_duration: maximum duration in milliseconds for the cached media. If less than mpd@minBufferTime, mpd@minBufferTime is used
+	@auto_switch_count: forces representation switching every auto_switch_count segments
+	@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
+*/
+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);
+
+/*delete the DASH client*/
+void gf_dash_del(GF_DashClient *dash);
+
+/*open the DASH client for the specific manifest file*/
+GF_Err gf_dash_open(GF_DashClient *dash, const char *manifest_url);
+/*closes the dash client*/
+void gf_dash_close(GF_DashClient *dash);
+
+/*returns URL of the DASH manifest file*/
+const char *gf_dash_get_url(GF_DashClient *dash);
+
+/*get title and source for this MPD*/
+void gf_dash_get_info(GF_DashClient *dash, const char **title, const char **source);
+
+/*switches quality up or down*/
+void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool force_immediate_switch);
+
+/*indicates whether the DASH client is running or not. For the moment, the DASH client is always run by an internal thread*/
+Bool gf_dash_is_running(GF_DashClient *dash);
+
+/*get duration of the presentation*/
+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);
+
+
+/*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);
+/*associate user data (or NULL) with this group*/
+GF_Err gf_dash_set_group_udta(GF_DashClient *dash, u32 group_index, void *udta);
+/*returns the user data associated with this group*/
+void *gf_dash_get_group_udta(GF_DashClient *dash, u32 group_index);
+/*indicates whether a group is selected for playback or not. Currently groups cannot be selected during playback*/
+Bool gf_dash_is_group_selected(GF_DashClient *dash, u32 group_index);
+
+/*indicates whether a group can be selected for playback or not. Some groups may have been disabled because of non supported features*/
+Bool gf_dash_is_group_selectable(GF_DashClient *dash, u32 idx);
+
+/*selects a group for playback. If other groups are alternate to this group (through the @group attribute), they are automatically deselected. */
+void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select);
+
+/*performs selection of representations based on language code*/
+void gf_dash_groups_set_language(GF_DashClient *dash, const char *lang_3cc);
+
+/*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. 
+If switching occured, sets switching_index to the new representation index.
+If no bitstream switching is possible, also set the url and byte range of the media file required to intialize 
+the playback of the next segment
+original_url is optional and may be used to het the URI of the segment
+*/
+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
+GF_Err gf_dash_group_probe_current_download_segment_location(GF_DashClient *dash, u32 idx, const char **url, s32 *switching_index, const char **switching_url, const char **original_url, Bool *switched);
+
+/*returns 1 if segment numbers loops at this level (not allowed but happens when looping captures ...*/
+Bool gf_dash_group_loop_detected(GF_DashClient *dash, u32 idx);
+
+/*returns number of seconds at which playback shall start */
+Double gf_dash_group_get_start_range(GF_DashClient *dash, u32 idx);
+
+/*discards the first media resource in the queue of this group*/
+void gf_dash_group_discard_segment(GF_DashClient *dash, u32 idx);
+/*get the number of media resources available in the cache for this group*/
+u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 idx, Bool *group_is_done);
+/*get the maximum number of media resources  that can be put in the cache for this group*/
+u32 gf_dash_group_get_max_segments_in_cache(GF_DashClient *dash, u32 idx);
+/*indicates to the DASH engine that the group playback has been stopped by the user*/
+void gf_dash_set_group_done(GF_DashClient *dash, u32 idx, Bool done);
+/*gets presentationTimeOffset and timescale for the active representation*/
+GF_Err gf_dash_group_get_presentation_time_offset(GF_DashClient *dash, u32 idx, u64 *presentation_time_offset, u32 *timescale);
+
+/*returns 1 if the playback position is in the last period of the presentation*/
+Bool gf_dash_in_last_period(GF_DashClient *dash);
+/*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
+*/
+u32 gf_dash_get_period_switch_status(GF_DashClient *dash);
+/*request period switch - this is typically called when the media engine signals that no more data is available for playback*/
+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*/
+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);
+
+/*returns the start_time of the first segment in the queue (usually the one being played)*/
+Double gf_dash_group_current_segment_start_time(GF_DashClient *dash, u32 idx);
+
+/*allow reloading of MPD on the local file system - usefull for testing live generators*/
+void gf_dash_allow_local_mpd_update(GF_DashClient *dash, Bool allow_local_mpd_update);
+
+/*gets media info for representation*/
+GF_Err gf_dash_group_get_representation_info(GF_DashClient *dash, u32 idx, u32 representation_idx, u32 *width, u32 *height, u32 *audio_samplerate, u32 *bandwidth, const char **codecs);
+
+/*gets media buffering info for all active representations*/
+void gf_dash_get_buffer_info_buffering(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);
+
+/*resync the downloader so that the next downloaded segment falls into the indicated range - used for error recovery*/
+GF_Err gf_dash_resync_to_segment(GF_DashClient *dash, const char *latest_segment_name, const char *earliest_segment_name);
+
+/*sets dash idle interval. The default is 1 sec. The dash client thread will never go to sleep for more than this interval*/
+void gf_dash_set_idle_interval(GF_DashClient *dash, u32 idle_time_ms);
+
+/*enables UTC drift computation using HTTP header "Server-UTC: UTC", where UTC is in ms*/
+void gf_dash_enable_utc_drift_compensation(GF_DashClient *dash, Bool estimate_utc_drift);
+
+/*returns GF-TRUE if MPD is dynamic, false otherwise*/
+Bool gf_dash_is_dynamic_mpd(GF_DashClient *dash);
+
+/*returns minimum buffer time indicated in mpd in ms*/
+u32 gf_dash_get_min_buffer_time(GF_DashClient *dash);
+
+//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 
+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. 
+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. 
+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. 
+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);
+
+#endif //GPAC_DISABLE_DASH_CLIENT
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/*_GF_DASH_H_*/
+

gpac-0.5.0.svn4668.tar.bz2/include/gpac/download.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/download.h Changed

@@ -52,7 +52,7 @@
 #include <gpac/cache.h>
 
 
-    /*!the download manager object. This is usually not used by GPAC modules*/
+	/*!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;
@@ -67,7 +67,7 @@
         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
@@ -130,7 +130,7 @@
     void gf_dm_set_auth_callback(GF_DownloadManager *dm, gf_dm_get_usr_pass get_pass, void *usr_cbk);
 
     /*!downloader session message types*/
-    enum
+    typedef enum
     {
         /*!signal that session is setup and waiting for connection request*/
         GF_NETIO_SETUP = 0,
@@ -156,7 +156,7 @@
         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
@@ -191,8 +191,16 @@
         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;
-        /*response code - only valid for GF_NETIO_PARSE_REPLY. Set to 1 in GF_NETIO_DATA_EXCHANGE to indicate end of chunk transfer*/
+        /*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;
 
     /*!
@@ -227,12 +235,12 @@
      *\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 cache_name cache name
-     *\param error error for failure cases
+     *\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,
@@ -321,7 +329,7 @@
      *\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 If set, forces a new cache entry if byte range are not continuous. Otherwise a single cache entry is used to reconstruct the file
+     *\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);
@@ -335,19 +343,22 @@
 
     /*!
      * \brief Marks the cache file to be deleted once the file is not used anymore by any session
-     * \param entry The cache entry to delete
+     * \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 * dm, const char * url);
+    void gf_dm_delete_cached_file_entry_session(const GF_DownloadSession * sess, const char * url);
 
     /*!
      * Get a range of a cache entry file
-     * \param entry The session
+     * \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
@@ -366,7 +377,16 @@
      *\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, u32 *net_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);
 
 
     /*!
@@ -399,7 +419,7 @@
      *\param sess the download session
      *\return the associated URL
      */
-    const char *gf_dm_sess_get_resource_name(GF_DownloadSession *dnload);
+    const char *gf_dm_sess_get_resource_name(GF_DownloadSession *sess);
     /*!
      *\brief Get session original resource url
      *
@@ -407,7 +427,7 @@
      *\param sess the download session
      *\return the associated URL
      */
-    const char *gf_dm_sess_get_original_resource_name(GF_DownloadSession *dnload);
+    const char *gf_dm_sess_get_original_resource_name(GF_DownloadSession *sess);
 	
 
     /*!
@@ -415,6 +435,8 @@
      * \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,
@@ -425,6 +447,8 @@
      * 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);
@@ -468,7 +492,7 @@
 
     /*!
      * 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.
+	 * 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
@@ -476,6 +500,16 @@
 	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).

gpac-0.5.0.svn4668.tar.bz2/include/gpac/dsmcc.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/dsmcc.h Changed

@@ -1,665 +1,665 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jonathan Sillan
- *			Copyright (c) Telecom ParisTech 2011-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_DSMCC_H_
-#define _GF_DSMCC_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/mpegts.h>
-#include <string.h>
-#include <gpac/bitstream.h>
-
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-
-#define DSMCC_SECTION_LENGTH_MAX 4093
-
-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;
-
-typedef enum{
-	TAG_BIOP =				0x49534F06,
-	TAG_LITE_OPTIONS =		0x49534F05
-}DSMCC_DOWNLOAD_PROFILE_ID_TAG;
-
-typedef enum{
-	CACHING_PRIORITY_DESCRIPTOR		=		0x71,
-	CONTENT_TYPE_DESCRIPTOR			=		0x72,
-	COMPRESSED_MODULE_DESCRIPTOR	=		0x09
-}DSMCC_BIOP_DESCRIPTOR;
-
-typedef struct{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	u32 carousel_id;
-	u8 FormatID;
-	char *private_data_byte;
-	u8 ModuleVersion;
-	u8 ModuleId;
-	u16 BlockSize;
-	u32 ModuleSize;
-	u8 CompressionMethod;
-	u32 OriginalSize;
-	u8 TimeOut;
-	u8 ObjectKeyLength;
-	char* ObjectKeyData;
-}GF_M2TS_CAROUSEL_INDENTIFIER_DESCRIPTOR;
-
-typedef struct
-{
-	u32 moduleId;
-	u32 downloadId;
-	u32 version_number;
-	Bool done;
-}GF_M2TS_DSMCC_PROCESSED;
-
-typedef struct
-{
-	/* Module identifier */
-	u32 moduleId;
-	/* Version number of the module */
-	u32 version_number;
-	/* size in byte of the module */
-	u32 size;
-	/* Download identifier */
-	u32 downloadId;
-	/* buffer of data */
-	char* buffer;
-	/* byte shifting in the buffer of data */
-	u32 byte_sift;
-	/* last section number processed */
-	u16 section_number;
-	/* the last section number of the module */
-	u16 last_section_number;
-	/* size in byte of each block in the module */
-	u32 block_size;
-	/* Checks if the module has been processed */
-	/* 1 if yes */
-	/* 0 otherwise */
-	Bool processed;
-	/* Checks if the module's data are zipped */
-	/* 1 if yes */
-	/* 0 otherwise */
-	Bool Gzip;
-	/* Size of the module's data after uncompression */
-	u32 original_size;
-}GF_M2TS_DSMCC_MODULE;
-
-typedef struct
-{
-	/* table id : identifier for dsmcc message type */
-	u8 table_id;
-	/* indicates the presence of CRC 32 */
-	u8 section_syntax_indicator;
-	u8 private_indicator;
-	/* length in byte of the dsmcc section */
-	u16 dsmcc_section_length;
-	/* linked with the moduleId if carried by the section */
-	u16 table_id_extension;
-	/* version number linked with the Data block if carried by the section */
-	u8 version_number;
-	u8 current_next_indicator;
-	/* 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; 
-	void* DSMCC_Extension;
-	u32 checksum;
-	u32 CRC_32;
-}GF_M2TS_DSMCC_SECTION;
-
-typedef struct
-{
-	u8 adaptationType;
-	char* adaptationDataByte;
-}
-GF_M2TS_DSMCC_ADAPTATION_HEADER;
-
-typedef struct
-{
-	u8 protocolDiscriminator;
-	u8 dsmccType;
-	u16 messageId;
-	/* dsmccMessageHeader mode */
-	u32 transactionId;
-	/* dsmccDownloadDataHeader */
-	u32 downloadId;
-	u8 reserved;
-	u8 adaptationLength;
-	u16 messageLength;
-	/* added not in the spec */
-	u8 header_length;
-	GF_M2TS_DSMCC_ADAPTATION_HEADER* DsmccAdaptationHeader;
-
-}GF_M2TS_DSMCC_MESSAGE_DATA_HEADER;
-
-/* DOWNLOAD_DATA_MESSAGE */
-typedef struct
-{
-	u8 protocolDiscriminator;
-	u8 dsmccType;
-	u16 messageId;
-	u32 downloadId;
-	u8 reserved;
-	u8 adaptationLength;
-	u16 messageLength;
-	GF_M2TS_DSMCC_ADAPTATION_HEADER* DsmccAdaptationHeader;
-
-}GF_M2TS_DSMCC_DOWNLOAD_DATA_HEADER;
-
-typedef struct
-{	
-	u8 subDescriptorType;
-	u8 subDescriptorLength;	
-	char *additionalInformation;
-
-}GF_M2TS_DSMCC_SUBDESCRIPTOR;
-
-typedef struct
-{
-	u8 descriptorType;
-	u8 descriptorLength;
-	u8 specifierType;
-	u32 specifierData;
-	u16 model;
-	u16 version;
-	u8 subDescriptorCount;
-	GF_M2TS_DSMCC_SUBDESCRIPTOR* SubDescriptor;
-
-}GF_M2TS_DSMCC_DESCRIPTOR;
-
-typedef struct
-{
-	u16 compatibilityDescriptorLength;
-	u16 descriptorCount;
-	GF_M2TS_DSMCC_DESCRIPTOR* 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;
-
-typedef struct
-{
-	u16 moduleId;
-	u32 moduleSize;
-	u8 moduleVersion;
-	u8 moduleInfoLength;
-	char* moduleInfoByte;
-}GF_M2TS_DSMCC_INFO_MODULES;
-
-typedef struct
-{  
-	u32 downloadId;
-	u16 blockSize;
-	u8 windowSize;
-	u8 ackPeriod;
-	u32 tCDownloadWindow;
-	u32 tCDownloadScenario;
-	GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR CompatibilityDescr;
-	u16 numberOfModules;
-	GF_M2TS_DSMCC_INFO_MODULES Modules;
-	u16 privateDataLength;     
-	char* privateDataByte;
-}GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC;
-
-typedef struct
-{  
-	u8 moduleId;
-	u8 moduleVersion;
-	u8 reserved;
-	u8 blockNumber;
-	char* blockDataByte;
-	/*added not in the spec */
-	u32 dataBlocksize;
-}GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK;
-
-typedef struct
-{ 
-	u16 moduleId;
-	u16 blockNumber;
-	u8 downloadReason;
-}GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE;
-
-typedef struct
-{  
-	u32 downloadId;
-	u16 moduleId;
-	u16 blockNumber;
-	u8 downloadCancelReason;
-	u8 reserved;
-	u16 privateDataLength;
-	char* privateDataByte;
-}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;
-
-typedef struct
-{
-	u16 NumberOfGroups;
-	GF_M2TS_DSMCC_INFO_GROUP* InfoGroup; 
-	u16 PrivateDataLength;
-	char* privateDataByte;
-
-}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;
-
-typedef struct
-{
-	GF_M2TS_DSMCC_MESSAGE_DATA_HEADER DownloadDataHeader;
-	void* dataMessagePayload;
-}GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE;
-
-/* DESCRIPTOR LIST */
-
-typedef struct
-{
-	u8 descriptorTag;
-	u8 descriptorLength;
-	u8 postDiscontinuityIndicator;
-	u8 contentId;
-	u8 STC_Reference[5];
-	u8 NPT_Reference[5];
-	u16 scaleNumerator;
-	u16 scaleDenominator;
-}GF_M2TS_DSMCC_NPT_REFERENCE_DESCRIPTOR;
-
-
-typedef struct
-{
-	u8 descriptorTag;
-	u8 descriptorLength;
-	void* descriptor;
-}GF_M2TS_DSMCC_STREAM_DESCRIPTOR;
-
-/* OBJECT CAROUSEL */
-typedef struct{
-	u16 id;
-	u16 use;
-	u16 assocTag;
-	u8 selector_length;
-	char* selector_data;
-	u16 selector_type;
-	u32 transactionId;
-	u32 timeout;
-}GF_M2TS_DSMCC_BIOP_TAPS;
-
-typedef struct{
-	u8 AFI;
-	u8 type;
-	u32 carouselId;
-	u8 specifierType;
-	u32 specifierData;
-	u16 transport_stream_id; 
-	u16 original_network_id;
-	u16 service_id;
-	u32 reserved;
-}GF_M2TS_DSMCC_SERVICE_DOMAIN;
-
-typedef struct{
-	u32 componentId_tag;
-	u8 component_data_length;
-	u32 carouselId;
-	u16 moduleId;
-	u8 version_major;
-	u8 version_minor;
-	u8 objectKey_length;
-	u32 objectKey_data;
-}GF_M2TS_DSMCC_BIOP_OBJECT_LOCATION;
-
-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;
-
-typedef struct{
-	GF_M2TS_DSMCC_BIOP_OBJECT_LOCATION ObjectLocation;
-	GF_M2TS_DSMCC_BIOP_CONN_BINDER ConnBinder;
-}GF_M2TS_DSMCC_BIOP_PROFILE_BODY;
-
-typedef struct{
-	u32 id_length;
-	char* id_data;
-	u32 kind_length;
-	char* kind_data;
-}GF_M2TS_DSMCC_BIOP_NAME_COMPONENT;
-
-typedef struct{
-	u32 componentId_tag;
-	u8 component_data_length;
-	u8 serviceDomain_length;
-	GF_M2TS_DSMCC_SERVICE_DOMAIN serviceDomain_data;
-	u32 nameComponents_count;
-	GF_M2TS_DSMCC_BIOP_NAME_COMPONENT* NameComponent;
-	u32 initialContext_length;
-	char* InitialContext_data_byte;
-}GF_M2TS_DSMCC_BIOP_SERVICE_LOCATION;
-
-typedef struct{
-	u32 componentId_tag;
-	u8 component_data_length;
-	char* component_data_byte;
-}GF_M2TS_DSMCC_BIOP_LITE_COMPONENT;
-
-typedef struct{
-	u32 profileId_tag;
-	u32 profile_data_length;
-	u8 profile_data_byte_order;
-	u8 lite_component_count;
-
-	GF_M2TS_DSMCC_BIOP_PROFILE_BODY* BIOPProfileBody;
-	GF_M2TS_DSMCC_BIOP_SERVICE_LOCATION* ServiceLocation;
-	GF_M2TS_DSMCC_BIOP_LITE_COMPONENT* LiteComponent;
-
-}GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE;
-
-typedef struct{
-	u32 type_id_length;
-	char* type_id_byte;
-	u32 taggedProfiles_count;
-	GF_List* taggedProfile;
-}GF_M2TS_DSMCC_IOR;
-
-typedef struct{
-	u32 moduleTimeOut;
-	u32 blockTimeOut;
-	u32 minBlockTime;
-	u8 taps_count;
-	GF_M2TS_DSMCC_BIOP_TAPS* Taps;
-	u8 userInfoLength;
-	u8* userInfo_data;
-	GF_List* descriptor;
-
-	u8 compression_method;	
-	u8 transparency_level; 
-}GF_M2TS_DSMCC_BIOP_MODULE_INFO;
-
-typedef struct{
-	u32 context_id;
-	u16 context_data_length;
-	char* context_data_byte;
-}GF_M2TS_DSMCC_SERVICE_CONTEXT;
-
-typedef struct{
-	GF_M2TS_DSMCC_IOR IOR;
-	u8 downloadTaps_count;
-	GF_M2TS_DSMCC_BIOP_TAPS* Taps;
-	u8 serviceContextList_count;
-	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
-	u16 userInfoLength;
-	char* userInfo_data;
-}GF_M2TS_DSMCC_SERVICE_GATEWAY_INFO;
-
-
-/* DESCRIPTORS */
-typedef struct{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	u8 priority_value;
-	u8 transparency_level;
-}GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR;
-
-typedef struct{
-	u8 descriptor_tag;
-	u8 descriptor_length;
-	u8 compression_method;
-	u32 original_size;
-}GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR;
-
-typedef struct{
-	u8 descriptor_tag;
-	u8 descriptor_length;							
-	char* content_type_data_byte;
-}GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR;
-
-
-typedef struct{
-	/* "BIOP" */
-	u32 magic;
-	u8 biop_version_major;
-	u8 biop_version_minor;
-	u8 byte_order;
-	u8 message_type;
-	/* size in byte of the whole object carousel */
-	u32 message_size;
-	u8 objectKey_length;
-	/* witness the kind of object carousel the item is */
-	/* fil for a file */
-	/* dir for a directory */
-	/* srg for the ServiceGateway */
-	/* str for Stream Message */
-	/* ste for Stream Event Message */
-	u32 objectKey_data;
-	u32 objectKind_length;
-	/* The number that identifies the object in the module */
-	char* objectKind_data;
-	u16 objectInfo_length;
-}GF_M2TS_DSMCC_BIOP_HEADER;
-
-typedef struct{
-	GF_M2TS_DSMCC_BIOP_HEADER* Header;
-	u64 ContentSize;
-	GF_List* descriptor;
-	u8 serviceContextList_count;
-	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
-	u32 messageBody_length;
-	/* size in byte of the data of the file */
-	u32 content_length;
-	/* data a the file */
-	char* content_byte;
-}GF_M2TS_DSMCC_BIOP_FILE;
-
-typedef struct{
-	/* Name */
-	u8 nameComponents_count;
-	/* There is must be only one nameComponent */
-	u8 id_length;
-	/* the name of the item */
-	char * id_data;
-	u8 kind_length;
-	/* the kind of the item */
-	/* fil for a file */
-	/* dir for a directory */
-	/* srg for the ServiceGateway */
-	/* str for Stream Message */
-	/* ste for Stream Event Message */
-	char* kind_data;
-	/* 1 if the item a file or a stream */
-	/* 0 if the item si a directory */
-	u8 BindingType;
-	GF_M2TS_DSMCC_IOR IOR;
-	u16 objectInfo_length;
-	u64 ContentSize;
-	GF_List* descriptor;
-}GF_M2TS_DSMCC_BIOP_NAME;
-
-typedef struct{
-	GF_M2TS_DSMCC_BIOP_HEADER* Header;
-	char* objectInfo_data;
-	u8 serviceContextList_count;
-	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
-	/* Length is byte of the message */
-	u32 messageBody_length;
-	/* 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;
-
-typedef struct{
-	u8 aDescription_length; 				
-	char* aDescription_bytes;
-	u32 duration_aSeconds;
-	u32 duration_aMicroseconds;
-	u8 audio;	 
-	u8 video;	 
-	u8 data;
-}GF_M2TS_DSMCC_STREAM_INFO;
-
-typedef struct{
-	GF_M2TS_DSMCC_BIOP_HEADER* Header;			
-	GF_M2TS_DSMCC_STREAM_INFO Info;
-	char* objectInfo_byte;
-	u8 serviceContextList_count; 				
-	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
-	u32 messageBody_length; 
-	u8 taps_count;
-	GF_M2TS_DSMCC_BIOP_TAPS* Taps; 				
-}GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE;
-
-typedef struct{					
-	u8 eventName_length; 				
-	char* eventName_data_byte;
-}GF_M2TS_DSMCC_BIOP_EVENT_LIST;
-
-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;				
-	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
-	u32 messageBody_length; 	 
-	u8 taps_count;
-	GF_M2TS_DSMCC_BIOP_TAPS* Taps;		
-	u8 eventIds_count;  				
-	u16* eventId;
-}GF_M2TS_DSMCC_BIOP_STREAM_EVENT;
-
-/*Define the base element for extracted dsmcc element*/
-#define GF_M2TS_DSMCC_ELEMENT		\
-			u32 moduleId; \
-			u32 downloadId; \
-			u32 version_number; \
-			u32 objectKey_data; \
-			char* name; \
-			void* parent;
-
-typedef struct
-{	
-	GF_M2TS_DSMCC_ELEMENT
-	/*Path to the file */
-	char* Path;
-}GF_M2TS_DSMCC_FILE;
-
-typedef struct
-{	GF_M2TS_DSMCC_ELEMENT
-	/* List of files in the directory*/
-	GF_List* File;
-	/* List of directories of the directory*/
-	GF_List* Dir;
-	/*Path to the directory */
-	char* Path;
-}GF_M2TS_DSMCC_DIR;
-
-typedef struct
-{	GF_M2TS_DSMCC_ELEMENT
-	/* Number of process directories */
-	u8 nb_processed_dir;
-	/* Service Id of the data carousel*/
-	u32 service_id;
-	/* List of files of the root of the file system*/
-	GF_List* File;
-	/* List of directories of the root of the file system*/
-	GF_List* Dir;
-}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];	
-	/*Check if the ServiceGateway has been recovered*/
-	/* 1 ServiceGateway received */
-	/* 0 otherwise */
-	Bool Got_ServiceGateway;
-	/* ServiceGateway Structure */
-	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway;
-	/* u32 transactionId for DownloadInfoIndicator versioning */
-	u32 transactionId;
-	/* List that carries modules that have been received before inti - TO DO */
-	GF_List* Unprocessed_module;
-	/* Service ID that carries this carousel */
-	u32 service_id;
-	/* Path of the root directory of the file system */
-	char* root_dir;
-	/*Check if the index.html (root of the application) has been recovered*/
-	/* 1 index.html received received */
-	/* 0 otherwise */
-	Bool get_index;
-	/* Number of the application that uses the carousel*/
-	u32 application_id;
-} GF_M2TS_DSMCC_OVERLORD;
-
-void on_dsmcc_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par);
-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_M2TS_DSMCC_OVERLORD* gf_m2ts_init_dsmcc_overlord(u32 service_id);
-GF_M2TS_DSMCC_OVERLORD* gf_m2ts_get_dmscc_overlord(GF_List* Dsmcc_controller,u32 service_id);
-void gf_m2ts_delete_dsmcc_overlord(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord);
-
-#endif /*GPAC_DISABLE_MPEG2TS*/
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	//_GF_CAROUSSEL_H_
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jonathan Sillan
+ *			Copyright (c) Telecom ParisTech 2011-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_DSMCC_H_
+#define _GF_DSMCC_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/mpegts.h>
+#include <string.h>
+#include <gpac/bitstream.h>
+
+
+#ifndef GPAC_DISABLE_MPEG2TS
+
+
+#define DSMCC_SECTION_LENGTH_MAX 4093
+
+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;
+
+typedef enum{
+	TAG_BIOP =				0x49534F06,
+	TAG_LITE_OPTIONS =		0x49534F05
+}DSMCC_DOWNLOAD_PROFILE_ID_TAG;
+
+typedef enum{
+	CACHING_PRIORITY_DESCRIPTOR		=		0x71,
+	CONTENT_TYPE_DESCRIPTOR			=		0x72,
+	COMPRESSED_MODULE_DESCRIPTOR	=		0x09
+}DSMCC_BIOP_DESCRIPTOR;
+
+typedef struct{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	u32 carousel_id;
+	u8 FormatID;
+	char *private_data_byte;
+	u8 ModuleVersion;
+	u8 ModuleId;
+	u16 BlockSize;
+	u32 ModuleSize;
+	u8 CompressionMethod;
+	u32 OriginalSize;
+	u8 TimeOut;
+	u8 ObjectKeyLength;
+	char* ObjectKeyData;
+}GF_M2TS_CAROUSEL_INDENTIFIER_DESCRIPTOR;
+
+typedef struct
+{
+	u32 moduleId;
+	u32 downloadId;
+	u32 version_number;
+	Bool done;
+}GF_M2TS_DSMCC_PROCESSED;
+
+typedef struct
+{
+	/* Module identifier */
+	u32 moduleId;
+	/* Version number of the module */
+	u32 version_number;
+	/* size in byte of the module */
+	u32 size;
+	/* Download identifier */
+	u32 downloadId;
+	/* buffer of data */
+	char* buffer;
+	/* byte shifting in the buffer of data */
+	u32 byte_sift;
+	/* last section number processed */
+	u16 section_number;
+	/* the last section number of the module */
+	u16 last_section_number;
+	/* size in byte of each block in the module */
+	u32 block_size;
+	/* Checks if the module has been processed */
+	/* 1 if yes */
+	/* 0 otherwise */
+	Bool processed;
+	/* Checks if the module's data are zipped */
+	/* 1 if yes */
+	/* 0 otherwise */
+	Bool Gzip;
+	/* Size of the module's data after uncompression */
+	u32 original_size;
+}GF_M2TS_DSMCC_MODULE;
+
+typedef struct
+{
+	/* table id : identifier for dsmcc message type */
+	u8 table_id;
+	/* indicates the presence of CRC 32 */
+	u8 section_syntax_indicator;
+	u8 private_indicator;
+	/* length in byte of the dsmcc section */
+	u16 dsmcc_section_length;
+	/* linked with the moduleId if carried by the section */
+	u16 table_id_extension;
+	/* version number linked with the Data block if carried by the section */
+	u8 version_number;
+	u8 current_next_indicator;
+	/* 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; 
+	void* DSMCC_Extension;
+	u32 checksum;
+	u32 CRC_32;
+}GF_M2TS_DSMCC_SECTION;
+
+typedef struct
+{
+	u8 adaptationType;
+	char* adaptationDataByte;
+}
+GF_M2TS_DSMCC_ADAPTATION_HEADER;
+
+typedef struct
+{
+	u8 protocolDiscriminator;
+	u8 dsmccType;
+	u16 messageId;
+	/* dsmccMessageHeader mode */
+	u32 transactionId;
+	/* dsmccDownloadDataHeader */
+	u32 downloadId;
+	u8 reserved;
+	u8 adaptationLength;
+	u16 messageLength;
+	/* added not in the spec */
+	u8 header_length;
+	GF_M2TS_DSMCC_ADAPTATION_HEADER* DsmccAdaptationHeader;
+
+}GF_M2TS_DSMCC_MESSAGE_DATA_HEADER;
+
+/* DOWNLOAD_DATA_MESSAGE */
+typedef struct
+{
+	u8 protocolDiscriminator;
+	u8 dsmccType;
+	u16 messageId;
+	u32 downloadId;
+	u8 reserved;
+	u8 adaptationLength;
+	u16 messageLength;
+	GF_M2TS_DSMCC_ADAPTATION_HEADER* DsmccAdaptationHeader;
+
+}GF_M2TS_DSMCC_DOWNLOAD_DATA_HEADER;
+
+typedef struct
+{	
+	u8 subDescriptorType;
+	u8 subDescriptorLength;	
+	char *additionalInformation;
+
+}GF_M2TS_DSMCC_SUBDESCRIPTOR;
+
+typedef struct
+{
+	u8 descriptorType;
+	u8 descriptorLength;
+	u8 specifierType;
+	u32 specifierData;
+	u16 model;
+	u16 version;
+	u8 subDescriptorCount;
+	GF_M2TS_DSMCC_SUBDESCRIPTOR* SubDescriptor;
+
+}GF_M2TS_DSMCC_DESCRIPTOR;
+
+typedef struct
+{
+	u16 compatibilityDescriptorLength;
+	u16 descriptorCount;
+	GF_M2TS_DSMCC_DESCRIPTOR* 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;
+
+typedef struct
+{
+	u16 moduleId;
+	u32 moduleSize;
+	u8 moduleVersion;
+	u8 moduleInfoLength;
+	char* moduleInfoByte;
+}GF_M2TS_DSMCC_INFO_MODULES;
+
+typedef struct
+{  
+	u32 downloadId;
+	u16 blockSize;
+	u8 windowSize;
+	u8 ackPeriod;
+	u32 tCDownloadWindow;
+	u32 tCDownloadScenario;
+	GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR CompatibilityDescr;
+	u16 numberOfModules;
+	GF_M2TS_DSMCC_INFO_MODULES Modules;
+	u16 privateDataLength;     
+	char* privateDataByte;
+}GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC;
+
+typedef struct
+{  
+	u8 moduleId;
+	u8 moduleVersion;
+	u8 reserved;
+	u8 blockNumber;
+	char* blockDataByte;
+	/*added not in the spec */
+	u32 dataBlocksize;
+}GF_M2TS_DSMCC_DOWNLOAD_DATA_BLOCK;
+
+typedef struct
+{ 
+	u16 moduleId;
+	u16 blockNumber;
+	u8 downloadReason;
+}GF_M2TS_DSMCC_DOWNLOAD_DATA_REQUEST_MESSAGE;
+
+typedef struct
+{  
+	u32 downloadId;
+	u16 moduleId;
+	u16 blockNumber;
+	u8 downloadCancelReason;
+	u8 reserved;
+	u16 privateDataLength;
+	char* privateDataByte;
+}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;
+
+typedef struct
+{
+	u16 NumberOfGroups;
+	GF_M2TS_DSMCC_INFO_GROUP* InfoGroup; 
+	u16 PrivateDataLength;
+	char* privateDataByte;
+
+}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;
+
+typedef struct
+{
+	GF_M2TS_DSMCC_MESSAGE_DATA_HEADER DownloadDataHeader;
+	void* dataMessagePayload;
+}GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE;
+
+/* DESCRIPTOR LIST */
+
+typedef struct
+{
+	u8 descriptorTag;
+	u8 descriptorLength;
+	u8 postDiscontinuityIndicator;
+	u8 contentId;
+	u8 STC_Reference[5];
+	u8 NPT_Reference[5];
+	u16 scaleNumerator;
+	u16 scaleDenominator;
+}GF_M2TS_DSMCC_NPT_REFERENCE_DESCRIPTOR;
+
+
+typedef struct
+{
+	u8 descriptorTag;
+	u8 descriptorLength;
+	void* descriptor;
+}GF_M2TS_DSMCC_STREAM_DESCRIPTOR;
+
+/* OBJECT CAROUSEL */
+typedef struct{
+	u16 id;
+	u16 use;
+	u16 assocTag;
+	u8 selector_length;
+	char* selector_data;
+	u16 selector_type;
+	u32 transactionId;
+	u32 timeout;
+}GF_M2TS_DSMCC_BIOP_TAPS;
+
+typedef struct{
+	u8 AFI;
+	u8 type;
+	u32 carouselId;
+	u8 specifierType;
+	u32 specifierData;
+	u16 transport_stream_id; 
+	u16 original_network_id;
+	u16 service_id;
+	u32 reserved;
+}GF_M2TS_DSMCC_SERVICE_DOMAIN;
+
+typedef struct{
+	u32 componentId_tag;
+	u8 component_data_length;
+	u32 carouselId;
+	u16 moduleId;
+	u8 version_major;
+	u8 version_minor;
+	u8 objectKey_length;
+	u32 objectKey_data;
+}GF_M2TS_DSMCC_BIOP_OBJECT_LOCATION;
+
+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;
+
+typedef struct{
+	GF_M2TS_DSMCC_BIOP_OBJECT_LOCATION ObjectLocation;
+	GF_M2TS_DSMCC_BIOP_CONN_BINDER ConnBinder;
+}GF_M2TS_DSMCC_BIOP_PROFILE_BODY;
+
+typedef struct{
+	u32 id_length;
+	char* id_data;
+	u32 kind_length;
+	char* kind_data;
+}GF_M2TS_DSMCC_BIOP_NAME_COMPONENT;
+
+typedef struct{
+	u32 componentId_tag;
+	u8 component_data_length;
+	u8 serviceDomain_length;
+	GF_M2TS_DSMCC_SERVICE_DOMAIN serviceDomain_data;
+	u32 nameComponents_count;
+	GF_M2TS_DSMCC_BIOP_NAME_COMPONENT* NameComponent;
+	u32 initialContext_length;
+	char* InitialContext_data_byte;
+}GF_M2TS_DSMCC_BIOP_SERVICE_LOCATION;
+
+typedef struct{
+	u32 componentId_tag;
+	u8 component_data_length;
+	char* component_data_byte;
+}GF_M2TS_DSMCC_BIOP_LITE_COMPONENT;
+
+typedef struct{
+	u32 profileId_tag;
+	u32 profile_data_length;
+	u8 profile_data_byte_order;
+	u8 lite_component_count;
+
+	GF_M2TS_DSMCC_BIOP_PROFILE_BODY* BIOPProfileBody;
+	GF_M2TS_DSMCC_BIOP_SERVICE_LOCATION* ServiceLocation;
+	GF_M2TS_DSMCC_BIOP_LITE_COMPONENT* LiteComponent;
+
+}GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE;
+
+typedef struct{
+	u32 type_id_length;
+	char* type_id_byte;
+	u32 taggedProfiles_count;
+	GF_List* taggedProfile;
+}GF_M2TS_DSMCC_IOR;
+
+typedef struct{
+	u32 moduleTimeOut;
+	u32 blockTimeOut;
+	u32 minBlockTime;
+	u8 taps_count;
+	GF_M2TS_DSMCC_BIOP_TAPS* Taps;
+	u8 userInfoLength;
+	u8* userInfo_data;
+	GF_List* descriptor;
+
+	u8 compression_method;	
+	u8 transparency_level; 
+}GF_M2TS_DSMCC_BIOP_MODULE_INFO;
+
+typedef struct{
+	u32 context_id;
+	u16 context_data_length;
+	char* context_data_byte;
+}GF_M2TS_DSMCC_SERVICE_CONTEXT;
+
+typedef struct{
+	GF_M2TS_DSMCC_IOR IOR;
+	u8 downloadTaps_count;
+	GF_M2TS_DSMCC_BIOP_TAPS* Taps;
+	u8 serviceContextList_count;
+	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
+	u16 userInfoLength;
+	char* userInfo_data;
+}GF_M2TS_DSMCC_SERVICE_GATEWAY_INFO;
+
+
+/* DESCRIPTORS */
+typedef struct{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	u8 priority_value;
+	u8 transparency_level;
+}GF_M2TS_DSMCC_BIOP_CACHING_PRIORITY_DESCRIPTOR;
+
+typedef struct{
+	u8 descriptor_tag;
+	u8 descriptor_length;
+	u8 compression_method;
+	u32 original_size;
+}GF_M2TS_DSMCC_BIOP_COMPRESSED_MODULE_DESCRIPTOR;
+
+typedef struct{
+	u8 descriptor_tag;
+	u8 descriptor_length;							
+	char* content_type_data_byte;
+}GF_M2TS_DSMCC_BIOP_CONTENT_TYPE_DESRIPTOR;
+
+
+typedef struct{
+	/* "BIOP" */
+	u32 magic;
+	u8 biop_version_major;
+	u8 biop_version_minor;
+	u8 byte_order;
+	u8 message_type;
+	/* size in byte of the whole object carousel */
+	u32 message_size;
+	u8 objectKey_length;
+	/* witness the kind of object carousel the item is */
+	/* fil for a file */
+	/* dir for a directory */
+	/* srg for the ServiceGateway */
+	/* str for Stream Message */
+	/* ste for Stream Event Message */
+	u32 objectKey_data;
+	u32 objectKind_length;
+	/* The number that identifies the object in the module */
+	char* objectKind_data;
+	u16 objectInfo_length;
+}GF_M2TS_DSMCC_BIOP_HEADER;
+
+typedef struct{
+	GF_M2TS_DSMCC_BIOP_HEADER* Header;
+	u64 ContentSize;
+	GF_List* descriptor;
+	u8 serviceContextList_count;
+	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
+	u32 messageBody_length;
+	/* size in byte of the data of the file */
+	u32 content_length;
+	/* data a the file */
+	char* content_byte;
+}GF_M2TS_DSMCC_BIOP_FILE;
+
+typedef struct{
+	/* Name */
+	u8 nameComponents_count;
+	/* There is must be only one nameComponent */
+	u8 id_length;
+	/* the name of the item */
+	char * id_data;
+	u8 kind_length;
+	/* the kind of the item */
+	/* fil for a file */
+	/* dir for a directory */
+	/* srg for the ServiceGateway */
+	/* str for Stream Message */
+	/* ste for Stream Event Message */
+	char* kind_data;
+	/* 1 if the item a file or a stream */
+	/* 0 if the item si a directory */
+	u8 BindingType;
+	GF_M2TS_DSMCC_IOR IOR;
+	u16 objectInfo_length;
+	u64 ContentSize;
+	GF_List* descriptor;
+}GF_M2TS_DSMCC_BIOP_NAME;
+
+typedef struct{
+	GF_M2TS_DSMCC_BIOP_HEADER* Header;
+	char* objectInfo_data;
+	u8 serviceContextList_count;
+	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
+	/* Length is byte of the message */
+	u32 messageBody_length;
+	/* 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;
+
+typedef struct{
+	u8 aDescription_length; 				
+	char* aDescription_bytes;
+	u32 duration_aSeconds;
+	u32 duration_aMicroseconds;
+	u8 audio;	 
+	u8 video;	 
+	u8 data;
+}GF_M2TS_DSMCC_STREAM_INFO;
+
+typedef struct{
+	GF_M2TS_DSMCC_BIOP_HEADER* Header;			
+	GF_M2TS_DSMCC_STREAM_INFO Info;
+	char* objectInfo_byte;
+	u8 serviceContextList_count; 				
+	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
+	u32 messageBody_length; 
+	u8 taps_count;
+	GF_M2TS_DSMCC_BIOP_TAPS* Taps; 				
+}GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE;
+
+typedef struct{					
+	u8 eventName_length; 				
+	char* eventName_data_byte;
+}GF_M2TS_DSMCC_BIOP_EVENT_LIST;
+
+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;				
+	GF_M2TS_DSMCC_SERVICE_CONTEXT* ServiceContext;
+	u32 messageBody_length; 	 
+	u8 taps_count;
+	GF_M2TS_DSMCC_BIOP_TAPS* Taps;		
+	u8 eventIds_count;  				
+	u16* eventId;
+}GF_M2TS_DSMCC_BIOP_STREAM_EVENT;
+
+/*Define the base element for extracted dsmcc element*/
+#define GF_M2TS_DSMCC_ELEMENT		\
+			u32 moduleId; \
+			u32 downloadId; \
+			u32 version_number; \
+			u32 objectKey_data; \
+			char* name; \
+			void* parent;
+
+typedef struct
+{	
+	GF_M2TS_DSMCC_ELEMENT
+	/*Path to the file */
+	char* Path;
+}GF_M2TS_DSMCC_FILE;
+
+typedef struct
+{	GF_M2TS_DSMCC_ELEMENT
+	/* List of files in the directory*/
+	GF_List* File;
+	/* List of directories of the directory*/
+	GF_List* Dir;
+	/*Path to the directory */
+	char* Path;
+}GF_M2TS_DSMCC_DIR;
+
+typedef struct
+{	GF_M2TS_DSMCC_ELEMENT
+	/* Number of process directories */
+	u8 nb_processed_dir;
+	/* Service Id of the data carousel*/
+	u32 service_id;
+	/* List of files of the root of the file system*/
+	GF_List* File;
+	/* List of directories of the root of the file system*/
+	GF_List* Dir;
+}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];	
+	/*Check if the ServiceGateway has been recovered*/
+	/* 1 ServiceGateway received */
+	/* 0 otherwise */
+	Bool Got_ServiceGateway;
+	/* ServiceGateway Structure */
+	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway;
+	/* u32 transactionId for DownloadInfoIndicator versioning */
+	u32 transactionId;
+	/* List that carries modules that have been received before inti - TO DO */
+	GF_List* Unprocessed_module;
+	/* Service ID that carries this carousel */
+	u32 service_id;
+	/* Path of the root directory of the file system */
+	char* root_dir;
+	/*Check if the index.html (root of the application) has been recovered*/
+	/* 1 index.html received received */
+	/* 0 otherwise */
+	Bool get_index;
+	/* Number of the application that uses the carousel*/
+	u32 application_id;
+} GF_M2TS_DSMCC_OVERLORD;
+
+void on_dsmcc_section(GF_M2TS_Demuxer *ts, u32 evt_type, void *par);
+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_M2TS_DSMCC_OVERLORD* gf_m2ts_init_dsmcc_overlord(u32 service_id);
+GF_M2TS_DSMCC_OVERLORD* gf_m2ts_get_dmscc_overlord(GF_List* Dsmcc_controller,u32 service_id);
+void gf_m2ts_delete_dsmcc_overlord(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord);
+
+#endif /*GPAC_DISABLE_MPEG2TS*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	//_GF_CAROUSSEL_H_
+

gpac-0.5.0.svn4668.tar.bz2/include/gpac/esi.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/esi.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/events.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/events.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/events_constants.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/events_constants.h Changed

@@ -1,510 +1,497 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Events management
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  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_EVENTS_CONSTANTS_H_
-#define _GF_EVENTS_CONSTANTS_H_
-
-
-
-/*
-		minimal event system
-
-	DO NOT CHANGE THEIR POSITION IN THE LIST, USED TO SPEED UP FILTERING OF USER INPUT EVENTS
-*/
-
-/*events*/
-enum {
-
-	/******************************************************
-
-		Events used for both GPAC internals and DOM Events
-
-	*******************************************************/
-	/*MouseEvents*/
-	GF_EVENT_CLICK,
-	GF_EVENT_MOUSEUP,
-	GF_EVENT_MOUSEDOWN,
-	GF_EVENT_MOUSEOVER,
-	GF_EVENT_MOUSEOUT,
-	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
-	GF_EVENT_MOUSEMOVE,
-	/*mouse wheel event*/
-	GF_EVENT_MOUSEWHEEL,
-
-	/*Key Events*/
-	GF_EVENT_KEYUP,
-	GF_EVENT_KEYDOWN, /* covers KeyDown, KeyPress and AccessKey */
-	GF_EVENT_LONGKEYPRESS,
-	/*character input*/
-	GF_EVENT_TEXTINPUT,
-
-
-	/******************************************************
-
-		Events used for DOM Events only
-
-	*******************************************************/
-	GF_EVENT_TEXTSELECT,
-
-	/*DOM UIEvents*/
-	GF_EVENT_FOCUSIN,
-	GF_EVENT_FOCUSOUT,
-	GF_EVENT_ACTIVATE,
-	GF_EVENT_CHANGE,
-	GF_EVENT_FOCUS,
-	GF_EVENT_BLUR,
-	/*SVG (HTML) Events*/
-	GF_EVENT_LOAD,
-	GF_EVENT_UNLOAD,
-	GF_EVENT_ABORT,
-	GF_EVENT_ERROR,
-	GF_EVENT_RESIZE,
-	GF_EVENT_SCROLL,
-	GF_EVENT_ZOOM,
-	GF_EVENT_BEGIN, /*this is a fake event, it is NEVER fired, only used in SMIL begin*/
-	GF_EVENT_BEGIN_EVENT,
-	GF_EVENT_END, /*this is a fake event, it is NEVER fired, only used in SMIL end*/
-	GF_EVENT_END_EVENT,
-	GF_EVENT_REPEAT, /*this is a fake event, it is NEVER fired, only used in SMIL repeat*/
-	GF_EVENT_REPEAT_EVENT,
-
-	/*DOM MutationEvents - NOT SUPPORTED YET*/
-	GF_EVENT_TREE_MODIFIED,
-	GF_EVENT_NODE_INSERTED,
-	GF_EVENT_NODE_REMOVED,
-	GF_EVENT_NODE_INSERTED_DOC,
-	GF_EVENT_NODE_REMOVED_DOC,
-	GF_EVENT_ATTR_MODIFIED,
-	GF_EVENT_CHAR_DATA_MODIFIED,
-	GF_EVENT_NODE_NAME_CHANGED,
-	GF_EVENT_ATTR_NAME_CHANGED,
-
-	GF_EVENT_DCCI_PROP_CHANGE,
-
-	/*LASeR events*/
-	GF_EVENT_ACTIVATED,
-	GF_EVENT_DEACTIVATED,
-	GF_EVENT_PAUSE,
-	GF_EVENT_PAUSED_EVENT,
-	GF_EVENT_PLAY,
-	GF_EVENT_REPEAT_KEY,
-	GF_EVENT_RESUME_EVENT,
-	GF_EVENT_SHORT_ACCESSKEY,
-	/*pseudo-event, only used in LASeR coding*/
-	GF_EVENT_EXECUTION_TIME,
-
-	/*MediaAccess events - cf http://www.w3.org/TR/MediaAccessEvents*/
-#if 0
-	GF_EVENT_MEDIA_BEGIN_SESSION_SETUP,
-	GF_EVENT_MEDIA_END_SESSION_SETUP,
-	GF_EVENT_MEDIA_DATA_REQUEST,
-	GF_EVENT_MEDIA_PLAYABLE,
-	GF_EVENT_MEDIA_NOT_PLAYABLE,
-	GF_EVENT_MEDIA_DATA_PROGRESS,
-	GF_EVENT_MEDIA_END_OF_DATA,
-	GF_EVENT_MEDIA_STOP,
-	GF_EVENT_MEDIA_ERROR,
-#endif
-
-	/*HTML5 media events*/
-
-	GF_EVENT_MEDIA_SETUP_BEGIN,	/*not HTML5 but should be :)*/
-	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_HTML_MSE_SOURCE_OPEN,
-	GF_EVENT_HTML_MSE_SOURCE_ENDED,
-	GF_EVENT_HTML_MSE_SOURCE_CLOSE,
-	GF_EVENT_HTML_MSE_APPEND_START,
-	GF_EVENT_HTML_MSE_APPEND_END,
-	GF_EVENT_HTML_MSE_APPEND_ERROR,
-	GF_EVENT_HTML_MSE_APPEND_ABORT,
-	GF_EVENT_HTML_MSE_ADD_SOURCE_BUFFER,
-	GF_EVENT_HTML_MSE_REMOVE_SOURCE_BUFFER,
-
-	GF_EVENT_BATTERY,
-	GF_EVENT_CPU,
-	GF_EVENT_UNKNOWN,
-
-
-	/******************************************************
-
-		Events used for GPAC internals only
-
-	*******************************************************/
-
-	/*same as mousedown, generated internally by GPAC*/
-	GF_EVENT_DBLCLICK,
-
-	/*scene attached event, dispatched when the root node of a scene is loaded and
-	attached to the window or parent object (animation, inline, ...)*/
-	GF_EVENT_SCENE_ATTACHED,
-
-	/*VP resize attached event, dispatched when viewport of a scene is being modified
-	attached to the window or parent object (animation, inline, ...)*/
-	GF_EVENT_VP_RESIZE,
-
-	/*window events*/
-	/*size has changed - indicate new w & h in .x end .y fields of event.
-	When sent from gpac to a video plugin, indicates the output size should be changed. This is only sent when the plugin
-	manages the output video himself
-	When sent from a video plugin to gpac, indicates the output size has been changed. This is only sent when the plugin
-	manages the output video himself
-	*/
-	GF_EVENT_SIZE,
-	/*signals the scene size (if indicated in scene) upon connection (sent to the user event proc only)
-		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_SET_CURSOR,	/*set mouse cursor*/
-	GF_EVENT_SET_CAPTION,	/*set window caption*/
-	GF_EVENT_MOVE,		/*move window*/
-	GF_EVENT_REFRESH, /*window needs repaint (whenever needed, eg restore, hide->show, background refresh, paint)*/
-	GF_EVENT_QUIT,	/*window is being closed*/
-	/*video hw setup message:
-		- when sent from gpac to plugin, indicates that the plugin should re-setup hardware context due to a window resize:
-			* for 2D output, this means resizing the backbuffer if needed (depending on HW constraints)
-			* 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 resources must be resetup before next render step (this is mainly
-		due to discard all openGL textures and cached objects)
-	*/
-	GF_EVENT_VIDEO_SETUP,
-	/*queries the list of system colors - only exchanged between compositor and video output*/
-	GF_EVENT_SYS_COLORS,
-
-	/*indicates some text has been pasted - from video output to compositor only*/
-	GF_EVENT_PASTE_TEXT,
-	/*queries for text to be copied - from video output to compositor only*/
-	GF_EVENT_COPY_TEXT,
-
-	/*terminal events*/
-	GF_EVENT_CONNECT,	/*signal URL is connected*/
-	GF_EVENT_DURATION,	/*signal duration of presentation*/
-	GF_EVENT_EOS,	/*signal End of scene playback*/
-	GF_EVENT_AUTHORIZATION,	/*indicates a user and pass is queried*/
-	GF_EVENT_NAVIGATE, /*indicates the user app should load or jump to the given URL.*/
-	GF_EVENT_NAVIGATE_INFO, /*indicates the link or its description under the mouse pointer*/
-	GF_EVENT_MESSAGE, /*message from the MPEG-4 terminal*/
-	GF_EVENT_PROGRESS, /*progress message from the MPEG-4 terminal*/
-	GF_EVENT_FORWARDED, /*event forwarded by service (MPEG-2, RTP, ...)*/
-	GF_EVENT_VIEWPOINTS,	/*indicates viewpoint list has changed - no struct associated*/
-	GF_EVENT_STREAMLIST,	/*indicates stream list has changed - no struct associated - only used when no scene info is present*/
-	GF_EVENT_METADATA, /*indicates a change in associated metadata*/
-	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
-};
-
-/*GPAC/DOM3 key codes*/
-enum {
-	GF_KEY_UNIDENTIFIED = 0,
-	GF_KEY_ACCEPT = 1, /* "Accept"    The Accept (Commit) key.*/
-	GF_KEY_AGAIN, /* "Again"  The Again key.*/
-	GF_KEY_ALLCANDIDATES, /* "AllCandidates"    The All Candidates key.*/
-	GF_KEY_ALPHANUM, /*"Alphanumeric"    The Alphanumeric key.*/
-	GF_KEY_ALT, /*"Alt"    The Alt (Menu) key.*/
-	GF_KEY_ALTGRAPH, /*"AltGraph"    The Alt-Graph key.*/
-	GF_KEY_APPS, /*"Apps"    The Application key.*/
-	GF_KEY_ATTN, /*"Attn"    The ATTN key.*/
-	GF_KEY_BROWSERBACK, /*"BrowserBack"    The Browser Back key.*/
-	GF_KEY_BROWSERFAVORITES, /*"BrowserFavorites"    The Browser Favorites key.*/
-	GF_KEY_BROWSERFORWARD, /*"BrowserForward"    The Browser Forward key.*/
-	GF_KEY_BROWSERHOME, /*"BrowserHome"    The Browser Home key.*/
-	GF_KEY_BROWSERREFRESH, /*"BrowserRefresh"    The Browser Refresh key.*/
-	GF_KEY_BROWSERSEARCH, /*"BrowserSearch"    The Browser Search key.*/
-	GF_KEY_BROWSERSTOP, /*"BrowserStop"    The Browser Stop key.*/
-	GF_KEY_CAPSLOCK, /*"CapsLock"    The Caps Lock (Capital) key.*/
-	GF_KEY_CLEAR, /*"Clear"    The Clear key.*/
-	GF_KEY_CODEINPUT, /*"CodeInput"    The Code Input key.*/
-	GF_KEY_COMPOSE, /*"Compose"    The Compose key.*/
-	GF_KEY_CONTROL, /*"Control"    The Control (Ctrl) key.*/
-	GF_KEY_CRSEL, /*"Crsel"    The Crsel key.*/
-	GF_KEY_CONVERT, /*"Convert"    The Convert key.*/
-	GF_KEY_COPY, /*"Copy"    The Copy key.*/
-	GF_KEY_CUT, /*"Cut"    The Cut key.*/
-	GF_KEY_DOWN, /*"Down"    The Down Arrow key.*/
-	GF_KEY_END, /*"End"    The End key.*/
-	GF_KEY_ENTER, /*"Enter"    The Enter key.
-                   Note: This key identifier is also used for the Return (Macintosh numpad) key.*/
-	GF_KEY_ERASEEOF, /*"EraseEof"    The Erase EOF key.*/
-	GF_KEY_EXECUTE, /*"Execute"    The Execute key.*/
-	GF_KEY_EXSEL, /*"Exsel"    The Exsel key.*/
-	GF_KEY_F1, /*"F1"    The F1 key.*/
-	GF_KEY_F2, /*"F2"    The F2 key.*/
-	GF_KEY_F3, /*"F3"    The F3 key.*/
-	GF_KEY_F4, /*"F4"    The F4 key.*/
-	GF_KEY_F5, /*"F5"    The F5 key.*/
-	GF_KEY_F6, /*"F6"    The F6 key.*/
-	GF_KEY_F7, /*"F7"    The F7 key.*/
-	GF_KEY_F8, /*"F8"    The F8 key.*/
-	GF_KEY_F9, /*"F9"    The F9 key.*/
-	GF_KEY_F10, /*"F10"    The F10 key.*/
-	GF_KEY_F11, /*"F11"    The F11 key.*/
-	GF_KEY_F12, /*"F12"    The F12 key.*/
-	GF_KEY_F13, /*"F13"    The F13 key.*/
-	GF_KEY_F14, /*"F14"    The F14 key.*/
-	GF_KEY_F15, /*"F15"    The F15 key.*/
-	GF_KEY_F16, /*"F16"    The F16 key.*/
-	GF_KEY_F17, /*"F17"    The F17 key.*/
-	GF_KEY_F18, /*"F18"    The F18 key.*/
-	GF_KEY_F19, /*"F19"    The F19 key.*/
-	GF_KEY_F20, /*"F20"    The F20 key.*/
-	GF_KEY_F21, /*"F21"    The F21 key.*/
-	GF_KEY_F22, /*"F22"    The F22 key.*/
-	GF_KEY_F23, /*"F23"    The F23 key.*/
-	GF_KEY_F24, /*"F24"    The F24 key.*/
-	GF_KEY_FINALMODE, /*"FinalMode"    The Final Mode (Final) key used on some asian keyboards.*/
-	GF_KEY_FIND, /*"Find"    The Find key.*/
-	GF_KEY_FULLWIDTH, /*"FullWidth"    The Full-Width Characters key.*/
-	GF_KEY_HALFWIDTH, /*"HalfWidth"    The Half-Width Characters key.*/
-	GF_KEY_HANGULMODE, /*"HangulMode"    The Hangul (Korean characters) Mode key.*/
-	GF_KEY_HANJAMODE, /*"HanjaMode"    The Hanja (Korean characters) Mode key.*/
-	GF_KEY_HELP, /*"Help"    The Help key.*/
-	GF_KEY_HIRAGANA, /*"Hiragana"    The Hiragana (Japanese Kana characters) key.*/
-	GF_KEY_HOME, /*"Home"    The Home key.*/
-	GF_KEY_INSERT, /*"Insert"    The Insert (Ins) key.*/
-	GF_KEY_JAPANESEHIRAGANA, /*"JapaneseHiragana"    The Japanese-Hiragana key.*/
-	GF_KEY_JAPANESEKATAKANA, /*"JapaneseKatakana"    The Japanese-Katakana key.*/
-	GF_KEY_JAPANESEROMAJI, /*"JapaneseRomaji"    The Japanese-Romaji key.*/
-	GF_KEY_JUNJAMODE, /*"JunjaMode"    The Junja Mode key.*/
-	GF_KEY_KANAMODE, /*"KanaMode"    The Kana Mode (Kana Lock) key.*/
-	GF_KEY_KANJIMODE, /*"KanjiMode"    The Kanji (Japanese name for ideographic characters of Chinese origin) Mode key.*/
-	GF_KEY_KATAKANA, /*"Katakana"    The Katakana (Japanese Kana characters) key.*/
-	GF_KEY_LAUNCHAPPLICATION1, /*"LaunchApplication1"    The Start Application One key.*/
-	GF_KEY_LAUNCHAPPLICATION2, /*"LaunchApplication2"    The Start Application Two key.*/
-	GF_KEY_LAUNCHMAIL, /*"LaunchMail"    The Start Mail key.*/
-	GF_KEY_LEFT, /*"Left"    The Left Arrow key.*/
-	GF_KEY_META, /*"Meta"    The Meta key.*/
-	GF_KEY_MEDIANEXTTRACK, /*"MediaNextTrack"    The Media Next Track key.*/
-	GF_KEY_MEDIAPLAYPAUSE, /*"MediaPlayPause"    The Media Play Pause key.*/
-	GF_KEY_MEDIAPREVIOUSTRACK, /*"MediaPreviousTrack"    The Media Previous Track key.*/
-	GF_KEY_MEDIASTOP, /*"MediaStop"    The Media Stok key.*/
-	GF_KEY_MODECHANGE, /*"ModeChange"    The Mode Change key.*/
-	GF_KEY_NONCONVERT, /*"Nonconvert"    The Nonconvert (Don't Convert) key.*/
-	GF_KEY_NUMLOCK, /*"NumLock"    The Num Lock key.*/
-	GF_KEY_PAGEDOWN, /*"PageDown"    The Page Down (Next) key.*/
-	GF_KEY_PAGEUP, /*"PageUp"    The Page Up key.*/
-	GF_KEY_PASTE, /*"Paste"    The Paste key.*/
-	GF_KEY_PAUSE, /*"Pause"    The Pause key.*/
-	GF_KEY_PLAY, /*"Play"    The Play key.*/
-	GF_KEY_PREVIOUSCANDIDATE, /*"PreviousCandidate"    The Previous Candidate function key.*/
-	GF_KEY_PRINTSCREEN, /*"PrintScreen"    The Print Screen (PrintScrn, SnapShot) key.*/
-	GF_KEY_PROCESS, /*"Process"    The Process key.*/
-	GF_KEY_PROPS, /*"Props"    The Props key.*/
-	GF_KEY_RIGHT, /*"Right"    The Right Arrow key.*/
-	GF_KEY_ROMANCHARACTERS, /*"RomanCharacters"    The Roman Characters function key.*/
-	GF_KEY_SCROLL, /*"Scroll"    The Scroll Lock key.*/
-	GF_KEY_SELECT, /*"Select"    The Select key.*/
-	GF_KEY_SELECTMEDIA, /*"SelectMedia"    The Select Media key.*/
-	GF_KEY_SHIFT, /*"Shift"    The Shift key.*/
-	GF_KEY_STOP, /*"Stop"    The Stop key.*/
-	GF_KEY_UP, /*"Up"    The Up Arrow key.*/
-	GF_KEY_UNDO, /*"Undo"    The Undo key.*/
-	GF_KEY_VOLUMEDOWN, /*"VolumeDown"    The Volume Down key.*/
-	GF_KEY_VOLUMEMUTE, /*"VolumeMute"    The Volume Mute key.*/
-	GF_KEY_VOLUMEUP, /*"VolumeUp"    The Volume Up key.*/
-	GF_KEY_WIN, /*"Win"    The Windows Logo key.*/
-	GF_KEY_ZOOM, /*"Zoom"    The Zoom key.*/
-	GF_KEY_BACKSPACE, /*"U+0008"    The Backspace (Back) key.*/
-	GF_KEY_TAB, /*"U+0009"    The Horizontal Tabulation (Tab) key.*/
-	GF_KEY_CANCEL, /*"U+0018"    The Cancel key.*/
-	GF_KEY_ESCAPE, /*"U+001B"    The Escape (Esc) key.*/
-	GF_KEY_SPACE, /*"U+0020"    The Space (Spacebar) key.*/
-	GF_KEY_EXCLAMATION, /*"U+0021"    The Exclamation Mark (Factorial, Bang) key (!).*/
-	GF_KEY_QUOTATION, /*"U+0022"    The Quotation Mark (Quote Double) key (").*/
-	GF_KEY_NUMBER, /*"U+0023"    The Number Sign (Pound Sign, Hash, Crosshatch, Octothorpe) key (#).*/
-	GF_KEY_DOLLAR, /*"U+0024"    The Dollar Sign (milreis, escudo) key ($).*/
-	GF_KEY_AMPERSAND, /*"U+0026"    The Ampersand key (&).*/
-	GF_KEY_APOSTROPHE, /*"U+0027"    The Apostrophe (Apostrophe-Quote, APL Quote) key (').*/
-	GF_KEY_LEFTPARENTHESIS, /*"U+0028"    The Left Parenthesis (Opening Parenthesis) key (().*/
-	GF_KEY_RIGHTPARENTHESIS, /*"U+0029"    The Right Parenthesis (Closing Parenthesis) key ()).*/
-	GF_KEY_STAR, /*"U+002A"    The Asterix (Star) key (*).*/
-	GF_KEY_PLUS, /*"U+002B"    The Plus Sign (Plus) key (+).*/
-	GF_KEY_COMMA, /*"U+002C"    The Comma (decimal separator) sign key (,).*/
-	GF_KEY_HYPHEN, /*"U+002D"    The Hyphen-minus (hyphen or minus sign) key (-).*/
-	GF_KEY_FULLSTOP, /*"U+002E"    The Full Stop (period, dot, decimal point) key (.).*/
-	GF_KEY_SLASH, /*"U+002F"    The Solidus (slash, virgule, shilling) key (/).*/
-	GF_KEY_0, /*"U+0030"    The Digit Zero key (0).*/
-	GF_KEY_1, /*"U+0031"    The Digit One key (1).*/
-	GF_KEY_2, /*"U+0032"    The Digit Two key (2).*/
-	GF_KEY_3, /*"U+0033"    The Digit Three key (3).*/
-	GF_KEY_4, /*"U+0034"    The Digit Four key (4).*/
-	GF_KEY_5, /*"U+0035"    The Digit Five key (5).*/
-	GF_KEY_6, /*"U+0036"    The Digit Six key (6).*/
-	GF_KEY_7, /*"U+0037"    The Digit Seven key (7).*/
-	GF_KEY_8, /*"U+0038"    The Digit Eight key (8).*/
-	GF_KEY_9, /*"U+0039"    The Digit Nine key (9).*/
-	GF_KEY_COLON, /*"U+003A"    The Colon key (:).*/
-	GF_KEY_SEMICOLON, /*"U+003B"    The Semicolon key (;).*/
-	GF_KEY_LESSTHAN, /*"U+003C"    The Less-Than Sign key (<).*/
-	GF_KEY_EQUALS, /*"U+003D"    The Equals Sign key (=).*/
-	GF_KEY_GREATERTHAN, /*"U+003E"    The Greater-Than Sign key (>).*/
-	GF_KEY_QUESTION, /*"U+003F"    The Question Mark key (?).*/
-	GF_KEY_AT, /*"U+0040"    The Commercial At (@) key.*/
-	GF_KEY_A, /*"U+0041"    The Latin Capital Letter A key (A).*/
-	GF_KEY_B, /*"U+0042"    The Latin Capital Letter B key (B).*/
-	GF_KEY_C, /*"U+0043"    The Latin Capital Letter C key (C).*/
-	GF_KEY_D, /*"U+0044"    The Latin Capital Letter D key (D).*/
-	GF_KEY_E, /*"U+0045"    The Latin Capital Letter E key (E).*/
-	GF_KEY_F, /*"U+0046"    The Latin Capital Letter F key (F).*/
-	GF_KEY_G, /*"U+0047"    The Latin Capital Letter G key (G).*/
-	GF_KEY_H, /*"U+0048"    The Latin Capital Letter H key (H).*/
-	GF_KEY_I, /*"U+0049"    The Latin Capital Letter I key (I).*/
-	GF_KEY_J, /*"U+004A"    The Latin Capital Letter J key (J).*/
-	GF_KEY_K, /*"U+004B"    The Latin Capital Letter K key (K).*/
-	GF_KEY_L, /*"U+004C"    The Latin Capital Letter L key (L).*/
-	GF_KEY_M, /*"U+004D"    The Latin Capital Letter M key (M).*/
-	GF_KEY_N, /*"U+004E"    The Latin Capital Letter N key (N).*/
-	GF_KEY_O, /*"U+004F"    The Latin Capital Letter O key (O).*/
-	GF_KEY_P, /*"U+0050"    The Latin Capital Letter P key (P).*/
-	GF_KEY_Q, /*"U+0051"    The Latin Capital Letter Q key (Q).*/
-	GF_KEY_R, /*"U+0052"    The Latin Capital Letter R key (R).*/
-	GF_KEY_S, /*"U+0053"    The Latin Capital Letter S key (S).*/
-	GF_KEY_T, /*"U+0054"    The Latin Capital Letter T key (T).*/
-	GF_KEY_U, /*"U+0055"    The Latin Capital Letter U key (U).*/
-	GF_KEY_V, /*"U+0056"    The Latin Capital Letter V key (V).*/
-	GF_KEY_W, /*"U+0057"    The Latin Capital Letter W key (W).*/
-	GF_KEY_X, /*"U+0058"    The Latin Capital Letter X key (X).*/
-	GF_KEY_Y, /*"U+0059"    The Latin Capital Letter Y key (Y).*/
-	GF_KEY_Z, /*"U+005A"    The Latin Capital Letter Z key (Z).*/
-	GF_KEY_LEFTSQUAREBRACKET, /*"U+005B"    The Left Square Bracket (Opening Square Bracket) key ([).*/
-	GF_KEY_BACKSLASH, /*"U+005C"    The Reverse Solidus (Backslash) key (\).*/
-	GF_KEY_RIGHTSQUAREBRACKET, /*"U+005D"    The Right Square Bracket (Closing Square Bracket) key (]).*/
-	GF_KEY_CIRCUM, /*"U+005E"    The Circumflex Accent key (^).*/
-	GF_KEY_UNDERSCORE, /*"U+005F"    The Low Sign (Spacing Underscore, Underscore) key (_).*/
-	GF_KEY_GRAVEACCENT, /*"U+0060"    The Grave Accent (Back Quote) key (`).*/
-	GF_KEY_LEFTCURLYBRACKET, /*"U+007B"    The Left Curly Bracket (Opening Curly Bracket, Opening Brace, Brace Left) key ({).*/
-	GF_KEY_PIPE, /*"U+007C"    The Vertical Line (Vertical Bar, Pipe) key (|).*/
-	GF_KEY_RIGHTCURLYBRACKET, /*"U+007D"    The Right Curly Bracket (Closing Curly Bracket, Closing Brace, Brace Right) key (}).*/
-	GF_KEY_DEL, /*"U+007F"    The Delete (Del) Key.*/
-	GF_KEY_INVERTEXCLAMATION, /*"U+00A1"    The Inverted Exclamation Mark key (�).*/
-	GF_KEY_DEADGRAVE, /*"U+0300"    The Combining Grave Accent (Greek Varia, Dead Grave) key.*/
-	GF_KEY_DEADEACUTE, /*"U+0301"    The Combining Acute Accent (Stress Mark, Greek Oxia, Tonos, Dead Eacute) key.*/
-	GF_KEY_DEADCIRCUM, /*"U+0302"    The Combining Circumflex Accent (Hat, Dead Circumflex) key.*/
-	GF_KEY_DEADTILDE, /*"U+0303"    The Combining Tilde (Dead Tilde) key.*/
-	GF_KEY_DEADMACRON, /*"U+0304"    The Combining Macron (Long, Dead Macron) key.*/
-	GF_KEY_DEADBREVE, /*"U+0306"    The Combining Breve (Short, Dead Breve) key.*/
-	GF_KEY_DEADABOVEDOT, /*"U+0307"    The Combining Dot Above (Derivative, Dead Above Dot) key.*/
-	GF_KEY_DEADDIARESIS, /*"U+0308"    The Combining Diaeresis (Double Dot Abode, Umlaut, Greek Dialytika, Double Derivative, Dead Diaeresis) key.*/
-	GF_KEY_DEADRINGABOVE, /*"U+030A"    The Combining Ring Above (Dead Above Ring) key.*/
-	GF_KEY_DEADDOUBLEACUTE, /*"U+030B"    The Combining Double Acute Accent (Dead Doubleacute) key.*/
-	GF_KEY_DEADCARON, /*"U+030C"    The Combining Caron (Hacek, V Above, Dead Caron) key.*/
-	GF_KEY_DEADCEDILLA, /*"U+0327"    The Combining Cedilla (Dead Cedilla) key.*/
-	GF_KEY_DEADOGONEK, /*"U+0328"    The Combining Ogonek (Nasal Hook, Dead Ogonek) key.*/
-	GF_KEY_DEADIOTA, /*"U+0345"    The Combining Greek Ypogegrammeni (Greek Non-Spacing Iota Below, Iota Subscript, Dead Iota) key.*/
-	GF_KEY_EURO, /*"U+20AC"    The Euro Currency Sign key (�).*/
-	GF_KEY_DEADVOICESOUND, /*"U+3099"    The Combining Katakana-Hiragana Voiced Sound Mark (Dead Voiced Sound) key.*/
-	GF_KEY_DEADSEMIVOICESOUND, /*"U+309A"    The Combining Katakana-Hiragana Semi-Voiced Sound Mark (Dead Semivoiced Sound) key. */
-	/* STB */
-	GF_KEY_CHANNELUP, /*ChannelUp*/
-	GF_KEY_CHANNELDOWN, /*ChannelDown*/
-	GF_KEY_TEXT, /*Text*/
-	GF_KEY_INFO, /*Info*/
-	GF_KEY_EPG, /*EPG*/
-	GF_KEY_RECORD, /*Record*/
-	GF_KEY_BEGINPAGE, /*BeginPage*/
-    /* end STB */
-
-	/*non-dom keys, used in LASeR*/
-	GF_KEY_CELL_SOFT1,	/*soft1 key of cell phones*/
-	GF_KEY_CELL_SOFT2,	/*soft2 key of cell phones*/
-
-	/*for joystick handling*/
-	GF_KEY_JOYSTICK
-};
-
-
-/*key modifiers state - set by terminal (not set by video driver)*/
-enum
-{
-	GF_KEY_MOD_SHIFT = (1),
-	GF_KEY_MOD_CTRL = (1<<2),
-	GF_KEY_MOD_ALT = (1<<3),
-
-	GF_KEY_EXT_NUMPAD = (1<<4),
-	GF_KEY_EXT_LEFT = (1<<5),
-	GF_KEY_EXT_RIGHT = (1<<6)
-};
-
-/*sensor signaling*/
-enum
-{
-	GF_CURSOR_NORMAL = 0x00,
-	GF_CURSOR_ANCHOR,
-	GF_CURSOR_TOUCH,
-	/*discSensor, cylinderSensor, sphereSensor*/
-	GF_CURSOR_ROTATE,
-	/*proximitySensor & proximitySensor2D*/
-	GF_CURSOR_PROXIMITY,
-	/*planeSensor & planeSensor2D*/
-	GF_CURSOR_PLANE,
-	/*collision*/
-	GF_CURSOR_COLLIDE,
-	GF_CURSOR_HIDE,
-};
-
-/*Mutation AttrChangeType Signaling*/
-enum
-{
-	GF_MUTATION_ATTRCHANGE_MODIFICATION = 0x01,
-	GF_MUTATION_ATTRCHANGE_ADDITION = 0x02,
-	GF_MUTATION_ATTRCHANGE_REMOVAL = 0x03,
-};
-
-enum
-{
-	/*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
-};
-
-#endif
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre 
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Events management
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  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_EVENTS_CONSTANTS_H_
+#define _GF_EVENTS_CONSTANTS_H_
+
+
+
+/*
+		minimal event system
+
+	DO NOT CHANGE THEIR POSITION IN THE LIST, USED TO SPEED UP FILTERING OF USER INPUT EVENTS
+*/
+
+/*events*/
+typedef enum {
+
+	/******************************************************
+
+		Events used for both GPAC internals and DOM Events
+
+	*******************************************************/
+	/*MouseEvents*/
+	GF_EVENT_CLICK,
+	GF_EVENT_MOUSEUP,
+	GF_EVENT_MOUSEDOWN,
+	GF_EVENT_MOUSEOVER,
+	GF_EVENT_MOUSEOUT,
+	/*!! ALL MOUSE EVENTS SHALL BE DECLARED BEFORE MOUSEMOVE !! */
+	GF_EVENT_MOUSEMOVE,
+	/*mouse wheel event*/
+	GF_EVENT_MOUSEWHEEL,
+
+	/*Key Events*/
+	GF_EVENT_KEYUP,
+	GF_EVENT_KEYDOWN, /* covers KeyDown, KeyPress and AccessKey */
+	GF_EVENT_LONGKEYPRESS,
+	/*character input*/
+	GF_EVENT_TEXTINPUT,
+
+
+	/******************************************************
+
+		Events used for DOM Events only
+
+	*******************************************************/
+	GF_EVENT_TEXTSELECT,
+
+	/*DOM UIEvents*/
+	GF_EVENT_FOCUSIN,
+	GF_EVENT_FOCUSOUT,
+	GF_EVENT_ACTIVATE,
+	GF_EVENT_CHANGE,
+	GF_EVENT_FOCUS,
+	GF_EVENT_BLUR,
+	/*SVG (HTML) Events*/
+	GF_EVENT_LOAD,
+	GF_EVENT_UNLOAD,
+	GF_EVENT_ABORT,
+	GF_EVENT_ERROR,
+	GF_EVENT_RESIZE,
+	GF_EVENT_SCROLL,
+	GF_EVENT_ZOOM,
+	GF_EVENT_BEGIN, /*this is a fake event, it is NEVER fired, only used in SMIL begin*/
+	GF_EVENT_BEGIN_EVENT,
+	GF_EVENT_END, /*this is a fake event, it is NEVER fired, only used in SMIL end*/
+	GF_EVENT_END_EVENT,
+	GF_EVENT_REPEAT, /*this is a fake event, it is NEVER fired, only used in SMIL repeat*/
+	GF_EVENT_REPEAT_EVENT,
+
+	/*DOM MutationEvents - NOT SUPPORTED YET*/
+	GF_EVENT_TREE_MODIFIED,
+	GF_EVENT_NODE_INSERTED,
+	GF_EVENT_NODE_REMOVED,
+	GF_EVENT_NODE_INSERTED_DOC,
+	GF_EVENT_NODE_REMOVED_DOC,
+	GF_EVENT_ATTR_MODIFIED,
+	GF_EVENT_CHAR_DATA_MODIFIED,
+	GF_EVENT_NODE_NAME_CHANGED,
+	GF_EVENT_ATTR_NAME_CHANGED,
+
+	GF_EVENT_DCCI_PROP_CHANGE,
+
+	/*LASeR events*/
+	GF_EVENT_ACTIVATED,
+	GF_EVENT_DEACTIVATED,
+	GF_EVENT_PAUSE,
+	GF_EVENT_PAUSED_EVENT,
+	GF_EVENT_PLAY,
+	GF_EVENT_REPEAT_KEY,
+	GF_EVENT_RESUME_EVENT,
+	GF_EVENT_SHORT_ACCESSKEY,
+	/*pseudo-event, only used in LASeR coding*/
+	GF_EVENT_EXECUTION_TIME,
+
+	/*HTML5 media events*/
+	GF_EVENT_MEDIA_SETUP_BEGIN,	/*not HTML5 but should be :)*/
+	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_HTML_MSE_SOURCE_OPEN,
+	GF_EVENT_HTML_MSE_SOURCE_ENDED,
+	GF_EVENT_HTML_MSE_SOURCE_CLOSE,
+	GF_EVENT_HTML_MSE_UPDATE_START,
+	GF_EVENT_HTML_MSE_UPDATE,
+	GF_EVENT_HTML_MSE_UPDATE_END,
+	GF_EVENT_HTML_MSE_UPDATE_ERROR,
+	GF_EVENT_HTML_MSE_UPDATE_ABORT,
+	GF_EVENT_HTML_MSE_ADD_SOURCE_BUFFER,
+	GF_EVENT_HTML_MSE_REMOVE_SOURCE_BUFFER,
+
+	GF_EVENT_BATTERY,
+	GF_EVENT_CPU,
+	GF_EVENT_UNKNOWN,
+
+
+	/******************************************************
+
+		Events used for GPAC internals only
+
+	*******************************************************/
+
+	/*same as mousedown, generated internally by GPAC*/
+	GF_EVENT_DBLCLICK,
+
+	/*scene attached event, dispatched when the root node of a scene is loaded and
+	attached to the window or parent object (animation, inline, ...)*/
+	GF_EVENT_SCENE_ATTACHED,
+
+	/*VP resize attached event, dispatched when viewport of a scene is being modified
+	attached to the window or parent object (animation, inline, ...)*/
+	GF_EVENT_VP_RESIZE,
+
+	/*window events*/
+	/*size has changed - indicate new w & h in .x end .y fields of event.
+	When sent from gpac to a video plugin, indicates the output size should be changed. This is only sent when the plugin
+	manages the output video himself
+	When sent from a video plugin to gpac, indicates the output size has been changed. This is only sent when the plugin
+	manages the output video himself
+	*/
+	GF_EVENT_SIZE,
+	/*signals the scene size (if indicated in scene) upon connection (sent to the user event proc only)
+		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_SET_CURSOR,	/*set mouse cursor*/
+	GF_EVENT_SET_CAPTION,	/*set window caption*/
+	GF_EVENT_MOVE,		/*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:
+		- when sent from gpac to plugin, indicates that the plugin should re-setup hardware context due to a window resize:
+			* for 2D output, this means resizing the backbuffer if needed (depending on HW constraints)
+			* 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 gpac to user, indicate aspect ratio has been modified and video output is ready
+	*/
+	GF_EVENT_VIDEO_SETUP,
+	/*queries the list of system colors - only exchanged between compositor and video output*/
+	GF_EVENT_SYS_COLORS,
+
+	/*indicates some text has been pasted - from video output to compositor only*/
+	GF_EVENT_PASTE_TEXT,
+	/*queries for text to be copied - from video output to compositor only*/
+	GF_EVENT_COPY_TEXT,
+
+	/*terminal events*/
+	GF_EVENT_CONNECT,	/*signal URL is connected*/
+	GF_EVENT_DURATION,	/*signal duration of presentation*/
+	GF_EVENT_EOS,	/*signal End of scene playback*/
+	GF_EVENT_AUTHORIZATION,	/*indicates a user and pass is queried*/
+	GF_EVENT_NAVIGATE, /*indicates the user app should load or jump to the given URL.*/
+	GF_EVENT_NAVIGATE_INFO, /*indicates the link or its description under the mouse pointer*/
+	GF_EVENT_MESSAGE, /*message from the MPEG-4 terminal*/
+	GF_EVENT_PROGRESS, /*progress message from the MPEG-4 terminal*/
+	GF_EVENT_FORWARDED, /*event forwarded by service (MPEG-2, RTP, ...)*/
+	GF_EVENT_VIEWPOINTS,	/*indicates viewpoint list has changed - no struct associated*/
+	GF_EVENT_STREAMLIST,	/*indicates stream list has changed - no struct associated - only used when no scene info is present*/
+	GF_EVENT_METADATA, /*indicates a change in associated metadata*/
+	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_EventType;
+
+/*GPAC/DOM3 key codes*/
+typedef enum {
+	GF_KEY_UNIDENTIFIED = 0,
+	GF_KEY_ACCEPT = 1, /* "Accept"    The Accept (Commit) key.*/
+	GF_KEY_AGAIN, /* "Again"  The Again key.*/
+	GF_KEY_ALLCANDIDATES, /* "AllCandidates"    The All Candidates key.*/
+	GF_KEY_ALPHANUM, /*"Alphanumeric"    The Alphanumeric key.*/
+	GF_KEY_ALT, /*"Alt"    The Alt (Menu) key.*/
+	GF_KEY_ALTGRAPH, /*"AltGraph"    The Alt-Graph key.*/
+	GF_KEY_APPS, /*"Apps"    The Application key.*/
+	GF_KEY_ATTN, /*"Attn"    The ATTN key.*/
+	GF_KEY_BROWSERBACK, /*"BrowserBack"    The Browser Back key.*/
+	GF_KEY_BROWSERFAVORITES, /*"BrowserFavorites"    The Browser Favorites key.*/
+	GF_KEY_BROWSERFORWARD, /*"BrowserForward"    The Browser Forward key.*/
+	GF_KEY_BROWSERHOME, /*"BrowserHome"    The Browser Home key.*/
+	GF_KEY_BROWSERREFRESH, /*"BrowserRefresh"    The Browser Refresh key.*/
+	GF_KEY_BROWSERSEARCH, /*"BrowserSearch"    The Browser Search key.*/
+	GF_KEY_BROWSERSTOP, /*"BrowserStop"    The Browser Stop key.*/
+	GF_KEY_CAPSLOCK, /*"CapsLock"    The Caps Lock (Capital) key.*/
+	GF_KEY_CLEAR, /*"Clear"    The Clear key.*/
+	GF_KEY_CODEINPUT, /*"CodeInput"    The Code Input key.*/
+	GF_KEY_COMPOSE, /*"Compose"    The Compose key.*/
+	GF_KEY_CONTROL, /*"Control"    The Control (Ctrl) key.*/
+	GF_KEY_CRSEL, /*"Crsel"    The Crsel key.*/
+	GF_KEY_CONVERT, /*"Convert"    The Convert key.*/
+	GF_KEY_COPY, /*"Copy"    The Copy key.*/
+	GF_KEY_CUT, /*"Cut"    The Cut key.*/
+	GF_KEY_DOWN, /*"Down"    The Down Arrow key.*/
+	GF_KEY_END, /*"End"    The End key.*/
+	GF_KEY_ENTER, /*"Enter"    The Enter key.
+                   Note: This key identifier is also used for the Return (Macintosh numpad) key.*/
+	GF_KEY_ERASEEOF, /*"EraseEof"    The Erase EOF key.*/
+	GF_KEY_EXECUTE, /*"Execute"    The Execute key.*/
+	GF_KEY_EXSEL, /*"Exsel"    The Exsel key.*/
+	GF_KEY_F1, /*"F1"    The F1 key.*/
+	GF_KEY_F2, /*"F2"    The F2 key.*/
+	GF_KEY_F3, /*"F3"    The F3 key.*/
+	GF_KEY_F4, /*"F4"    The F4 key.*/
+	GF_KEY_F5, /*"F5"    The F5 key.*/
+	GF_KEY_F6, /*"F6"    The F6 key.*/
+	GF_KEY_F7, /*"F7"    The F7 key.*/
+	GF_KEY_F8, /*"F8"    The F8 key.*/
+	GF_KEY_F9, /*"F9"    The F9 key.*/
+	GF_KEY_F10, /*"F10"    The F10 key.*/
+	GF_KEY_F11, /*"F11"    The F11 key.*/
+	GF_KEY_F12, /*"F12"    The F12 key.*/
+	GF_KEY_F13, /*"F13"    The F13 key.*/
+	GF_KEY_F14, /*"F14"    The F14 key.*/
+	GF_KEY_F15, /*"F15"    The F15 key.*/
+	GF_KEY_F16, /*"F16"    The F16 key.*/
+	GF_KEY_F17, /*"F17"    The F17 key.*/
+	GF_KEY_F18, /*"F18"    The F18 key.*/
+	GF_KEY_F19, /*"F19"    The F19 key.*/
+	GF_KEY_F20, /*"F20"    The F20 key.*/
+	GF_KEY_F21, /*"F21"    The F21 key.*/
+	GF_KEY_F22, /*"F22"    The F22 key.*/
+	GF_KEY_F23, /*"F23"    The F23 key.*/
+	GF_KEY_F24, /*"F24"    The F24 key.*/
+	GF_KEY_FINALMODE, /*"FinalMode"    The Final Mode (Final) key used on some asian keyboards.*/
+	GF_KEY_FIND, /*"Find"    The Find key.*/
+	GF_KEY_FULLWIDTH, /*"FullWidth"    The Full-Width Characters key.*/
+	GF_KEY_HALFWIDTH, /*"HalfWidth"    The Half-Width Characters key.*/
+	GF_KEY_HANGULMODE, /*"HangulMode"    The Hangul (Korean characters) Mode key.*/
+	GF_KEY_HANJAMODE, /*"HanjaMode"    The Hanja (Korean characters) Mode key.*/
+	GF_KEY_HELP, /*"Help"    The Help key.*/
+	GF_KEY_HIRAGANA, /*"Hiragana"    The Hiragana (Japanese Kana characters) key.*/
+	GF_KEY_HOME, /*"Home"    The Home key.*/
+	GF_KEY_INSERT, /*"Insert"    The Insert (Ins) key.*/
+	GF_KEY_JAPANESEHIRAGANA, /*"JapaneseHiragana"    The Japanese-Hiragana key.*/
+	GF_KEY_JAPANESEKATAKANA, /*"JapaneseKatakana"    The Japanese-Katakana key.*/
+	GF_KEY_JAPANESEROMAJI, /*"JapaneseRomaji"    The Japanese-Romaji key.*/
+	GF_KEY_JUNJAMODE, /*"JunjaMode"    The Junja Mode key.*/
+	GF_KEY_KANAMODE, /*"KanaMode"    The Kana Mode (Kana Lock) key.*/
+	GF_KEY_KANJIMODE, /*"KanjiMode"    The Kanji (Japanese name for ideographic characters of Chinese origin) Mode key.*/
+	GF_KEY_KATAKANA, /*"Katakana"    The Katakana (Japanese Kana characters) key.*/
+	GF_KEY_LAUNCHAPPLICATION1, /*"LaunchApplication1"    The Start Application One key.*/
+	GF_KEY_LAUNCHAPPLICATION2, /*"LaunchApplication2"    The Start Application Two key.*/
+	GF_KEY_LAUNCHMAIL, /*"LaunchMail"    The Start Mail key.*/
+	GF_KEY_LEFT, /*"Left"    The Left Arrow key.*/
+	GF_KEY_META, /*"Meta"    The Meta key.*/
+	GF_KEY_MEDIANEXTTRACK, /*"MediaNextTrack"    The Media Next Track key.*/
+	GF_KEY_MEDIAPLAYPAUSE, /*"MediaPlayPause"    The Media Play Pause key.*/
+	GF_KEY_MEDIAPREVIOUSTRACK, /*"MediaPreviousTrack"    The Media Previous Track key.*/
+	GF_KEY_MEDIASTOP, /*"MediaStop"    The Media Stok key.*/
+	GF_KEY_MODECHANGE, /*"ModeChange"    The Mode Change key.*/
+	GF_KEY_NONCONVERT, /*"Nonconvert"    The Nonconvert (Don't Convert) key.*/
+	GF_KEY_NUMLOCK, /*"NumLock"    The Num Lock key.*/
+	GF_KEY_PAGEDOWN, /*"PageDown"    The Page Down (Next) key.*/
+	GF_KEY_PAGEUP, /*"PageUp"    The Page Up key.*/
+	GF_KEY_PASTE, /*"Paste"    The Paste key.*/
+	GF_KEY_PAUSE, /*"Pause"    The Pause key.*/
+	GF_KEY_PLAY, /*"Play"    The Play key.*/
+	GF_KEY_PREVIOUSCANDIDATE, /*"PreviousCandidate"    The Previous Candidate function key.*/
+	GF_KEY_PRINTSCREEN, /*"PrintScreen"    The Print Screen (PrintScrn, SnapShot) key.*/
+	GF_KEY_PROCESS, /*"Process"    The Process key.*/
+	GF_KEY_PROPS, /*"Props"    The Props key.*/
+	GF_KEY_RIGHT, /*"Right"    The Right Arrow key.*/
+	GF_KEY_ROMANCHARACTERS, /*"RomanCharacters"    The Roman Characters function key.*/
+	GF_KEY_SCROLL, /*"Scroll"    The Scroll Lock key.*/
+	GF_KEY_SELECT, /*"Select"    The Select key.*/
+	GF_KEY_SELECTMEDIA, /*"SelectMedia"    The Select Media key.*/
+	GF_KEY_SHIFT, /*"Shift"    The Shift key.*/
+	GF_KEY_STOP, /*"Stop"    The Stop key.*/
+	GF_KEY_UP, /*"Up"    The Up Arrow key.*/
+	GF_KEY_UNDO, /*"Undo"    The Undo key.*/
+	GF_KEY_VOLUMEDOWN, /*"VolumeDown"    The Volume Down key.*/
+	GF_KEY_VOLUMEMUTE, /*"VolumeMute"    The Volume Mute key.*/
+	GF_KEY_VOLUMEUP, /*"VolumeUp"    The Volume Up key.*/
+	GF_KEY_WIN, /*"Win"    The Windows Logo key.*/
+	GF_KEY_ZOOM, /*"Zoom"    The Zoom key.*/
+	GF_KEY_BACKSPACE, /*"U+0008"    The Backspace (Back) key.*/
+	GF_KEY_TAB, /*"U+0009"    The Horizontal Tabulation (Tab) key.*/
+	GF_KEY_CANCEL, /*"U+0018"    The Cancel key.*/
+	GF_KEY_ESCAPE, /*"U+001B"    The Escape (Esc) key.*/
+	GF_KEY_SPACE, /*"U+0020"    The Space (Spacebar) key.*/
+	GF_KEY_EXCLAMATION, /*"U+0021"    The Exclamation Mark (Factorial, Bang) key (!).*/
+	GF_KEY_QUOTATION, /*"U+0022"    The Quotation Mark (Quote Double) key (").*/
+	GF_KEY_NUMBER, /*"U+0023"    The Number Sign (Pound Sign, Hash, Crosshatch, Octothorpe) key (#).*/
+	GF_KEY_DOLLAR, /*"U+0024"    The Dollar Sign (milreis, escudo) key ($).*/
+	GF_KEY_AMPERSAND, /*"U+0026"    The Ampersand key (&).*/
+	GF_KEY_APOSTROPHE, /*"U+0027"    The Apostrophe (Apostrophe-Quote, APL Quote) key (').*/
+	GF_KEY_LEFTPARENTHESIS, /*"U+0028"    The Left Parenthesis (Opening Parenthesis) key (().*/
+	GF_KEY_RIGHTPARENTHESIS, /*"U+0029"    The Right Parenthesis (Closing Parenthesis) key ()).*/
+	GF_KEY_STAR, /*"U+002A"    The Asterix (Star) key (*).*/
+	GF_KEY_PLUS, /*"U+002B"    The Plus Sign (Plus) key (+).*/
+	GF_KEY_COMMA, /*"U+002C"    The Comma (decimal separator) sign key (,).*/
+	GF_KEY_HYPHEN, /*"U+002D"    The Hyphen-minus (hyphen or minus sign) key (-).*/
+	GF_KEY_FULLSTOP, /*"U+002E"    The Full Stop (period, dot, decimal point) key (.).*/
+	GF_KEY_SLASH, /*"U+002F"    The Solidus (slash, virgule, shilling) key (/).*/
+	GF_KEY_0, /*"U+0030"    The Digit Zero key (0).*/
+	GF_KEY_1, /*"U+0031"    The Digit One key (1).*/
+	GF_KEY_2, /*"U+0032"    The Digit Two key (2).*/
+	GF_KEY_3, /*"U+0033"    The Digit Three key (3).*/
+	GF_KEY_4, /*"U+0034"    The Digit Four key (4).*/
+	GF_KEY_5, /*"U+0035"    The Digit Five key (5).*/
+	GF_KEY_6, /*"U+0036"    The Digit Six key (6).*/
+	GF_KEY_7, /*"U+0037"    The Digit Seven key (7).*/
+	GF_KEY_8, /*"U+0038"    The Digit Eight key (8).*/
+	GF_KEY_9, /*"U+0039"    The Digit Nine key (9).*/
+	GF_KEY_COLON, /*"U+003A"    The Colon key (:).*/
+	GF_KEY_SEMICOLON, /*"U+003B"    The Semicolon key (;).*/
+	GF_KEY_LESSTHAN, /*"U+003C"    The Less-Than Sign key (<).*/
+	GF_KEY_EQUALS, /*"U+003D"    The Equals Sign key (=).*/
+	GF_KEY_GREATERTHAN, /*"U+003E"    The Greater-Than Sign key (>).*/
+	GF_KEY_QUESTION, /*"U+003F"    The Question Mark key (?).*/
+	GF_KEY_AT, /*"U+0040"    The Commercial At (@) key.*/
+	GF_KEY_A, /*"U+0041"    The Latin Capital Letter A key (A).*/
+	GF_KEY_B, /*"U+0042"    The Latin Capital Letter B key (B).*/
+	GF_KEY_C, /*"U+0043"    The Latin Capital Letter C key (C).*/
+	GF_KEY_D, /*"U+0044"    The Latin Capital Letter D key (D).*/
+	GF_KEY_E, /*"U+0045"    The Latin Capital Letter E key (E).*/
+	GF_KEY_F, /*"U+0046"    The Latin Capital Letter F key (F).*/
+	GF_KEY_G, /*"U+0047"    The Latin Capital Letter G key (G).*/
+	GF_KEY_H, /*"U+0048"    The Latin Capital Letter H key (H).*/
+	GF_KEY_I, /*"U+0049"    The Latin Capital Letter I key (I).*/
+	GF_KEY_J, /*"U+004A"    The Latin Capital Letter J key (J).*/
+	GF_KEY_K, /*"U+004B"    The Latin Capital Letter K key (K).*/
+	GF_KEY_L, /*"U+004C"    The Latin Capital Letter L key (L).*/
+	GF_KEY_M, /*"U+004D"    The Latin Capital Letter M key (M).*/
+	GF_KEY_N, /*"U+004E"    The Latin Capital Letter N key (N).*/
+	GF_KEY_O, /*"U+004F"    The Latin Capital Letter O key (O).*/
+	GF_KEY_P, /*"U+0050"    The Latin Capital Letter P key (P).*/
+	GF_KEY_Q, /*"U+0051"    The Latin Capital Letter Q key (Q).*/
+	GF_KEY_R, /*"U+0052"    The Latin Capital Letter R key (R).*/
+	GF_KEY_S, /*"U+0053"    The Latin Capital Letter S key (S).*/
+	GF_KEY_T, /*"U+0054"    The Latin Capital Letter T key (T).*/
+	GF_KEY_U, /*"U+0055"    The Latin Capital Letter U key (U).*/
+	GF_KEY_V, /*"U+0056"    The Latin Capital Letter V key (V).*/
+	GF_KEY_W, /*"U+0057"    The Latin Capital Letter W key (W).*/
+	GF_KEY_X, /*"U+0058"    The Latin Capital Letter X key (X).*/
+	GF_KEY_Y, /*"U+0059"    The Latin Capital Letter Y key (Y).*/
+	GF_KEY_Z, /*"U+005A"    The Latin Capital Letter Z key (Z).*/
+	GF_KEY_LEFTSQUAREBRACKET, /*"U+005B"    The Left Square Bracket (Opening Square Bracket) key ([).*/
+	GF_KEY_BACKSLASH, /*"U+005C"    The Reverse Solidus (Backslash) key (\).*/
+	GF_KEY_RIGHTSQUAREBRACKET, /*"U+005D"    The Right Square Bracket (Closing Square Bracket) key (]).*/
+	GF_KEY_CIRCUM, /*"U+005E"    The Circumflex Accent key (^).*/
+	GF_KEY_UNDERSCORE, /*"U+005F"    The Low Sign (Spacing Underscore, Underscore) key (_).*/
+	GF_KEY_GRAVEACCENT, /*"U+0060"    The Grave Accent (Back Quote) key (`).*/
+	GF_KEY_LEFTCURLYBRACKET, /*"U+007B"    The Left Curly Bracket (Opening Curly Bracket, Opening Brace, Brace Left) key ({).*/
+	GF_KEY_PIPE, /*"U+007C"    The Vertical Line (Vertical Bar, Pipe) key (|).*/
+	GF_KEY_RIGHTCURLYBRACKET, /*"U+007D"    The Right Curly Bracket (Closing Curly Bracket, Closing Brace, Brace Right) key (}).*/
+	GF_KEY_DEL, /*"U+007F"    The Delete (Del) Key.*/
+	GF_KEY_INVERTEXCLAMATION, /*"U+00A1"    The Inverted Exclamation Mark key (�).*/
+	GF_KEY_DEADGRAVE, /*"U+0300"    The Combining Grave Accent (Greek Varia, Dead Grave) key.*/
+	GF_KEY_DEADEACUTE, /*"U+0301"    The Combining Acute Accent (Stress Mark, Greek Oxia, Tonos, Dead Eacute) key.*/
+	GF_KEY_DEADCIRCUM, /*"U+0302"    The Combining Circumflex Accent (Hat, Dead Circumflex) key.*/
+	GF_KEY_DEADTILDE, /*"U+0303"    The Combining Tilde (Dead Tilde) key.*/
+	GF_KEY_DEADMACRON, /*"U+0304"    The Combining Macron (Long, Dead Macron) key.*/
+	GF_KEY_DEADBREVE, /*"U+0306"    The Combining Breve (Short, Dead Breve) key.*/
+	GF_KEY_DEADABOVEDOT, /*"U+0307"    The Combining Dot Above (Derivative, Dead Above Dot) key.*/
+	GF_KEY_DEADDIARESIS, /*"U+0308"    The Combining Diaeresis (Double Dot Abode, Umlaut, Greek Dialytika, Double Derivative, Dead Diaeresis) key.*/
+	GF_KEY_DEADRINGABOVE, /*"U+030A"    The Combining Ring Above (Dead Above Ring) key.*/
+	GF_KEY_DEADDOUBLEACUTE, /*"U+030B"    The Combining Double Acute Accent (Dead Doubleacute) key.*/
+	GF_KEY_DEADCARON, /*"U+030C"    The Combining Caron (Hacek, V Above, Dead Caron) key.*/
+	GF_KEY_DEADCEDILLA, /*"U+0327"    The Combining Cedilla (Dead Cedilla) key.*/
+	GF_KEY_DEADOGONEK, /*"U+0328"    The Combining Ogonek (Nasal Hook, Dead Ogonek) key.*/
+	GF_KEY_DEADIOTA, /*"U+0345"    The Combining Greek Ypogegrammeni (Greek Non-Spacing Iota Below, Iota Subscript, Dead Iota) key.*/
+	GF_KEY_EURO, /*"U+20AC"    The Euro Currency Sign key (�).*/
+	GF_KEY_DEADVOICESOUND, /*"U+3099"    The Combining Katakana-Hiragana Voiced Sound Mark (Dead Voiced Sound) key.*/
+	GF_KEY_DEADSEMIVOICESOUND, /*"U+309A"    The Combining Katakana-Hiragana Semi-Voiced Sound Mark (Dead Semivoiced Sound) key. */
+	/* STB */
+	GF_KEY_CHANNELUP, /*ChannelUp*/
+	GF_KEY_CHANNELDOWN, /*ChannelDown*/
+	GF_KEY_TEXT, /*Text*/
+	GF_KEY_INFO, /*Info*/
+	GF_KEY_EPG, /*EPG*/
+	GF_KEY_RECORD, /*Record*/
+	GF_KEY_BEGINPAGE, /*BeginPage*/
+    /* end STB */
+
+	/*non-dom keys, used in LASeR*/
+	GF_KEY_CELL_SOFT1,	/*soft1 key of cell phones*/
+	GF_KEY_CELL_SOFT2,	/*soft2 key of cell phones*/
+
+	/*for joystick handling*/
+	GF_KEY_JOYSTICK
+} GF_KeyCode;
+
+
+/*key modifiers state - set by terminal (not set by video driver)*/
+typedef enum
+{
+	GF_KEY_MOD_SHIFT = (1),
+	GF_KEY_MOD_CTRL = (1<<2),
+	GF_KEY_MOD_ALT = (1<<3),
+
+	GF_KEY_EXT_NUMPAD = (1<<4),
+	GF_KEY_EXT_LEFT = (1<<5),
+	GF_KEY_EXT_RIGHT = (1<<6)
+} GF_KeyModifier;
+
+/*sensor signaling*/
+enum
+{
+	GF_CURSOR_NORMAL = 0x00,
+	GF_CURSOR_ANCHOR,
+	GF_CURSOR_TOUCH,
+	/*discSensor, cylinderSensor, sphereSensor*/
+	GF_CURSOR_ROTATE,
+	/*proximitySensor & proximitySensor2D*/
+	GF_CURSOR_PROXIMITY,
+	/*planeSensor & planeSensor2D*/
+	GF_CURSOR_PLANE,
+	/*collision*/
+	GF_CURSOR_COLLIDE,
+	GF_CURSOR_HIDE,
+};
+
+/*Mutation AttrChangeType Signaling*/
+enum
+{
+	GF_MUTATION_ATTRCHANGE_MODIFICATION = 0x01,
+	GF_MUTATION_ATTRCHANGE_ADDITION = 0x02,
+	GF_MUTATION_ATTRCHANGE_REMOVAL = 0x03,
+};
+
+enum
+{
+	/*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
+};
+
+#endif

gpac-0.5.0.svn4668.tar.bz2/include/gpac/filestreamer.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/filestreamer.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/html5_media.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/html5_media.h Changed

@@ -1,328 +1,361 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2013-
- *					All rights reserved
- *
- *  This file is part of GPAC / HTML Media Element 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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  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_HTMLMEDIA_H_
-#define _GF_HTMLMEDIA_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/internal/scenegraph_dev.h>
-
-/*base SVG type*/
-#include <gpac/nodes_svg.h>
-/*dom events*/
-#include <gpac/events.h>
-/*dom text event*/
-#include <gpac/utf.h>
-
-#include <gpac/download.h>
-#include <gpac/network.h>
-#include <gpac/modules/service.h>
-#include <gpac/xml.h>
-#include <gpac/internal/terminal_dev.h>
-
-#include <gpac/internal/smjs_api.h>
-
-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;
-} GF_HTML_MediaRuntime;
-
-/************************************************************
- *
- *  HTML 5 Media Element
- *  http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#media-element
- *
- *************************************************************/
-
-typedef enum
-{
-    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
-} GF_HTML_NetworkState;
-
-typedef enum
-{
-    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;
-
-    GF_HTML_MediaErrorCode   code;
-} GF_HTML_MediaError;
-
-typedef struct _timerange
-{
-    /* JavaScript context associated to this object */
-    JSContext               *c;
-    /* JavaScript counterpart */
-    JSObject                *_this;
-
-    GF_List                 *times;
-} 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
-} GF_HTML_TrackType;
-
-#define BASE_HTML_TRACK     \
-    /* JavaScript context associated to this object */\
-    JSContext               *c;\
-    /* JavaScript counterpart */\
-    JSObject                *_this;\
-    /* GPAC-specific properties */\
-    u32                     bin_id;    /* track id */\
-    LPNETCHANNEL            channel;   /* channel object used by the terminal */\
-    GF_ObjectDescriptor     *od;       /* MPEG-4 Object descriptor for this track */\
-    GF_List                 *buffer;   /* List of MSE Packets */\
-    GF_Mutex                *buffer_mutex;\
-    Bool                    last_dts_set; \
-    double                  last_dts; /* MSE  last decode timestamp */ \
-    Bool                    highest_pts_set; \
-    double                  highest_pts; /* MSE highest presentation timestamp */ \
-    Bool                    needs_rap; /* MSE  need random access point flag */ \
-    u32                     timescale; /* used by time stamps in MSE Packets */ \
-    /* standard HTML properties */ \
-    GF_HTML_TrackType        type;\
-    char                    *id;\
-    char                    *kind;\
-    char                    *label;\
-    char                    *language;\
-    char                    *mime; \
-    Bool                    enabled_or_selected; 
-
-typedef struct
-{
-    BASE_HTML_TRACK
-} GF_HTML_Track;
-
-typedef struct
-{
-    BASE_HTML_TRACK
-    /*char                    *inBandMetadataTrackDispatchType;
-    GF_HTMLTextTrackMode    mode;
-    GF_HTMLTextTrackCueList cues;
-    GF_HTMLTextTrackCueList activeCues;
-    oncuechange; */
-} GF_HTML_TextTrack;
-
-#define BASE_HTML_TRACK_LIST     \
-    /* JavaScript context associated to this object */\
-    JSContext               *c;\
-    /* JavaScript counterpart */\
-    JSObject                *_this;\
-    GF_List                 *tracks; \
-    /* onchange, onaddtrack, onremovetrack */ \
-    u32                     selected_index;
-
-typedef struct
-{
-    BASE_HTML_TRACK_LIST
-} GF_HTML_TrackList;
-
-typedef enum
-{
-    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;
-} 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;
-} GF_HTML_MediaElement;
-typedef struct 
-{
-    /* JavaScript context used to create the JavaScript object below */
-    JSContext               *c;
-
-    /* JavaScript counterpart for this object*/
-    JSObject                *_this;
-
-    char    *data;
-    u32     length;
-    char    *url;
-
-    u32     reference_count;
-} GF_HTML_ArrayBuffer;
-
-GF_Err gf_media_time_ranges_add(GF_HTML_MediaTimeRanges *timeranges, double start, double end);
-void gf_html_timeranges_del(GF_HTML_MediaTimeRanges *range);
-
-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);
-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);
-
-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);
-void gf_html_track_del(GF_HTML_Track *track);
-
-GF_HTML_MediaElement *gf_html_media_element_new(GF_Node *media_node, GF_HTML_MediaController *mc);
-void gf_html_media_element_del(GF_HTML_MediaElement *me);
-
-GF_HTML_MediaController *gf_html_media_controller_new();
-void gf_html_media_controller_del(GF_HTML_MediaController *mc);
-
-GF_HTML_ArrayBuffer *gf_arraybuffer_new(char *data, u32 length);
-JSObject *gf_arraybuffer_js_new(JSContext *c, char *data, u32 length, JSObject *parent);
-void gf_arraybuffer_del(GF_HTML_ArrayBuffer *buffer, Bool del_js);
-
-void html_media_element_js_init(JSContext *c, JSObject *new_obj, GF_Node *n);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	// _GF_HTMLMEDIA_H_
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2013-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / HTML Media Element 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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  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_HTMLMEDIA_H_
+#define _GF_HTMLMEDIA_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/internal/scenegraph_dev.h>
+
+/*base SVG type*/
+#include <gpac/nodes_svg.h>
+/*dom events*/
+#include <gpac/events.h>
+/*dom text event*/
+#include <gpac/utf.h>
+
+#include <gpac/download.h>
+#include <gpac/network.h>
+#include <gpac/modules/service.h>
+#include <gpac/xml.h>
+#include <gpac/internal/terminal_dev.h>
+
+#include <gpac/internal/smjs_api.h>
+
+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;
+} GF_HTML_MediaRuntime;
+
+/************************************************************
+ *
+ *  HTML 5 Media Element
+ *  http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#media-element
+ *
+ *************************************************************/
+
+typedef enum
+{
+    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
+} GF_HTML_NetworkState;
+
+typedef enum
+{
+    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;
+
+    GF_HTML_MediaErrorCode   code;
+} GF_HTML_MediaError;
+
+typedef struct _timerange
+{
+    /* JavaScript context associated to this object */
+    JSContext               *c;
+    /* JavaScript counterpart */
+    JSObject                *_this;
+
+    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
+} GF_HTML_TrackType;
+
+#define BASE_HTML_TRACK     \
+    /* JavaScript context associated to this object */\
+    JSContext               *c;\
+    /* JavaScript counterpart */\
+    JSObject                *_this;\
+    /* GPAC-specific properties */\
+    u32                     bin_id;    /* track id */\
+    LPNETCHANNEL            channel;   /* channel object used by the terminal */\
+    GF_ObjectDescriptor     *od;       /* MPEG-4 Object descriptor for this track */\
+    GF_List                 *buffer;   /* List of MSE Packets */\
+    u32						packet_index;   /* index of MSE Packets*/\
+    GF_Mutex                *buffer_mutex;\
+    Bool                    last_dts_set; \
+    u64						last_dts; /* MSE  last decode timestamp (in timescale units)*/ \
+    u32						last_dur; /* MSE  last frame duration (in timescale units)*/ \
+    Bool                    highest_pts_set; \
+    u64						highest_pts; /* MSE highest presentation timestamp (in timescale units)*/ \
+    Bool                    needs_rap; /* MSE  need random access point flag */ \
+    u32                     timescale; /* used by time stamps in MSE Packets */ \
+    s64                     timestampOffset; /* MSE SourceBuffer value (in timescale units) */ \
+    /* standard HTML properties */ \
+    GF_HTML_TrackType        type;\
+    char                    *id;\
+    char                    *kind;\
+    char                    *label;\
+    char                    *language;\
+    char                    *mime; \
+    Bool                    enabled_or_selected; 
+
+typedef struct
+{
+    BASE_HTML_TRACK
+} GF_HTML_Track;
+
+typedef struct
+{
+    BASE_HTML_TRACK
+	JSFunction				*oncuechange;
+    char                    *inBandMetadataTrackDispatchType;
+    //GF_HTMLTextTrackMode    mode;
+    //GF_HTMLTextTrackCueList cues;
+    //GF_HTMLTextTrackCueList activeCues;
+} GF_HTML_TextTrack;
+
+#define BASE_HTML_TRACK_LIST     \
+    /* JavaScript context associated to this object */\
+    JSContext               *c;\
+    /* JavaScript counterpart */\
+    JSObject                *_this;\
+    GF_List                 *tracks; \
+	jsval					onchange; \
+	jsval					onaddtrack; \
+	jsval					onremovetrack; \
+    u32                     selected_index;
+
+typedef struct
+{
+    BASE_HTML_TRACK_LIST
+} GF_HTML_TrackList;
+
+typedef enum
+{
+    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;
+} 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;
+
+	GF_DOMEventTarget		 *evt_target;
+} GF_HTML_MediaElement;
+
+typedef struct 
+{
+    /* JavaScript context used to create the JavaScript object below */
+    JSContext               *c;
+
+    /* JavaScript counterpart for this object*/
+    JSObject                *_this;
+
+	char    *data;
+    u32     length;
+    char    *url;
+	Bool	is_init;
+
+	/* used to do proper garbage collection between JS and Terminal */
+    u32     reference_count;
+} GF_HTML_ArrayBuffer;
+
+/* 
+ * TimeRanges 
+ */
+GF_HTML_MediaTimeRanges *gf_html_timeranges_new(u32 timescale);
+GF_Err gf_html_timeranges_add_start(GF_HTML_MediaTimeRanges *timeranges, u64 start);
+GF_Err gf_html_timeranges_add_end(GF_HTML_MediaTimeRanges *timeranges, u64 end);
+void	gf_html_timeranges_reset(GF_HTML_MediaTimeRanges *range);
+void	gf_html_timeranges_del(GF_HTML_MediaTimeRanges *range);
+GF_HTML_MediaTimeRanges *gf_html_timeranges_intersection(GF_HTML_MediaTimeRanges *a, GF_HTML_MediaTimeRanges *b);
+GF_HTML_MediaTimeRanges *gf_html_timeranges_union(GF_HTML_MediaTimeRanges *a, GF_HTML_MediaTimeRanges *b);
+
+/*
+ * 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);
+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);
+
+/*
+ * HTML5 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);
+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);
+void gf_html_media_element_del(GF_HTML_MediaElement *me);
+
+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);
+JSObject *gf_arraybuffer_js_new(JSContext *c, char *data, u32 length, JSObject *parent);
+void gf_arraybuffer_del(GF_HTML_ArrayBuffer *buffer, Bool del_js);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	// _GF_HTMLMEDIA_H_

gpac-0.5.0.svn4668.tar.bz2/include/gpac/html5_mse.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/html5_mse.h Changed

@@ -1,178 +1,227 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2013-
- *					All rights reserved
- *
- *  This file is part of GPAC / HTML Media Source 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
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  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_HTMLMSE_H_
-#define _GF_HTMLMSE_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <gpac/setup.h>
-
-#include <gpac/html5_media.h>
-#include <gpac/internal/smjs_api.h>
-
-typedef enum 
-{
-    MEDIA_SOURCE_CLOSED = 0,
-    MEDIA_SOURCE_OPEN   = 1,
-    MEDIA_SOURCE_ENDED  = 2,
-} GF_HTML_MediaSource_ReadyState;
-
-typedef enum 
-{
-    MEDIA_SOURCE_ABORT_MODE_NONE            = 0,
-    MEDIA_SOURCE_ABORT_MODE_CONTINUATION    = 1,
-    MEDIA_SOURCE_ABORT_MODE_OFFSET          = 2,
-} GF_HTML_MediaSource_AbortMode;
-
-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
-} 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;
-    double                  timestampOffset;
-    double                  appendWindowStart;
-    double                  appendWindowEnd;
-    u32                     timescale;
-
-    GF_HTML_MediaSource_AppendState append_state;
-    Bool                    buffer_full_flag;
-    GF_HTML_MediaSource_AbortMode   abort_mode;
-    double                  continuation_timestamp;
-    Bool                    continuation_timestamp_flag;
-    double                  highest_end_timestamp;
-    Bool                    highest_end_timestamp_set;
-    Bool                    first_init_segment;
-
-    double                  remove_start;
-    double                  remove_end;
-
-    /* GPAC internal objects */
-    GF_List                 *tracks;         /* Media tracks associated to this source buffer */
-    GF_List                 *input_buffer;  /* List of ArrayBuffer objects as given by appendBuffer call (only one buffer for now)*/
-    void                    *prev_buffer;  /* Previous ArrayBuffer (for garbage collection)*/
-    GF_InputService         *parser;        /* Media parser */
-    GF_ObjectDescriptor     *service_desc;  /* MPEG-4 Object descriptor as returned by the media parser */
-    Bool                    parser_connected;
-    Bool                    parsing;
-    GF_Mutex                *parser_mutex;
-    GF_Thread               *parser_thread;
-    GF_Thread               *remove_thread;
-
-} GF_HTML_SourceBuffer;
-
-typedef struct
-{
-    /* JavaScript counterpart for this object */
-    JSObject                *_this;
-
-    GF_List                 *list;
-} GF_HTML_SourceBufferList;
-
-typedef enum
-{
-    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 counterpart for this object*/
-    JSObject                *_this;
-
-    GF_HTML_SourceBufferList sourceBuffers;
-    GF_HTML_SourceBufferList activeSourceBuffers;
-
-    double  duration;
-    GF_HTML_MediaSource_DurationType    durationType;
-
-    u32     readyState;
-
-    /* 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;
-
-    /* Node the MediaSource is attached to */
-    GF_Node *node;
-
-    /* object implementing Event Target Interface */
-    GF_DOMEventTarget *target;
-} GF_HTML_MediaSource;
-
-GF_HTML_MediaSource *gf_mse_media_source_new();
-
-GF_HTML_SourceBuffer   *gf_mse_source_buffer_new(GF_HTML_MediaSource *mediasource);
-GF_Err                  gf_mse_source_buffer_load_parser(GF_HTML_SourceBuffer *sourcebuffer, const char *mime);
-void                    gf_mse_source_buffer_del(GF_HTML_SourceBuffer *sb);
-GF_Err                  gf_mse_source_buffer_abort(GF_HTML_SourceBuffer *sb, GF_HTML_MediaSource_AbortMode mode);
-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);
-u32                     gf_mse_source_buffer_remove(void *par);
-
-typedef struct
-{
-    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);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif	
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2013-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / HTML Media Source 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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  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_HTMLMSE_H_
+#define _GF_HTMLMSE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gpac/setup.h>
+
+#include <gpac/html5_media.h>
+#include <gpac/internal/smjs_api.h>
+
+typedef enum 
+{
+    MEDIA_SOURCE_READYSTATE_CLOSED = 0,
+    MEDIA_SOURCE_READYSTATE_OPEN   = 1,
+    MEDIA_SOURCE_READYSTATE_ENDED  = 2,
+} GF_HTML_MediaSource_ReadyState;
+
+typedef enum 
+{
+    MEDIA_SOURCE_APPEND_MODE_SEGMENTS	= 0,
+    MEDIA_SOURCE_APPEND_MODE_SEQUENCE   = 1
+} GF_HTML_MediaSource_AppendMode;
+
+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
+} 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, 
+	   - "sequence" ignores them and appends just after the previous data */
+    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;
+	/* time (in timescale units) of the frame end time (start + duration) in the group */
+    u64						group_end_timestamp;
+    Bool                    group_end_timestamp_set;
+
+    Bool                    first_init_segment;
+
+	/* times (in timescale units) of the frames to be removed */
+    u64						remove_start;
+    u64						remove_end;
+
+    /*
+	 * GPAC internal objects 
+	 */
+
+	/* Media tracks (GF_HTML_Track) associated to this source buffer */
+    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, 
+	   so we need to keep the buffer in the meantime */
+    void                    *prev_buffer;
+
+	/* Media parser */
+    GF_InputService         *parser;
+
+	/* MPEG-4 Object descriptor as returned by the media parser */
+    GF_ObjectDescriptor     *service_desc;  
+
+    /* 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;
+
+	/* Object used to fire JavaScript events to */
+	GF_DOMEventTarget		*evt_target;
+} GF_HTML_SourceBuffer;
+
+typedef struct
+{
+    /* JavaScript counterpart for this object */
+    JSObject                *_this;
+
+    GF_List                 *list;
+
+	struct _html_mediasource *parent;
+
+	/* Object used to fire JavaScript events to */
+	GF_DOMEventTarget		*evt_target;
+} GF_HTML_SourceBufferList;
+
+typedef enum
+{
+    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 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;
+
+    double  duration;
+    GF_HTML_MediaSource_DurationType    durationType;
+
+    u32     readyState;
+
+    /* 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;
+
+	/* SceneGraph to be used before the node is actually attached */
+    GF_SceneGraph *sg;
+
+    /* Node the MediaSource is attached to */
+    GF_Node *node;
+
+    /* object implementing Event Target Interface */
+    GF_DOMEventTarget *evt_target;
+} GF_HTML_MediaSource;
+
+GF_HTML_MediaSource		*gf_mse_media_source_new();
+void					gf_mse_mediasource_del(GF_HTML_MediaSource *ms, Bool del_js);
+void					gf_mse_mediasource_open(GF_HTML_MediaSource *ms, struct _mediaobj *mo);
+void					gf_mse_mediasource_close(GF_HTML_MediaSource *ms);
+void					gf_mse_mediasource_end(GF_HTML_MediaSource *ms);
+void					gf_mse_mediasource_add_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *sb);
+
+GF_HTML_SourceBuffer   *gf_mse_source_buffer_new(GF_HTML_MediaSource *mediasource);
+void					gf_mse_source_buffer_set_timestampOffset(GF_HTML_SourceBuffer *sb, double d);
+void					gf_mse_source_buffer_set_timescale(GF_HTML_SourceBuffer *sb, u32 timescale);
+GF_Err                  gf_mse_source_buffer_load_parser(GF_HTML_SourceBuffer *sourcebuffer, const char *mime);
+GF_Err					gf_mse_remove_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *sb);
+void                    gf_mse_source_buffer_del(GF_HTML_SourceBuffer *sb);
+GF_Err                  gf_mse_source_buffer_abort(GF_HTML_SourceBuffer *sb);
+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;
+} 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);
+GF_Err gf_mse_track_buffer_release_packet(GF_HTML_Track *track);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	
+

gpac-0.5.0.svn4668.tar.bz2/include/gpac/ietf.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/ietf.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/camera.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/camera.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/compositor_dev.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/compositor_dev.h Changed

@@ -62,7 +62,7 @@
 #define GF_SR_USE_DEPTH
 
 /*FPS computed on this number of frame*/
-#define GF_SR_FPS_COMPUTE_SIZE	30
+#define GF_SR_FPS_COMPUTE_SIZE	60
 
 
 
@@ -99,8 +99,10 @@
 	Bool npot_texture;
 	Bool rect_texture;
 	Bool point_sprite;
-	Bool vbo;
+	Bool vbo, pbo;
 	u32 yuv_texture;
+	Bool has_shaders;
+	s32 max_texture_size;
 } GLCaps;
 
 #endif
@@ -165,6 +167,8 @@
 	/*0: not init, 1: running, 2: exit requested, 3: done*/
 	u32 video_th_state;
 
+	u32 video_th_id;
+
 	/*compositor exclusive access to the scene and display*/
 	GF_Mutex *mx;
 
@@ -184,15 +188,21 @@
 	/*all textures (texture handlers)*/
 	GF_List *textures;
 
-#ifdef GF_SR_EVENT_QUEUE
+	/*all textures to be destroyed (needed for openGL context ...)*/
+	GF_List *textures_gc;
+
 	/*event queue*/
-	GF_List *events;
-	GF_Mutex *ev_mx;
-#endif
+	GF_List *event_queue, *event_queue_back;
+	GF_Mutex *evq_mx;
+
+	Bool video_setup_failed;
 
 	/*simulation frame rate*/
 	Double frame_rate;
-	Bool no_regulation, video_regulation;
+	Bool bench_mode;
+	//0: no frame pending, 1: frame pending, needs clock increase, 2: frames are pending but one frame has been decoded, do not increase clock
+	u32 force_bench_frame;
+	Bool no_regulation;
 	u32 frame_duration;
 	u32 frame_time[GF_SR_FPS_COMPUTE_SIZE];
 	u32 frame_dur[GF_SR_FPS_COMPUTE_SIZE];
@@ -200,8 +210,12 @@
 	u32 last_frame_time, caret_next_draw_time;
 	Bool show_caret;
 	Bool text_edit_changed;
-
+	u32 scene_sampled_clock;
 	u32 last_click_time;
+	u32 next_frame_delay;
+	s32 frame_delay;
+	Bool video_frame_pending;
+	Bool fullscreen_postponed;
 
 	/*display size*/
 	u32 display_width, display_height;
@@ -236,7 +250,7 @@
 	u32 interaction_sensors;
 
 	/*set whenever 3D HW ctx changes (need to rebuild dlists/textures if any used)*/
-	Bool reset_graphics;
+	u32 reset_graphics;
 
 	/*font engine*/
 	GF_FontManager *font_manager;
@@ -247,11 +261,17 @@
 	/*options*/
 	u32 aspect_ratio, antiAlias, texture_text_mode;
 	Bool high_speed, stress_mode;
-	Bool force_opengl_2d, was_opengl;
+	Bool is_opengl;
+	Bool autoconfig_opengl;
+	u32 force_opengl_2d;
 #ifdef OPENGL_RASTER
 	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. 
+	//the mode supports defer and immediate rendering
+	Bool hybrid_opengl;
+
 	/*key modif*/
 	u32 key_states;
 	u32 interaction_level;
@@ -332,7 +352,8 @@
 	/*screen buffer for direct access*/
 	GF_VideoSurface hw_surface;
 	/*output buffer is configured in video memory*/
-	Bool video_memory, request_video_memory, was_system_memory;
+	u32  video_memory;
+	Bool request_video_memory, was_system_memory;
 	/*indicate if overlays were prezsent in the previous frame*/
 	Bool last_had_overlays;
 	GF_RasterCallback raster_callbacks;
@@ -459,6 +480,8 @@
 	Bool disable_gl_cull;
 	/*YUV textures in OpenGL are disabled (soft YUV->RGB )*/
 	Bool disable_yuvgl;
+	//use PBO to start pushing textures at the begining of the render pass
+	Bool enable_pbo;
 
 	u32 default_navigation_mode;
 
@@ -483,8 +506,14 @@
 	Fixed interoccular_offset;
 	/*specifies distance the camera focal point and the screen plane : <0 is behind the screen, >0 is in front*/
 	Fixed focus_distance;
+
+	struct _gf_sc_texture_handler *hybgl_txh;
+	GF_Mesh *hybgl_mesh;
+	GF_Mesh *hybgl_mesh_background;
 #endif
-	
+
+	Bool texture_from_decoder_memory;
+    
 	u32 networks_time;
 	u32 decoders_time;
 
@@ -510,6 +539,17 @@
 #endif
 };
 
+typedef struct
+{
+	GF_Event evt;
+	GF_DOM_Event dom_evt;
+	GF_Node *node;
+	GF_DOMEventTarget *target;
+	GF_SceneGraph *sg;
+} GF_QueuedEvent;
+
+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);
 
 /*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
@@ -589,6 +629,10 @@
 	u32 width, height, stride, pixelformat, pixel_ar;
     Bool is_flipped;
 
+	Bool raw_memory;
+	u8 *pU, *pV;
+	u32 nb_frames, upload_time;
+
 #ifndef GPAC_DISABLE_VRML
 	/*if set texture has been transformed by MatteTexture -> disable blit*/
 	Bool has_cmat;
@@ -613,6 +657,8 @@
 
 /*returns 1 if url changed from current one*/
 Bool gf_sc_texture_check_url_change(GF_TextureHandler *txh, MFURL *url);
+/* opens associated object */
+GF_Err gf_sc_texture_open(GF_TextureHandler *txh, MFURL *url, Bool lock_scene_timeline);
 /*starts associated object*/
 GF_Err gf_sc_texture_play(GF_TextureHandler *txh, MFURL *url);
 GF_Err gf_sc_texture_play_from_to(GF_TextureHandler *txh, MFURL *url, Double start_offset, Double end_offset, Bool can_loop, Bool lock_scene_timeline);
@@ -625,6 +671,7 @@
 /*release video memory if needed*/
 void gf_sc_texture_release_stream(GF_TextureHandler *txh);
 
+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 
@@ -823,6 +870,8 @@
 	Bool has_clip, has_layer_clip;
 	/*active clipper in world coord system */
 	GF_Rect clipper, layer_clipper;
+	/*current object (model) transformation at the given layer*/
+	GF_Matrix layer_matrix;
 
 	
 	/*set when traversing a cached group during offscreen bitmap construction.*/
@@ -1110,6 +1159,11 @@
 void compositor_2d_init_callbacks(GF_Compositor *compositor);
 GF_Rect compositor_2d_update_clipper(GF_TraverseState *tr_state, GF_Rect this_clip, Bool *need_restore, GF_Rect *original, Bool for_layer);
 
+#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);
+#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);
 
 Bool compositor_get_2d_plane_intersection(GF_Ray *ray, SFVec3f *res);
@@ -1165,6 +1219,8 @@
 Bool gf_scene_is_over(GF_SceneGraph *sg);
 GF_SceneGraph *gf_scene_enum_extra_scene(GF_SceneGraph *sg, u32 *i);
 
+Bool gf_scene_is_dynamic_scene(GF_SceneGraph *sg);
+
 #ifndef GPAC_DISABLE_SVG
 
 void compositor_svg_build_gradient_texture(GF_TextureHandler *txh);
@@ -1348,6 +1404,18 @@
 
 GF_Err gf_sc_set_scene_size(GF_Compositor *compositor, u32 Width, u32 Height, Bool force_size);
 
+
+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 
+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
+void gf_sc_set_video_pending_frame(GF_Compositor *compositor);
+
+Bool gf_sc_is_over(GF_Compositor *compositor, GF_SceneGraph *scene_graph);
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/crypt_dev.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/crypt_dev.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/ietf_dev.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/ietf_dev.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/isomedia_dev.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/isomedia_dev.h Changed

@@ -164,6 +164,15 @@
 	GF_ISOM_BOX_TYPE_PSSH	= GF_4CC( 'p', 's', 's', 'h' ),
 	GF_ISOM_BOX_TYPE_TENC	= GF_4CC( 't', 'e', 'n', 'c' ),
 
+	/*Adobe's protection boxes*/
+	GF_ISOM_BOX_TYPE_ADKM	= GF_4CC( 'a', 'd', 'k', 'm' ),
+	GF_ISOM_BOX_TYPE_AHDR	= GF_4CC( 'a', 'h', 'd', 'r' ),
+	GF_ISOM_BOX_TYPE_ADAF	= GF_4CC( 'a', 'd', 'a', 'f' ),
+	GF_ISOM_BOX_TYPE_APRM	= GF_4CC( 'a', 'p', 'r', 'm' ),
+	GF_ISOM_BOX_TYPE_AEIB	= GF_4CC( 'a', 'e', 'i', 'b' ),
+	GF_ISOM_BOX_TYPE_AKEY	= GF_4CC( 'a', 'k', 'e', 'y' ),
+	GF_ISOM_BOX_TYPE_FLXS	= GF_4CC( 'f', 'l', 'x', 's' ),
+
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	/*Movie Fragments*/
 	GF_ISOM_BOX_TYPE_MVEX	= GF_4CC( 'm', 'v', 'e', 'x' ),
@@ -186,6 +195,7 @@
 	GF_ISOM_BOX_TYPE_SDHD	= GF_4CC( 's', 'd', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_ODHD	= GF_4CC( 'o', 'd', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_NMHD	= GF_4CC( 'n', 'm', 'h', 'd' ),
+	GF_ISOM_BOX_TYPE_STHD	= GF_4CC( 's', 't', 'h', 'd' ),
 	GF_ISOM_BOX_TYPE_MP4S	= GF_4CC( 'm', 'p', '4', 's' ),
 	GF_ISOM_BOX_TYPE_MP4A	= GF_4CC( 'm', 'p', '4', 'a' ),
 	GF_ISOM_BOX_TYPE_MP4V	= GF_4CC( 'm', 'p', '4', 'v' ),
@@ -206,6 +216,12 @@
 	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_HVC2	= GF_4CC( 'h', 'v', 'c', '2' ),
+	GF_ISOM_BOX_TYPE_HEV2	= GF_4CC( 'h', 'e', 'v', '2' ),
+	GF_ISOM_BOX_TYPE_SHCC	= GF_4CC( 's', 'h', 'c', 'C' ),
+	GF_ISOM_BOX_TYPE_SHC1	= GF_4CC( 's', 'h', 'c', '1' ),
+	GF_ISOM_BOX_TYPE_SHV1	= GF_4CC( 's', 'h', 'v', '1' ),
+
 	/*LASeR extension*/
 	GF_ISOM_BOX_TYPE_LSRC	= GF_4CC( 'l', 's', 'r', 'C' ),
 	GF_ISOM_BOX_TYPE_LSR1	= GF_4CC( 'l', 's', 'r', '1' ),
@@ -366,6 +382,14 @@
 	GF_ISOM_BOX_TYPE_PAYL	= GF_4CC( 'p', 'a', 'y', 'l' ),
 	GF_ISOM_BOX_TYPE_WVTT	= GF_4CC( 'w', 'v', 't', 't' ),
 
+	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_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*/
@@ -379,11 +403,9 @@
 	/*for compatibility with old files hinted for DSS - needs special parsing*/
 	GF_ISOM_BOX_TYPE_VOID	= GF_4CC( 'V', 'O', 'I', 'D' ),
 
-
 	/*MS Smooth - these are actually UUID boxes*/
 	GF_ISOM_BOX_UUID_PSSH	= GF_4CC( 'P', 'S', 'S', 'H' ),
 	GF_ISOM_BOX_UUID_TENC	= GF_4CC( 'T', 'E', 'N', 'C' ),
-	GF_ISOM_BOX_UUID_PSEC	= GF_4CC( 'P', 'S', 'E', 'C' ),
 	GF_ISOM_BOX_UUID_TFRF	= GF_4CC( 'T', 'F', 'R', 'F' ),
 	GF_ISOM_BOX_UUID_TFXD	= GF_4CC( 'T', 'F', 'X', 'D' ),
 };
@@ -552,6 +574,7 @@
 	u64 dts_at_seg_start;
 	u32 sample_count_at_seg_start;
 	Bool first_traf_merged;
+	Bool present_in_scalable_segment;
 #endif 
 } GF_TrackBox;
 
@@ -618,6 +641,11 @@
 typedef struct
 {
 	GF_ISOM_FULL_BOX
+} GF_SubtitleMediaHeaderBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
 } GF_ODMediaHeaderBox;
 
 typedef struct
@@ -879,6 +907,7 @@
 	GF_AVCConfigurationBox *svc_config;
 	/*hevc extension*/
 	GF_HEVCConfigurationBox *hevc_config;
+	GF_HEVCConfigurationBox *shvc_config;
 
 	GF_MPEG4BitRateBox *bitrate;
 	/*ext descriptors*/
@@ -1163,6 +1192,34 @@
 
 typedef struct
 {
+	GF_ISOM_FULL_BOX
+
+	u32 aux_info_type;
+	u32 aux_info_type_parameter;
+
+	u8 default_sample_info_size; 
+	u32 sample_count; 
+	u8 *sample_info_size;
+} GF_SampleAuxiliaryInfoSizeBox;
+
+typedef struct
+{
+	GF_ISOM_FULL_BOX
+
+	u32 aux_info_type;
+	u32 aux_info_type_parameter;
+
+	u8 default_sample_info_size; 
+	u32 entry_count;  //1 or stco / trun count
+	u32 *offsets;
+	u64 *offsets_large;
+
+	u64 offset_first_offset_field;
+} GF_SampleAuxiliaryInfoOffsetBox;
+
+
+typedef struct
+{
 	GF_ISOM_BOX
 	GF_TimeToSampleBox *TimeToSample;
 	GF_CompositionOffsetBox *CompositionOffset;
@@ -1181,6 +1238,9 @@
 
 	GF_SubSampleInformationBox *SubSamples;
 
+	GF_Box *piff_psec;
+	GF_Box *senc;
+
 	GF_List *sampleGroups;
 	GF_List *sampleGroupsDescription;
 
@@ -1191,6 +1251,8 @@
 	u16 groupID;
 	u16 trackPriority;
 	u32 currentEntryIndex;
+
+	Bool no_sync_found;
 } GF_SampleTableBox;
 
 typedef struct __tag_media_info_box
@@ -1199,6 +1261,7 @@
 	GF_DataInformationBox *dataInformation;
 	GF_SampleTableBox *sampleTable;
 	GF_Box *InfoHeader;
+	struct __tag_data_map *scalableDataHandler;
 	struct __tag_data_map *dataHandler;
 	u32 dataEntryIndex;
 } GF_MediaInformationBox;
@@ -1495,6 +1558,7 @@
 	struct __oma_kms_box *okms;
 	struct __cenc_tenc_box *tenc;
 	struct __piff_tenc_box *piff_tenc;
+	struct __adobe_drm_key_management_system_box *adkm;
 } GF_SchemeInformationBox;
 
 typedef struct __tag_protect_box
@@ -1583,6 +1647,10 @@
 	u64 fragment_offset;
 	u32 mdat_size;
 	char *mdat;
+
+	//temp storage of prft box
+	u32 reference_track_ID;
+	u64 ntp, timestamp;
 } GF_MovieFragmentBox;
 
 
@@ -1636,10 +1704,13 @@
 	GF_List *sai_offsets;
 
 	struct __piff_sample_enc_box *piff_sample_encryption;
+	struct __sample_encryption_box *sample_encryption;
 
 	/*when data caching is on*/
 	u32 DataCache;
     GF_TFBaseMediaDecodeTimeBox *tfdt;
+
+	u64 moof_start_in_bs;
 } GF_TrackFragmentBox;
 
 /*FLAGS for TRUN : specify what is written in the SampleTable of TRUN*/
@@ -2131,32 +2202,6 @@
 } GF_RollRecoveryEntry;
 
 
-typedef struct
-{
-	GF_ISOM_FULL_BOX
-
-	u32 aux_info_type;
-	u32 aux_info_type_parameter;
-
-	u8 default_sample_info_size; 
-	u32 sample_count; 
-	u8 *sample_info_size;
-} GF_SampleAuxiliaryInfoSizeBox;
-
-typedef struct
-{
-	GF_ISOM_FULL_BOX
-
-	u32 aux_info_type;
-	u32 aux_info_type_parameter;
-
-	u8 default_sample_info_size; 
-	u32 entry_count;  //1 or stco / trun count
-	u32 *offsets;
-	u64 *offsets_large;
-
-	u64 single_offset;
-} GF_SampleAuxiliaryInfoOffsetBox;
 
 /* 
 		CENC stuff
@@ -2213,50 +2258,118 @@
 } GF_PIFFProtectionSystemHeaderBox;
 
 
-typedef struct 
+typedef struct __piff_sample_enc_box
 {
-	u32 bytes_clear_data;
-	u32 bytes_encrypted_data;
-} GF_CENCSubSampleEntry;
-
-typedef struct __cenc_sample_info
-{
-	/*set to 1 if keyID, IV_size and algo_id are NOT the default vamlues for the track*/
-	Bool is_alt_info;
-	bin128 keyID;
-	/*can be 0, 64 or 128 bits - if 64, bytes 0-7 are used and 8-15 are 0-padded*/
-	bin128 IV;
-	u32 algo_id;
-	u16 IV_size;
-    u16 subsample_count;
-	GF_CENCSubSampleEntry *subsamples;
-} GF_CENCSampleInfo;
+	GF_ISOM_UUID_BOX
+	u8 version;
+	u32 flags;		
+
+	GF_List *samp_aux_info;
+	u64 bs_offset;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-GF_CENCSampleInfo *gf_isom_cenc_get_sample(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u32 sample_number);
-void gf_isom_cenc_sample_del(GF_CENCSampleInfo *samp);
+	/*pointer to container traf*/
+	GF_TrackFragmentBox *traf;
 #endif
+	/*pointer to associated saio*/
+	GF_SampleAuxiliaryInfoSizeBox *cenc_saiz;
+	GF_SampleAuxiliaryInfoOffsetBox *cenc_saio;
 
+	//do NOT change order below this point or insert anything, since we cast GF_PIFFSampleEncryptionBox into GF_SampleEncryptionBox
 
-typedef struct __piff_sample_enc_box
-{
-	GF_ISOM_UUID_BOX
-	u8 version;
-	u32 flags;		
 
 	u32 AlgorithmID;
 	u8 IV_size;
 	bin128 KID;
 
-	u32 sample_count;
-	u32 cenc_data_size;
-	char *cenc_data;
+} GF_PIFFSampleEncryptionBox;
+
+typedef struct __sample_encryption_box
+{
+	GF_ISOM_UUID_BOX
+	u8 version;
+	u32 flags;		
+
+	GF_List *samp_aux_info;
+	u64 bs_offset;
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	/*pointer to container traf*/
 	GF_TrackFragmentBox *traf;
 #endif
-} GF_PIFFSampleEncryptionBox;
+	/*pointer to associated saio*/
+	GF_SampleAuxiliaryInfoSizeBox *cenc_saiz;
+	GF_SampleAuxiliaryInfoOffsetBox *cenc_saio;
+
+} GF_SampleEncryptionBox;
+
+GF_PIFFSampleEncryptionBox *gf_isom_create_piff_psec_box(u8 version, u32 flags, u32 AlgorithmID, u8 IV_size, bin128 KID);
+GF_SampleEncryptionBox * gf_isom_create_samp_enc_box(u8 version, u32 flags);
+
+void gf_isom_cenc_get_default_info_ex(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID);
+GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID);
+
+GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *ptr);
+
+/*
+	Boxes for Adobe's protection scheme
+*/
+typedef struct __adobe_enc_info_box
+{
+	GF_ISOM_FULL_BOX
+	char *enc_algo; /*spec: The encryption algorithm shall be 'AES-CBC'*/
+	u8 key_length;
+} GF_AdobeEncryptionInfoBox;
+
+typedef struct __adobe_flash_access_params_box
+{
+	GF_ISOM_BOX
+	char *metadata; /*base-64 encoded metadata used by the DRM client to retrieve decrypted key*/
+} GF_AdobeFlashAccessParamsBox;
+
+typedef struct __adobe_key_info_box
+{
+	GF_ISOM_FULL_BOX
+	GF_AdobeFlashAccessParamsBox * params; /*spec: APSParamsBox will no longer be produced by conformaing applications*/
+} GF_AdobeKeyInfoBox;
+
+typedef struct __adobe_std_enc_params_box
+{
+	GF_ISOM_FULL_BOX
+	GF_AdobeEncryptionInfoBox *enc_info;
+	GF_AdobeKeyInfoBox *key_info;
+} GF_AdobeStdEncryptionParamsBox;
+
+typedef struct __adobe_drm_header_box
+{
+	GF_ISOM_FULL_BOX
+	GF_AdobeStdEncryptionParamsBox *std_enc_params;
+	//AdobeSignatureBox *signature; /*AdobeSignatureBox is not described*/
+} GF_AdobeDRMHeaderBox;
+
+
+typedef struct __adobe_drm_au_format_box
+{
+	GF_ISOM_FULL_BOX
+	u8 selective_enc;
+	u8 IV_length;
+} GF_AdobeDRMAUFormatBox;
+
+typedef struct __adobe_drm_key_management_system_box
+{
+	GF_ISOM_FULL_BOX
+	GF_AdobeDRMHeaderBox *header;
+	GF_AdobeDRMAUFormatBox *au_format;
+} GF_AdobeDRMKeyManagementSystemBox;
+
+
+typedef struct 
+{
+	GF_ISOM_FULL_BOX
+	u32 refTrackID;
+	u64 ntp, timestamp;
+} GF_ProducerReferenceTimeBox;
+
 
 /*
 		Data Map (media storage) stuff
@@ -2291,7 +2404,8 @@
 	u8	type;		\
 	u64	curPos;		\
 	u8	mode;		\
-	GF_BitStream *bs;
+	GF_BitStream *bs;\
+	char *szName;
 
 typedef struct __tag_data_map
 {
@@ -2344,6 +2458,8 @@
 GF_Err gf_isom_datamap_add_data(GF_DataMap *ptr, char *data, u32 dataSize);
 #endif	
 
+void gf_isom_datamap_flush(GF_DataMap *map);
+
 /*
 		Movie stuff
 */
@@ -2403,6 +2519,7 @@
 	u8 convert_streaming_text;
 	u8 is_jp2;
 
+	Bool keep_utc;
 	/*main boxes for fast access*/
 	/*moov*/
 	GF_MovieBox *moov;
@@ -2435,7 +2552,11 @@
 	Bool is_index_segment;
 
 	GF_BitStream *segment_bs;
+	/* 0: no moof found yet, 1: 1 moof found, 2: next moof found */
+	Bool single_moof_mode;
+	u32 single_moof_state;
 #endif
+	GF_ProducerReferenceTimeBox *last_producer_ref_time;
 
 	/*this contains ALL the root boxes excepts fragments*/
 	GF_List *TopBoxes;
@@ -2476,7 +2597,7 @@
 /*Find a reference of a given type*/
 GF_Err Track_FindRef(GF_TrackBox *trak, u32 ReferenceType, GF_TrackReferenceTypeBox **dpnd);
 /*Time and sample*/
-GF_Err GetMediaTime(GF_TrackBox *trak, Bool force_non_empty, u64 movieTime, u64 *MediaTime, s64 *SegmentStartTime, s64 *MediaOffset, u8 *useEdit);
+GF_Err GetMediaTime(GF_TrackBox *trak, Bool force_non_empty, u64 movieTime, u64 *MediaTime, s64 *SegmentStartTime, s64 *MediaOffset, u8 *useEdit, u64 *next_edit_start_plus_one);
 GF_Err Media_GetSample(GF_MediaBox *mdia, u32 sampleNumber, GF_ISOSample **samp, u32 *sampleDescriptionIndex, Bool no_data, u64 *out_offset);
 GF_Err Media_CheckDataEntry(GF_MediaBox *mdia, u32 dataEntryIndex);
 GF_Err Media_FindSyncSample(GF_SampleTableBox *stbl, u32 searchFromTime, u32 *sampleNumber, u8 mode);
@@ -2581,8 +2702,7 @@
 GF_Err stbl_RemoveSampleFragments(GF_SampleTableBox *stbl, u32 sampleNumber);
 GF_Err stbl_RemoveRedundant(GF_SampleTableBox *stbl, u32 SampleNumber);
 
-/*expands sampleGroup table for the given grouping type and sample_number. If sample_number is 0, just appends an entry at the end of the table*/
-GF_Err gf_isom_add_sample_group_entry(GF_List *sampleGroups, u32 sample_number, u32 grouping_type, u32 sampleGroupDescriptionIndex);
+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);
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 GF_Err gf_isom_close_fragments(GF_ISOFile *movie);
@@ -2616,16 +2736,21 @@
 GF_Err dinf_AddBox(GF_Box *s, GF_Box *a);
 GF_Err minf_AddBox(GF_Box *s, GF_Box *a);
 GF_Err mdia_AddBox(GF_Box *s, GF_Box *a);
-GF_Err stbl_AddBox(GF_SampleTableBox *ptr, GF_Box *a);
+GF_Err traf_AddBox(GF_Box *s, GF_Box *a);
 
 /*rewrites avcC based on the given esd - this destroys the esd*/
 GF_Err AVC_HEVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd);
+void AVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *avc, GF_MediaBox *mdia);
 void AVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc);
+void HEVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *avc, GF_MediaBox *mdia);
 void HEVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc);
 
 GF_Err reftype_AddRefTrack(GF_TrackReferenceTypeBox *ref, u32 trackID, u16 *outRefIndex);
 
 GF_XMLBox *gf_isom_get_meta_xml(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool *is_binary);
+void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox  *traf, u32 len);
+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);
 
 #ifndef GPAC_DISABLE_ISOM_HINTING
 
@@ -2843,7 +2968,6 @@
 GF_Box *iods_New();
 GF_Box *trak_New();
 GF_Box *mp4s_New();
-GF_Box *mp4v_New();
 GF_Box *mp4a_New();
 GF_Box *edts_New();
 GF_Box *udta_New();
@@ -3303,13 +3427,7 @@
 GF_Err avcc_Write(GF_Box *s, GF_BitStream *bs);
 GF_Err avcc_Size(GF_Box *s);
 
-GF_Box *avc1_New();
-GF_Box *avc2_New();
-GF_Box *avc3_New();
-GF_Box *avc4_New();
-GF_Box *svc1_New();
-GF_Box *hvc1_New();
-GF_Box *hev1_New();
+GF_Box *mp4v_encv_avc_hevc_new(u32 type);
 
 GF_Box *m4ds_New();
 void m4ds_del(GF_Box *s);
@@ -3429,6 +3547,38 @@
 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 
+{
+    GF_ISOM_BOX
+    char *string;
+} GF_StringBox;
+
+typedef struct
+{
+    GF_ISOM_SAMPLE_ENTRY_FIELDS
+    GF_StringBox *config;
+} GF_WebVTTSampleEntryBox;
+
+typedef struct
+{
+    GF_ISOM_SAMPLE_ENTRY_FIELDS
+	char *xmlnamespace;			// not optional
+	char *schema_location;		// optional
+	char *auxiliary_mime_types;	// optional
+	GF_MPEG4BitRateBox *bitrate;// not optional
+} GF_XMLSubtitleSampleEntryBox;
+
+typedef struct
+{
+    GF_ISOM_SAMPLE_ENTRY_FIELDS
+	char *content_encoding;			//optional
+	char *mime_type;				//not optional
+	GF_MPEG4BitRateBox *bitrate;	// optional
+    GF_StringBox *config;
+} GF_SimpleTextSampleEntryBox;
+
+GF_List *gf_webvtt_parse_cues_from_data(const char *data, u32 dataLength, u64 start);
+
 #endif /* GPAC_DISABLE_VTT */
 
 /* MPEG-21 functions */
@@ -3445,7 +3595,6 @@
 GF_Box *schm_New();
 GF_Box *schi_New();
 GF_Box *enca_New();
-GF_Box *encv_New();
 GF_Box *encs_New();
 
 void meta_del(GF_Box *s);
@@ -3774,7 +3923,19 @@
 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 *stpp_New();
+void stpp_del(GF_Box *s);
+GF_Err stpp_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err stpp_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err stpp_Size(GF_Box *s);
+GF_Err stpp_dump(GF_Box *a, FILE * trace);
 
 GF_Box *tsel_New();
 void tsel_del(GF_Box *s);
@@ -3935,6 +4096,13 @@
 GF_Err piff_pssh_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err piff_pssh_dump(GF_Box *a, FILE * trace);
 
+GF_Box *senc_New();
+void senc_del(GF_Box *);
+GF_Err senc_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err senc_Size(GF_Box *s);
+GF_Err senc_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err senc_dump(GF_Box *a, FILE * trace);
+
 
 GF_Box *cslg_New();
 void cslg_del(GF_Box *);
@@ -3950,6 +4118,73 @@
 GF_Err hvcc_Read(GF_Box *s, GF_BitStream *bs);
 GF_Err hvcc_dump(GF_Box *a, FILE * trace);
 
+
+void prft_del(GF_Box *s);
+GF_Box *prft_New();
+GF_Err prft_Read(GF_Box *s,GF_BitStream *bs);
+GF_Err prft_dump(GF_Box *a, FILE * trace);
+
+//exported for sgpd comparison in traf merge
+void sgpd_write_entry(u32 grouping_type, void *entry, GF_BitStream *bs);
+
+/*
+	Adobe's protection boxes
+*/
+
+GF_Box *adkm_New();
+void adkm_del(GF_Box *s);
+GF_Err adkm_AddBox(GF_Box *s, GF_Box *a);
+GF_Err adkm_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err adkm_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err adkm_Size(GF_Box *s);
+GF_Err adkm_dump(GF_Box *a, FILE * trace);
+
+GF_Box *ahdr_New();
+void ahdr_del(GF_Box *s);
+GF_Err ahdr_AddBox(GF_Box *s, GF_Box *a);
+GF_Err ahdr_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err ahdr_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err ahdr_Size(GF_Box *s);
+GF_Err ahdr_dump(GF_Box *a, FILE * trace);
+
+GF_Box *aprm_New();
+void aprm_del(GF_Box *s);
+GF_Err aprm_AddBox(GF_Box *s, GF_Box *a);
+GF_Err aprm_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err aprm_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err aprm_Size(GF_Box *s);
+GF_Err aprm_dump(GF_Box *a, FILE * trace);
+
+GF_Box *aeib_New();
+void aeib_del(GF_Box *s);
+GF_Err aeib_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err aeib_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err aeib_Size(GF_Box *s);
+GF_Err aeib_dump(GF_Box *a, FILE * trace);
+
+GF_Box *akey_New();
+void akey_del(GF_Box *s);
+GF_Err akey_AddBox(GF_Box *s, GF_Box *a);
+GF_Err akey_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err akey_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err akey_Size(GF_Box *s);
+GF_Err akey_dump(GF_Box *a, FILE * trace);
+
+GF_Box *flxs_New();
+void flxs_del(GF_Box *s);
+GF_Err flxs_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err flxs_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err flxs_Size(GF_Box *s);
+GF_Err flxs_dump(GF_Box *a, FILE * trace);
+
+
+GF_Box *adaf_New();
+void adaf_del(GF_Box *s);
+GF_Err adaf_Read(GF_Box *s, GF_BitStream *bs);
+GF_Err adaf_Write(GF_Box *s, GF_BitStream *bs);
+GF_Err adaf_Size(GF_Box *s);
+GF_Err adaf_dump(GF_Box *a, FILE * trace);
+
 #endif /*GPAC_DISABLE_ISOM*/
 
 #ifdef __cplusplus

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/m3u8.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/m3u8.h Changed

@@ -116,7 +116,7 @@
 
 /**
  * Creates a new playlist
- * @return NULL if playlist could not be allocated
+ * \return NULL if playlist could not be allocated
  *
 Playlist * playlist_new();
 */
@@ -144,13 +144,13 @@
 /**
  * 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. Element deletion will be deleted recusivly by #playlist_del(Playlist*)
+ * \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);
 
 /**
  * Creates a new VariantPlaylist
- * @return NULL if VariantPlaylist element could not be allocated
+ * \return NULL if VariantPlaylist element could not be allocated
  */
 VariantPlaylist * variant_playlist_new ();
 
@@ -171,19 +171,20 @@
 
 /**
  * Parse the given playlist file
- * @param file The file from cache to parse
- * @param The playlist to fill. If argument is null, and file is valid, playlist will be allocated
- * @return GF_OK if playlist valid
+ * \param file The file from cache to parse
+ * \param playlist The playlist to fill. If argument is null, and file is valid, playlist will be allocated
+ * \param baseURL The base URL of the playlist
+ * \return GF_OK if playlist valid
  */
 GF_Err parse_root_playlist(const char * file, VariantPlaylist ** playlist, const char * baseURL);
 /**
  * Parse the given playlist file as a subplaylist of an existing playlist
- * @param file The file from cache to parse
- * @param The playlist to fill.
- * @param baseURL base URL of the playlist
- * @param program in which the playlist is parsed
- * @param sub_playlist existing subplaylist element in the @playlist in which the playlist is parsed
- * @return GF_OK if playlist valid
+ * \param file The file from cache to parse
+ * \param playlist The playlist to fill.
+ * \param baseURL base URL of the playlist
+ * \param in_program in which the playlist is parsed
+ * \param sub_playlist existing subplaylist element in the playlist in which the playlist is parsed
+ * \return GF_OK if playlist valid
  */
 GF_Err parse_sub_playlist(const char * file, VariantPlaylist ** playlist, const char * baseURL, Program * in_program, PlaylistElement *sub_playlist);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/media_dev.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/media_dev.h Changed

@@ -44,6 +44,7 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
+u32 gf_latm_get_value(GF_BitStream *bs);
 
 #define GF_SVC_SSPS_ID_SHIFT	16	
 
@@ -233,6 +234,7 @@
 
 #ifndef GPAC_DISABLE_ISOM
 GF_Err gf_media_avc_change_par(GF_AVCConfig *avcc, s32 ar_n, s32 ar_d);
+GF_Err gf_media_hevc_change_par(GF_HEVCConfig *hvcc, s32 ar_n, s32 ar_d);
 #endif
 
 
@@ -298,6 +300,8 @@
 	u32 num_units_in_tick, time_scale;
 	Bool poc_proportional_to_timing_flag;
 	u32 num_ticks_poc_diff_one_minus1;
+
+	u32 rep_format_idx;
 } HEVC_SPS;
 
 typedef struct
@@ -318,25 +322,50 @@
 	u32 column_width[22], row_height[20];
 } HEVC_PPS;
 
+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;
+	u8 separate_colour_plane_flag;
+} HEVC_RepFormat;
+
 typedef struct
 {
 	u16 avg_bit_rate, max_bit_rate, avg_pic_rate;
 	u8 constand_pic_rate_idc;
 } HEVC_RateInfo;
 
+
+#define MAX_SHVC_LAYERS	4
 typedef struct
 {
 	s32 id; 
 	/*used to discard repeated SPSs - 0: not parsed, 1 parsed, 2 stored*/
 	u32 state;
 	u32 crc;
-	u8 max_sub_layer;
+	u32 max_layers, max_sub_layers, max_layer_id, num_layer_sets;
 	Bool temporal_id_nesting;
 	HEVC_ProfileTierLevel ptl;
 
 	HEVC_SublayerPTL sub_ptl[8];
 	HEVC_RateInfo rates[8];
 
+
+	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 profile_level_tier_idx[MAX_SHVC_LAYERS];
+	HEVC_ProfileTierLevel ext_ptl[MAX_SHVC_LAYERS];
+
+	u32 num_rep_formats;
+	HEVC_RepFormat rep_formats[16];
+    u32 rep_format_idx[16];
 } HEVC_VPS;
 
 typedef struct
@@ -367,7 +396,7 @@
 	HEVC_PPS *pps;
 } HEVCSliceInfo;
 
-typedef struct
+typedef struct _hevc_state
 {
 	HEVC_SPS sps[16]; /* range allowed in the spec is 0..15 */
 	s8 sps_active_idx;	/*currently active sps; must be initalized to -1 in order to discard not yet decodable SEIs*/
@@ -391,10 +420,11 @@
 s32 gf_media_hevc_read_vps(char *data, u32 size, HEVCState *hevc);
 s32 gf_media_hevc_read_sps(char *data, u32 size, HEVCState *hevc);
 s32 gf_media_hevc_read_pps(char *data, u32 size, HEVCState *hevc);
-s32 gf_media_hevc_parse_nalu(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id);
+s32 gf_media_hevc_parse_nalu(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id);
 Bool gf_media_hevc_slice_is_intra(HEVCState *hevc);
 Bool gf_media_hevc_slice_is_IDR(HEVCState *hevc);
 
+GF_Err gf_hevc_get_sps_info_with_state(HEVCState *hevc_state, char *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d);
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/mpd.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/mpd.h Changed

@@ -97,6 +97,7 @@
 	u32 time_shift_buffer_depth; /* expressed in milliseconds */	\
 	GF_MPD_ByteRange *index_range;	\
 	Bool index_range_exact;	\
+	Double availability_time_offset;	\
 	GF_MPD_URL *initialization_segment;	\
 	GF_MPD_URL *representation_index;	\
 
@@ -214,6 +215,9 @@
 
 	GF_List *sub_representations;
 
+	/*index of the next enhancement representation plus 1, 0 is reserved in case of the highest representation*/
+	u32 enhancement_rep_index_plus_one;
+
 	/*GPAC playback implementation*/
 	GF_DASH_RepresentationPlayback playback;
 } GF_MPD_Representation;
@@ -300,6 +304,7 @@
     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*/

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/reedsolomon.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/reedsolomon.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/scenegraph_dev.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/scenegraph_dev.h Changed

@@ -178,8 +178,6 @@
 	/*real scene time callback*/
 	Double (*GetSceneTime)(void *userpriv);
 
-
-
 	/*parent scene if any*/
 	struct __tag_scene_graph *parent_scene;
 
@@ -253,7 +251,7 @@
 
 
 	GF_Mutex *dom_evt_mx;
-	GF_DOMEventTarget dom_evt;
+	GF_DOMEventTarget *dom_evt;
 	u32 nb_evts_focus;
 	u32 nb_evts_mouse;
 	u32 nb_evts_key;
@@ -264,7 +262,7 @@
 	u32 nb_evts_laser;
 	u32 nb_evts_media;
 	u32 nb_evts_svg;
-	u32 dom_evt_filter;
+	GF_DOMEventCategory dom_evt_filter;
 
 	GF_List *xlink_hrefs;
 	GF_List *smil_timed_elements;
@@ -1121,7 +1119,13 @@
 
 GF_DOMHandler *gf_dom_listener_build_ex(GF_Node *node, u32 event_type, u32 event_parameter, GF_Node *handler, GF_Node **out_listener);
 
+void	gf_dom_event_dump_listeners(GF_Node *n, FILE *f);
+void	gf_dom_event_remove_all_listeners(GF_DOMEventTarget *event_target);
+void	gf_dom_event_target_del(GF_DOMEventTarget *target);
+GF_Err	gf_dom_event_remove_listener_from_parent(GF_DOMEventTarget *event_target, GF_Node *listener);
 
+/* returns associated DOMEventtarget for an HTML/SVG media element, or NULL otherwise*/
+GF_DOMEventTarget *gf_dom_event_get_target_from_node(GF_Node *n);
 
 #ifdef __cplusplus
 }

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/smjs_api.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/smjs_api.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/swf_dev.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/swf_dev.h Changed

@@ -28,6 +28,11 @@
 
 #include <gpac/scene_manager.h>
 #include <gpac/color.h>
+#include <gpac/media_tools.h>
+
+
+#ifndef GPAC_DISABLE_SWF_IMPORT
+
 
 #define SWF_TWIP_SCALE				(1/20.0f)
 
@@ -60,8 +65,10 @@
 struct SWFReader
 {
 	GF_SceneLoader *load;
+
 	FILE *input;
 
+	char *inputName;
 	char *localPath;
 	/*file header*/
 	u32 length;
@@ -70,6 +77,7 @@
 	u32 frame_count;
 	Fixed width, height;
 	Bool has_interact, no_as;
+	Bool empty_frame;
 
 	/*copy of the swf import flags*/	
 	u32 flags;
@@ -170,21 +178,36 @@
 	/* </BIFS conversion state> */
 
     /* SVG conversion state */
-    FILE *svg_output;
+	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 */
 
+	/* 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);
 };
 
 
 void swf_report(SWFReader *read, GF_Err e, char *format, ...);
 SWFFont *swf_find_font(SWFReader *read, u32 fontID);
 GF_Err swf_parse_sprite(SWFReader *read);
-
+GF_Err swf_parse_tag(SWFReader *read);
 
 GF_Err swf_to_bifs_init(SWFReader *read);
-GF_Err swf_to_svg_init(SWFReader *read);
+GF_Err swf_to_svg_init(SWFReader *read, u32 flags, Float angle);
 
+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));
 
 typedef struct
 {
@@ -371,6 +394,6 @@
 	char *url;
 };
 
-
+#endif /*GPAC_DISABLE_SWF_IMPORT*/
 
 #endif /*_GF_SWF_DEV_H_*/

gpac-0.5.0.svn4668.tar.bz2/include/gpac/internal/terminal_dev.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/internal/terminal_dev.h Changed

@@ -75,10 +75,6 @@
 	/*quick hack for avoiding double session creation*/
 	GF_DownloadSession *pending_service_session;
 
-	/*rebuffer window for http/...*/
-	u32 download_rebuffer;
-	Bool auto_rebuffer;
-
 	Bool is_paused;
 
 	/*used by DASH until we rewrite the input module API:
@@ -152,10 +148,6 @@
 	*/
 	u32 graph_attached;
 
-
-	/*current simulation time of the compositor*/
-	Double simulation_time;
-
 	/*set to 1 when single time-line presentation with only static resources (ONE OD AU is detected or no media removal/adding possible)
 	This allows preventing OD/BIFS streams shutdown/startup when seeking.*/
 	Bool static_media_ressources;
@@ -197,6 +189,7 @@
 	/*URLs of current video, audio and subs (we can't store objects since they may be destroyed when seeking)*/
 	SFURL visual_url, audio_url, text_url, dims_url;
 
+	Bool end_of_scene;
 #ifndef GPAC_DISABLE_VRML
 	/*list of externproto libraries*/
 	GF_List *extern_protos;
@@ -222,7 +215,7 @@
 void gf_scene_del(GF_Scene *scene);
 struct _od_manager *gf_scene_find_odm(GF_Scene *scene, u16 OD_ID);
 void gf_scene_disconnect(GF_Scene *scene, Bool for_shutdown);
-void gf_scene_remove_object(GF_Scene *scene, GF_ObjectManager *odm, Bool for_shutdown);
+void gf_scene_remove_object(GF_Scene *scene, GF_ObjectManager *odm, u32 for_shutdown);
 /*browse all (media) channels and send buffering info to the app*/
 void gf_scene_buffering_info(GF_Scene *scene);
 void gf_scene_attach_to_compositor(GF_Scene *scene);
@@ -250,11 +243,10 @@
 not root one. Returns 1 if handled (cf user.h, navigate event)*/
 Bool gf_scene_process_anchor(GF_Node *caller, GF_Event *evt);
 void gf_scene_force_size_to_video(GF_Scene *scene, GF_MediaObject *mo);
-void gf_scene_sample_time(GF_Scene *scene);
 
 Bool gf_scene_check_clocks(GF_ClientService *ns, GF_Scene *scene);
 
-void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *dom_evt, GF_Err code);
+void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *dom_evt, GF_Err code, Bool no_queueing);
 
 void gf_scene_mpeg4_inline_restart(GF_Scene *scene);
 
@@ -424,6 +416,9 @@
 
 	GF_Shortcut shortcuts[MAX_SHORTCUTS];
 	Fixed speed_ratio;
+
+	/*bench mode type: 0-none 1: regular 2- systems layers only: all decoders inputs are discarded*/
+	u32 bench_mode;
 };
 
 
@@ -479,7 +474,7 @@
 void gf_term_queue_node_traverse(GF_Terminal *term, GF_Node *node);
 void gf_term_unqueue_node_traverse(GF_Terminal *term, GF_Node *node);
 
-Bool gf_term_lock_codec(GF_Codec *codec, Bool lock);
+Bool gf_term_lock_codec(GF_Codec *codec, Bool lock, Bool try_lock);
 
 typedef struct
 {
@@ -678,14 +673,20 @@
 	Bool is_protected;
 
 	/*indicates that AU received will be copied to the composition memory*/
-	Bool is_raw_channel;
+	u32 is_raw_channel;
 
 	u32 resync_drift;
+	s32 prev_pcr_diff;
 
 	/*TSs as received from network - these are used for cache storage*/
 	u64 net_dts, net_cts;
 
+	Bool last_au_was_seek;
 	Bool no_timestamps;
+	u32 prev_aggregated_dts;
+
+	Bool pull_forced_buffer;
+
 };
 
 /*creates a new channel for this stream*/
@@ -722,6 +723,15 @@
 void gf_es_dispatch_raw_media_au(GF_Channel *ch, char *payload, u32 payload_size, u32 cts);
 /*returns true if this stream owns its clock, false if it simply refers to it*/
 Bool gf_es_owns_clock(GF_Channel *ch);
+void gf_es_reset_timing(GF_Channel *ch);
+/*reset all timestamps in CB*/
+void gf_cm_reset_timing(GF_CompositionMemory *cb);
+/*reset timing of all objects associated with this clock*/
+void gf_clock_discontinuity(GF_Clock *ck, GF_Scene *scene, Bool is_pcr_discontinuity);
+//turns on buffering on the stream
+void gf_es_buffer_on(GF_Channel *ch);
+//turns off buffering on the stream
+void gf_es_buffer_off(GF_Channel *ch);
 
 /*
 		decoder stuff
@@ -799,11 +809,14 @@
 	u32 bytes_per_sec;
 	Double fps;
 	u32 nb_dispatch_skipped;
+	Bool direct_vout;
 
 	/*statistics*/
-	u32 last_stat_start, cur_bit_size;
+	u32 last_stat_start, cur_bit_size, tot_bit_size, stat_start;
 	u32 avg_bit_rate, max_bit_rate;
-	u32 total_dec_time, nb_dec_frames, max_dec_time;
+	u32 nb_dec_frames;
+	u64 total_dec_time, max_dec_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)*/
@@ -893,7 +906,7 @@
 	GF_Scene *parentscene;
 	/*channels associated with this object (media channels, OCR, IPMP, OCI, etc)*/
 	GF_List *channels;
-	/*sub scene for inline/animation or NULL */
+	/*sub scene for inline or NULL */
 	GF_Scene *subscene;
 	/*object codec (media or BIFS for AnimationStream) attached if any*/
 	struct _generic_codec *codec;
@@ -956,7 +969,7 @@
 /*setup OD*/
 void gf_odm_setup_object(GF_ObjectManager *odm, GF_ClientService *parent_serv);
 /*disctonnect OD and removes it if desired (otherwise only STOP is propagated)*/
-void gf_odm_disconnect(GF_ObjectManager *odman, Bool do_remove);
+void gf_odm_disconnect(GF_ObjectManager *odman, u32 do_remove);
 /*setup an ESD*/
 GF_Err gf_odm_setup_es(GF_ObjectManager *odm, GF_ESD *esd, GF_ClientService *service, GF_MediaObject *sync_ref);
 /*removes an ESD (this destroys associated channel if any)*/
@@ -1025,11 +1038,15 @@
 	u32 nb_fetch;
 	/*frame presentation time*/
 	u32 timestamp;
+	/*time in ms until next frame shall be presented*/
+	s32 ms_until_next;
+	s32 ms_until_pres;
 	/*data frame size*/
 	u32 framesize;
 	/*pointer to data frame */
 	char *frame;
-	/* used to dispatch Media Access Events and HTML5 Media and Media Source Events */
+	/* Objects implementing the DOM Event Target interface
+	   used to dispatch HTML5 Media and Media Source Events */
 	GF_List *evt_targets;
 	/*pointer to the node responsible for the creation of this media object
 	ONLY used for scene media type (animationStreams) 
@@ -1060,8 +1077,8 @@
 Bool gf_term_send_event(GF_Terminal *term, GF_Event *evt);
 
 /*media access events */
-void gf_term_service_media_event(GF_ObjectManager *odm, u32 event_type);
-void gf_term_service_media_event_with_download(GF_ObjectManager *odm, u32 event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec);
+void gf_term_service_media_event(GF_ObjectManager *odm, GF_EventType event_type);
+void gf_term_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec);
 
 /*checks the URL and returns the ODID (MPEG-4 od://) or GF_MEDIA_EXTERNAL_ID for all regular URLs*/
 u32 gf_mo_get_od_id(MFURL *url);
@@ -1070,6 +1087,9 @@
 
 GF_Err gf_codec_process_private_media(GF_Codec *codec, u32 TimeAvailable);
 
+
+Bool gf_codec_is_scene_or_image(GF_Codec *codec);
+
 #ifdef __cplusplus
 }
 #endif

gpac-0.5.0.svn4668.tar.bz2/include/gpac/ismacryp.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/ismacryp.h Changed

@@ -42,24 +42,24 @@
 enum
 {
 	/*no selective encryption*/
-	GF_ISMACRYP_SELENC_NONE = 0,
+	GF_CRYPT_SELENC_NONE = 0,
 	/*only encrypts RAP samples*/
-	GF_ISMACRYP_SELENC_RAP = 1,
+	GF_CRYPT_SELENC_RAP = 1,
 	/*only encrypts non-RAP samples*/
-	GF_ISMACRYP_SELENC_NON_RAP = 2,
+	GF_CRYPT_SELENC_NON_RAP = 2,
 	/*selective encryption of random samples*/
-	GF_ISMACRYP_SELENC_RAND = 3,
+	GF_CRYPT_SELENC_RAND = 3,
 	/*selective encryption of a random sample in given range*/
-	GF_ISMACRYP_SELENC_RAND_RANGE = 4,
+	GF_CRYPT_SELENC_RAND_RANGE = 4,
 	/*selective encryption of first sample in given range*/
-	GF_ISMACRYP_SELENC_RANGE = 5,
+	GF_CRYPT_SELENC_RANGE = 5,
 	/*encryption of all samples but the preview range*/
-	GF_ISMACRYP_SELENC_PREVIEW = 6,
+	GF_CRYPT_SELENC_PREVIEW = 6,
 };
 
 typedef struct
 {
-	/*0: ISMACryp - 1: OMA DRM*/
+	/*0: ISMACryp - 1: OMA DRM - 2: CENC CTR - 3: CENC CBC - 4: ADOBE*/
 	u32 enc_type;
 	u32 trackID;
 	unsigned char key[16];
@@ -77,6 +77,8 @@
 	u32 ipmp_type;
 	/*if not set and IPMP enabled, defaults to TrackID*/
 	u32 ipmp_desc_id;
+	/*type of box where sample auxiliary informations is saved, or 0 in case of ISMACrypt (it will be written in samples)*/
+	u32 sai_saved_box_type;
 
 	/*OMA extensions*/
 	/*0: none, 1: AES CBC, 2: AES CTR*/
@@ -85,6 +87,21 @@
 	u32 TextualHeadersLen;
 	char TransactionID[17];
 
+	/*CENC extensions*/
+	u32 IsEncrypted;
+	u8 IV_size; 
+	bin128 default_KID;
+	u32 KID_count;
+	bin128 *KIDs;
+	bin128 *keys;
+	/*IV of first sample in track*/
+	unsigned char first_IV[16];
+	u32 defaultKeyIdx;
+	u32 keyRoll;
+
+	char metadata[5000];
+	u32 metadata_len;
+
 } GF_TrackCryptInfo;
 
 #if !defined(GPAC_DISABLE_MCRYPT) && !defined(GPAC_DISABLE_ISOM_WRITE)
@@ -95,17 +112,32 @@
 /*decrypts track - logs, progress: info callbacks, NULL for default*/
 GF_Err gf_ismacryp_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
 
+/*Common Encryption*/
+/*AES-CTR*/
+GF_Err gf_cenc_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
+GF_Err gf_cenc_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
+/*AES-CBC*/
+GF_Err gf_cbc_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
+GF_Err gf_cbc_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
+
+/*ADOBE*/
+GF_Err gf_adobe_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
+GF_Err gf_adobe_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk);
+
+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 
 @drm_file: location of DRM data (cf MP4Box doc).
 @LogMsg: redirection for message or NULL for default
 */
-GF_Err gf_ismacryp_decrypt_file(GF_ISOFile *mp4file, const char *drm_file);
+GF_Err gf_decrypt_file(GF_ISOFile *mp4file, const char *drm_file);
 
 /*Crypt a the file 
 @drm_file: location of DRM data.
 @LogMsg: redirection for message or NULL for default
 */
-GF_Err gf_ismacryp_crypt_file(GF_ISOFile *mp4file, const char *drm_file);
+GF_Err gf_crypt_file(GF_ISOFile *mp4file, const char *drm_file);
 
 #endif /*!defined(GPAC_DISABLE_MCRYPT) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-0.5.0.svn4668.tar.bz2/include/gpac/isomedia.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/isomedia.h Changed

@@ -129,10 +129,10 @@
 	GF_ISOM_MEDIA_HINT		= GF_4CC( 'h', 'i', 'n', 't' ),
 	GF_ISOM_MEDIA_META		= GF_4CC( 'm', 'e', 't', 'a' ),
 	GF_ISOM_MEDIA_TEXT		= GF_4CC( 't', 'e', 'x', 't' ),
-	GF_ISOM_MEDIA_SUBM		= GF_4CC( 's', 'u', 'b', 'm' ),
 	/*subtitle code point used on ipod - same as text*/
 	GF_ISOM_MEDIA_SUBT		= GF_4CC( 's', 'b', 't', 'l' ),
 	GF_ISOM_MEDIA_SUBPIC	= GF_4CC( 's', 'u', 'b', 'p' ),
+	GF_ISOM_MEDIA_MPEG_SUBT	= GF_4CC( 's', 'u', 'b', 't' ),
 
 	/*MPEG-4 media types*/
 	GF_ISOM_MEDIA_OD		= GF_4CC( 'o', 'd', 's', 'm' ),
@@ -151,16 +151,26 @@
 	GF_ISOM_MEDIA_FLASH		= GF_4CC( 'f', 'l', 's', 'h' )
 };
 
-/* Encryption Scheme Type in the SchemeTypeInfoBox */
-enum 
-{
-	GF_ISOM_ISMACRYP_SCHEME	= GF_4CC( 'i', 'A', 'E', 'C' )
-};
 
-/* Encryption Scheme Type in the SchemeTypeInfoBox */
-enum 
+/*DRM related code points*/
+enum
 {
-	GF_ISOM_OMADRM_SCHEME	= GF_4CC('o','d','k','m')
+	GF_ISOM_BOX_UUID_PSEC	= GF_4CC( 'P', 'S', 'E', 'C' ),
+	GF_ISOM_BOX_TYPE_SENC	= GF_4CC( 's', 'e', 'n', 'c'),
+
+	/* Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_ISMACRYP_SCHEME	= GF_4CC( 'i', 'A', 'E', 'C' ),
+	/* Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_OMADRM_SCHEME	= GF_4CC('o','d','k','m'),
+
+	/* Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_CENC_SCHEME	= GF_4CC('c','e','n','c'),
+	
+	/* Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_CBC_SCHEME	= GF_4CC('c','b','c','1'),
+
+	/* Encryption Scheme Type in the SchemeTypeInfoBox */
+	GF_ISOM_ADOBE_SCHEME	= GF_4CC('a','d','k','m'),
 };
 
 
@@ -184,6 +194,10 @@
 	GF_ISOM_SUBTYPE_SVC_H264		= GF_4CC( 's', 'v', 'c', '1' ),
 	GF_ISOM_SUBTYPE_HVC1			= GF_4CC( 'h', 'v', 'c', '1' ),
 	GF_ISOM_SUBTYPE_HEV1			= GF_4CC( 'h', 'e', 'v', '1' ),
+	GF_ISOM_SUBTYPE_HVC2			= GF_4CC( 'h', 'v', 'c', '2' ),
+	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' ),
 
 	/*3GPP(2) extension subtypes*/
 	GF_ISOM_SUBTYPE_3GP_H263		= GF_4CC( 's', '2', '6', '3' ),
@@ -200,6 +214,9 @@
 
 	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_STPP		= GF_4CC( 's', 't', 'p', 'p' ),
+	GF_ISOM_SUBTYPE_SBTT		= GF_4CC( 's', 'b', 't', 't' ),
 };
 
 
@@ -323,8 +340,10 @@
 param is specified...*/
 GF_Err gf_isom_last_error(GF_ISOFile *the_file);
 
-/*returns 1 if target file is an IsoMedia file, 0 otherwise*/
-Bool gf_isom_probe_file(const char *fileName);
+/*indicates if target file is an IsoMedia file
+  returns 1 if it is a non-special file, 2 if an init segment, 3 if a media segment, 
+  returns 0 otherwise*/
+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
@@ -389,6 +408,7 @@
 and SampleCount change too ...
 
 if new_location is set, the previous bitstream is changed to this new location, otherwise it is refreshed (disk flush)
+
 */
 GF_Err gf_isom_refresh_fragmented(GF_ISOFile *the_file, u64 *MissingBytes, const char *new_location);
 
@@ -398,7 +418,17 @@
 
 /* check if the file has a top styp box and returns the brand and version of the first styp found */
 Bool gf_isom_has_segment(GF_ISOFile *file, u32 *brand, u32 *version);
+/*get number of movie fragments in the file*/
+u32 gf_isom_segment_get_fragment_count(GF_ISOFile *file);
+/*get number of track fragments in the indicated movie fragment (1-based index)*/
+u32 gf_isom_segment_get_track_fragment_count(GF_ISOFile *file, u32 moof_index);
+/*returns the track ID and get the tfdt of the given track fragment (1-based index) in the indicated movie fragment (1-based index)*/
+u32 gf_isom_segment_get_track_fragment_decode_time(GF_ISOFile *file, u32 moof_index, u32 traf_index, u64 *decode_time);
 
+/* 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);
 /********************************************************************
 				READING API FUNCTIONS
 ********************************************************************/
@@ -530,6 +560,9 @@
 /*retrieves given sample DTS*/
 u32 gf_isom_get_sample_from_dts(GF_ISOFile *the_file, u32 trackNumber, u64 dts);
 
+/*get the current tfdt of the track - this can be used to adjust sample time queries when edit list are used*/
+u64 gf_isom_get_current_tfdt(GF_ISOFile *the_file, u32 trackNumber);
+
 /*Track Edition functions*/
 
 /*return a sample given a desired time in the movie. MovieTime is IN MEDIA TIME SCALE , handles edit list.
@@ -780,8 +813,13 @@
   for files without movie, returns the file meta handler type
 */
 u32 gf_isom_guess_specification(GF_ISOFile *file);
+/*keeps UTC edit times when storing*/
+void gf_isom_keep_utc_times(GF_ISOFile *file, Bool keep_utc);
 
 
+/*gets last UTC/timestamp values indicated for the reference track in the file if any. Returns 0 if no info found*/
+Bool gf_isom_get_last_producer_time_box(GF_ISOFile *file, u32 *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info);
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 
@@ -1116,8 +1154,10 @@
 GF_Err gf_isom_clone_root_od(GF_ISOFile *input, GF_ISOFile *output);
 
 /*clones the entire movie file to destination. Tracks can be cloned if clone_tracks is set, in which case hint tracks can be
-kept if keep_hint_tracks is set*/
-GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks);
+kept if keep_hint_tracks is set
+if keep_pssh, all pssh boxes will be kept
+fragment information (mvex) is not kept*/
+GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh);
 
 /*returns true if same set of sample description in both tracks - this does include self-contained checking
 and reserved flags. The specific media cfg (DSI & co) is not analysed, only
@@ -1126,13 +1166,23 @@
 
 GF_Err gf_isom_set_JPEG2000(GF_ISOFile *mov, Bool set_on);
 
-/*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. This allows keeping the memory
+/* sample information for all tracks setup are reset. This allows keeping the memory
 footprint low when playing segments. Note however that seeking in the file is then no longer possible*/
+GF_Err gf_isom_reset_tables(GF_ISOFile *movie, Bool reset_sample_count);
+/* sets the offset for parsing from the input buffer to 0 (used to reclaim input buffer)*/
+GF_Err gf_isom_reset_data_offset(GF_ISOFile *movie, u64 *top_box_start);
+
+/*releases current movie segment - this closes the associated file IO object.
+If reset_tables is set, sample information for all tracks setup as segment are destroyed, along with all PSSH boxes. This allows keeping the memory
+footprint low when playing segments. Note however that seeking in the file is then no longer possible
+WARNING - the sample count is not reset after the release of tables. This means you need to keep counting samples.*/
 GF_Err gf_isom_release_segment(GF_ISOFile *movie, Bool reset_tables);
 /*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);
+GF_Err gf_isom_open_segment(GF_ISOFile *movie, const char *fileName, u64 start_range, u64 end_range, Bool is_scalable_segment);
+
+/*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);
 
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
 
@@ -1212,12 +1262,16 @@
 /*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);
 
-/*closes current segment - if fragments_per_sidx is <0, no sidx is used - if fragments_per_sidx is ==0, a single sidx is used*/
-GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegs_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool last_segment, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range);
+/*closes current segment - if fragments_per_sidx is <0, no sidx is used - if fragments_per_sidx is ==0, a single sidx is used
+timestamp_shift is the constant difference between media time and presentation time (derived from edit list)*/
+GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegs_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, s32 timestamp_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool last_segment, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range);
 
 /*writes any pending fragment to file for low-latency output. shall only be used if no SIDX is used (subsegs_per_sidx<0 or flushing all fragments before calling gf_isom_close_segment)*/
 GF_Err gf_isom_flush_fragments(GF_ISOFile *movie, Bool last_segment);
 
+/*sets fragment prft box info, written just before the moof*/
+GF_Err gf_isom_set_fragment_reference_time(GF_ISOFile *movie, u32 reference_track_ID, u64 ntp, u64 timestamp);
+
 /*writes an empty sidx in the current movie. The SIDX will be forced to have nb_segs entries - nb_segs shall match the number of calls to
 gf_isom_close_segment that will follow. This avoids wasting time and disk space moving data around. Once gf_isom_close_segment has then been called nb_segs times, 
 the pre-allocated SIDX is destroyed and sucessive calls to gf_isom_close_segment will create their own sidx (unless gf_isom_allocate_sidx is called again).
@@ -1270,15 +1324,22 @@
 CANNOT be used with OD tracks*/
 GF_Err gf_isom_fragment_append_data(GF_ISOFile *the_file, u32 TrackID, char *data, u32 data_size, u8 PaddingBits);
 
-void gf_isom_reset_fragment_info(GF_ISOFile *movie);
+/*reset internal info used with fragments and segment. Should be called when seeking (with keep_sample_count=0) or when loading a media segments with the same timing as the previously loaded segment*/
+void gf_isom_reset_fragment_info(GF_ISOFile *movie, Bool keep_sample_count);
 
 /*return the duration of the movie+fragments if known, 0 if error*/
 u64 gf_isom_get_fragmented_duration(GF_ISOFile *movie);
-/*returns the number */
+/*returns the number of sidx boxes*/
 u32 gf_isom_get_fragments_count(GF_ISOFile *movie, Bool segments_only);
+/*gets total sample number and duration*/
+GF_Err gf_isom_get_fragmented_samples_info(GF_ISOFile *movie, u32 trackID, u32 *nb_samples, u64 *duration);
+
+GF_Err gf_isom_fragment_add_sai(GF_ISOFile *output, GF_ISOFile *input, u32 TrackID, u32 SampleNum);
+GF_Err gf_isom_clone_pssh(GF_ISOFile *output, GF_ISOFile *input, Bool in_moof);
 
 #endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
 
+GF_Err gf_isom_set_sync_table(GF_ISOFile *the_file, u32 trackNumber);
 
 /******************************************************************
 		GENERIC Publishing API
@@ -1581,9 +1642,6 @@
 /*gets uncompressed SVC config - user is responsible for deleting it*/
 GF_AVCConfig *gf_isom_svc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
-/*gets uncompressed HEVC config - user is responsible for deleting it*/
-GF_HEVCConfig *gf_isom_hevc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
-
 typedef enum
 {
 	GF_ISOM_AVCTYPE_NONE=0,
@@ -1595,6 +1653,23 @@
 u32 gf_isom_get_avc_svc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
 
+typedef enum
+{
+	GF_ISOM_HEVCTYPE_NONE=0,
+	GF_ISOM_HEVCTYPE_HEVC_ONLY,
+	GF_ISOM_HEVCTYPE_HEVC_SHVC,
+	GF_ISOM_HEVCTYPE_SHVC_ONLY,
+} GF_ISOMHEVCType;
+
+u32 gf_isom_get_hevc_shvc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+/*gets HEVC config - user is responsible for deleting it*/
+GF_HEVCConfig *gf_isom_hevc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+/*gets SHVC config - user is responsible for deleting it*/
+GF_HEVCConfig *gf_isom_shvc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
+
+Bool gf_isom_has_scalable_layer(GF_ISOFile *file);
+
 enum
 {
 	/*all extractors are rewritten*/
@@ -1614,6 +1689,7 @@
 GF_Err gf_isom_set_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber, u32 nalu_extract_mode);
 u32 gf_isom_get_nalu_extract_mode(GF_ISOFile *the_file, u32 trackNumber);
 
+
 #ifndef GPAC_DISABLE_ISOM_WRITE
 /*creates new AVC config*/
 GF_Err gf_isom_avc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_AVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
@@ -1629,15 +1705,18 @@
 /*sets avc3 entry type (inband SPS/PPS) instead of of avc1 (SPS/PPS in avcC box)*/
 GF_Err gf_isom_avc_set_inband_config(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex);
 
-/*sets avc3 entry type (inband SPS/PPS) instead of of avc1 (SPS/PPS in avcC box)*/
+/*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);
 
 
-/*creates new AVC config*/
+/*creates new HEVC config*/
 GF_Err gf_isom_hevc_config_new(GF_ISOFile *the_file, u32 trackNumber, GF_HEVCConfig *cfg, char *URLname, char *URNname, u32 *outDescriptionIndex);
-/*updates AVC config*/
+/*updates HEVC config*/
 GF_Err gf_isom_hevc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg);
 
+/*updates SHVC config*/
+GF_Err gf_isom_shvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, Bool is_additional);
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 
@@ -1761,14 +1840,13 @@
 
 
 GF_Err gf_isom_generic_subtitle_reset(GF_GenericSubtitleSample *samp);
-GF_Err gf_isom_new_generic_subtitle_description(GF_ISOFile *movie, u32 trackNumber, char *content_encoding, char *xml_schema_loc, char*mime_type_or_namespace, Bool is_xml, char *URLname, char *URNname, u32 *outDescriptionIndex);
 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_Err gf_isom_generic_subtitle_reset(GF_GenericSubtitleSample *samp);
-GF_Err gf_isom_new_generic_subtitle_description(GF_ISOFile *movie, u32 trackNumber, char *content_encoding, char *xml_schema_loc, char*mime_type_or_namespace, Bool is_xml, char *URLname, char *URNname, u32 *outDescriptionIndex);
-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_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);
+GF_Err gf_isom_xml_subtitle_sample_add_text(GF_GenericSubtitleSample *samp, char *text_data, u32 text_len);
 
 #endif	/*GPAC_DISABLE_ISOM_WRITE*/
 
@@ -1840,10 +1918,13 @@
 */
 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);
 
+/*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);
+
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
-/*removes ISMACryp protection info (does not perform decryption :)*/
-GF_Err gf_isom_remove_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 StreamDescriptionIndex);
+/*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, 
@@ -1861,8 +1942,62 @@
 						   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_cenc_set_pssh(GF_ISOFile *mp4, bin128 systemID, u32 version, u32 KID_count, bin128 *KID, char *data, u32 len);
+
+GF_Err gf_isom_remove_cenc_saiz(GF_ISOFile *the_file, u32 trackNumber);
+GF_Err gf_isom_remove_cenc_saio(GF_ISOFile *the_file, u32 trackNumber);
+GF_Err gf_isom_remove_samp_enc_box(GF_ISOFile *the_file, u32 trackNumber);
+GF_Err gf_isom_remove_samp_group_box(GF_ISOFile *the_file, u32 trackNumber);
+GF_Err gf_isom_remove_pssh_box(GF_ISOFile *the_file);
+
+Bool gf_isom_is_adobe_protection_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
+GF_Err gf_isom_get_adobe_protection_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion);
+GF_Err gf_isom_set_adobe_protection(GF_ISOFile *the_file, u32 trackNumber, u32 desc_index, u32 scheme_type, u32 scheme_version, Bool is_selective_enc, char *metadata, u32 len);
+
+void gf_isom_ipmpx_remove_tool_list(GF_ISOFile *the_file);
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+Bool gf_isom_is_cenc_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex);
+GF_Err gf_isom_get_cenc_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, u32 *outIVLength);
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+void gf_isom_cenc_samp_aux_info_del(GF_CENCSampleAuxInfo *samp_aux_info);
+#endif
+
+/*boxType is type of box which contains the sample auxiliary information. Now we have two type: GF_ISOM_BOX_UUID_PSEC and GF_ISOM_BOX_TYPE_SENC*/
+GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_CENCSampleAuxInfo **sai, u32 *container_type);
+
+void gf_isom_cenc_get_default_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *default_IsEncrypted, u8 *default_IV_size, bin128 *default_KID);
+
+u32 gf_isom_get_pssh_count(GF_ISOFile *file);
+/*index is 1-based, all pointers shall not be free*/
+GF_Err gf_isom_get_pssh_info(GF_ISOFile *file, u32 pssh_index, bin128 SystemID, u32 *KID_count, const bin128 **KIDs, const u8 **private_data, u32 *private_data_size);
+
+
 #ifndef GPAC_DISABLE_ISOM_DUMP
 /*xml dumpers*/
 GF_Err gf_isom_dump_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, FILE * trace);
@@ -1956,13 +2091,14 @@
 	@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. 
 	@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)
 */
-GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, const char *mime_type, const char *content_encoding, const char *URL, const char *URN);
+GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, const char *URL, const char *URN);
 /*same as above excepts take the item directly in memory*/
-GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, const char *mime_type, const char *content_encoding, char *data, u32 data_len);
+GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, char *data, u32 data_len);
 
 /*removes item from meta*/
 GF_Err gf_isom_remove_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, u32 item_num);
@@ -2133,7 +2269,7 @@
 GF_Err gf_isom_fragment_add_subsample(GF_ISOFile *movie, u32 TrackID, u32 subSampleSize, u8 priority, u32 reserved, Bool discardable);
 
 /*copy over the subsample and sampleToGroup information of the given sample from the source track/file to the last sample added to the current track fragment of the destination file*/
-GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber);
+GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf);
 
 /*gets the number of the next moof to be produced*/
 u32 gf_isom_get_next_moof_number(GF_ISOFile *movie);
@@ -2154,10 +2290,14 @@
 - 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*/ 
+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);
 
 #endif
 
+GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID);
 
 
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4668.tar.bz2/include/gpac/list.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/list.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/map.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/map.h Changed

@@ -1,208 +1,213 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jerome Gorin
- *			Copyright (c) Telecom ParisTech 2000-2013
- *					All rights reserved
- *
- *  This file is part of GPAC / dashcast-Debug@dashcast_build
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#ifndef _GF_MAP_H_
-#define _GF_MAP_H_
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
- *	\file <map.h>
- *	\brief map functions.
- */
-
-/*!
- *	\addtogroup  map_grp map
- *	\ingroup utils_grp
- *	\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.
- *	@{
- */
-
-#include <gpac/tools.h>
-
-
-/**
- * \struct GF_Map
- * \brief Map Object.
- *
- * A GF_Map associate key to values.
- */
-typedef struct _tag_map GF_Map;
-
-
-/**
- * \struct GF_Iterator
- * \brief Map iterator Object.
- *
- * Allows to go through each pair key/value in the map.
- */
-typedef struct _it_map GF_It_Map;
-
-/* Pair structure */
-
-/**
- * \struct GF_Pair
- * \brief Pair structure.
- *
- * Define the association Key/value.
- */
-typedef struct {
-	char *key;
-	void *value;
-} GF_Pair;
-
-
-/*!
- *	\brief map constructor
- *
- *	Constructs a new map object
- *
- *	\param hash_capacity the number of slot in the hash table
- *	\note a zero hash_capacity is not allowed, a hash_capacity of 1 is
- *	equivalent to a gf_list_find from GF_List with a complexity search in o(n)
- *	\return new map object
- */
-GF_Map *gf_map_new(u32 hash_capacity);
-
-/*!
- *	\brief map destructor
- *
- *	Destructs a map object
- *	\param ptr map object to destruct
- *	\note The caller is only responsible to destroy the content of the map, not the key
- */
-void gf_map_del(GF_Map *ptr);
-
-/*!
- *	\brief map iterator constructor
- *
- *	Constructs a new map iterator object
- *
- *	\param map the map associated to the iterator
- *	\param it the resulting iterator
- *	\return GF_OK if iterator has been properly generated, otherwiise a GF_Err
- */
-GF_Err gf_map_iter_new(GF_Map* map, GF_It_Map** it);
-
-/*!
- *	\brief map iterator destructor
- *
- *	Destructs a map iterator object
- *	\param ptr map iterator object to destruct
- */
-void gf_map_iter_del(GF_It_Map *ptr);
-
-/*!
- *	\brief return the next value in the map
- *
- *	Return the next value of a GF_Pair in the map
- *	\param it  the map iterator object
- *  \return the next value of the map if exists, otherwise NULL
- */
-void* gf_map_iter_has_next(GF_It_Map* it);
-
-/*!
- *	\brief Reset the iterator in the map
- *
- *	Reinitalize the iterator to the beginning of the map
- *	\param it  the map iterator object
- *  \return GF_OK if the iterator has been correctly reinitialize, otherwise a GF_Err
- */
-GF_Err gf_map_iter_reset(GF_It_Map* it);
-
-/*!
- *	\brief get count
- *
- *	Returns number of items in the map
- *	\param ptr target map object
- *	\return number of items in the map
- */
-u32 gf_map_count(const GF_Map *ptr);
-
-/*!
- *	\brief add item
- *
- *	Adds an item in the map with an associated key
- *
- *	\param ptr target map object
- *	\param key the identified key
- *	\param item item to add
- *	\return GF_OF if insertion occurs properly, GF_NOT_SUPPORTED if the key already exists, a GF_Err in other cases
- *	\note the caller is responsible for the deallocation of the key as it is copyied in the map
- */
-GF_Err gf_map_insert(GF_Map *ptr, const char* key, void* item);
-
-/*!
- *	\brief removes the couple key/item from the map
- *
- *	Removes an item from the map given to its key if exists
- *	\param ptr target map object
- *	\param key the key of the item.
- *	\return GF_TRUE if the key has been delete, otherwise GF_FALSE
- *	\note It is the caller responsability to destroy the content of the list if needed
- */
-Bool gf_map_rem(GF_Map *ptr, const char* key);
-
-/*!
- *	\brief finds item
- *
- *	Finds a key in the map
- *
- *	\param ptr target map object.
- *	\param key the key to find.
- *	\return a pointer to the corresponding value if found, otherwise NULL.
- */
-void* gf_map_find(GF_Map *ptr, const char* key);
-
-/*!
- *	\brief Check if map contains key
- *
- *	\param ptr target map object.
- *	\param key the key to check.
- *	\return GF_TRUE if map contains keys, otherwise GF_FALSE
- */
-Bool gf_map_has_key(GF_Map *ptr, const char* key);
-
-/*!
- *	\brief resets map
- *
- *	Resets the content of the map
- *	\param ptr target map object.
- *	\note It is the caller responsability to destroy the content of the list if needed
- */
-void gf_map_reset(GF_Map *ptr);
-
-
-/*! @} */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _GF_MAP_H_ */
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jerome Gorin
+ *			Copyright (c) Telecom ParisTech 2000-2013
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / dashcast-Debug@dashcast_build
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#ifndef _GF_MAP_H_
+#define _GF_MAP_H_
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*!
+ *	\file <map.h>
+ *	\brief map functions.
+ */
+
+/*!
+ *	\addtogroup  map_grp map
+ *	\ingroup utils_grp
+ *	\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.
+ *	@{
+ */
+
+#include <gpac/tools.h>
+
+
+/**
+ * \struct GF_Map
+ * \brief Map Object.
+ *
+ * A GF_Map associate key to values.
+ */
+typedef struct _tag_map GF_Map;
+
+
+/* Pair structure */
+
+/**
+ * \struct GF_Pair
+ * \brief Pair structure.
+ *
+ * Define the association Key/value.
+ */
+typedef struct {
+	char *key;
+	void *value;
+} GF_Pair;
+
+
+/**
+ * \struct GF_Iterator
+ * \brief Map iterator Object.
+ *
+ * Allows to go through each pair key/value in the map.
+ */
+typedef struct _it_map{
+	/* The current map*/
+	GF_Map* map;
+
+	/* The current pair */
+	GF_Pair* pair;
+
+	/* The current list */
+	u32 ilist;
+
+	/* The current index in the hasmap*/
+	u32 hash;
+	
+}GF_It_Map;
+
+/*!
+ *	\brief map constructor
+ *
+ *	Constructs a new map object
+ *
+ *	\param hash_capacity the number of slot in the hash table
+ *	\note a zero hash_capacity is not allowed, a hash_capacity of 1 is
+ *	equivalent to a gf_list_find from GF_List with a complexity search in o(n)
+ *	\return new map object
+ */
+GF_Map *gf_map_new(u32 hash_capacity);
+
+/*!
+ *	\brief map destructor
+ *
+ *	Destructs a map object
+ *	\param ptr map object to destruct
+ *	\note The caller is only responsible to destroy the content of the map, not the key
+ */
+void gf_map_del(GF_Map *ptr);
+
+/*!
+ *	\brief Set a new map iterator
+ *
+ *	Associate a map iterator to a map
+ *
+ *	\param map the map associated to the iterator
+ *	\param it the resulting iterator
+ *	\return GF_OK if iterator has been set properly, otherwise a GF_Err
+ */
+GF_Err gf_map_iter_set(GF_Map* map, GF_It_Map* it);
+
+/*!
+ *	\brief return the next value in the map
+ *
+ *	Return the next value of a GF_Pair in the map
+ *	\param it  the map iterator object
+ *  \return the next value of the map if exists, otherwise NULL
+ */
+void* gf_map_iter_has_next(GF_It_Map* it);
+
+/*!
+ *	\brief Reset the iterator in the map
+ *
+ *	Reinitalize the iterator to the beginning of the map
+ *	\param it  the map iterator object
+ *  \return GF_OK if the iterator has been correctly reinitialize, otherwise a GF_Err
+ */
+GF_Err gf_map_iter_reset(GF_It_Map* it);
+
+/*!
+ *	\brief get count
+ *
+ *	Returns number of items in the map
+ *	\param ptr target map object
+ *	\return number of items in the map
+ */
+u32 gf_map_count(const GF_Map *ptr);
+
+/*!
+ *	\brief add item
+ *
+ *	Adds an item in the map with an associated key
+ *
+ *	\param ptr target map object
+ *	\param key the identified key
+ *	\param item item to add
+ *	\return GF_OF if insertion occurs properly, GF_NOT_SUPPORTED if the key already exists, a GF_Err in other cases
+ *	\note the caller is responsible for the deallocation of the key as it is copyied in the map
+ */
+GF_Err gf_map_insert(GF_Map *ptr, const char* key, void* item);
+
+/*!
+ *	\brief removes the couple key/item from the map
+ *
+ *	Removes an item from the map given to its key if exists
+ *	\param ptr target map object
+ *	\param key the key of the item.
+ *	\return GF_TRUE if the key has been delete, otherwise GF_FALSE
+ *	\note It is the caller responsability to destroy the content of the list if needed
+ */
+Bool gf_map_rem(GF_Map *ptr, const char* key);
+
+/*!
+ *	\brief finds item
+ *
+ *	Finds a key in the map
+ *
+ *	\param ptr target map object.
+ *	\param key the key to find.
+ *	\return a pointer to the corresponding value if found, otherwise NULL.
+ */
+void* gf_map_find(GF_Map *ptr, const char* key);
+
+/*!
+ *	\brief Check if map contains key
+ *
+ *	\param ptr target map object.
+ *	\param key the key to check.
+ *	\return GF_TRUE if map contains keys, otherwise GF_FALSE
+ */
+Bool gf_map_has_key(GF_Map *ptr, const char* key);
+
+/*!
+ *	\brief resets map
+ *
+ *	Resets the content of the map
+ *	\param ptr target map object.
+ *	\note It is the caller responsability to destroy the content of the list if needed
+ */
+void gf_map_reset(GF_Map *ptr);
+
+
+/*! @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GF_MAP_H_ */

gpac-0.5.0.svn4668.tar.bz2/include/gpac/math.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/math.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/media_tools.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/media_tools.h Changed

@@ -88,9 +88,9 @@
 	GF_IMPORT_USE_COMPACT_SIZE = 1<<8,
 	/*don't add a final empty sample when importing text tracks from srt*/
 	GF_IMPORT_NO_TEXT_FLUSH = 1<<9,
-	/*for SVC video: forces explicit SVC signaling */
+	/*for SVC or SHVC video: forces explicit SVC / SHVC signaling */
 	GF_IMPORT_SVC_EXPLICIT = 1<<10,
-	/*for SVC video: removes all SVC extensions*/
+	/*for SVC / SHVC video: removes all SVC / SHVC extensions*/
 	GF_IMPORT_SVC_NONE = 1<<11,
 
 	/*for AAC audio: forces PS mode with implicit signaling (backward compatible)*/
@@ -189,6 +189,9 @@
 	u32 duration;
 	/*importer flags*/
 	u32 flags;
+	/*importer swf flags*/
+	u32 swf_flags;
+	Float swf_flatten_angle;
 	/*if non 0, force video FPS (CMP, AVI, OGG, H264) - also used by SUB import*/
 	Double video_fps;
 	/*optional ESD*/
@@ -220,6 +223,7 @@
 	u32 nb_tracks;
 	/*track info after probing (GF_IMPORT_PROBE_ONLY set).*/
 	struct __track_import_info tk_info[GF_IMPORT_MAX_TRACKS];
+	u64 probe_duration;
 
 	/*for MPEG-TS and similar: program names*/
 	u32 nb_progs;
@@ -260,7 +264,11 @@
 /* Merge SVC layers*/
 GF_Err gf_media_merge_svc(GF_ISOFile *file, u32 track, Bool mergeAll);
 
+/* Split SHVC layers */
+GF_Err gf_media_split_shvc(GF_ISOFile *file, u32 track, Bool splitAll, Bool use_extractors);
+
 GF_Err gf_media_split_hevc_tiles(GF_ISOFile *file);
+
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 
@@ -269,6 +277,7 @@
 	char *file_name;
 	char representationID[100];
 	char periodID[100];
+	char xlink[100];
 	char role[100];
 	u32 bandwidth;
 } GF_DashSegmenterInput;
@@ -276,11 +285,14 @@
 typedef enum
 {
 	GF_DASH_PROFILE_FULL = 0,
-	/*live for ISOFF, SIMPLE for M2TS*/
-	GF_DASH_PROFILE_LIVE,
+	GF_DASH_PROFILE_LIVE, /*live for ISOFF, SIMPLE for M2TS*/
 	GF_DASH_PROFILE_ONDEMAND,
 	GF_DASH_PROFILE_MAIN,
 
+	/* DASH-AVC/264 profiles */
+	GF_DASH_PROFILE_AVC264_LIVE,
+	GF_DASH_PROFILE_AVC264_ONDEMAND,
+
 	/*internal use only*/
 	GF_DASH_PROFILE_UNKNOWN
 } GF_DashProfile;
@@ -297,10 +309,11 @@
 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, 
-							   Bool use_url_template, Bool use_segment_timeline,  Bool single_segment, Bool single_file, GF_DashSwitchingMode bitstream_switching_mode,
+							   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);
+							   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);
 
 /*returns time to wait until end of currently generated segments*/
 u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time);
@@ -339,6 +352,12 @@
 	GF_EXPORT_NHML = (1<<6),
 	/*SAF format*/
 	GF_EXPORT_SAF = (1<<7),
+	/*WebVTT metadata format (any media)*/
+	GF_EXPORT_WEBVTT_META = (1<<8),
+	/*WebVTT metadata format: media data will be embedded in webvtt*/
+	GF_EXPORT_WEBVTT_META_EMBEDDED = (1<<9),
+	/* Experimental Streaming Instructions */
+	GF_EXPORT_SIX = (1<<14),
 
 	/*following ones are real flags*/
 	/*

gpac-0.5.0.svn4668.tar.bz2/include/gpac/mediaobject.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/mediaobject.h Changed

@@ -90,17 +90,22 @@
 /*checks whether the target object is changed - you MUST use this in order to detect url changes*/
 Bool gf_mo_url_changed(GF_MediaObject *mo, MFURL *url);
 
+/*checks whether the target object is changed - you MUST use this in order to detect url changes*/
+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 
 
 */
-char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size);
+char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size, s32 *ms_until_pres, s32 *ms_until_next);
 
-/*release given amount of media data - nb_bytes is used for audio - if forceDrop is set, the unlocked frame will be 
-droped if all bytes are consumed, otherwise it will be droped based on object time - typically, video fetches with the resync
-flag set and release without forceDrop, while audio fetches without resync but forces buffer drop. If forceDrop is set to 2, 
-the frame will be stated as a discraded frame*/
-void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 forceDrop);
+/*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) 
+2: the frame will be stated as a discraded frame
+*/
+void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 drop_mode);
 /*get media time*/
 void gf_mo_get_media_time(GF_MediaObject *mo, u32 *media_time, u32 *media_dur);
 /*get object clock*/
@@ -153,7 +158,6 @@
 void gf_mo_del(GF_MediaObject *mo);
 
 GF_DOMEventTarget  *gf_mo_event_target_add_node(GF_MediaObject *mo, GF_Node *n);
-GF_DOMEventTarget  *gf_mo_event_target_add_object(GF_MediaObject *mo, void *object);
 GF_Err              gf_mo_event_target_remove(GF_MediaObject *mo, GF_DOMEventTarget *target);
 GF_Err              gf_mo_event_target_remove_by_node(GF_MediaObject *mo, GF_Node *node);
 GF_Err              gf_mo_event_target_remove_by_index(GF_MediaObject *mo, u32 i);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/module.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/module.h Changed

@@ -168,8 +168,7 @@
  *\brief module manager construtcor
  *
  *Constructs a module manager object.
- *\param directory absolute path to the directory where the manager shall look for modules \deprecated {Module manager uses now 
- *  infomation from cfg file}
+ *\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
@@ -283,10 +282,10 @@
 GF_Err gf_modules_set_option(GF_BaseInterface *interface_obj, const char *secName, const char *keyName, const char *keyValue);
 
 /*!
- *\brief get config fiole
+ *\brief get config file
  *
  *Gets the configuration file for the module instance
- *\param interface_obj the interface object used
+ *\param ifce the interface object used
  *\return handle to the config file
  */
 GF_Config *gf_modules_get_config(GF_BaseInterface *ifce);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/modules/codec.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/codec.h Changed

@@ -102,7 +102,10 @@
 	GF_CODEC_PIXEL_FORMAT,
 	/*isgnal decoder performs frame re-ordering in temporal scalability*/
 	GF_CODEC_REORDER,
-	
+
+	/*set cap only, indicate smax bpp of display*/
+	GF_CODEC_DISPLAY_BPP,
+
 	/*Audio sample rate*/
 	GF_CODEC_SAMPLERATE,
 	/*Audio num channels*/
@@ -116,6 +119,8 @@
 	GF_CODEC_CU_DURATION,
 	/*queries whether data is RAW (directly dispatched to CompositionMemory) or not*/
 	GF_CODEC_RAW_MEDIA,
+	/*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 
 	showed (cap.valueINT=1) or hidden (cap.valueINT=0). Currently only used with SetCap*/
@@ -207,6 +212,10 @@
 			u16 ES_ID,
 			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*/
+	GF_Err (*GetOutputBuffer)(struct _mediadecoder *, u16 ES_ID, u8 **pY_or_RGB, u8 **pU, u8 **pV);
 } GF_MediaDecoder;

gpac-0.5.0.svn4668.tar.bz2/include/gpac/modules/ipmp.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/ipmp.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/modules/service.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/service.h Changed

@@ -47,6 +47,8 @@
 	/*channel control, app->module. Note that most modules don't need to handle pause/resume/set_speed*/
 	GF_NET_CHAN_PLAY,
 	GF_NET_CHAN_STOP,
+
+	/* pause channel (can be sent from service to terminal send from a pull-mode module to indicate buffer on/off) */
 	GF_NET_CHAN_PAUSE,
 	GF_NET_CHAN_RESUME,
 	GF_NET_CHAN_SET_SPEED,
@@ -54,7 +56,8 @@
 	GF_NET_CHAN_CONFIG,
 	/*channel duration, app<->module (in case duration is not known at setup)*/
 	GF_NET_CHAN_DURATION,
-	/*channel buffer, app->module*/
+	/*queries channel buffer min/max, app->module. Default values are passed and can be overriden by the module.
+	PULL channels will get this command but buffering has to be handled by the service*/
 	GF_NET_CHAN_BUFFER,
 	/*channel buffer query, app<-module*/
 	GF_NET_CHAN_BUFFER_QUERY,
@@ -97,6 +100,8 @@
 	GF_NET_SERVICE_INFO,
 	/*checks if there is an audio stream in the service - term->net only*/
 	GF_NET_SERVICE_HAS_AUDIO,
+	/*send by the terminal to indicate the channel(s) on this service need more data - term->net only*/
+	GF_NET_SERVICE_FLUSH_DATA,
 
 	/*checks if there is a forced video size  - if yes, info is stored in GF_NetComPixelAR - term->net only*/
 	GF_NET_SERVICE_HAS_FORCED_VIDEO_SIZE,
@@ -108,11 +113,18 @@
 
 	/*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 */
 	GF_NET_SERVICE_STATUS_PROXY,
+
+	/*When using DASH or playlists, indicates that DATA (chunk or complete file ) has been received by the playlist proxy*/
+	GF_NET_SERVICE_PROXY_DATA_RECEIVE,
+
+	/*query screen capabilities*/
+	GF_NET_SERVICE_MEDIA_CAP_QUERY,
+
 } GF_NET_CHAN_CMD;
 
 /*channel command for all commands that don't need params:
@@ -204,6 +216,16 @@
 	u32 padding_bytes;
 } GF_NetComPadding;
 
+
+/*GF_NET_SERVICE_PROXY_DATA_RECEIVE*/
+typedef struct
+{
+	u32 command_type;
+	LPNETCHANNEL on_channel;
+	Bool is_chunk;
+	Bool is_live;
+} GF_NetComProxyData;
+
 /*GF_NET_CHAN_MAP_TIME*/
 typedef struct
 {
@@ -217,6 +239,16 @@
 	Bool reset_buffers;
 } GF_NetComMapTime;
 
+
+typedef struct
+{
+	bin128 SystemID;
+	u32 KID_count;
+	bin128 *KIDs;
+	u32 private_data_size;
+	u8 *private_data;
+} GF_NetComDRMConfigPSSH;
+
 /*GF_NET_CHAN_ISMACRYP_CFG*/
 typedef struct
 {
@@ -238,6 +270,10 @@
 
 	/*SHA-1 file hash*/
 	u8 hash[20];
+
+	/*CENC PSSH data*/
+	u32 PSSH_count;
+	GF_NetComDRMConfigPSSH *PSSHs;
 } GF_NetComDRMConfig;
 
 /*GF_NET_CHAN_GET_ESD*/
@@ -325,6 +361,8 @@
 
 	/*drops first segment */
 	Bool drop_first_segment;
+	/*in : cache index we want to query; by defaut is 0*/
+	u32 dependent_representation_index;
 
 	//output
 
@@ -344,8 +382,11 @@
 	u64 switch_start_range, switch_end_range;
 
 
-	/*indicates that the return URL is the currently downloaded one, not yet completed (progressive mode only).	*/
-	Bool is_current_download;
+	Bool has_next;
+	/*module->proxy: indicates that currently downloaded segment should be checked.	
+	  proxy->module: indicates that the return URL is the currently downloaded one, not yet completed (progressive mode only).	
+	*/
+	Bool current_download;
 	/*indicates that there is new data in the cache for the current URL (progressive mode only) - only valid if is_current_download is set.*/
 	Bool has_new_data;
 
@@ -365,16 +406,34 @@
 typedef struct
 {
 	u32 command_type;
-	GF_Err e;
 	LPNETCHANNEL channel;
+	GF_Err e;
 	Bool is_disconnect;
 	Bool is_add_media;
 	GF_Descriptor *desc;
 } GF_NetServiceStatus;
 
-typedef union __netcommand
+/*GF_NET_SERVICE_STATUS_PROXY*/
+typedef struct
 {
 	u32 command_type;
+	LPNETCHANNEL channel;
+	u32 width;
+	u32 height;
+	//max bits per color channel
+	u32 display_bit_depth;
+	u32 audio_bpp;
+	u32 channels;
+	u32 sample_rate;
+	const char *mime_query;
+	const char *mime_params;
+	//set upon reply
+	Bool mime_supported;
+} GF_MediaCapQuery;
+
+typedef union __netcommand
+{
+	GF_NET_CHAN_CMD command_type;
 	GF_NetComBase base;
 	GF_NetComPlay play;
 	GF_NetComConfig cfg;
@@ -393,6 +452,8 @@
 	GF_NetURLQuery url_query;
 	GF_NetQualitySwitch switch_quality;
 	GF_NetServiceStatus status;
+	GF_MediaCapQuery mcaps;
+	GF_NetComProxyData proxy_data;
 } GF_NetworkCommand;
 
 /*

gpac-0.5.0.svn4668.tar.bz2/include/gpac/modules/video_out.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/modules/video_out.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/mpeg4_odf.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/mpeg4_odf.h Changed

@@ -899,7 +899,7 @@
 	u8 profile_space;
 	u8 tier_flag;
 	u8 profile_idc;
-	u32 profile_compatibility_indications;
+	u32 general_profile_compatibility_flags;
 	u8 progressive_source_flag;
 	u8 interlaced_source_flag;
 	u8 non_packed_constraint_flag;
@@ -921,6 +921,15 @@
 	u8 nal_unit_size;
 	
 	GF_List *param_array;
+
+	//set by libisomedia at import/export time
+	Bool is_shvc;
+
+	//used in SHVC config
+	Bool complete_representation;
+	Bool non_hevc_base_layer;
+	u8 num_layers;
+	u16 scalability_mask;
 } GF_HEVCConfig;
 
 /************************************************************
@@ -1121,8 +1130,8 @@
 void gf_odf_hevc_cfg_del(GF_HEVCConfig *cfg);
 GF_Err gf_odf_hevc_cfg_write_bs(GF_HEVCConfig *cfg, GF_BitStream *bs);
 GF_Err gf_odf_hevc_cfg_write(GF_HEVCConfig *cfg, char **outData, u32 *outSize);
-GF_HEVCConfig *gf_odf_hevc_cfg_read_bs(GF_BitStream *bs);
-GF_HEVCConfig *gf_odf_hevc_cfg_read(char *dsi, u32 dsi_size);
+GF_HEVCConfig *gf_odf_hevc_cfg_read_bs(GF_BitStream *bs, Bool is_shvc);
+GF_HEVCConfig *gf_odf_hevc_cfg_read(char *dsi, u32 dsi_size, Bool is_shvc);
 
 /*destroy the descriptors in a list but not the list*/
 GF_Err gf_odf_desc_list_del(GF_List *descList);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/mpegts.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/mpegts.h Changed

@@ -60,6 +60,9 @@
 	GF_M2TS_MPEG4_SL_DESCRIPTOR				= 0x1E,
 	GF_M2TS_MPEG4_FMC_DESCRIPTOR				= 0x1F,
 	/* ... */
+	GF_M2TS_METADATA_POINTER_DESCRIPTOR			= 0x25,
+	GF_M2TS_METADATA_DESCRIPTOR					= 0x26,
+	/* ... */
 	GF_M2TS_AVC_VIDEO_DESCRIPTOR				= 0x28,
 	/* ... */	
 	GF_M2TS_AVC_TIMING_HRD_DESCRIPTOR			= 0x2A,
@@ -207,9 +210,13 @@
 	GF_M2TS_SYSTEMS_MPEG4_PES		= 0x12,
 	GF_M2TS_SYSTEMS_MPEG4_SECTIONS	= 0x13,
 
+	GF_M2TS_METADATA_PES			= 0x15,
+
 	GF_M2TS_VIDEO_H264				= 0x1B,
 	GF_M2TS_VIDEO_SVC				= 0x1F,
 	GF_M2TS_VIDEO_HEVC				= 0x24,
+	//NOT NORMATIVE YET!!!
+	GF_M2TS_VIDEO_SHVC				= 0x27,
 
 	GF_M2TS_VIDEO_DCII				= 0x80,
 	GF_M2TS_AUDIO_AC3				= 0x81,
@@ -223,9 +230,19 @@
 	GF_M2TS_DVB_TELETEXT			= 0x152,
 	GF_M2TS_DVB_VBI					= 0x153,
 	GF_M2TS_DVB_SUBTITLE			= 0x154,
+	GF_M2TS_METADATA_ID3_HLS		= 0x155,
 };
 
 
+
+/*MPEG-2 Descriptor tags*/
+enum
+{
+	GF_M2TS_AFDESC_LOCATION_DESCRIPTOR	= 0x00,
+	GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR	= 0x01,
+	GF_M2TS_AFDESC_BASEURL_DESCRIPTOR	= 0x02,
+};
+
 #define SECTION_HEADER_LENGTH 3 /* header till the last bit of the section_length field */
 #define SECTION_ADDITIONAL_HEADER_LENGTH 5 /* header from the last bit of the section_length field to the payload */
 #define	CRC_LENGTH 4
@@ -274,7 +291,9 @@
 	/*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
+	GF_M2TS_PES_FRAMING_SKIP_NO_RESET,
+	/*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,
 };
 
 /*PES packet flags*/
@@ -329,6 +348,8 @@
 	GF_M2TS_EVT_SL_PCK,
 	/*An IP datagram has been received in a section - assoctiated parameter: IP datagram */
 	GF_M2TS_EVT_IP_DATAGRAM,
+	/*Duration has been estimated - assoctiated parameter: PES packet with no data, PTS is duration in msec*/
+	GF_M2TS_EVT_DURATION_ESTIMATED,
 
 	/*AAC config has been extracted - associated parameter: PES Packet with encoded M4ADecSpecInfo in its data
 		THIS MUST BE CLEANED UP
@@ -435,7 +456,29 @@
 	gf_m2ts_section_callback process_section; 
 } GF_M2TS_SectionFilter;
 
+enum metadata_carriage {
+	METADATA_CARRIAGE_SAME_TS		= 0,
+	METADATA_CARRIAGE_DIFFERENT_TS	= 1,
+	METADATA_CARRIAGE_PS			= 2,
+	METADATA_CARRIAGE_OTHER			= 3
+};
 
+typedef struct tag_m2ts_metadata_pointer_descriptor {
+	u16 application_format;
+	u32 application_format_identifier;
+	u8 format;
+	u32 format_identifier;
+	u8 service_id;
+	Bool locator_record_flag;
+	u32 locator_length;
+	char *locator_data;
+	enum metadata_carriage carriage_flag;
+	u16 program_number;
+	u16 ts_location;
+	u16 ts_id;
+	char *data;
+	u32 data_size;
+} GF_M2TS_MetadataPointerDescriptor;
 
 /*MPEG-2 TS program object*/
 typedef struct 
@@ -468,6 +511,8 @@
 
 	u32 pid_playing;
 	Bool is_scalable;
+
+	GF_M2TS_MetadataPointerDescriptor *metadata_pointer_descriptor;
 } GF_M2TS_Program;
 
 /*ES flags*/
@@ -552,6 +597,23 @@
 	u8 page_number;
 } GF_M2TS_DVB_Teletext_Descriptor;
 
+typedef struct tag_m2ts_metadata_descriptor {
+	u16 application_format;
+	u32 application_format_identifier;
+	u8 format;
+	u32 format_identifier;
+	u8 service_id;
+	u8 decoder_config_flags;
+	Bool dsmcc_flag;
+	u8 service_id_record_length;
+	char *service_id_record;
+	u8 decoder_config_length;
+	char *decoder_config;
+	u8 decoder_config_id_length;
+	char *decoder_config_id;
+	u8 decoder_config_service_id;
+} GF_M2TS_MetadataDescriptor;
+
 /*MPEG-2 TS ES object*/
 typedef struct tag_m2ts_pes
 {
@@ -570,10 +632,12 @@
 
 	/*mpegts lib private - do not touch :)*/
 	/*PES re-assembler*/
-	unsigned char *data;
+	unsigned char *pck_data;
+	/*amount of bytes allocated for data */
+	u32 pck_alloc_len;
 	/*amount of bytes received in the current PES packet (NOT INCLUDING ANY PENDING BYTES)*/
-	u32 data_len;
-	/*size of the PES packet being recevied*/
+	u32 pck_data_len;
+	/*size of the PES packet being received, as indicated in pes header length field - can be 0 if unknown*/
 	u32 pes_len;
 	Bool rap;
 	u64 PTS, DTS;
@@ -596,8 +660,9 @@
 
 	/*PES reframer - if NULL, pes processing is skiped*/
 	/*returns the number of bytes NOT consummed from the input data buffer - these bytes are kept when reassembling the next PES packet*/
-	u32 (*reframe)(struct tag_m2ts_demux *ts, struct tag_m2ts_pes *pes, Bool same_pts, unsigned char *data, u32 data_len);
+	u32 (*reframe)(struct tag_m2ts_demux *ts, struct tag_m2ts_pes *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *hdr);
 
+	Bool single_nal_mode;
 	/*used by several reframers to store their parsing state*/
 	u32 frame_state;
 	/*LATM stuff - should be moved out of mpegts*/
@@ -606,6 +671,7 @@
 	u64 prev_PTS;
 
 	GF_M2TS_DVB_Subtitling_Descriptor sub;
+	GF_M2TS_MetadataDescriptor *metadata_descriptor;
 } GF_M2TS_PES;
 
 /*SDT information object*/
@@ -750,6 +816,7 @@
 	GF_Thread *th;
 	u32 run_state;
 
+	Bool force_file_refresh;
     /*net playing*/
 	GF_Socket *sock;
 
@@ -762,7 +829,7 @@
 	char filename[GF_MAX_PATH];
 	u32 start_range, end_range;
 	u64 file_size;
-	u64 start_byterange, end_byterange;
+	u64 pos_in_stream;
 	Double duration;
 	u32 nb_playing;
 	Bool file_regulate;
@@ -822,15 +889,6 @@
 
 	const char *dvb_channels_conf_path;
 
-	/*for DASH - query_type is:
-		0: query init range
-		1: drop current segment and query next segment
-		2: query next segment
-	*/
-	GF_Err (*query_next)(void *udta, u32 query_type, const char **next_url, u64 *next_start_range, u64 *next_end_range, Bool *is_refresh);
-	void *query_udta;
-	Bool segment_switch;
-
 	/*AIT*/
 	GF_List* ChannelAppList;
 
@@ -838,6 +896,13 @@
 	Bool process_dmscc;
 	char* dsmcc_root_dir;
 	GF_List* dsmcc_controler;
+
+	Bool segment_switch;
+
+	//duration estimation
+	u64 first_pcr_found;
+	u16 pcr_pid;
+	u64 nb_pck_at_pcr;
 };
 
 GF_M2TS_Demuxer *gf_m2ts_demux_new();
@@ -852,7 +917,7 @@
 
 
 
-u32 gf_m2ts_crc32_check(char *data, u32 len);
+Bool gf_m2ts_crc32_check(char *data, u32 len);
 
 
 
@@ -902,6 +967,12 @@
 
 void gf_m2ts_print_info(GF_M2TS_Demuxer *ts);
 
+/*demuxes the TS file using a complete number of 1888 blocks - refresh_type is one of the following:
+0 - this is a new file
+1 - this is a refresh of a previous file
+2 - this is the last refresh of a previous file
+*/
+GF_Err gf_m2ts_demux_file(GF_M2TS_Demuxer *ts, const char *fileName, u64 start_byterange, u64 end_byterange, u32 refresh_type, Bool signal_end_of_stream);
 
 #endif /*GPAC_DISABLE_MPEG2TS*/
 
@@ -953,6 +1024,10 @@
 	u32 data_len;
 	u32 flags;
 	u64 cts, dts;
+	u32 duration;
+
+	char *mpeg2_af_descriptors;
+	u32 mpeg2_af_descriptors_size;
 } GF_M2TS_Packet;

gpac-0.5.0.svn4668.tar.bz2/include/gpac/network.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/network.h Changed

@@ -121,7 +121,7 @@
  *\brief Remove last delimenter from URL
  *
  * Remove last delimenter from URL
- *\param url 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,7 +131,7 @@
  *\brief Extract extension from a resource path in URL
  *
  * Extract a resource path of URL and analyze its extension
- *\param url input url 
+ *\param sURL input url 
  *\return The corresponding extension if exists, otherwise NULL.
  */
 const char* gf_url_get_ressource_extension(const char *sURL);
@@ -426,7 +426,7 @@
 /*!
  *	\brief MobileIP Callback
  *
- * The gf_net_mobileip_ctrl_cbk type is the type for the callback of the \ref gf_net_set_mobileip_callback function. By default no mobileip is used
+ * The gf_net_mobileip_ctrl_cbk type is the type for the callback of the \ref gf_net_mobileip_set_callback function. By default no mobileip is used
  *	\param cbck Opaque user data.
  *	\param start boolean indicating wether the MobileIP subsystem should be started or stopped.
  *	\return Error code if needed.
@@ -439,6 +439,7 @@
  *
  *Assigns the MobileIP control callback.
  *\param _mobip_cbk MobileIP control callback
+ *\param MobileIP MobileIP address
  */
 void gf_net_mobileip_set_callback(gf_net_mobileip_ctrl_cbk _mobip_cbk, const char *MobileIP);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/options.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/options.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/path2d.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/path2d.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/rtp_streamer.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/rtp_streamer.h Changed

@@ -36,7 +36,6 @@
  */
 
 /*!
- *	\addtogroup media_grp RTPStreamer
  *	\ingroup media_grp
  *	\brief RTPStreamer object
  *
@@ -55,7 +54,17 @@
  *	\brief RTP Streamer constructor
  *
  *	Constructs a new RTP file streamer
+ *\param streamType type of the stream (GF_STREAM_* as defined in \ref constants.h)
+ *\param oti MPEG-4 object type indication for the stream (GPAC_OTI_* as defined in \ref constants.h)
+ *\param timeScale unit to express timestamps
+ *\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 ifce_addr IP of the local interface to use (may be NULL)
+ *\param flags 
+ *\param dsi MPEG-4 Decoder Specific Info for the stream
+ *\param dsi_len length of the dsi parameter
  *\return new object
  */
 
@@ -63,7 +72,37 @@
 								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
+ *
+ *	Constructs a new RTP file streamer
+ *\param streamType type of the stream (GF_STREAM_* as defined in \ref constants.h)
+ *\param oti MPEG-4 object type indication for the stream (GPAC_OTI_* as defined in \ref constants.h)
+ *\param timeScale unit to express timestamps
+ *\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 ifce_addr IP of the local interface to use (may be NULL)
+ *\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
+ *\param sample_rate audio sample rate
+ *\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 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, 								 
@@ -76,7 +115,7 @@
  *	\brief RTP file streamer destructor
  *
  *	Destructs an RTP file streamer
- *	\param ptr object to destruct
+ *	\param streamer object to destruct
  */
 void gf_rtp_streamer_del(GF_RTPStreamer *streamer);
 
@@ -84,7 +123,11 @@
  *	\brief gets the SDP file
  *
  *	Gets the SDP asscoiated with all media in the streaming session (only media parts are returned)
- *	\param streamer RTP streamer object
+ *	\param rtp RTP streamer object
+ *	\param ESID The MPEG-4 elementary stream id of the stream to process
+ *	\param dsi The MPEG-4 decoder specific info data
+ *	\param dsi_len length of The MPEG-4 decoder specific info data
+ *	\param KMS_URI URI of the Key Management System
  *	\param out_sdp_buffer location to the SDP buffer to allocate and fill
  */
 GF_Err gf_rtp_streamer_append_sdp(GF_RTPStreamer *rtp, u16 ESID, char *dsi, u32 dsi_len, char *KMS_URI, char **out_sdp_buffer);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/scene_engine.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/scene_engine.h Changed

@@ -41,23 +41,24 @@
 typedef void (*gf_seng_callback)(void *udta, u16 ESID, char *data, u32 size, u64 ts);
 
 /**
- * @calling_object is the calling object on which call back will be called
- * @inputContext is the name of a scene file (bt, xmt or mp4) to initialize the coding context
- * @load_type is the prefered loader type for the content (e.g. SVG vs DIMS)
- * @dump_path is the path where scenes are dumped 
- * @embed_resources indicates if images and scripts should be encoded inlined with the content
+ * \param calling_object is the calling object on which call back will be called
+ * \param inputContext is the name of a scene file (bt, xmt or mp4) to initialize the coding context
+ * \param load_type is the prefered loader type for the content (e.g. SVG vs DIMS)
+ * \param dump_path is the path where scenes are dumped 
+ * \param embed_resources indicates if images and scripts should be encoded inlined with the content
  *
  * must be called only one time (by process calling the DLL) before other calls
  */
 GF_SceneEngine *gf_seng_init(void *calling_object, char *inputContext, u32 load_type, char *dump_path, Bool embed_resources);
 
 /**
- * @calling_object is the calling object on which call back will be called
- * @inputContext is an UTF-8 scene description (with or without IOD) in BT or XMT-A format
- * @load_type is the prefered loader type for the content (e.g. SVG vs DIMS)
- * @width, @height: width and height of scene if no IOD is given in the context.
- * @usePixelMetrics: metrics system used in the scene, if no IOD is given in the context.
- * @dump_path is the path where scenes are dumped 
+ * \param calling_object is the calling object on which call back will be called
+ * \param inputContext is an UTF-8 scene description (with or without IOD) in BT or XMT-A format
+ * \param load_type is the prefered loader type for the content (e.g. SVG vs DIMS)
+ * \param width width of scene if no IOD is given in the context.
+ * \param height height of scene if no IOD is given in the context.
+ * \param usePixelMetrics metrics system used in the scene, if no IOD is given in the context.
+ * \param dump_path the path where scenes are dumped 
  *
  * must be called only one time (by process calling the DLL) before other calls
  */
@@ -65,40 +66,40 @@
 
 
 /**
- * @calling_object is the calling object on which call back will be called
- * @ctx is an already loaded scene manager
- * @dump_path is the path where scenes are dumped 
+ * \param calling_object the calling object on which call back will be called
+ * \param ctx an already loaded scene manager
+ * \param dump_path the path where scenes are dumped 
  *
  * must be called only one time (by process calling the DLL) before other calls
  */
 GF_SceneEngine *gf_seng_init_from_context(void *calling_object, GF_SceneManager *ctx, char *dump_path);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
  *
  * must be called after gf_seng_init()
  */
 u32 gf_seng_get_stream_count(GF_SceneEngine *seng);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @ESID, ID of the stream
- * @carousel_period: pointer to store the carousel_period 
- * @aggregate_on_es_id: pointer to store the target carousel stream ID
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param ESID ID of the stream
+ * \param carousel_period pointer to store the carousel_period 
+ * \param aggregate_on_es_id pointer to store the target carousel stream ID
  *
  * must be called after gf_seng_init()
  */
 GF_Err gf_seng_get_stream_carousel_info(GF_SceneEngine *seng, u16 ESID, u32 *carousel_period, u16 *aggregate_on_es_id);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @idx: stream index
- * @ESID: pointer to the stream ID
- * @config: pointer to the encoded BIFS config (memory is not allocated)
- * @config_len: length of the buffer
- * @streamType: pointer to get stream type
- * @objectType: pointer to get object type
- * @timeScale: pointer to get time scale
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param idx stream index
+ * \param ESID pointer to the stream ID
+ * \param config pointer to the encoded BIFS config (memory is not allocated)
+ * \param config_len length of the buffer
+ * \param streamType pointer to get stream type
+ * \param objectType pointer to get object type
+ * \param timeScale pointer to get time scale
  *
  * must be called after gf_seng_init()
  */
@@ -108,42 +109,46 @@
  * Encodes the AU context which is not encoded when calling BENC_EncodeAUFromString/File
  * Should be called after Aggregate.
  *
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @AUCallback, pointer on a callback function to get the result of the coding the AU using the current context
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param callback pointer on a callback function to get the result of the coding the AU using the current context
  *
  */
 GF_Err gf_seng_encode_context(GF_SceneEngine *seng, gf_seng_callback callback);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @ESID, target streams when no indication is present in the file (eg, no atES_ID )
- * @auFile, name of a file containing a description for an access unit (BT or XMT)
- * @AUCallback, pointer on a callback function to get the result of the coding the AU using the current context
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param ESID target streams when no indication is present in the file (eg, no atES_ID )
+ * \param disable_aggregation 
+ * \param auFile name of a file containing a description for an access unit (BT or XMT)
+ * \param callback pointer on a callback function to get the result of the coding the AU using the current context
  *
  */
 GF_Err gf_seng_encode_from_file(GF_SceneEngine *seng, u16 ESID, Bool disable_aggregation, char *auFile, gf_seng_callback callback);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @ESID, target streams when no indication is present in the file (eg, no atES_ID )
- * @auString, a char string to encode (must one or several complete nodes in BT
- * @AUCallback, pointer on a callback function to get the result of the coding the AU using the current context
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param ESID target streams when no indication is present in the file (eg, no atES_ID )
+ * \param disable_aggregation 
+ * \param auString a char string to encode (must one or several complete nodes in BT
+ * \param callback pointer on a callback function to get the result of the coding the AU using the current context
  *
  */
 GF_Err gf_seng_encode_from_string(GF_SceneEngine *seng, u16 ESID, Bool disable_aggregation, char *auString, gf_seng_callback callback);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @ESID, indicates the stream to which these commands apply (0 if first scene stream)
- * @commans, the list of commands to encode
- * @AUCallback, pointer on a callback function to get the result of the coding the AU using the current context
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param ESID indicates the stream to which these commands apply (0 if first scene stream)
+ * \param disable_aggregation 
+ * \param time
+ * \param commands the list of commands to encode
+ * \param callback pointer on a callback function to get the result of the coding the AU using the current context
  *
  */
-GF_Err gf_seng_encode_from_commands(GF_SceneEngine *codec, u16 ESID, Bool disable_aggregation, u32 time, GF_List *commands, gf_seng_callback callback);
+GF_Err gf_seng_encode_from_commands(GF_SceneEngine *seng, u16 ESID, Bool disable_aggregation, u32 time, GF_List *commands, gf_seng_callback callback);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @ctxFileName, name of the file to save the current state of the BIFS scene to
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param ctxFileName name of the file to save the current state of the BIFS scene to
  *
  * save the current context of the seng.
  * if you want to save an aggregate context, use BENC_AggregateCurrentContext before
@@ -152,24 +157,25 @@
 GF_Err gf_seng_save_context(GF_SceneEngine *seng, char *ctxFileName);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @ESID, stream ID
- * @onESID: set stream aggragation on to the specified stream, or off if onESID is 0
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param ESID stream ID
+ * \param onESID set stream aggragation on to the specified stream, or off if onESID is 0
  *
  * marks the stream as carrying its own "rap" in the first AU of the stream 
  */
-GF_Err gf_seng_enable_aggregation(GF_SceneEngine *codec, u16 ESID, u16 onESID);
+GF_Err gf_seng_enable_aggregation(GF_SceneEngine *seng, u16 ESID, u16 onESID);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param ESID stream ID
  *
  * aggregates the current context of the seng, creates a scene replace
- * if @ESID is specified, only aggregate commands for this stream
+ * if ESID is specified, only aggregate commands for this stream
  */
 GF_Err gf_seng_aggregate_context(GF_SceneEngine *seng, u16 ESID);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
  *
  * release the memory used by this seng, no more call on the seng should happen after this
  *
@@ -177,9 +183,7 @@
 void gf_seng_terminate(GF_SceneEngine *seng);
 
 /**
- * @seng, pointer to the GF_SceneEngine returned by gf_seng_init()
- * @buf64, pointer to a buffer that will be allocated and will contain the base64 encoded version of the binary IOD
- * @buf64, pointer to the size of the buffer
+ * \param seng pointer to the GF_SceneEngine returned by gf_seng_init()
  *
  * encodes the IOD for this BIFS Engine into Base64
  *

gpac-0.5.0.svn4668.tar.bz2/include/gpac/scene_manager.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/scene_manager.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/scenegraph.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/scenegraph.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/scenegraph_svg.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/scenegraph_svg.h Changed

@@ -160,7 +160,7 @@
 	u32 ns;
 } GF_DOMFullNode;
 
-enum
+typedef enum
 {
 	/*XMLNS is undefined*/
 	GF_XMLNS_UNDEFINED = 0,
@@ -175,19 +175,19 @@
     GF_XMLNS_SVG_GPAC_EXTENSION,
 
 	/*any other namespace uses the CRC32 of the namespace as an identifier*/
-};
+} GF_NamespaceType;
 
 /*returns the built-in XMLNS id for this namespace if known, otherwise returns GF_XMLNS_UNDEFINED*/
-u32 gf_xml_get_namespace_id(char *name);
+GF_NamespaceType gf_xml_get_namespace_id(char *name);
 
 GF_Err gf_sg_add_namespace(GF_SceneGraph *sg, char *name, char *qname);
 GF_Err gf_sg_remove_namespace(GF_SceneGraph *sg, char *name, char *qname);
 u32 gf_sg_get_namespace_code(GF_SceneGraph *sg, char *qname);
 u32 gf_sg_get_namespace_code_from_name(GF_SceneGraph *sg, char *name);
-const char *gf_sg_get_namespace_qname(GF_SceneGraph *sg, u32 xmlns_id);
+const char *gf_sg_get_namespace_qname(GF_SceneGraph *sg, GF_NamespaceType xmlns_id);
 
-u32 gf_xml_get_element_namespace(GF_Node *n);
-const char *gf_sg_get_namespace(GF_SceneGraph *sg, u32 xmlns_id);
+GF_NamespaceType gf_xml_get_element_namespace(GF_Node *n);
+const char *gf_sg_get_namespace(GF_SceneGraph *sg, GF_NamespaceType xmlns_id);
 
 void gf_xml_push_namespaces(GF_DOMNode *elt);
 void gf_xml_pop_namespaces(GF_DOMNode *elt);
@@ -235,20 +235,10 @@
 /*creates a new updates node and register node with parent*/
 GF_DOMUpdates *gf_dom_add_updates_node(GF_Node *parent);
 
-typedef struct
-{
-	Bool bufferValid;
-	u32 level;
-	Fixed remaining_time;
-	u16 status;
-	const char *session_name;
-	u64 loaded_size, total_size;
-} GF_DOMMediaEvent;
-
 /* 
 	DOM event handling
 */
-enum
+typedef enum
 {
 	GF_DOM_EVENT_PHASE_CAPTURE = 1,
 	GF_DOM_EVENT_PHASE_AT_TARGET = 2,
@@ -261,31 +251,46 @@
 	GF_DOM_EVENT_PHASE_CANCEL_ALL = 1<<6,
 	/*special phase indicating the default action of the event is prevented*/
 	GF_DOM_EVENT_PHASE_PREVENT = 1<<7,
-};
+} GF_DOMEventPhase;
 
 /*possible event targets*/
 typedef enum
 {
-	GF_DOM_EVENT_NODE,
-	GF_DOM_EVENT_DOCUMENT,
-	GF_DOM_EVENT_JS
+	GF_DOM_EVENT_TARGET_NODE,
+	GF_DOM_EVENT_TARGET_DOCUMENT,
+	GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE,
+	GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST,
+	GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER,
+	GF_DOM_EVENT_TARGET_XHR,
 } GF_DOMEventTargetType;
 
+
+/* Structure representing the DOM EventTarget Interface */
 typedef struct 
 {
-	GF_List *evt_list;
-	void *ptr;
-	GF_DOMEventTargetType ptr_type;
-	GF_List *listeners;
+	GF_List *listeners;				// list of SVG Listener nodes attached to this Event Target
+	void *ptr;						// pointer to the object implementing the DOM Event Target Interface
+	GF_DOMEventTargetType ptr_type; // type of the object implementing the DOM Event Target Interface
 } GF_DOMEventTarget;
 
+GF_DOMEventTarget *gf_dom_event_target_new(GF_DOMEventTargetType type, void *obj);
 GF_Err gf_sg_listener_add(GF_Node *listener, GF_DOMEventTarget *evt_target);
 
+typedef struct
+{
+	Bool bufferValid;
+	u32 level;
+	Fixed remaining_time;
+	u16 status;
+	const char *session_name;
+	u64 loaded_size, total_size;
+} GF_DOMMediaEvent;
 
+/* Structure representing a DOM Event */
 typedef struct
 {
 	/*event type, as defined in <gpac/events.h>*/
-	u32 type;
+	GF_EventType type;
 	/*event phase type, READ-ONLY
 	0: at target, 1: bubbling, 2: capturing , 3: canceled
 	*/
@@ -297,7 +302,7 @@
 	
 	/*we don't use a GF_DOMEventTarget here since the structure is only created when events are attached */
 	void *target;
-	u32 target_type;
+	GF_DOMEventTargetType target_type;
 
 	GF_DOMEventTarget *currentTarget;
 	Double timestamp;
@@ -348,7 +353,7 @@
 BE CAREFULL: event execution may very well destroy ANY node, especially the event target node !!
 */
 Bool gf_dom_event_fire(GF_Node *node, GF_DOM_Event *event);
-Bool sg_fire_dom_event(GF_DOMEventTarget *et, GF_DOM_Event *event, GF_SceneGraph *sg, GF_Node *n);
+Bool gf_sg_fire_dom_event(GF_DOMEventTarget *et, GF_DOM_Event *event, GF_SceneGraph *sg, GF_Node *n);
 
 /*fires event on the specified node
 BE CAREFULL: event execution may very well destroy ANY node, especially the event target node !!
@@ -356,11 +361,11 @@
 */
 Bool gf_dom_event_fire_ex(GF_Node *node, GF_DOM_Event *event, GF_List *use_stack);
 
-u32 gf_dom_event_type_by_name(const char *name);
-const char *gf_dom_event_get_name(u32 type);
+GF_EventType gf_dom_event_type_by_name(const char *name);
+const char *gf_dom_event_get_name(GF_EventType type);
 
-const char *gf_dom_get_key_name(u32 key_identifier);
-u32 gf_dom_get_key_type(char *key_name);
+const char *gf_dom_get_key_name(GF_KeyCode key_identifier);
+GF_KeyCode gf_dom_get_key_type(char *key_name);
 
 
 /*listener is simply a node added to the node events list. 
@@ -379,11 +384,6 @@
 	/* text content of the callback */ \
 	char *callback; 
 
-typedef struct __dom_listener
-{
-    GF_DOM_BASE_LISTENER
-} GF_DOMListener;
-
 typedef struct __xml_ev_handler 
 {
 	GF_DOM_BASE_NODE
@@ -391,10 +391,9 @@
 	GF_DOM_BASE_LISTENER
 } GF_DOMHandler;
 
-
-
-enum
+typedef enum
 {
+	GF_DOM_EVENT_UNKNOWN_CATEGORY,
 	/*basic DOM events*/
 	GF_DOM_EVENT_DOM = 1,
 	/*DOM mutation events*/
@@ -417,22 +416,18 @@
 	GF_DOM_EVENT_LASER = 1<<9,
 	/*HTML Media events*/
 	GF_DOM_EVENT_MEDIA = 1<<10,
-#if 0
-	/*MediaAccess events*/
-	GF_DOM_EVENT_MEDIA_ACCESS = 1<<11,
-#endif
 	/*HTML Media Source events*/
-	GF_DOM_EVENT_MEDIASOURCE = 1<<12,
+	GF_DOM_EVENT_MEDIASOURCE = 1<<11,
 
 	/*fake events - these events are NEVER fired*/
 	GF_DOM_EVENT_FAKE = 1<<31,
-};
-u32 gf_dom_event_get_category(u32 type);
+} GF_DOMEventCategory;
+GF_DOMEventCategory gf_dom_event_get_category(GF_EventType type);
 u32 gf_sg_get_dom_event_filter(GF_SceneGraph *sg);
 u32 gf_node_get_dom_event_filter(GF_Node *node);
 
-void gf_sg_register_event_type(GF_SceneGraph *sg, u32 type);
-void gf_sg_unregister_event_type(GF_SceneGraph *sg, u32 type);
+void gf_sg_register_event_type(GF_SceneGraph *sg, GF_DOMEventCategory category);
+void gf_sg_unregister_event_type(GF_SceneGraph *sg, GF_DOMEventCategory category);
 
 /*adds a listener to the node.
 The listener node is NOT registered with the node (it may very well not be a direct child of the node)
@@ -445,7 +440,7 @@
 /*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, u32 event_type, u32 event_param);
+GF_DOMHandler *gf_dom_listener_build(GF_Node *observer, GF_EventType event_type, u32 event_param);
 
 
 void gf_node_register_iri(GF_SceneGraph *sg, XMLRI *iri);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/setup.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/setup.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/svg_types.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/svg_types.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/sync_layer.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/sync_layer.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/term_info.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/term_info.h Changed

@@ -72,6 +72,8 @@
 	u8 audio_pl;
 	u8 visual_pl;
 	u8 graphics_pl;
+	Bool raw_media;
+	Bool generated_scene;
 
 	/*name of module handling the service service */
 	const char *service_handler;
@@ -90,6 +92,8 @@
 	u32 db_unit_count;
 	/*number of CUs in composition memory (if any) and CM capacity*/
 	u16 cb_unit_count, cb_max_count;
+	/*inidciate that thye composition memory is bypassed for this decoder (video only) */
+	Bool direct_video_memory;
 	/*clock drift in ms of object clock: this is the delay set by the audio renderer to keep AV in sync*/
 	s32 clock_drift;
 	/*codec name*/
@@ -102,8 +106,10 @@
 	u32 width, height, pixelFormat, par;
 
 	/*average birate over last second and max bitrate over one second at decoder input - expressed in bits per sec*/
-	u32 avg_bitrate, max_bitrate;
-	u32 total_dec_time, max_dec_time, nb_dec_frames, nb_droped;
+	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;
 
 	/*set if ISMACryp present on the object - will need refinement for IPMPX...
 	0: not protected - 1: protected and OK - 2: protected and DRM failed*/

gpac-0.5.0.svn4668.tar.bz2/include/gpac/terminal.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/terminal.h Changed

gpac-0.5.0.svn4668.tar.bz2/include/gpac/thread.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/thread.h Changed

@@ -73,7 +73,7 @@
  *\brief thread constructor
  *
  *Constructs a new thread object
- *\param log name of the thread if any
+ *\param name log name of the thread if any
  */
 GF_Thread *gf_th_new(const char *name);
 /*!
@@ -280,79 +280,6 @@
 Bool gf_sema_wait_for(GF_Semaphore *sm, u32 time_out);
 
 
-/*********************************************************************
-					Condition Variable
-**********************************************************************/
-
-/*
- * condition object
- *
- * A condition variable is a synchronization device that allows threads to suspend execution
- * and relinquish the processors until some predicate on shared data is satisfied.
- * The basic operations on conditions are: signal the condition (when the predicate becomes true),
- * and wait for the condition, suspending the thread execution until another thread signals the condition.
- * A condition variable must always be associated with a mutex, to avoid the race condition where a thread prepares to wait on
- * a condition variable and another thread signals the condition just before the first thread actually waits on it.
- *
-*/
-typedef struct __tag_condition GF_Condition;
-
-/*
- * condition constructor
- *
- * Constructs a new condition variable
- *
- * @return a condition variable
- */
-GF_Condition * gf_cond_new();
-
-/*
- * condition destructor
- *
- * Destroys a condition variable
- *
- * @param cond the condition variable
- */
-void gf_cond_del(GF_Condition * cond);
-
-/*
- * condition wait
- *
- * Waits until the condition object has been signaled. (Note that user of the function needs to acquire a mutex
- * and the function releases the mutex while waiting.)
- *
- * Atomically unlocks the mutex and waits for the condition variable cond to be signalled.
- * The thread execution is suspended and does not consume any CPU time until the condition variable is signalled.
- * The mutex must be locked by the calling thread on entrance to gf_cond_wait.
- * Before returning to the calling thread, gf_cond_wait re-acquires mutex.
- *
- * @param cond the condition variable
- * @param mx the mutex
- */
-void gf_cond_wait(GF_Condition * cond, GF_Mutex * mx);
-
-/*
- * condition signal
- *
- * Restarts one of the threads that are waiting on the condition variable cond.
- * If no threads are waiting on cond, nothing happens.
- * If several threads are waiting on cond, exactly one is restarted, but it is not specified which.
- *
- * @param cond the condition variable
- */
-void gf_cond_signal(GF_Condition * cond);
-
-/*
- * condition broadcast
- *
- * Restarts all the threads that are waiting on the condition variable cond.
- * Nothing happens if no threads are waiting on cond.
- *
- * @param cond the condition variable
- */
-void gf_cond_broadcast(GF_Condition * cond);
-
-
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.5.0.svn4668.tar.bz2/include/gpac/token.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/token.h Changed

@@ -50,11 +50,11 @@
  *\brief get string component 
  *
  *Gets the next string component comprised in a given set of characters
- *\param buffer source string to scan
- *\param start char offset from begining of buffer where tokenization shall start
- *\param separators separator characters to use
- *\param token output buffer location
- *\param token_size output buffer allocated size
+ *\param Buffer source string to scan
+ *\param Start char offset from begining of buffer where tokenization shall start
+ *\param Separator separator characters to use
+ *\param Container output buffer location
+ *\param ContainerSize output buffer allocated size
  *\return position of the first char in the buffer after the last terminating separator, or -1 if token could not be found
  */
 s32 gf_token_get(const char* Buffer, s32 Start, const char* Separator, char* Container, s32 ContainerSize);
@@ -62,12 +62,12 @@
  *\brief get string component without delimitting characters
  *
  *Gets the next string component comprised in a given set of characters, removing surrounding characters
- *\param buffer source string to scan
- *\param start char offset from begining of buffer where tokenization shall start
- *\param separators separator characters to use
+ *\param Buffer source string to scan
+ *\param Start char offset from begining of buffer where tokenization shall start
+ *\param Separator separator characters to use
  *\param strip_set surrounding characters to remove
- *\param token output buffer location
- *\param token_size output buffer allocated size
+ *\param Container output buffer location
+ *\param ContainerSize output buffer allocated size
  *\return position of the first char in the buffer after the last terminating separator, or -1 if token could not be found
  */
 s32 gf_token_get_strip(const char* Buffer, s32 Start, const char* Separator, const char* strip_set, char* Container, s32 ContainerSize);
@@ -87,10 +87,10 @@
  *\brief pattern location
  *
  *Locates a pattern in the buffer
- *\param buffer source string to scan
- *\param start char offset from begining of buffer where tokenization shall start
- *\param size size of the input buffer to analyze
- *\param pattern pattern to locate
+ *\param Buffer source string to scan
+ *\param Start char offset from begining of buffer where tokenization shall start
+ *\param Size size of the input buffer to analyze
+ *\param Pattern pattern to locate
  *\return position of the first char in the buffer after the pattern, or -1 if pattern could not be found
  */
 s32 gf_token_find(const char* Buffer, u32 Start, u32 Size, const char* Pattern);

gpac-0.5.0.svn4668.tar.bz2/include/gpac/tools.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/tools.h Changed

@@ -142,9 +142,9 @@
  *	\brief large file seeking
  *
  *	Seeks the current read/write position in a large file
- *	\param f Same semantics as gf_f64_seek
- *	\param pos Same semantics as gf_f64_seek
- *	\param whence Same semantics as gf_f64_seek
+ *	\param f Same semantics as fseek
+ *	\param pos Same semantics as fseek
+ *	\param whence Same semantics as fseek
  *	\return new position in the file
  *	\note You only need to call this function if you're suspecting the file to be a large one (usually only media files), otherwise use regular stdio.
 */
@@ -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 log_tools_levels 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);
@@ -667,11 +667,19 @@
  *	\brief System clock query
  *
  *	Gets the system clock time.
- *	\return System clock value since initialization in milliseconds.
+ *	\return System clock value since GPAC initialization in milliseconds.
  */
 u32 gf_sys_clock();
 
 /*!
+ *	\brief High precision system clock query
+ *
+ *	Gets the hight precision system clock time.
+ *	\return System clock value since GPAC initialization in microseconds.
+ */
+u64 gf_sys_clock_high_res();
+
+/*!
  *	\brief Sleeps thread/process
  *
  *	Locks calling thread/process execution for a given time.
@@ -712,15 +720,55 @@
  */
 u32 gf_crc_32(const char *data, u32 size);
 
+#ifdef _WIN32_WCE
+/*!
+ *	\brief WINCE time constant
+ *	\hideinitializer
+ *
+ *	time between jan 1, 1601 and jan 1, 1970 in units of 100 nanoseconds
+*/
+#define TIMESPEC_TO_FILETIME_OFFSET (((LONGLONG)27111902 << 32) + (LONGLONG)3577643008)
+
+#endif
 
 /*!
  *\brief gets UTC time in milliseconds 
  *
- *Gets UTC clock in milliseconds
- \retrun UTC time in seconds
+ * Gets UTC clock in milliseconds
+ * \return UTC time in milliseconds
  */
 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  
+	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 
+ *
+ * \param date string containing the date to parse
+ * \return UTC time in milliseconds
+ */
+u64 gf_net_parse_date(const char *date);
+
+/*!
+ *\brief gets timezone adjustment in seconds 
+ *
+ * Gets timezone adjustment in seconds, with localtime - timezone = UTC time
+ * \return timezone shift in seconds
+ */
+s32 gf_net_get_timezone();
+
+/*!
+ *\brief 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
+ * \return error code if any
+ */
+GF_Err gf_bin128_parse(char *string, bin128 value);
+
 /*!\brief run-time system info object
  *
  *The Run-Time Info object is used to get CPU and memory occupation of the calling process.
@@ -758,6 +806,8 @@
 	u64 physical_memory_avail;
 	/*!total memory currently allocated by gpac*/
 	u64 gpac_memory;
+	/*!total number of cores on the system*/
+	u32 nb_cores;
 } GF_SystemRTInfo;
 
 /*!

gpac-0.5.0.svn4668.tar.bz2/include/gpac/version.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/version.h Changed

gpac-0.5.0.svn5178.tar.bz2/include/gpac/webvtt.h Added

@@ -0,0 +1,83 @@
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2013-
+ *					All rights reserved
+ *
+ *  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
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  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_WEBVTT_H_
+#define _GF_WEBVTT_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* WebVTT types */
+typedef enum {
+    WEBVTT_ID,
+    WEBVTT_SETTINGS,
+    WEBVTT_PAYLOAD,
+    WEBVTT_TIME
+} GF_WebVTTCuePropertyType;
+
+typedef struct _webvtt_timestamp {
+    u32 hour, min, sec, ms;
+} GF_WebVTTTimestamp;
+u64 gf_webvtt_timestamp_get(GF_WebVTTTimestamp *ts);
+void gf_webvtt_timestamp_set(GF_WebVTTTimestamp *ts, u64 value);
+void gf_webvtt_timestamp_dump(GF_WebVTTTimestamp *ts, FILE *dump, Bool dump_hour);
+
+typedef struct _webvtt_cue
+{
+    GF_WebVTTTimestamp start;
+    GF_WebVTTTimestamp end;
+    char *id;
+    char *settings;
+    char *text;
+    char *time;
+
+    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);
+
+GF_Err gf_webvtt_dump_header_boxed(FILE *dump, const char *data, u32 dataLength, u32 *printLength);
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+#include <gpac/internal/scenegraph_dev.h>
+
+GF_Err gf_webvtt_js_addCue(GF_Node *node, const char *id, 
+										  const char *start, const char *end,
+										  const char *settings, 
+										  const char *payload);
+GF_Err gf_webvtt_js_removeCues(GF_Node *node);
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif		/*_GF_THREAD_H_*/
+

gpac-0.5.0.svn4668.tar.bz2/include/gpac/xml.h -> gpac-0.5.0.svn5178.tar.bz2/include/gpac/xml.h Changed

@@ -236,6 +236,31 @@
  */
 void gf_xml_dom_node_del(GF_XMLNode *node);
 
+/*
+ *\brief bitsequence parser.
+ *
+ * inspects all child elements of the node and converts <BS> children into bits. BS take the following attributes:.
+ *bits: value gives the number of bits used to code a value or a length 
+ *value: value is a 32 bit signed value 
+ *dataOffset: value gives an offset into a file
+ *dataLength: value gives the number of bits bytes to copy in a file
+ *dataFile: value gives the name of the source file
+ *textmode: indicates whether the file shall be opened in text or binary mode before reading
+ *text: or string: value gives a string (length is first coded on number of bits in bits attribute)
+ *fcc: value gives a four character code, coded on 32 bits
+ *ID128: value gives a 128 bit vlue in hexadecimal
+ *data64: value gives data coded as base64 
+ *data: value gives data coded in hexa 
+ *
+ *
+ *
+ *\param node the root node of the bitstream to create
+ *\param out_data pointer to output buffer allocated by the function to store the result
+ *\param out_data_size pointer to output buffer size allocated by the function to store the result
+ *\return error code or GF_OK
+ */
+GF_Err gf_xml_parse_bit_sequence(GF_XMLNode *bsroot, char **out_data, u32 *out_data_size);
+
 /*! @} */
 
 #ifdef __cplusplus

gpac-0.5.0.svn4668.tar.bz2/modules/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/aac_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/aac_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/aac_in/aac_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/aac_in/aac_in.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ac3_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/ac3_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ac3_in/ac3_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/ac3_in/ac3_in.c Changed

@@ -101,7 +101,7 @@
 	GF_ESD *esd;
 	esd = gf_odf_desc_esd_new(0);
 	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	esd->decoderConfig->objectTypeIndication = 0xA5;
+	esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AC3;
 	esd->ESID = 1;
 	esd->OCRESID = 1;
 	esd->slConfig->timestampResolution = read->sample_rate;
@@ -179,7 +179,7 @@
 
 	if (read->needs_connection) {
 		read->needs_connection = 0;
-		bs = gf_bs_new(read->data, read->data_size, GF_BITSTREAM_READ);
+		bs = gf_bs_new((char *) read->data, read->data_size, GF_BITSTREAM_READ);
 		sync = gf_ac3_parser_bs(bs, &hdr, 1);
 		gf_bs_del(bs);
 		if (!sync) return;
@@ -195,7 +195,7 @@
 	/*need a full ac3 header*/
 	if (read->data_size<=7) return;
 
-	bs = gf_bs_new(read->data, read->data_size, GF_BITSTREAM_READ);
+	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)) {
@@ -205,7 +205,7 @@
 		read->sl_hdr.AU_sequenceNumber++;
 		read->sl_hdr.compositionTimeStampFlag = 1;
 		read->sl_hdr.compositionTimeStamp += 1536;
-		gf_term_on_sl_packet(read->service, read->ch, read->data + pos, hdr.framesize, &read->sl_hdr, GF_OK);
+		gf_term_on_sl_packet(read->service, read->ch, (char *) read->data + pos, hdr.framesize, &read->sl_hdr, GF_OK);
 		gf_bs_skip_bytes(bs, hdr.framesize);
 	}
 
@@ -213,7 +213,7 @@
 	gf_bs_del(bs);
 
 	if (pos) {
-		char *d;
+		u8 *d;
 		read->data_size -= (u32) pos;
 		d = gf_malloc(sizeof(char) * read->data_size);
 		memcpy(d, read->data + pos, sizeof(char) * read->data_size);
@@ -414,7 +414,7 @@
 
 static GF_Err AC3_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
 {
-	u32 ES_ID;
+	u32 ES_ID=0;
 	GF_Err e;
 	AC3Reader *read = plug->priv;
 
@@ -589,12 +589,12 @@
 		read->sl_hdr.compositionTimeStamp = read->current_time;
 
 		read->data = gf_malloc(sizeof(char) * (read->data_size+read->pad_bytes));
-		gf_bs_read_data(bs, read->data, read->data_size);
+		gf_bs_read_data(bs, (char *) read->data, read->data_size);
 		if (read->pad_bytes) memset(read->data + read->data_size, 0, sizeof(char) * read->pad_bytes);
 		gf_bs_del(bs);
 	}
 	*out_sl_hdr = read->sl_hdr;
-	*out_data_ptr = read->data;
+	*out_data_ptr =(char *) read->data;
 	*out_data_size = read->data_size;
 	return GF_OK;
 }

gpac-0.5.0.svn4668.tar.bz2/modules/alsa/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/alsa/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/amr_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/amr_dec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/amr_dec/amr_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/amr_dec/amr_in.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/amr_float_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/amr_float_dec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/audio_filter/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/audio_filter/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/avcap/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/avcap/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/avcap/avcap.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/avcap/avcap.cpp Changed

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

gpac-0.5.0.svn4668.tar.bz2/modules/bifs_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/bifs_dec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ctx_load/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/ctx_load/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ctx_load/ctx_load.c -> gpac-0.5.0.svn5178.tar.bz2/modules/ctx_load/ctx_load.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/demo_is/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/demo_is/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/directfb_out/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/directfb_out/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/directfb_out/directfb_out.c -> gpac-0.5.0.svn5178.tar.bz2/modules/directfb_out/directfb_out.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/droid_out/droid_vout-bitmap.c -> gpac-0.5.0.svn5178.tar.bz2/modules/droid_out/droid_vout-bitmap.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/droid_out/droid_vout.c -> gpac-0.5.0.svn5178.tar.bz2/modules/droid_out/droid_vout.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/dummy_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/dummy_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/dummy_in/dummy_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/dummy_in/dummy_in.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/copy_pixels.c -> gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/copy_pixels.c Changed

@@ -43,6 +43,8 @@
 		return GF_PIXEL_YUY2;
 	case GF_PIXEL_YVYU:
 		return GF_PIXEL_YVYU;
+	case GF_PIXEL_YV12_10:
+		return GF_PIXEL_YV12_10;
 	default:
 		return 0;
 	}
@@ -82,13 +84,14 @@
 }
 
 
-static void write_yv12_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)
+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)
 {
-	unsigned char *pY, *pU, *pV;
-	pY = src;
-	pU = src + src_stride * src_height;
-	pV = src + 5*src_stride * src_height/4;
+
+	if (!pU) {
+		pU = pY + src_stride * src_height;
+		pV = pY + 5*src_stride * src_height/4;
+	}
 
 
 	pY = pY + src_stride * src_wnd->y + src_wnd->x;
@@ -209,7 +212,6 @@
 			}
 		}
 	}
-
 }
 
 static void write_yvyu_to_yuv(GF_VideoSurface *vs,  unsigned char *src, u32 src_stride, u32 src_pf,
@@ -552,7 +554,13 @@
 	if (get_yuv_base(src_s->pixel_format)==GF_PIXEL_YV12) {
 		if (format_is_yuv(dst_s->pixel_format)) {
 			/*generic YV planar to YUV (planar or not) */
-			write_yv12_to_yuv(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->pixel_format, src_s->width, src_s->height, src_wnd);
+			write_yv12_to_yuv(dst_s, src_s->video_buffer, src_s->pitch_y, src_s->pixel_format, src_s->width, src_s->height, src_wnd, src_s->u_ptr, src_s->v_ptr);
+			return;
+		}
+	} else if (get_yuv_base(src_s->pixel_format)==GF_PIXEL_YV12_10) {
+		if (format_is_yuv(dst_s->pixel_format)) {
+			/*generic YV planar to YUV (planar or not) */
+			gf_color_write_yv12_10_to_yuv(dst_s, src_s->video_buffer, src_s->u_ptr, src_s->v_ptr, src_s->pitch_y, src_s->width, src_s->height, src_wnd);
 			return;
 		}
 	} else if (format_is_yuv(src_s->pixel_format)) {

gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_2d.c -> gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_2d.c Changed

@@ -46,6 +46,7 @@
 	case GF_PIXEL_YV12:
 	case GF_PIXEL_IYUV:
 	case GF_PIXEL_I420:
+	case GF_PIXEL_YV12_10:
 		return 1;
 	default:
 		return 0;
@@ -78,6 +79,8 @@
 		return mmioFOURCC('I', 'Y', 'U', 'V');
 	case GF_PIXEL_I420:
 		return mmioFOURCC('I', '4', '2', '0');
+	case GF_PIXEL_YV12_10:
+		return mmioFOURCC('P', '0', '1', '0');
 	default:
 		return 0;
 	}
@@ -204,7 +207,6 @@
 	DDPIXELFORMAT pixelFmt;
     LPDIRECTDRAWCLIPPER pcClipper;
 	DDCONTEXT;
-	
 	if (!dd->cur_hwnd || !Width || !Height || !dd->DirectDrawCreate) return GF_BAD_PARAM;
 	DestroyObjects(dd);
 
@@ -244,8 +246,10 @@
 	ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
 
     hr = dd->pDD->lpVtbl->CreateSurface(dd->pDD, &ddsd, &dd->pPrimary, NULL);
-	if( FAILED(hr) )
-        return GF_IO_ERR;
+	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;
+	}
 
 	/*get pixel format of video board*/
 	memset (&pixelFmt, 0, sizeof(pixelFmt));
@@ -299,9 +303,10 @@
     }
 	pcClipper->lpVtbl->Release(pcClipper);
 
+
 	dd->ddraw_init = 1;
 	/*if YUV not initialize, init using HW video memory to setup HW caps*/
-	return CreateBackBuffer(dr, Width, Height, dd->yuv_init);
+	return GF_OK;
 }
 
 static GF_Err DD_LockSurface(DDContext *dd, GF_VideoSurface *vi, LPDDRAWSURFACE surface)
@@ -341,6 +346,7 @@
 	DDCONTEXT;
 
 	if (do_lock) {
+		memset(vi, 0, sizeof(GF_VideoSurface));
 		vi->pixel_format = dd->pixelFormat;
 		return DD_LockSurface(dd, vi, dd->pBack);
 	}
@@ -405,7 +411,7 @@
 
 #ifndef GPAC_DISABLE_LOG
 	if (hr) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DX Out] Failed blitting %s %s memory: error %08x\n", src->is_yuv ? "YUV" : "RGB", dd->systems_memory ? "systems" : "hardware", hr));
+		GF_LOG(dd->systems_memory ? GF_LOG_INFO : GF_LOG_ERROR, GF_LOG_MMIO, ("[DX Out] Failed blitting %s %s memory: error %08x\n", src->is_yuv ? "YUV" : "RGB", dd->systems_memory ? "systems" : "hardware", hr));
 	} else {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[DX Out] %s blit %s memory %dx%d -> %dx%d\n", src->is_yuv ? "YUV" : "RGB", dd->systems_memory ? "systems" : "hardware", src_w, src_h, dst_w, dst_h));
 	}
@@ -549,6 +555,7 @@
 	if (!pool) 
 		return GF_IO_ERR;
 
+	memset(&temp_surf, 0, sizeof(GF_VideoSurface));
 	temp_surf.pixel_format = pool->format;
 	e = DD_LockSurface(dd, &temp_surf, pool->pSurface);
 	if (e) return e;
@@ -825,11 +832,15 @@
 
 GF_Err DD_SetBackBufferSize(GF_VideoOutput *dr, u32 width, u32 height, Bool use_system_memory)
 {
+	GF_Err e;
 	DDCONTEXT;
 #ifndef GPAC_DISABLE_3D
 	if (dd->output_3d_type) return GF_BAD_PARAM;
 #endif
-	if (!dd->ddraw_init) return InitDirectDraw(dr, width, height);
+	if (!dd->ddraw_init) {
+		e = InitDirectDraw(dr, width, height);
+		if (e) return e;
+	}
 	return CreateBackBuffer(dr, width, height, use_system_memory);
 }

gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_hw.h -> gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_hw.h Changed

gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_video.c -> gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_video.c Changed

@@ -42,10 +42,12 @@
 
 #ifndef GPAC_DISABLE_3D
 
-#define WGL_RED_BITS_ARB                    0x2015
-#define WGL_GREEN_BITS_ARB                  0x2017
-#define WGL_BLUE_BITS_ARB                   0x2019
-
+#define WGL_DRAW_TO_WINDOW_ARB   0x2001
+#define WGL_PIXEL_TYPE_ARB   0x2013
+#define WGL_RED_BITS_ARB                0x2015
+#define WGL_GREEN_BITS_ARB              0x2017
+#define WGL_BLUE_BITS_ARB               0x2019
+#define WGL_ALPHA_BITS_ARB				0x201B
 #define WGL_TEXTURE_FORMAT_ARB         0x2072
 #define WGL_TEXTURE_TARGET_ARB         0x2073
 #define WGL_TEXTURE_RGB_ARB            0x2075
@@ -54,6 +56,7 @@
 #define WGL_NO_TEXTURE_ARB             0x2077
 #define WGL_TEXTURE_2D_ARB             0x207A
 #define WGL_SUPPORT_OPENGL_ARB         0x2010
+#define WGL_DOUBLE_BUFFER_ARB          0x2011
 #define WGL_DRAW_TO_PBUFFER_ARB        0x202D
 #define WGL_BIND_TO_TEXTURE_RGBA_ARB   0x2071
 #define WGL_COLOR_BITS_ARB             0x2014
@@ -62,10 +65,15 @@
 #define WGL_ACCELERATION_ARB           0x2003
 #define WGL_GENERIC_ACCELERATION_ARB	0x2026
 #define WGL_FULL_ACCELERATION_ARB      0x2027
+#define WGL_TYPE_RGBA_ARB   0x202B
 
 typedef Bool (APIENTRY *CHOOSEPFFORMATARB)(HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
 static CHOOSEPFFORMATARB wglChoosePixelFormatARB = NULL;
 
+typedef Bool (APIENTRY *GETPIXELFORMATATTRIBIV)(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int* piAttributes, int *piValues);
+static GETPIXELFORMATATTRIBIV wglGetPixelFormatAttribivARB = NULL;
+
+
 typedef void *(APIENTRY *CREATEPBUFFERARB)(HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList);
 static CREATEPBUFFERARB wglCreatePbufferARB = NULL;
 
@@ -78,6 +86,9 @@
 typedef HDC (APIENTRY *RELEASEPBUFFERDCARB)(void *pb, HDC dc);
 static RELEASEPBUFFERDCARB wglReleasePbufferDCARB = NULL;
 
+typedef BOOL (APIENTRY *PFNWGLSWAPINTERVALFARPROC)( int );
+PFNWGLSWAPINTERVALFARPROC wglSwapIntervalEXT = NULL;
+
 static void dd_init_gl_offscreen(GF_VideoOutput *driv)
 {
 	const char *opt;
@@ -86,12 +97,12 @@
 	opt = gf_modules_get_option((GF_BaseInterface *)driv, "Video", "GLOffscreenMode");
 
 #ifndef _WIN32_WCE
+	wglChoosePixelFormatARB = (CHOOSEPFFORMATARB) wglGetProcAddress("wglChoosePixelFormatARB");
 
 	wglCreatePbufferARB = (CREATEPBUFFERARB) wglGetProcAddress("wglCreatePbufferARB");
 	if (opt && strcmp(opt, "PBuffer")) wglCreatePbufferARB = NULL;
 
 	if (wglCreatePbufferARB) {
-		wglChoosePixelFormatARB = (CHOOSEPFFORMATARB) wglGetProcAddress("wglChoosePixelFormatARB");
 		wglDestroyPbufferARB = (DESTROYBUFFERARB) wglGetProcAddress("wglDestroyPbufferARB");
 		wglGetPbufferDCARB = (GETPBUFFERDCARB ) wglGetProcAddress("wglGetPbufferDCARB");
 		wglReleasePbufferDCARB = (RELEASEPBUFFERDCARB ) wglGetProcAddress("wglReleasePbufferDCARB");
@@ -104,13 +115,7 @@
 #endif
 	{
 		u32 gl_type = 1;
-		HINSTANCE hInst;
 
-#ifndef _WIN32_WCE
-		hInst = GetModuleHandle("gm_dx_hw.dll");
-#else
-		hInst = GetModuleHandle(_T("gm_dx_hw.dll"));
-#endif
 		opt = gf_modules_get_option((GF_BaseInterface *)driv, "Video", "GLOffscreenMode");
 		if (opt) {
 			if (!strcmp(opt, "Window")) gl_type = 1;
@@ -122,9 +127,9 @@
 
 		if (gl_type) {
 #ifdef _WIN32_WCE
-			dd->gl_hwnd = CreateWindow(_T("GPAC DirectDraw Output"), _T("GPAC OpenGL Offscreen"), WS_POPUP, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
+			dd->gl_hwnd = CreateWindow(_T("GPAC DirectDraw Output"), _T("GPAC OpenGL Offscreen"), WS_POPUP, 0, 0, 120, 100, NULL, NULL, GetModuleHandle(_T("gm_dx_hw.dll")), NULL);
 #else
-			dd->gl_hwnd = CreateWindow("GPAC DirectDraw Output", "GPAC OpenGL Offscreen", WS_POPUP, 0, 0, 120, 100, NULL, NULL, hInst, NULL);
+			dd->gl_hwnd = CreateWindow("GPAC DirectDraw Output", "GPAC OpenGL Offscreen", WS_POPUP, 0, 0, 120, 100, NULL, NULL, GetModuleHandle("gm_dx_hw.dll"), NULL);
 #endif
 			if (!dd->gl_hwnd)
 				return;
@@ -238,6 +243,7 @@
 {
 	const char *sOpt;
 	GF_Event evt;
+	Bool hw_reset = GF_FALSE;
 	DDCONTEXT
 
 #ifdef GPAC_USE_OGL_ES
@@ -287,45 +293,160 @@
 #elif !defined(_WIN32_WCE)
     PIXELFORMATDESCRIPTOR pfd; 
     s32 pixelformat;
+	HWND highbpp_hwnd = NULL;
+	HWND target_hwnd = NULL;
 	int bits_depth = 24;
 	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) 
+		goto exit;
+
+	hw_reset = GF_TRUE;
+	dd->bound_hwnd = target_hwnd;
+
+	/*cleanup*/
 	DestroyObjectsEx(dd, (dd->output_3d_type==1) ? 0 : 1);
 
-	dd->bound_hwnd = (dd->gl_hwnd && (dd->output_3d_type==2)) ? dd->gl_hwnd : dd->cur_hwnd;
-	dd->gl_HDC = GetDC(dd->bound_hwnd );
+	//first time we init GL: create a dummy window to select pixel format for high bpp - we must do this because 
+	//- we must get a valid GL context to query the extensions for bpp > 8 (regular choosePixelFormat does not work for them)
+	//- we must call SetPixelFormat to create the GL context 
+	//- it is not possible to call several time SetPixelFormat on the same window with different PF properties ...
+	if (!dd->mode_high_bpp) {
+		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsPerComponent");
+		if (!sOpt) {
+			gf_modules_set_option((GF_BaseInterface *)dr, "Video", "GLNbBitsPerComponent", "8");
+			dd->bpp = 8;
+		} else {
+			dd->bpp = atoi(sOpt);
+		}
+		if (dd->bpp > 8) {
+			highbpp_hwnd = CreateWindow("GPAC DirectDraw Output", "dummy", WS_POPUP, 0, 0, 128, 128, NULL, NULL, NULL /* GetModuleHandle("gm_dx_hw.dll")*/, NULL);
+			dd->gl_HDC = GetDC(highbpp_hwnd);
+
+			memset(&pfd, 0, sizeof(pfd));
+			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 (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; 
+			}
+			dd->gl_HRC = wglCreateContext(dd->gl_HDC);
+			if (!dd->gl_HRC) return GF_IO_ERR;
 
-	if (!dd->gl_HDC) return GF_IO_ERR;
+			wglMakeCurrent(dd->gl_HDC, dd->gl_HRC);
+			wglChoosePixelFormatARB = (CHOOSEPFFORMATARB) wglGetProcAddress("wglChoosePixelFormatARB");
+			wglGetPixelFormatAttribivARB = (GETPIXELFORMATATTRIBIV) wglGetProcAddress("wglGetPixelFormatAttribivARB");
 
-    memset(&pfd, 0, sizeof(pfd));
-    pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
-    pfd.nVersion = 1;
-    pfd.dwFlags = PFD_SUPPORT_OPENGL;
-	if (dd->bound_hwnd != dd->fs_hwnd) pfd.dwFlags |= PFD_DRAW_TO_WINDOW;
+			wglMakeCurrent(NULL, NULL);
+			wglDeleteContext(dd->gl_HRC);
+			dd->gl_HRC = NULL;
+			ReleaseDC(highbpp_hwnd, dd->gl_HDC);
+			DestroyWindow(highbpp_hwnd);
 
+			
+			dd->mode_high_bpp = wglChoosePixelFormatARB ? 1 : 2;
+		} else {
+			dd->mode_high_bpp = 2;
+		}
+	}
+
+	dd->gl_HDC = GetDC(dd->bound_hwnd);
+	if (!dd->gl_HDC) return GF_IO_ERR;
+
+	use_double_buffer = 0;
 	if (dd->gl_double_buffer ) {
-		pfd.dwFlags |= PFD_DOUBLEBUFFER;
+		use_double_buffer = dd->gl_double_buffer;
 	} else {
 		sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "UseGLDoubleBuffering");
-		if (!sOpt || !strcmp(sOpt, "yes")) pfd.dwFlags |= PFD_DOUBLEBUFFER;
+		if (!sOpt || !strcmp(sOpt, "yes")) use_double_buffer = 1;
 	}
 
-    pfd.dwLayerMask = PFD_MAIN_PLANE;
-    pfd.iPixelType = PFD_TYPE_RGBA;
-    pfd.cColorBits = 32;
 	sOpt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "GLNbBitsDepth");
 	if (sOpt) bits_depth = atoi(sOpt);
-	pfd.cDepthBits = bits_depth;
-	/*we need alpha support for composite textures...*/
-	pfd.cAlphaBits = 8;
-    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; 
+
+	memset(&pfd, 0, sizeof(pfd));
+	pfd.nSize = sizeof(PIXELFORMATDESCRIPTOR);
+	pfd.nVersion = 1;
+
+	if (dd->mode_high_bpp == 1) {
+		int pformats[200];
+		u32 nbformats=0;
+		Bool found = GF_FALSE;
+		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_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_DEPTH_BITS_ARB, bits_depth,
+			WGL_DOUBLE_BUFFER_ARB, use_double_buffer ? TRUE : FALSE, 
+			0,0
+		}; 
+
+		wglChoosePixelFormatARB(dd->gl_HDC, hdcAttributes, NULL, 200, pformats, &nbformats); 
+
+		for (i=0; i<nbformats; i++) {
+			if (SetPixelFormat(dd->gl_HDC, pformats[i], &pfd) != FALSE) {
+				found = GF_TRUE;
+				break;
+			}
+		}
+		if (!found) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DX GL] Cannot select pixel format: error %d - disabling high color res GL and retrying\n", GetLastError() ));
+			dd->mode_high_bpp = 2;
+			return DD_SetupOpenGL(dr, offscreen_width, offscreen_height);
+		}
+
+		dr->max_screen_bpp = dd->bpp;
+
+		if (wglGetPixelFormatAttribivARB) {
+			int rb, gb, bb, att;
+			rb = gb = bb = 0;
+			att = WGL_RED_BITS_ARB;
+			wglGetPixelFormatAttribivARB(dd->gl_HDC, pformats[0], 0, 1, &att, &rb);
+			att = WGL_GREEN_BITS_ARB;
+			wglGetPixelFormatAttribivARB(dd->gl_HDC, pformats[0], 0, 1, &att, &gb);
+			att = WGL_BLUE_BITS_ARB;
+			wglGetPixelFormatAttribivARB(dd->gl_HDC, pformats[0], 0, 1, &att, &bb);
+
+			if ((rb != dd->bpp) || (gb != dd->bpp) || (bb != dd->bpp)) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DX GL] Asked for %d bits per pixel but got %d red %d green %d blue\n", dd->bpp, rb, gb, bb ));
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MMIO, ("[DX GL] Setup OpenGL bpp: %d red %d green %d blue\n", rb, gb, bb ));
+			}
+		}
+
+	} else {
+		pfd.dwFlags = PFD_SUPPORT_OPENGL;
+		if (dd->bound_hwnd != dd->fs_hwnd) pfd.dwFlags |= PFD_DRAW_TO_WINDOW;
+
+		if (use_double_buffer) pfd.dwFlags |= PFD_DOUBLEBUFFER;
+		pfd.dwLayerMask = PFD_MAIN_PLANE;
+		pfd.iPixelType = PFD_TYPE_RGBA;
+		pfd.cColorBits = 32;
+		pfd.cDepthBits = bits_depth;
+		/*we need alpha support for composite textures...*/
+		pfd.cAlphaBits = 8;
+
+		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; 
+		}
 	}
-	
+
 	dd->gl_HRC = wglCreateContext(dd->gl_HDC);
 	if (!dd->gl_HRC) return GF_IO_ERR;
 
@@ -333,9 +454,16 @@
 		dd->glext_init=1;
 		wglMakeCurrent(dd->gl_HDC, dd->gl_HRC);
 		dd_init_gl_offscreen(dr);
-		return DD_SetupOpenGL(dr, offscreen_width, offscreen_height);
 	}
 
+	if (dd->disable_vsync) {
+		if (!wglSwapIntervalEXT) {
+			wglSwapIntervalEXT = (PFNWGLSWAPINTERVALFARPROC)wglGetProcAddress( "wglSwapIntervalEXT" );
+		}
+		if (wglSwapIntervalEXT) {
+			wglSwapIntervalEXT(0);
+		}
+	}
 
 	if ((dd->output_3d_type!=2) || dd->gl_hwnd) {
 		if (!wglMakeCurrent(dd->gl_HDC, dd->gl_HRC)) return GF_IO_ERR;
@@ -345,7 +473,7 @@
 			WGL_TEXTURE_TARGET_ARB,	WGL_TEXTURE_2D_ARB,
 			0
 		};
-		u32 pformats[20];
+		int pformats[20];
 		u32 nbformats=0;
 		int hdcAttributes[] = {
 			WGL_SUPPORT_OPENGL_ARB, TRUE,
@@ -353,13 +481,8 @@
 			WGL_RED_BITS_ARB, 8,
 			WGL_GREEN_BITS_ARB, 8,
 			WGL_BLUE_BITS_ARB, 8, 
-
 			WGL_DEPTH_BITS_ARB, bits_depth,
-/*			WGL_BIND_TO_TEXTURE_RGBA_ARB, TRUE,
-			WGL_COLOR_BITS_ARB,24,
-			WGL_DEPTH_BITS_ARB, 0,
-			WGL_STENCIL_BITS_ARB,0,
-*/			0
+			0
 		}; 
 		wglChoosePixelFormatARB(dd->gl_HDC, hdcAttributes, NULL, 20, pformats, &nbformats); 
 		// Create the PBuffer
@@ -386,10 +509,11 @@
 		SetWindowLong(dd->os_hwnd, GWL_WNDPROC, (DWORD) DD_WindowProc);
 #endif
 
+exit:
 	if (dd->output_3d_type==1) {
 		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_VIDEO_SETUP;
-		evt.setup.opengl_mode = 1;
+		evt.setup.hw_reset = hw_reset;
 		dr->on_event(dr->evt_cbk_hdl, &evt);	
 	}
 	return GF_OK;
@@ -403,6 +527,7 @@
 {
 	RECT rc;
 	DDCONTEXT
+	const char *opt;
 	dd->os_hwnd = (HWND) os_handle;
 	
 	DD_SetupWindow(dr, init_flags);
@@ -422,7 +547,11 @@
 	dd->output_3d_type = 0;
 #endif
 	GetWindowRect(dd->cur_hwnd, &rc);
-	return InitDirectDraw(dr, rc.right - rc.left, rc.bottom - rc.top);
+
+	opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "DisableVSync");
+	if (opt && !strcmp(opt, "yes")) dd->disable_vsync = GF_TRUE;
+
+	return GF_OK;
 }
 
 static void DD_Shutdown(GF_VideoOutput *dr)
@@ -445,10 +574,12 @@
 	u32 MaxWidth, MaxHeight;
 	DDCONTEXT;
 
-	if (!dd->width ||!dd->height) return GF_BAD_PARAM;
 	if (bOn == dd->fullscreen) return GF_OK;
 	if (!dd->fs_hwnd) return GF_NOT_SUPPORTED;
+
 	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)*/
@@ -511,32 +642,12 @@
 				dd->fs_width = MaxWidth;
 				dd->fs_height = MaxHeight;
 			}
-			SetWindowPos(dd->cur_hwnd, NULL, X, Y, dd->fs_width, dd->fs_height, SWP_NOZORDER | SWP_SHOWWINDOW | SWP_ASYNCWINDOWPOS);
-
-//#ifndef _WIN32_WCE
-			/*commented out since it causes problem on multiple monitors*/
-#if 0
-			{
-			DEVMODE settings;
-
-			memset(&settings, 0, sizeof(DEVMODE));
-			settings.dmSize = sizeof(DEVMODE);
-			settings.dmPelsWidth = dd->fs_width;
-			settings.dmPelsHeight = dd->fs_height;
-			settings.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
-
-			if ( ChangeDisplaySettings(&settings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL ) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[DirectDraw] cannot change display settings\n"));
-				e = GF_IO_ERR;
-			} 
-			}
-			dd->NeedRestore = 1;
-#endif
+			SetWindowPos(dd->cur_hwnd, NULL, X, Y, dd->fs_width, dd->fs_height, SWP_SHOWWINDOW | SWP_NOZORDER /*| SWP_ASYNCWINDOWPOS*/);
 
 			dd->fs_store_width = dd->fs_width;
 			dd->fs_store_height = dd->fs_height;
 		} else if (dd->os_hwnd==dd->fs_hwnd) {
-			SetWindowPos(dd->os_hwnd, NULL, 0, 0, dd->store_width+dd->off_w, dd->store_height+dd->off_h, SWP_NOZORDER | SWP_NOMOVE | SWP_ASYNCWINDOWPOS);
+			SetWindowPos(dd->os_hwnd, NULL, 0, 0, dd->store_width+dd->off_w, dd->store_height+dd->off_h, SWP_NOMOVE | SWP_NOZORDER /*| SWP_ASYNCWINDOWPOS*/);
 		}
 
 		if (!e) e = DD_SetupOpenGL(dr, 0, 0);
@@ -609,7 +720,9 @@
 		return GF_OK;
 	}
 	
-	hr = dd->pDD->lpVtbl->WaitForVerticalBlank(dd->pDD, DDWAITVB_BLOCKBEGIN, NULL);
+	if (!dd->disable_vsync)
+		hr = dd->pDD->lpVtbl->WaitForVerticalBlank(dd->pDD, DDWAITVB_BLOCKBEGIN, NULL);
+
 	if (dest) {
 		POINT pt;
 		pt.x = dest->x;
@@ -701,6 +814,7 @@
 
     driv->max_screen_width = GetSystemMetrics(SM_CXSCREEN);
     driv->max_screen_height = GetSystemMetrics(SM_CYSCREEN);
+	driv->max_screen_bpp = 8;
 	driv->hw_caps = GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_OPENGL_OFFSCREEN | GF_VIDEO_HW_OPENGL_OFFSCREEN_ALPHA | GF_VIDEO_HW_HAS_HWND_HDC;
 
 	DD_SetupDDraw(driv);

gpac-0.5.0.svn4668.tar.bz2/modules/dx_hw/dx_window.c -> gpac-0.5.0.svn5178.tar.bz2/modules/dx_hw/dx_window.c Changed

@@ -363,6 +363,7 @@
 		break;
 	case WM_CLOSE:
 		if (hWnd==ctx->os_hwnd) {
+			memset(&evt, 0, sizeof(GF_Event));
 			evt.type = GF_EVENT_QUIT;
 			vout->on_event(vout->evt_cbk_hdl, &evt);
 		}
@@ -582,6 +583,7 @@
 		if (evt.key.key_code==GF_KEY_ALT) ctx->alt_down = (evt.type==GF_EVENT_KEYDOWN) ? 1 : 0;
 		if (evt.key.key_code==GF_KEY_CONTROL) ctx->ctrl_down = (evt.type==GF_EVENT_KEYDOWN) ? 1 : 0;
 		if ((ctx->os_hwnd==ctx->fs_hwnd) && ctx->alt_down && (evt.key.key_code==GF_KEY_F4)) {
+			memset(&evt, 0, sizeof(GF_Event));
 			evt.type = GF_EVENT_QUIT;
 		}
 		else if (ctx->ctrl_down && (evt.type==GF_EVENT_KEYUP) && (evt.key.key_code==GF_KEY_V)) {
@@ -602,7 +604,7 @@
 		}
 		else if (ctx->ctrl_down && (evt.type==GF_EVENT_KEYUP) && (evt.key.key_code==GF_KEY_C)) {
 			evt.type = GF_EVENT_COPY_TEXT;
-			if ((vout->on_event(vout->evt_cbk_hdl, &evt)==GF_OK) && evt.message.message) {
+			if ((vout->on_event(vout->evt_cbk_hdl, &evt)==GF_TRUE) && evt.message.message) {
 				size_t len;
 				HGLOBAL hglbCopy;
 				LPTSTR lptstrCopy;
@@ -831,7 +833,6 @@
 	ctx->curs_hand = LoadCursor(hInst, MAKEINTRESOURCE(IDC_HAND_PTR));
 	ctx->curs_collide = LoadCursor(hInst, MAKEINTRESOURCE(IDC_COLLIDE));
 	ctx->cursor_type = GF_CURSOR_NORMAL;
-
 	return 1;
 }
 
@@ -885,7 +886,8 @@
 		/*create event thread*/
 		ctx->th = gf_th_new("DirectX Video");
 		gf_th_run(ctx->th, DD_WindowThread, dr);
-		while (!ctx->th_state) gf_sleep(2);
+		while (!ctx->th_state)
+			gf_sleep(1);
 	}
 	if (!the_video_output) the_video_output = dr;
 }

gpac-0.5.0.svn4668.tar.bz2/modules/epoc_hw/epoc_vout.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/epoc_hw/epoc_vout.cpp Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ffmpeg_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/ffmpeg_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ffmpeg_in/ffmpeg_decode.c -> gpac-0.5.0.svn5178.tar.bz2/modules/ffmpeg_in/ffmpeg_decode.c Changed

@@ -26,34 +26,26 @@
 #include "ffmpeg_in.h"
 #include <gpac/avparse.h>
 
-#ifndef FFMPEG_OLD_HEADERS
 
-#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 20)
-#undef USE_AVCODEC2
-#else
-#define USE_AVCODEC2	1
-#endif
+#if (LIBAVCODEC_VERSION_MAJOR >= 55) && (LIBAVCODEC_VERSION_MINOR >= 38)
+#define HAS_HEVC
 
-#else
-#undef USE_AVCODEC2
+#include <libavutil/opt.h>
 #endif
 
-#if (LIBAVCODEC_VERSION_MAJOR >= 55) 
-#define USE_AVCTX3
-#elif (LIBAVCODEC_VERSION_MAJOR >= 54) && (LIBAVCODEC_VERSION_MINOR >= 35)
-#define USE_AVCTX3
+#if defined(GPAC_ANDROID) || defined(GPAC_IPHONE)
+#define NO_10bit
 #endif
 
 
-
 /**
  * Allocates data for FFMPEG decoding
  * \param oldBuffer The oldBuffer (freed if not NULL)
  * \param size Size to allocate (will use extra padding for real size)
  * \return The newly allocated buffer
  */
-static char * ffmpeg_realloc_buffer(char * oldBuffer, u32 size){
-	char * buffer;
+static uint8_t * ffmpeg_realloc_buffer(uint8_t * oldBuffer, u32 size){
+	uint8_t * buffer;
 	/* Size of buffer must be larger, see avcodec_decode_video2 documentation */
 	u32 allocatedSz = sizeof( char ) * (FF_INPUT_BUFFER_PADDING_SIZE + size);
 	if (oldBuffer)
@@ -104,7 +96,7 @@
 			gf_free(ctx->extradata);
 		ctx->extradata_size = dsi_size;
 		ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
-		gf_bs_read_data(bs, ctx->extradata, ctx->extradata_size);
+		gf_bs_read_data(bs, (char *) ctx->extradata, ctx->extradata_size);
 		return;
 	}
 
@@ -120,8 +112,8 @@
 				gf_free(ctx->extradata);
 			ctx->extradata_size = 0x5a + size;
 			ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
-			strcpy(ctx->extradata, "SVQ3");
-			gf_bs_read_data(bs, (unsigned char *)ctx->extradata + 0x5a, size);
+			strcpy((char *) ctx->extradata, "SVQ3");
+			gf_bs_read_data(bs, (char *)ctx->extradata + 0x5a, size);
 		}
 	}
 		break;
@@ -130,7 +122,7 @@
 			gf_free(ctx->extradata);
 		ctx->extradata_size = dsi_size;
 		ctx->extradata = ffmpeg_realloc_buffer(ctx->extradata, ctx->extradata_size);
-		gf_bs_read_data(bs, ctx->extradata, ctx->extradata_size);
+		gf_bs_read_data(bs, (char *)ctx->extradata, ctx->extradata_size);
 		break;
 	}
 }
@@ -143,6 +135,7 @@
 	AVCodecContext **ctx;
 	AVCodec **codec;
 	AVFrame **frame;
+	const char *sOpt;
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 	GF_M4VDecSpecInfo dsi;
@@ -198,14 +191,16 @@
 
 			/*ffmpeg specific*/
 			(*ctx)->block_align = gf_bs_read_u16(bs);
+			(*ctx)->bit_rate = gf_bs_read_u32(bs);
+			(*ctx)->codec_tag = gf_bs_read_u32(bs);
 		} else if (ffd->st==GF_STREAM_VISUAL) {
 			(*ctx)->codec_type = AVMEDIA_TYPE_VIDEO;
 			(*ctx)->width = gf_bs_read_u16(bs);
 			(*ctx)->height = gf_bs_read_u16(bs);
+			(*ctx)->bit_rate = gf_bs_read_u32(bs);
+			(*ctx)->codec_tag = gf_bs_read_u32(bs);
+			ffd->raw_pix_fmt = gf_bs_read_u32(bs);
 		}
-		(*ctx)->bit_rate = gf_bs_read_u32(bs);
-		(*ctx)->codec_tag = gf_bs_read_u32(bs);
-		ffd->raw_pix_fmt = gf_bs_read_u32(bs);
 
 		*codec = avcodec_find_decoder(codec_id);
 		FFDEC_LoadDSI(ffd, bs, *codec, *ctx, 1);
@@ -248,10 +243,13 @@
 				break;
 			case GPAC_OTI_VIDEO_AVC:
 				codec_id = CODEC_ID_H264;
-				/*ffmpeg H264/AVC needs that*/
-				//(*ctx)->codec_tag = 0x31637661;
 				break;
-			case GPAC_OTI_VIDEO_MPEG1:
+#ifdef HAS_HEVC
+            case GPAC_OTI_VIDEO_HEVC:
+                codec_id = AV_CODEC_ID_HEVC;
+                break;
+#endif
+                case GPAC_OTI_VIDEO_MPEG1:
 			case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
 			case GPAC_OTI_VIDEO_MPEG2_MAIN:
 			case GPAC_OTI_VIDEO_MPEG2_SNR:
@@ -287,9 +285,9 @@
 	if (! (*codec)) return GF_OUT_OF_MEM;
 
 	/*setup MPEG-4 video streams*/
-	if ((ffd->st==GF_STREAM_VISUAL)) {
+	if (ffd->st==GF_STREAM_VISUAL) {
 		/*for all MPEG-4 variants get size*/
-		if ((ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2) || (ffd->oti == GPAC_OTI_VIDEO_AVC)) {
+		if ((ffd->oti==GPAC_OTI_VIDEO_MPEG4_PART2) || (ffd->oti == GPAC_OTI_VIDEO_AVC) || (ffd->oti == GPAC_OTI_VIDEO_HEVC)) {
 			/*if not set this may be a remap of non-mpeg4 transport (eg, transport on MPEG-TS) where
 			the DSI is carried in-band*/
 			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
@@ -312,7 +310,7 @@
 				}
 
 				/*setup dsi for FFMPEG context BEFORE attaching decoder (otherwise not proper init)*/
-				(*ctx)->extradata = ffmpeg_realloc_buffer((*ctx)->extradata, esd->decoderConfig->decoderSpecificInfo->dataLength);
+				(*ctx)->extradata = ffmpeg_realloc_buffer((*ctx)->extradata, esd->decoderConfig->decoderSpecificInfo->dataLength + 8);
 				if ((*ctx)->extradata){
 					memcpy((*ctx)->extradata, esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
 					(*ctx)->extradata_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
@@ -324,10 +322,51 @@
 		}
 		*frame = avcodec_alloc_frame();
 	}
+#ifdef HAS_HEVC
+	if (ffd->oti == GPAC_OTI_VIDEO_HEVC) {
+		GF_SystemRTInfo rti;
+		u32 nb_threads, detected_nb_threads = 1;
+		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "OpenHEVC", "ThreadingType");
+		if (sOpt && !strcmp(sOpt, "wpp")) av_opt_set(*ctx, "thread_type", "slice", 0);
+		else if (sOpt && !strcmp(sOpt, "frame+wpp")) av_opt_set(*ctx, "thread_type", "frameslice", 0);
+		else {
+			av_opt_set(*ctx, "thread_type", "frame", 0);
+			if (!sOpt) gf_modules_set_option((GF_BaseInterface *)plug, "OpenHEVC", "ThreadingType", "frame");
+		}
+		if (gf_sys_get_rti(0, &rti, 0) ) {
+			detected_nb_threads = (rti.nb_cores>1) ? rti.nb_cores-1 : 1;
+		}
+		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "OpenHEVC", "NumThreads");
+		if (!sOpt) {
+			char szO[100];
+			sprintf(szO, "%d", detected_nb_threads);
+			gf_modules_set_option((GF_BaseInterface *)plug, "OpenHEVC", "NumThreads", szO);
+			nb_threads = detected_nb_threads;
+		} else {
+			nb_threads = atoi(sOpt);
+		}
+		if (nb_threads > detected_nb_threads) {
+			GF_LOG(GF_LOG_CODEC, GF_LOG_WARNING, ("[HEVC@ffmpeg] Initializing with %d threads but only %d available cores detected on the system\n", nb_threads, rti.nb_cores));
+		} else {
+			GF_LOG(GF_LOG_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);
+
+        /* Set the decoder id */
+		//av_opt_set_int(openHevcContext->c->priv_data, "decoder-id", i, 0);
+
+		sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "OpenHEVC", "CBUnits");
+		if (!sOpt) gf_modules_set_option((GF_BaseInterface *)plug, "OpenHEVC", "CBUnits", "4");
+		if (sOpt) ffd->output_cb_size = atoi(sOpt);
+	}
+#endif //HAS_HEVC
+	if (!ffd->output_cb_size) ffd->output_cb_size = 4;
+
 	if (codec_id == CODEC_ID_RAWVIDEO) {
 		(*ctx)->codec_id = CODEC_ID_RAWVIDEO;
 		(*ctx)->pix_fmt = ffd->raw_pix_fmt;
-		if ((*ctx)->extradata && strstr((*ctx)->extradata, "BottomUp")) ffd->flipped = 1;
+		if ((*ctx)->extradata && strstr((char *) (*ctx)->extradata, "BottomUp")) ffd->flipped = 1;
 	} else {
 #ifdef USE_AVCTX3
 		if (avcodec_open2((*ctx), (*codec), NULL )<0) return GF_NON_COMPLIANT_BITSTREAM;
@@ -335,7 +374,6 @@
 		if (avcodec_open((*ctx), (*codec) )<0) return GF_NON_COMPLIANT_BITSTREAM;
 #endif
 	}
-
 	/*setup audio streams*/
 	if (ffd->st==GF_STREAM_AUDIO) {
 		if ((*codec)->id == CODEC_ID_MP2) {
@@ -345,6 +383,11 @@
 		ffd->out_size = (*ctx)->channels * (*ctx)->frame_size * 2 /*16 / 8*/;
 		if (!(*ctx)->sample_rate) (*ctx)->sample_rate = 44100;
 		if (!(*ctx)->channels) (*ctx)->channels = 2;
+
+#if defined(USE_AVCTX3)
+		ffd->audio_frame = avcodec_alloc_frame();
+#endif
+
 	} else {
 		switch ((*codec)->id) {
 		case CODEC_ID_MJPEG:
@@ -363,7 +406,7 @@
 			{
 			  AVPacket pkt;
 			  av_init_packet(&pkt);
-			  pkt.data = esd->decoderConfig->decoderSpecificInfo->data;
+			  pkt.data = (uint8_t *) esd->decoderConfig->decoderSpecificInfo->data;
 			  pkt.size = esd->decoderConfig->decoderSpecificInfo->dataLength;
 			  avcodec_decode_video2((*ctx), *frame, &gotpic, &pkt);
 			}
@@ -380,6 +423,7 @@
 		ffd->out_pix_fmt = ffd->pix_fmt;
 
 		if (ffd->out_pix_fmt == GF_PIXEL_YV12) {
+			ffd->stride = (*ctx)->width;
 			if (ffd->depth_codec) {
 				ffd->out_size = (*ctx)->width * (*ctx)->height * 5 / 2;
 				ffd->out_pix_fmt = GF_PIXEL_YUVD;
@@ -391,6 +435,18 @@
 			ffd->out_size = (*ctx)->width * (*ctx)->height * 3;
 		}
 	}
+
+
+	sOpt = gf_modules_get_option((GF_BaseInterface *)plug, "Systems", "Output8bit");
+	if (!sOpt) gf_modules_set_option((GF_BaseInterface *)plug, "Systems", "Output8bit", (ffd->display_bpp>8) ? "no" : "yes");
+	if (sOpt && !strcmp(sOpt, "yes")) ffd->output_as_8bit = 1;
+
+	if (ffd->output_as_8bit && (ffd->stride > (u32) (*ctx)->width)) {
+		ffd->stride /=2;
+		ffd->out_size /= 2;
+		ffd->conv_to_8bit = 1;
+	}
+
 	return GF_OK;
 }
 
@@ -429,12 +485,22 @@
 	}
 	*codec = NULL;
 
+#if defined(USE_AVCTX3)
+	if (ffd->audio_frame) {
+		av_free(ffd->audio_frame);
+	}
+#endif
+
 #ifdef FFMPEG_SWSCALE
 	if (*sws) {
 		sws_freeContext(*sws);
 		*sws = NULL;
 	}
 #endif
+	if (ffd->conv_buffer) {
+		gf_free(ffd->conv_buffer);
+		ffd->conv_buffer = NULL;
+	}
 	return GF_OK;
 }
 
@@ -454,6 +520,12 @@
 	case GF_CODEC_REORDER:
 		capability->cap.valueInt = 1;
 		return GF_OK;
+	case GF_CODEC_DIRECT_OUTPUT:
+		capability->cap.valueBool = GF_TRUE;
+		return GF_OK;
+	case GF_CODEC_WANTS_THREAD:
+		capability->cap.valueBool= GF_TRUE;
+		break;
 	}
 
 	if (!ffd->base_ctx) {
@@ -480,7 +552,7 @@
 		break;
 	case GF_CODEC_BUFFER_MAX:
 	  /*for audio let the systems engine decide since we may have very large block size (1 sec with some QT movies)*/
-		capability->cap.valueInt = (ffd->st==GF_STREAM_AUDIO) ? 0 : (ffd->is_image ? 1 : 4);
+		capability->cap.valueInt = (ffd->st==GF_STREAM_AUDIO) ? 0 : (ffd->is_image ? 1 : ffd->output_cb_size);
 		break;
 	/*by default AAC access unit lasts num_samples (timescale being sampleRate)*/
 	case GF_CODEC_CU_DURATION:
@@ -493,8 +565,12 @@
 		capability->cap.valueInt = ffd->base_ctx->height;
 		break;
 	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ffd->base_ctx->width;
-		if (ffd->out_pix_fmt==GF_PIXEL_RGB_24) capability->cap.valueInt *= 3;
+		if (ffd->out_pix_fmt==GF_PIXEL_RGB_24) 
+			capability->cap.valueInt = ffd->stride*3;
+		else if (ffd->conv_buffer) 
+			capability->cap.valueInt = ffd->base_ctx->width;
+		else 
+			capability->cap.valueInt = ffd->stride;
 		break;
 	case GF_CODEC_FPS:
 		capability->cap.valueFloat = 30.0f;
@@ -504,6 +580,7 @@
 		break;
 	case GF_CODEC_PIXEL_FORMAT:
 		if (ffd->base_ctx->width) capability->cap.valueInt = ffd->out_pix_fmt;
+		if (ffd->conv_buffer) capability->cap.valueInt = GF_PIXEL_YV12;
 		break;
 	/*ffmpeg performs frame reordering internally*/
 	case GF_CODEC_REORDER:
@@ -537,6 +614,9 @@
 	assert(plug);
 	assert( ffd );
 	switch (capability.CapCode) {
+	case GF_CODEC_DISPLAY_BPP:
+		ffd->display_bpp = capability.cap.valueInt;
+		return GF_OK;
 	case GF_CODEC_WAIT_RAP:
 		ffd->frame_start = 0;
 		if (ffd->st==GF_STREAM_VISUAL) {
@@ -544,6 +624,9 @@
 			if (ffd->depth_ctx && ffd->depth_ctx->codec) avcodec_flush_buffers(ffd->depth_ctx);
 		}
 		return GF_OK;
+	case GF_CODEC_DIRECT_OUTPUT:
+		ffd->direct_output = GF_TRUE;
+		return GF_OK;
 	default:
 		/*return unsupported to avoid confusion by the player (like color space changing ...) */
 		return GF_NOT_SUPPORTED;
@@ -561,7 +644,7 @@
 #endif
 	AVPicture pict;
 	u32 pix_out;
-	s32 w, h, gotpic;
+	s32 w, h, gotpic, stride;
 	u32 outsize;
 	AVCodecContext *ctx;
 	AVCodec **codec;
@@ -610,13 +693,14 @@
 
 #ifdef USE_AVCODEC2
 	av_init_packet(&pkt);
-	pkt.data = inBuffer;
+	pkt.data = (uint8_t *)inBuffer;
 	pkt.size = inBufferLength;
 #endif
 	/*audio stream*/
 	if (ffd->st==GF_STREAM_AUDIO) {
 		s32 len;
 		u32 buf_size = (*outBufferLength);
+
 		(*outBufferLength) = 0;
 
 		/*seeking don't decode*/
@@ -628,7 +712,11 @@
 		if (ffd->frame_start>inBufferLength) ffd->frame_start = 0;
 
 redecode:
-#ifdef USE_AVCODEC2
+
+#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;
+#elif defined(USE_AVCODEC2)
 		gotpic = 192000;
 		len = avcodec_decode_audio3(ctx, (short *)ffd->audio_buf, &gotpic, &pkt);
 #else
@@ -640,7 +728,8 @@
 
 		/*first config*/
 		if (!ffd->out_size) {
-			if (ctx->channels * ctx->frame_size* 2 < gotpic) ctx->frame_size = gotpic / 2 * ctx->channels;
+			if (ctx->channels * ctx->frame_size* 2 < gotpic) ctx->frame_size = gotpic / (2 * ctx->channels);
+
 			ffd->out_size = ctx->channels * ctx->frame_size * 2 /* 16 / 8 */;
 		}
 		if (ffd->out_size < (u32) gotpic) {
@@ -656,8 +745,28 @@
 			return GF_BUFFER_TOO_SMALL;
 		}
 
+#if defined(USE_AVCTX3)
+		if (ffd->audio_frame->format==AV_SAMPLE_FMT_FLTP) {
+			s32 i, j;
+			s16 *output = (s16 *) outBuffer;
+			for (j=0; j<ctx->channels; j++) {
+				Float* inputChannel = (Float*)ffd->audio_frame->extended_data[j];
+				for (i=0 ; i<ffd->audio_frame->nb_samples ; i++) {
+					Float sample = inputChannel[i];
+					if (sample<-1.0f) sample=-1.0f;
+					else if (sample>1.0f) sample=1.0f;
+					
+					output[i*ctx->channels + j] = (int16_t) (sample * GF_SHORT_MAX );
+				}
+			}
+		} else {
+			memcpy(outBuffer, ffd->audio_frame->data, sizeof(char) * ffd->audio_frame->nb_samples * ctx->channels*2);
+		}
+#else
 		/*we're sure to have at least gotpic bytes available in output*/
 		memcpy(outBuffer, ffd->audio_buf, sizeof(char) * gotpic);
+#endif
+
 		(*outBufferLength) += gotpic;
 		outBuffer += gotpic;
 
@@ -686,10 +795,10 @@
 			if (ffd->raw_pix_fmt==PIX_FMT_BGR24) {
 				s32 i, j;
 				for (j=0; j<ctx->height; j++) {
-					u8 *src = inBuffer + j*3*ctx->width;
-					u8 *dst = outBuffer + j*3*ctx->width;
+					u8 *src = (u8 *) inBuffer + j*3*ctx->width;
+					u8 *dst = (u8 *)outBuffer + j*3*ctx->width;
 					if (ffd->flipped) {
-						dst = outBuffer + (ctx->height-j-1) * 3*ctx->width;
+						dst = (u8 *)outBuffer + (ctx->height-j-1) * 3*ctx->width;
 					}
 					for (i=0; i<ctx->width; i++) {
 						dst[0] = src[2];
@@ -820,11 +929,40 @@
 		return GF_BUFFER_TOO_SMALL;
 	}
 
-
+	stride = frame->linesize[0];
+#ifndef NO_10bit
+    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)) {
-		outsize = ctx->width * ctx->height * 3;
-		if (ffd->out_pix_fmt != GF_PIXEL_RGB_24) outsize /= 2;
+	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->stride = (!ffd->conv_to_8bit && ffd->direct_output) ? frame->linesize[0] : ctx->width;
+		if (ffd->out_pix_fmt == GF_PIXEL_RGB_24) {
+			outsize = ctx->width * ctx->height * 3;
+		}
+#ifndef NO_10bit
+		//this YUV format is handled natively in GPAC
+		else if ((ctx->pix_fmt == PIX_FMT_YUV420P10LE) && !ffd->output_as_8bit) {
+			ffd->stride = ffd->direct_output ? frame->linesize[0] : ctx->width*2;
+			outsize = ffd->stride * ctx->height * 3 / 2;
+			ffd->out_pix_fmt = GF_PIXEL_YV12_10;
+		}
+#endif
+		//the rest will be YUV
+		else {
+			outsize = ffd->stride * ctx->height * 3 / 2;
+			ffd->out_pix_fmt = GF_PIXEL_YV12;
+		}
+
 		if (ffd->depth_codec) {
 			outsize = 5 * ctx->width * ctx->height / 2;
 			ffd->yuv_size = 3 * ctx->width * ctx->height / 2;
@@ -853,6 +991,11 @@
 		}
 #endif
 		ffd->had_pic = 1;
+
+		if (ffd->conv_to_8bit && ffd->direct_output) {
+			ffd->conv_buffer = gf_realloc(ffd->conv_buffer, sizeof(char)*ffd->out_size);
+		}
+
 		return GF_BUFFER_TOO_SMALL;
 	}
 	/*check PAR in case on-the-fly change*/
@@ -875,12 +1018,40 @@
 
 	if (!gotpic) return GF_OK;
 
+#if (LIBAVCODEC_VERSION_MAJOR>52)
+	//fixme - investigate this, happens in some dash cases 
+	if ((frame->width!=ctx->width) || (frame->height!=ctx->height))  {
+		*outBufferLength = 0;
+		return GF_OK;
+	}
+#endif
+
+	if (ffd->direct_output && !ffd->conv_to_8bit) {
+		*outBufferLength = ffd->out_size;
+		return GF_OK;
+	}
+
+	if (ffd->conv_to_8bit) {
+		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 = 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;	
+		return GF_OK;
+	}
+
+
 	if (ES_ID == ffd->depth_ES_ID) {
 		s32 i;
 		u8 *pYO, *pYD;
 
 		pYO = frame->data[0];
-		pYD = outBuffer+ffd->yuv_size;
+		pYD = (u8 *) outBuffer+ffd->yuv_size;
 		for (i=0; i<ctx->height; i++) {
 			memcpy(pYD, pYO, sizeof(char) * ctx->width);
 			pYD += ctx->width;
@@ -921,18 +1092,25 @@
 		*outBufferLength = ffd->out_size;
 	}
 #else
+
 	memset(&pict, 0, sizeof(pict));
 	if (ffd->out_pix_fmt==GF_PIXEL_RGB_24) {
-		pict.data[0] = outBuffer;
+		pict.data[0] =  (uint8_t *)outBuffer;
 		pict.linesize[0] = 3*ctx->width;
 		pix_out = PIX_FMT_RGB24;
 	} else {
-		pict.data[0] = outBuffer;
-		pict.data[1] = outBuffer + ctx->width * ctx->height;
-		pict.data[2] = outBuffer + 5 * ctx->width * ctx->height / 4;
-		pict.linesize[0] = ctx->width;
-		pict.linesize[1] = pict.linesize[2] = ctx->width/2;
+		pict.data[0] =  (uint8_t *)outBuffer;
+		pict.data[1] =  (uint8_t *)outBuffer + ffd->stride * ctx->height;
+		pict.data[2] =  (uint8_t *)outBuffer + 5 * ffd->stride * ctx->height / 4;
+		pict.linesize[0] = ffd->stride;
+		pict.linesize[1] = pict.linesize[2] = ffd->stride/2;
 		pix_out = PIX_FMT_YUV420P;
+#ifndef NO_10bit
+		//this YUV format is handled natively in GPAC
+		if (ctx->pix_fmt==PIX_FMT_YUV420P10LE) {
+			pix_out = PIX_FMT_YUV420P10LE;
+		}
+#endif
 		if (!mmlevel && frame->interlaced_frame) {
 			avpicture_deinterlace((AVPicture *) frame, (AVPicture *) frame, ctx->pix_fmt, ctx->width, ctx->height);
 		}
@@ -962,6 +1140,31 @@
 	return GF_OK;
 }
 
+static GF_Err FFDEC_GetOutputBuffer(GF_MediaDecoder *ifcg, u16 ES_ID, u8 **pY_or_RGB, u8 **pU, u8 **pV)
+{
+	FFDec *ffd = ifcg->privateStack;
+	AVFrame *frame;
+	
+
+	if (ffd->conv_buffer) {
+		*pY_or_RGB = (u8 *) ffd->conv_buffer;
+		*pU = (u8 *) ffd->conv_buffer + ffd->stride * ffd->base_ctx->height;
+		*pV = (u8 *) ffd->conv_buffer + 5*ffd->stride * ffd->base_ctx->height/4;
+		return GF_OK;
+	}
+
+	if (ES_ID && (ffd->depth_ES_ID==ES_ID)) {
+		frame = ffd->depth_frame;
+		*pY_or_RGB = frame->data[0];
+	} else {
+		frame = ffd->base_frame;
+		*pY_or_RGB = frame->data[0];
+		*pU = frame->data[1];
+		*pV = frame->data[2];
+	} 
+	return GF_OK;
+}
+
 static u32 FFDEC_CanHandleStream(GF_BaseDecoder *plug, u32 StreamType, GF_ESD *esd, u8 PL)
 {
 	GF_BitStream *bs;
@@ -1040,7 +1243,11 @@
 		/*H264 (not std OTI, just the way we use it internally)*/
 		case GPAC_OTI_VIDEO_AVC:
 			codec_id = CODEC_ID_H264; break;
-		/*MPEG1 video*/
+#ifdef HAS_HEVC
+        case GPAC_OTI_VIDEO_HEVC:
+            codec_id = AV_CODEC_ID_HEVC; break;
+#endif
+        /*MPEG1 video*/
 		case GPAC_OTI_VIDEO_MPEG1:
 		/*MPEG2 video*/
 		case GPAC_OTI_VIDEO_MPEG2_SIMPLE:
@@ -1088,7 +1295,7 @@
 		return NULL;
 	ffd = dec->privateStack;
 	if (ffd && ffd->base_codec) {
-		sprintf(ffd->szCodec, "FFMPEG %s", ffd->base_codec->name ? ffd->base_codec->name : "unknown");
+		sprintf(ffd->szCodec, "FFMPEG %s - version %s", ffd->base_codec->name ? ffd->base_codec->name : "unknown", LIBAVCODEC_IDENT);
 		return ffd->szCodec;
 	}
 	return NULL;
@@ -1120,6 +1327,7 @@
 	ptr->CanHandleStream = FFDEC_CanHandleStream;
 	ptr->GetName = FFDEC_GetCodecName;
 	ptr->ProcessData = FFDEC_ProcessData;
+	ptr->GetOutputBuffer = FFDEC_GetOutputBuffer;
 
 	GF_REGISTER_MODULE_INTERFACE(ptr, GF_MEDIA_DECODER_INTERFACE, "FFMPEG decoder", "gpac distribution");
 	return (GF_BaseInterface *) ptr;

gpac-0.5.0.svn4668.tar.bz2/modules/ffmpeg_in/ffmpeg_demux.c -> gpac-0.5.0.svn5178.tar.bz2/modules/ffmpeg_in/ffmpeg_demux.c Changed

@@ -69,8 +69,6 @@
 {
 	AVPacket pkt;
 	s64 seek_to;
-	u64 seek_audio, seek_video;
-	Bool video_init, do_seek, map_audio_time, map_video_time;
 	GF_NetworkCommand com;
 	GF_NetworkCommand map;
 	GF_SLHeader slh;
@@ -80,27 +78,23 @@
 	map.command_type = GF_NET_CHAN_MAP_TIME;
 
 	memset(&com, 0, sizeof(GF_NetworkCommand));
-	com.command_type = GF_NET_CHAN_BUFFER_QUERY;
+	com.command_type = GF_NET_BUFFER_QUERY;
 
 	memset(&slh, 0, sizeof(GF_SLHeader));
-
+	
 	slh.compositionTimeStampFlag = slh.decodingTimeStampFlag = 1;
-	seek_to = (s64) (AV_TIME_BASE*ffd->seek_time);
-	map_video_time = !ffd->seekable;
-
-	video_init = (seek_to && ffd->video_ch) ? GF_FALSE : GF_TRUE;
-	seek_audio = seek_video = 0;
-	if (ffd->seekable && (ffd->audio_st>=0)) seek_audio = (u64) (s64) (ffd->seek_time*ffd->audio_tscale.den);
-	if (ffd->seekable && (ffd->video_st>=0)) seek_video = (u64) (s64) (ffd->seek_time*ffd->video_tscale.den);
-
-	/*it appears that ffmpeg has trouble resyncing on some mpeg files - we trick it by restarting to 0 to get the
-	first video frame, and only then seek*/
-	if (ffd->seekable) av_seek_frame(ffd->ctx, -1, video_init ? seek_to : 0, AVSEEK_FLAG_BACKWARD);
-	do_seek = !video_init;
-	map_audio_time = video_init ? ffd->unreliable_audio_timing : 0;
 
 	while (ffd->is_running) {
+		if ((!ffd->video_ch && (ffd->video_st>=0)) || (!ffd->audio_ch && (ffd->audio_st>=0))) {
+			gf_sleep(100);
+			continue;
+		}
 
+		if ((ffd->seek_time>=0) && ffd->seekable) {
+			seek_to = (s64) (AV_TIME_BASE*ffd->seek_time);
+			av_seek_frame(ffd->ctx, -1, seek_to, AVSEEK_FLAG_BACKWARD);
+			ffd->seek_time = -1;
+		}
 		pkt.stream_index = -1;
 		/*EOF*/
 		if (av_read_frame(ffd->ctx, &pkt) <0) break;
@@ -112,73 +106,41 @@
 
 		gf_mx_p(ffd->mx);
 		/*blindly send audio as soon as video is init*/
-		if (ffd->audio_ch && (pkt.stream_index == ffd->audio_st) && !do_seek) {
+		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 (map_audio_time) {
-				map.base.on_channel = ffd->audio_ch;
-				map.map_time.media_time = ffd->seek_time;
-				/*mapwith TS=0 since we don't use SL*/
-				map.map_time.timestamp = 0;
-				map.map_time.reset_buffers = 1;
-				map_audio_time = 0;
-				gf_term_on_command(ffd->service, &map, GF_OK);
-			}
-			else if (slh.compositionTimeStamp < seek_audio) {
+#if 0
+			if (slh.compositionTimeStamp < seek_audio) {
 				slh.decodingTimeStamp = slh.compositionTimeStamp = seek_audio;
 			}
-			gf_term_on_sl_packet(ffd->service, ffd->audio_ch, pkt.data, pkt.size, &slh, GF_OK);
+#endif
+			gf_term_on_sl_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 we get pts = 0 after a seek the demuxer is reseting PTSs, so force map time*/
-			if ((!do_seek && seek_to && !slh.compositionTimeStamp) || (map_video_time) ) {
-				seek_to = 0;
-				map_video_time = 0;
-
-				map.base.on_channel = ffd->video_ch;
-				map.map_time.timestamp = (u64) pkt.pts;
-//				map.map_time.media_time = ffd->seek_time;
-				map.map_time.media_time = 0;
-				map.map_time.reset_buffers = 0;
-				gf_term_on_command(ffd->service, &map, GF_OK);
-			}
-			else if (slh.compositionTimeStamp < seek_video) {
+#if 0
+			if (slh.compositionTimeStamp < seek_video) {
 				slh.decodingTimeStamp = slh.compositionTimeStamp = seek_video;
 			}
-			gf_term_on_sl_packet(ffd->service, ffd->video_ch, pkt.data, pkt.size, &slh, GF_OK);
-			video_init = 1;
+#endif
+			gf_term_on_sl_packet(ffd->service, ffd->video_ch, (char *) pkt.data, pkt.size, &slh, GF_OK);
 		}
 		gf_mx_v(ffd->mx);
 		av_free_packet(&pkt);
 
-		/*here's the trick - only seek after sending the first packets of each stream - this allows ffmpeg video decoders
-		to resync properly*/
-		if (do_seek && video_init && ffd->seekable) {
-			av_seek_frame(ffd->ctx, -1, seek_to, AVSEEK_FLAG_BACKWARD);
-			do_seek = 0;
-			map_audio_time = ffd->unreliable_audio_timing;
-		}
 		/*sleep untill the buffer occupancy is too low - note that this work because all streams in this
 		demuxer are synchronized*/
-		while (1) {
-			if (ffd->audio_ch) {
-				com.base.on_channel = ffd->audio_ch;
-				gf_term_on_command(ffd->service, &com, GF_OK);
-				if (com.buffer.occupancy < ffd->data_buffer_ms) break;
-			}
-			if (ffd->video_ch) {
-				com.base.on_channel = ffd->video_ch;
-				gf_term_on_command(ffd->service, &com, GF_OK);
-				if (com.buffer.occupancy < ffd->data_buffer_ms) break;
-			}
+		while (ffd->audio_run || ffd->video_run) {
+			gf_term_on_command(ffd->service, &com, GF_OK);
+			if (com.buffer.occupancy < com.buffer.max) 
+				break;
 			gf_sleep(10);
 
-			/*escape if disconnect*/
-			if (!ffd->audio_run && !ffd->video_run) break;
 		}
 		if (!ffd->audio_run && !ffd->video_run) break;
 	}
@@ -401,7 +363,7 @@
 			gf_bs_write_u32(bs, dec->bit_rate);
 			gf_bs_write_u32(bs, dec->codec_tag);
 			if (dec->extradata_size) {
-				gf_bs_write_data(bs, dec->extradata, dec->extradata_size);
+				gf_bs_write_data(bs, (char *) dec->extradata, dec->extradata_size);
 			}
 			gf_bs_get_content(bs, (char **) &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
 			gf_bs_del(bs);
@@ -446,7 +408,7 @@
 			gf_bs_write_u32(bs, dec->pix_fmt);
 
 			if (dec->extradata_size) {
-				gf_bs_write_data(bs, dec->extradata, dec->extradata_size);
+				gf_bs_write_data(bs, (char *) dec->extradata, dec->extradata_size);
 			}
 			gf_bs_get_content(bs, (char **) &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
 			gf_bs_del(bs);
@@ -620,7 +582,7 @@
 		} else {
 			pd.filename = szName;
 			pd.buf_size = ffd->buffer_used;
-			pd.buf = ffd->buffer;
+			pd.buf = (u8 *) ffd->buffer;
 			av_in = av_probe_input_format(&pd, 1);
 			if (!av_in) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[FFMPEG] error probing file %s - probe start with %c %c %c %c\n", url, ffd->buffer[0], ffd->buffer[1], ffd->buffer[2], ffd->buffer[3]));
@@ -881,7 +843,6 @@
 	case GF_NET_CHAN_INTERACTIVE:
 		return ffd->seekable ? GF_OK : GF_NOT_SUPPORTED;
 	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 0;
 		return GF_OK;
 	case GF_NET_CHAN_DURATION:
 		if (ffd->ctx->duration == AV_NOPTS_VALUE)

gpac-0.5.0.svn4668.tar.bz2/modules/ffmpeg_in/ffmpeg_in.h -> gpac-0.5.0.svn5178.tar.bz2/modules/ffmpeg_in/ffmpeg_in.h Changed

gpac-0.5.0.svn4668.tar.bz2/modules/freenect/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/freenect/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/freenect/freenect.c -> gpac-0.5.0.svn5178.tar.bz2/modules/freenect/freenect.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ft_font/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/ft_font/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ft_font/ft_font.c -> gpac-0.5.0.svn5178.tar.bz2/modules/ft_font/ft_font.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/gapi/gapi.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/gapi/gapi.cpp Changed

gpac-0.5.0.svn4668.tar.bz2/modules/gdip_raster/gdip_texture.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/gdip_raster/gdip_texture.cpp Changed

gpac-0.5.0.svn4668.tar.bz2/modules/gpac_js/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/gpac_js/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/gpac_js/gpac_js.c -> gpac-0.5.0.svn5178.tar.bz2/modules/gpac_js/gpac_js.c Changed

@@ -121,15 +121,15 @@
 		*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(term->compositor->trans_y)) );
 	}
 	else if (!strcmp(prop_name, "rectangular_textures")) {
-		Bool any_size = 0;
+		Bool any_size = GF_FALSE;
 #ifndef GPAC_DISABLE_3D
 		if (term->compositor->gl_caps.npot_texture || term->compositor->gl_caps.rect_texture)
-			any_size = 1;
+			any_size = GF_TRUE;
 #endif
 		*vp = BOOLEAN_TO_JSVAL( any_size ? JS_TRUE : JS_FALSE );
 	}
 	else if (!strcmp(prop_name, "batteryOn")) {
-		Bool on_battery = 0;
+		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 );
 	}
@@ -183,11 +183,21 @@
 		*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGB) ? 1 : 0 );
 	}
 	else if (!strcmp(prop_name, "hardware_rgba")) {
-		*vp = INT_TO_JSVAL( (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGBA) ? 1 : 0 );
+		u32 has_rgba = (term->compositor->video_out->hw_caps & GF_VIDEO_HW_HAS_RGBA) ? 1 : 0;
+#ifndef GPAC_DISABLE_3D
+		if (term->compositor->hybrid_opengl || term->compositor->is_opengl) has_rgba = 1;
+#endif
+		*vp = INT_TO_JSVAL( has_rgba  );
 	}
 	else if (!strcmp(prop_name, "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")) {
+		*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_width);
+	}
+	else if (!strcmp(prop_name, "screen_height")) {
+		*vp = INT_TO_JSVAL( term->compositor->video_out->max_screen_height);
+	}
 	else if (!strcmp(prop_name, "http_bitrate")) {
 		*vp = INT_TO_JSVAL( gf_dm_get_data_rate(term->downloader)*8/1024);
 	}
@@ -572,6 +582,7 @@
 	GF_Event evt;
 	SMJS_OBJ
 	GF_Terminal *term = gpac_get_term(c, obj);
+	memset(&evt, 0, sizeof(GF_Event));
 	evt.type = GF_EVENT_QUIT;
 	gf_term_send_event(term, &evt);
 	return JS_TRUE;
@@ -587,7 +598,7 @@
 	if (term->compositor->inherit_type_3d != type_3d) {
 		term->compositor->inherit_type_3d = type_3d;
 		term->compositor->root_visual_setup = 0;
-		term->compositor->reset_graphics = 1;
+		gf_sc_reset_graphics(term->compositor);
 	}
 	return JS_TRUE;
 }
@@ -682,32 +693,32 @@
 
 	if (SMJS_ID_IS_INT(id)) {
 		switch (SMJS_ID_TO_INT(id)) {
-		case 0:
-			*vp = INT_TO_JSVAL(evt->type);
-			break;
-		case 1:
+		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:
+		case -2:
 			*vp = INT_TO_JSVAL(evt->mouse.x); 
 			break;
-		case 3:
+		case -3:
 			*vp = INT_TO_JSVAL(evt->mouse.y); 
 			break;
-		case 4:
+		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:
+		case -5:
 			*vp = DOUBLE_TO_JSVAL( JS_NewDouble(c, FIX2FLT(evt->mouse.wheel_pos)) );
 			break;
-		case 6:
+		case -6:
 			*vp = INT_TO_JSVAL( evt->mouse.button);
 			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));
@@ -879,13 +890,13 @@
 	GF_JSAPIParam par;
 
 	JSPropertySpec gpacEvtClassProps[] = {
-		SMJS_PROPERTY_SPEC("type",			 0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("keycode",			 1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("mouse_x",			 2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("mouse_y",			 3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		SMJS_PROPERTY_SPEC("picked",			 4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-		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("keycode",			 -1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("mouse_x",			 -2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("mouse_y",			 -3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		SMJS_PROPERTY_SPEC("picked",			 -4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+		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(0, 0, 0, 0, 0)
 	};
 	JSFunctionSpec gpacEvtClassFuncs[] = {

gpac-0.5.0.svn4668.tar.bz2/modules/hyb_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/hyb_in/fm_fake_pull.c -> gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/fm_fake_pull.c Changed

@@ -1,220 +1,220 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-20xx
- *					All rights reserved
- *
- *  This file is part of GPAC / Hybrid Media input module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-/*hybrid media interface implementation generating fake audio consisting in beeps every second in pull mode*/
-
-#include <gpac/thread.h>
-#include "hyb_in.h"
-
-/**********************************************************************************************************************/
-
-#define EXT_MEDIA_LOAD_THREADED
-
-/**********************************************************************************************************************/
-
-#define FM_FAKE_PULL_AUDIO_FREQ 44100
-#define FM_FAKE_PULL_CHAN_NUM	2
-#define FM_FAKE_PULL_BITS		16
-#define FM_FAKE_PULL_TYPE		s16
-#define FM_FAKE_PULL_FRAME_DUR	60		/*in ms*/
-#define FM_FAKE_PULL_FRAME_LEN	((FM_FAKE_PULL_FRAME_DUR*FM_FAKE_PULL_CHAN_NUM*FM_FAKE_PULL_BITS*FM_FAKE_PULL_AUDIO_FREQ)/(1000*8))		/*in bytes*/
-
-/**********************************************************************************************************************/
-
-typedef struct s_FM_FAKE_PULL {
-	u64 PTS;
-	unsigned char buffer10[FM_FAKE_PULL_FRAME_LEN]; /*played 10 percent of time*/
-	unsigned char buffer90[FM_FAKE_PULL_FRAME_LEN]; /*played 90 percent of time*/
-
-#ifdef EXT_MEDIA_LOAD_THREADED
-	GF_Thread *media_th;
-#endif
-} FM_FAKE_PULL;
-FM_FAKE_PULL FM_FAKE_PULL_private_data;
-
-/**********************************************************************************************************************/
-
-static Bool FM_FAKE_PULL_CanHandleURL(const char *url);
-static GF_ObjectDescriptor* FM_FAKE_PULL_GetOD(void);
-static GF_Err FM_FAKE_PULL_Connect(GF_HYBMEDIA *self, GF_ClientService *service, const char *url);
-static GF_Err FM_FAKE_PULL_Disconnect(GF_HYBMEDIA *self);
-static GF_Err FM_FAKE_PULL_GetData(GF_HYBMEDIA *self, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr);
-static GF_Err FM_FAKE_PULL_ReleaseData(GF_HYBMEDIA *self);
-
-GF_HYBMEDIA master_fm_fake_pull = {
-	"Fake FM (pull mode)",		/*name*/
-	FM_FAKE_PULL_CanHandleURL,	/*CanHandleURL()*/
-	FM_FAKE_PULL_GetOD,			/*GetOD()*/
-	FM_FAKE_PULL_Connect,		/*Connect()*/
-	FM_FAKE_PULL_Disconnect,	/*Disconnect()*/
-	NULL,						/*SetState()*/
-	FM_FAKE_PULL_GetData,		/*GetData()*/
-	FM_FAKE_PULL_ReleaseData,	/*ReleaseData()*/
-	HYB_PULL,					/*data_mode*/
-	&FM_FAKE_PULL_private_data	/*private_data*/
-};
-
-/**********************************************************************************************************************/
-
-static Bool FM_FAKE_PULL_CanHandleURL(const char *url)
-{
-	if (!strnicmp(url, "fm://fake_pull", 14))
-		return 1;
-
-	return 0;
-}
-
-/**********************************************************************************************************************/
-
-static GF_ESD* get_esd()
-{
-	GF_BitStream *dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	GF_ESD *esd = gf_odf_desc_esd_new(0);
-
-	esd->ESID = 1;
-	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
-	esd->decoderConfig->avgBitrate = esd->decoderConfig->maxBitrate = 0;
-	esd->slConfig->timestampResolution = FM_FAKE_PULL_AUDIO_FREQ;
-
-	/*Decoder Specific Info for raw media*/
-	gf_bs_write_u32(dsi, FM_FAKE_PULL_AUDIO_FREQ);	/*u32 sample_rate*/
-	gf_bs_write_u16(dsi, FM_FAKE_PULL_CHAN_NUM);	/*u16 nb_channels*/
-	gf_bs_write_u16(dsi, FM_FAKE_PULL_BITS);		/*u16 nb_bits_per_sample*/
-	gf_bs_write_u32(dsi, FM_FAKE_PULL_FRAME_LEN);	/*u32 frame_size*/
-	gf_bs_write_u32(dsi, 0);						/*u32 channel_config*/
-	gf_bs_get_content(dsi, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-	gf_bs_del(dsi);
-
-	return esd;
-}
-
-/**********************************************************************************************************************/
-
-static GF_ObjectDescriptor* FM_FAKE_PULL_GetOD(void)
-{
-	/*declare object to terminal*/
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-	GF_ESD *esd = get_esd();
-	od->objectDescriptorID = 1;
-	gf_list_add(od->ESDescriptors, esd);
-	return od;
-}
-
-/**********************************************************************************************************************/
-
-static u32 ext_media_load_th(void *par) {
-	GF_HYBMEDIA *self = (GF_HYBMEDIA*) par;
-	/*declare object to terminal*/
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-	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);
-	return 0;
-}
-
-static GF_Err FM_FAKE_PULL_Connect(GF_HYBMEDIA *self, GF_ClientService *service, const char *url)
-{
-	u32 i;
-
-	if (!self)
-		return GF_BAD_PARAM;
-
-	if (!service)
-		return GF_BAD_PARAM;
-
-	self->owner = service;
-
-	/*set audio preloaded data*/
-	assert(self->private_data);
-	memset(self->private_data, 0, sizeof(FM_FAKE_PULL));
-	for (i=0; i<(FM_FAKE_PULL_FRAME_LEN*8)/FM_FAKE_PULL_BITS; i++) {
-		if (((2*i)/(FM_FAKE_PULL_CHAN_NUM*100))%2) /*100Hz*/
-			*((FM_FAKE_PULL_TYPE*)((FM_FAKE_PULL*)self->private_data)->buffer10+i) = 1 << (FM_FAKE_PULL_BITS-1);
-	}
-
-	/*for hybrid scenarios: add an external media*/
-	if (1) {
-#ifdef EXT_MEDIA_LOAD_THREADED
-		GF_Thread **th = &((FM_FAKE_PULL*)self->private_data)->media_th;
-		assert(*th == NULL);	//once at a time
-		*th = gf_th_new("HYB-FM fake external media load thread");
-		gf_th_run(*th, ext_media_load_th, self);
-#else
-		ext_media_load_th(self);
-#endif
-		//wait for video to begin as late video creates desynchro.
-		//gf_sleep(5000);
-	}
-
-	return GF_OK;
-}
-
-/**********************************************************************************************************************/
-
-static GF_Err FM_FAKE_PULL_Disconnect(GF_HYBMEDIA *self)
-{
-	FM_FAKE_PULL *priv = (FM_FAKE_PULL*)self->private_data;
-	self->owner = NULL;
-#ifdef EXT_MEDIA_LOAD_THREADED
-	gf_th_del(priv->media_th);
-#endif
-	return GF_OK;
-}
-
-/**********************************************************************************************************************/
-
-static GF_Err FM_FAKE_PULL_GetData(GF_HYBMEDIA *self, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr)
-{
-	u64 delta_pts = (FM_FAKE_PULL_FRAME_DUR*FM_FAKE_PULL_AUDIO_FREQ)/1000;
-	assert(!(FM_FAKE_PULL_FRAME_DUR*FM_FAKE_PULL_AUDIO_FREQ%1000));
-
-	/*write SL header*/
-	memset(out_sl_hdr, 0, sizeof(GF_SLHeader));
-	out_sl_hdr->compositionTimeStampFlag = 1;
-	out_sl_hdr->compositionTimeStamp = ((FM_FAKE_PULL*)self->private_data)->PTS;
-	out_sl_hdr->accessUnitStartFlag = 1;
-
-	/*write audio data*/
-	if ((((FM_FAKE_PULL*)self->private_data)->PTS%(10*delta_pts))) {
-		*out_data_ptr = ((FM_FAKE_PULL*)self->private_data)->buffer90;
-	} else {
-		*out_data_ptr = ((FM_FAKE_PULL*)self->private_data)->buffer10;
-	}
-	*out_data_size = FM_FAKE_PULL_FRAME_LEN;
-	((FM_FAKE_PULL*)self->private_data)->PTS += delta_pts;
-
-	return GF_OK;
-}
-
-/**********************************************************************************************************************/
-
-static GF_Err FM_FAKE_PULL_ReleaseData(GF_HYBMEDIA *self)
-{
-	return GF_OK;
-}
-
-/**********************************************************************************************************************/
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-20xx
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Hybrid Media input module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+/*hybrid media interface implementation generating fake audio consisting in beeps every second in pull mode*/
+
+#include <gpac/thread.h>
+#include "hyb_in.h"
+
+/**********************************************************************************************************************/
+
+#define EXT_MEDIA_LOAD_THREADED
+
+/**********************************************************************************************************************/
+
+#define FM_FAKE_PULL_AUDIO_FREQ 44100
+#define FM_FAKE_PULL_CHAN_NUM	2
+#define FM_FAKE_PULL_BITS		16
+#define FM_FAKE_PULL_TYPE		s16
+#define FM_FAKE_PULL_FRAME_DUR	60		/*in ms*/
+#define FM_FAKE_PULL_FRAME_LEN	((FM_FAKE_PULL_FRAME_DUR*FM_FAKE_PULL_CHAN_NUM*FM_FAKE_PULL_BITS*FM_FAKE_PULL_AUDIO_FREQ)/(1000*8))		/*in bytes*/
+
+/**********************************************************************************************************************/
+
+typedef struct s_FM_FAKE_PULL {
+	u64 PTS;
+	unsigned char buffer10[FM_FAKE_PULL_FRAME_LEN]; /*played 10 percent of time*/
+	unsigned char buffer90[FM_FAKE_PULL_FRAME_LEN]; /*played 90 percent of time*/
+
+#ifdef EXT_MEDIA_LOAD_THREADED
+	GF_Thread *media_th;
+#endif
+} FM_FAKE_PULL;
+FM_FAKE_PULL FM_FAKE_PULL_private_data;
+
+/**********************************************************************************************************************/
+
+static Bool FM_FAKE_PULL_CanHandleURL(const char *url);
+static GF_ObjectDescriptor* FM_FAKE_PULL_GetOD(void);
+static GF_Err FM_FAKE_PULL_Connect(GF_HYBMEDIA *self, GF_ClientService *service, const char *url);
+static GF_Err FM_FAKE_PULL_Disconnect(GF_HYBMEDIA *self);
+static GF_Err FM_FAKE_PULL_GetData(GF_HYBMEDIA *self, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr);
+static GF_Err FM_FAKE_PULL_ReleaseData(GF_HYBMEDIA *self);
+
+GF_HYBMEDIA master_fm_fake_pull = {
+	"Fake FM (pull mode)",		/*name*/
+	FM_FAKE_PULL_CanHandleURL,	/*CanHandleURL()*/
+	FM_FAKE_PULL_GetOD,			/*GetOD()*/
+	FM_FAKE_PULL_Connect,		/*Connect()*/
+	FM_FAKE_PULL_Disconnect,	/*Disconnect()*/
+	NULL,						/*SetState()*/
+	FM_FAKE_PULL_GetData,		/*GetData()*/
+	FM_FAKE_PULL_ReleaseData,	/*ReleaseData()*/
+	HYB_PULL,					/*data_mode*/
+	&FM_FAKE_PULL_private_data	/*private_data*/
+};
+
+/**********************************************************************************************************************/
+
+static Bool FM_FAKE_PULL_CanHandleURL(const char *url)
+{
+	if (!strnicmp(url, "fm://fake_pull", 14))
+		return 1;
+
+	return 0;
+}
+
+/**********************************************************************************************************************/
+
+static GF_ESD* get_esd()
+{
+	GF_BitStream *dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	GF_ESD *esd = gf_odf_desc_esd_new(0);
+
+	esd->ESID = 1;
+	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+	esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
+	esd->decoderConfig->avgBitrate = esd->decoderConfig->maxBitrate = 0;
+	esd->slConfig->timestampResolution = FM_FAKE_PULL_AUDIO_FREQ;
+
+	/*Decoder Specific Info for raw media*/
+	gf_bs_write_u32(dsi, FM_FAKE_PULL_AUDIO_FREQ);	/*u32 sample_rate*/
+	gf_bs_write_u16(dsi, FM_FAKE_PULL_CHAN_NUM);	/*u16 nb_channels*/
+	gf_bs_write_u16(dsi, FM_FAKE_PULL_BITS);		/*u16 nb_bits_per_sample*/
+	gf_bs_write_u32(dsi, FM_FAKE_PULL_FRAME_LEN);	/*u32 frame_size*/
+	gf_bs_write_u32(dsi, 0);						/*u32 channel_config*/
+	gf_bs_get_content(dsi, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+	gf_bs_del(dsi);
+
+	return esd;
+}
+
+/**********************************************************************************************************************/
+
+static GF_ObjectDescriptor* FM_FAKE_PULL_GetOD(void)
+{
+	/*declare object to terminal*/
+	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
+	GF_ESD *esd = get_esd();
+	od->objectDescriptorID = 1;
+	gf_list_add(od->ESDescriptors, esd);
+	return od;
+}
+
+/**********************************************************************************************************************/
+
+static u32 ext_media_load_th(void *par) {
+	GF_HYBMEDIA *self = (GF_HYBMEDIA*) par;
+	/*declare object to terminal*/
+	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
+	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);
+	return 0;
+}
+
+static GF_Err FM_FAKE_PULL_Connect(GF_HYBMEDIA *self, GF_ClientService *service, const char *url)
+{
+	u32 i;
+
+	if (!self)
+		return GF_BAD_PARAM;
+
+	if (!service)
+		return GF_BAD_PARAM;
+
+	self->owner = service;
+
+	/*set audio preloaded data*/
+	assert(self->private_data);
+	memset(self->private_data, 0, sizeof(FM_FAKE_PULL));
+	for (i=0; i<(FM_FAKE_PULL_FRAME_LEN*8)/FM_FAKE_PULL_BITS; i++) {
+		if (((2*i)/(FM_FAKE_PULL_CHAN_NUM*100))%2) /*100Hz*/
+			*((FM_FAKE_PULL_TYPE*)((FM_FAKE_PULL*)self->private_data)->buffer10+i) = 1 << (FM_FAKE_PULL_BITS-1);
+	}
+
+	/*for hybrid scenarios: add an external media*/
+	if (1) {
+#ifdef EXT_MEDIA_LOAD_THREADED
+		GF_Thread **th = &((FM_FAKE_PULL*)self->private_data)->media_th;
+		assert(*th == NULL);	//once at a time
+		*th = gf_th_new("HYB-FM fake external media load thread");
+		gf_th_run(*th, ext_media_load_th, self);
+#else
+		ext_media_load_th(self);
+#endif
+		//wait for video to begin as late video creates desynchro.
+		//gf_sleep(5000);
+	}
+
+	return GF_OK;
+}
+
+/**********************************************************************************************************************/
+
+static GF_Err FM_FAKE_PULL_Disconnect(GF_HYBMEDIA *self)
+{
+	FM_FAKE_PULL *priv = (FM_FAKE_PULL*)self->private_data;
+	self->owner = NULL;
+#ifdef EXT_MEDIA_LOAD_THREADED
+	gf_th_del(priv->media_th);
+#endif
+	return GF_OK;
+}
+
+/**********************************************************************************************************************/
+
+static GF_Err FM_FAKE_PULL_GetData(GF_HYBMEDIA *self, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr)
+{
+	u64 delta_pts = (FM_FAKE_PULL_FRAME_DUR*FM_FAKE_PULL_AUDIO_FREQ)/1000;
+	assert(!(FM_FAKE_PULL_FRAME_DUR*FM_FAKE_PULL_AUDIO_FREQ%1000));
+
+	/*write SL header*/
+	memset(out_sl_hdr, 0, sizeof(GF_SLHeader));
+	out_sl_hdr->compositionTimeStampFlag = 1;
+	out_sl_hdr->compositionTimeStamp = ((FM_FAKE_PULL*)self->private_data)->PTS;
+	out_sl_hdr->accessUnitStartFlag = 1;
+
+	/*write audio data*/
+	if ((((FM_FAKE_PULL*)self->private_data)->PTS%(10*delta_pts))) {
+		*out_data_ptr = ((FM_FAKE_PULL*)self->private_data)->buffer90;
+	} else {
+		*out_data_ptr = ((FM_FAKE_PULL*)self->private_data)->buffer10;
+	}
+	*out_data_size = FM_FAKE_PULL_FRAME_LEN;
+	((FM_FAKE_PULL*)self->private_data)->PTS += delta_pts;
+
+	return GF_OK;
+}
+
+/**********************************************************************************************************************/
+
+static GF_Err FM_FAKE_PULL_ReleaseData(GF_HYBMEDIA *self)
+{
+	return GF_OK;
+}
+
+/**********************************************************************************************************************/

gpac-0.5.0.svn4668.tar.bz2/modules/hyb_in/fm_fake_push.c -> gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/fm_fake_push.c Changed

@@ -1,329 +1,329 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-20xx
- *					All rights reserved
- *
- *  This file is part of GPAC / Hybrid Media input module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-/*hybrid media interface implementation generating fake audio consisting in beeps every second in push mode*/
-
-#include <gpac/thread.h>
-#include <gpac/modules/service.h>
-#include <time.h>
-#include "hyb_in.h"
-
-/**********************************************************************************************************************/
-
-#define EXT_MEDIA_LOAD_THREADED
-
-/**********************************************************************************************************************/
-
-#define FM_FAKE_PUSH_AUDIO_FREQ 22050
-#define FM_FAKE_PUSH_CHAN_NUM	2
-#define FM_FAKE_PUSH_BITS		16
-#define FM_FAKE_PUSH_TYPE		s16
-#define FM_FAKE_PUSH_FRAME_DUR	60		/*in ms*/
-#define FM_FAKE_PUSH_FRAME_LEN	((FM_FAKE_PUSH_FRAME_DUR*FM_FAKE_PUSH_CHAN_NUM*FM_FAKE_PUSH_BITS*FM_FAKE_PUSH_AUDIO_FREQ)/(1000*8))		/*in bytes*/
-
-/**********************************************************************************************************************/
-
-typedef struct s_FM_FAKE_PUSH {
-	u64 PTS;
-	unsigned char buffer10[FM_FAKE_PUSH_FRAME_LEN]; /*played 10 percent of time*/
-	unsigned char buffer90[FM_FAKE_PUSH_FRAME_LEN]; /*played 90 percent of time*/
-
-	GF_Thread *th;
-#ifdef EXT_MEDIA_LOAD_THREADED
-	GF_Thread *media_th;
-#endif
-} FM_FAKE_PUSH;
-FM_FAKE_PUSH FM_FAKE_PUSH_private_data;
-
-/**********************************************************************************************************************/
-
-static Bool FM_FAKE_PUSH_CanHandleURL(const char *url);
-static GF_ObjectDescriptor* FM_FAKE_PUSH_GetOD(void);
-static GF_Err FM_FAKE_PUSH_Connect(GF_HYBMEDIA *self, GF_ClientService *service, const char *url);
-static GF_Err FM_FAKE_PUSH_Disconnect(GF_HYBMEDIA *self);
-static GF_Err FM_FAKE_PUSH_SetState(GF_HYBMEDIA *self, const GF_NET_CHAN_CMD state);
-
-GF_HYBMEDIA master_fm_fake_push = {
-	"Fake FM (push mode)",		/*name*/
-	FM_FAKE_PUSH_CanHandleURL,	/*CanHandleURL()*/
-	FM_FAKE_PUSH_GetOD,			/*GetOD()*/
-	FM_FAKE_PUSH_Connect,		/*Connect()*/
-	FM_FAKE_PUSH_Disconnect,	/*Disconnect()*/
-	FM_FAKE_PUSH_SetState,		/*SetState()*/
-	NULL,						/*GetData()*/
-	NULL,						/*ReleaseData()*/
-	HYB_PUSH,					/*data_mode*/
-	&FM_FAKE_PUSH_private_data	/*private_data*/
-};
-
-/**********************************************************************************************************************/
-
-static Bool FM_FAKE_PUSH_CanHandleURL(const char *url)
-{
-	if (!strnicmp(url, "fm://fake_push", 14))
-		return 1;
-
-	return 0;
-}
-
-/**********************************************************************************************************************/
-
-static GF_ESD* get_esd()
-{
-	GF_BitStream *dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	GF_ESD *esd = gf_odf_desc_esd_new(0);
-
-	esd->ESID = 1;
-	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
-	esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
-	esd->decoderConfig->avgBitrate = esd->decoderConfig->maxBitrate = 0;
-	esd->slConfig->timestampResolution = FM_FAKE_PUSH_AUDIO_FREQ;
-
-	/*Decoder Specific Info for raw media*/
-	gf_bs_write_u32(dsi, FM_FAKE_PUSH_AUDIO_FREQ);	/*u32 sample_rate*/
-	gf_bs_write_u16(dsi, FM_FAKE_PUSH_CHAN_NUM);	/*u16 nb_channels*/
-	gf_bs_write_u16(dsi, FM_FAKE_PUSH_BITS);		/*u16 nb_bits_per_sample*/
-	gf_bs_write_u32(dsi, FM_FAKE_PUSH_FRAME_LEN);	/*u32 frame_size*/
-	gf_bs_write_u32(dsi, 0);						/*u32 channel_config*/
-	gf_bs_get_content(dsi, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-	gf_bs_del(dsi);
-
-	return esd;
-}
-
-/**********************************************************************************************************************/
-
-static GF_ObjectDescriptor* FM_FAKE_PUSH_GetOD(void)
-{
-	/*declare object to terminal*/
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-	GF_ESD *esd = get_esd();
-	od->objectDescriptorID = 1;
-	gf_list_add(od->ESDescriptors, esd);
-	return od;
-}
-
-/**********************************************************************************************************************/
-
-static GF_Err GetData(const GF_HYBMEDIA *self, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr)
-{
-	u64 delta_pts = (FM_FAKE_PUSH_FRAME_DUR*FM_FAKE_PUSH_AUDIO_FREQ)/1000;
-	assert(!(FM_FAKE_PUSH_FRAME_DUR*FM_FAKE_PUSH_AUDIO_FREQ%1000));
-
-	/*write SL header*/
-	memset(out_sl_hdr, 0, sizeof(GF_SLHeader));
-	out_sl_hdr->compositionTimeStampFlag = 1;
-	out_sl_hdr->compositionTimeStamp = ((FM_FAKE_PUSH*)self->private_data)->PTS;
-	out_sl_hdr->accessUnitStartFlag = 1;
-
-	/*write audio data*/
-	if ((((FM_FAKE_PUSH*)self->private_data)->PTS%(10*delta_pts))) {
-		*out_data_ptr = ((FM_FAKE_PUSH*)self->private_data)->buffer90;
-	} else {
-		*out_data_ptr = ((FM_FAKE_PUSH*)self->private_data)->buffer10;
-	}
-	*out_data_size = FM_FAKE_PUSH_FRAME_LEN;
-	((FM_FAKE_PUSH*)self->private_data)->PTS += delta_pts;
-
-	return GF_OK;
-}
-
-/**********************************************************************************************************************/
-
-u32 ext_media_load_th(void *par) {
-	GF_HYBMEDIA *self = (GF_HYBMEDIA*) par;
-	/*declare object to terminal*/
-	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
-	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);
-	return 0;
-}
-
-static u32 audio_gen_th(void *par) 
-{
-	GF_Err e;
-	char *data;
-	u32 data_size, init_time;
-	volatile s32 time_to_wait = 0;
-	GF_SLHeader slh;
-	GF_HYBMEDIA *self = (GF_HYBMEDIA*) par;
-	FM_FAKE_PUSH *fm_fake_push = (FM_FAKE_PUSH*)self->private_data;
-	memset(&slh, 0, sizeof(GF_SLHeader));
-
-	{
-		/*for hybrid scenarios: add an external media*/
-		if (1) {
-#ifdef EXT_MEDIA_LOAD_THREADED
-			GF_Thread **th = &((FM_FAKE_PUSH*)self->private_data)->media_th;
-			assert(*th == NULL);	//once at a time
-			*th = gf_th_new("HYB-FM fake external media load thread");
-			gf_th_run(*th, ext_media_load_th, par);
-#else
-			ext_media_load_th(par);
-#endif
-			gf_sleep(2000); //TODO: remove the sleep
-		}
-
-		if (0) {
-			time_t now;
-			struct tm *now_tm;
-			time(&now);
-			now_tm = gmtime(&now);
-			{
-				GF_NetworkCommand com;
-				memset(&com, 0, sizeof(com));
-				com.command_type = GF_NET_CHAN_MAP_TIME;
-
-				com.map_time.media_time = now_tm->tm_hour*3600+now_tm->tm_min*60+now_tm->tm_sec;
-				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_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));
-			}
-		}
-
-		/*initialize clock*/
-		init_time = gf_sys_clock();
-	}
-
-	while (self->state >= 0) /*pause or play*/
-	{
-		if (self->state == HYB_STATE_PAUSE) {
-			gf_sleep(10);
-			init_time = (u32)(gf_sys_clock() - ((u64)slh.compositionTimeStamp*1000)/FM_FAKE_PUSH_AUDIO_FREQ - 50/*50ms delay*/);	/*pause: won't wait at resume*/
-			continue;
-		}
-
-#if 0
-		time_to_wait = (s32)(init_time + ((u64)slh.compositionTimeStamp*1000)/FM_FAKE_PUSH_AUDIO_FREQ - gf_sys_clock());
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] FM_FAKE_PUSH - %d ms before next AU\n", time_to_wait));
-		if (time_to_wait > 0) {
-			if (time_to_wait > 1000) /*TODO: understand the big shifts when playing icecasts contents*/
-				GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[HYB_IN] FM_FAKE_PUSH - audio asked to sleep for %d ms\n", time_to_wait));
-			gf_sleep(time_to_wait);
-		}
-#endif
-
-		e = GetData(self, &data, &data_size, &slh);
-		gf_term_on_sl_packet(self->owner, self->channel, data, data_size, &slh, e);
-	}
-
-	self->state = HYB_STATE_STOPPED;
-
-	return 0;
-}
-
-/**********************************************************************************************************************/
-
-static void audio_gen_stop(GF_HYBMEDIA *self)
-{
-	if (self->state >= 0) { /*only when playing*/
-		self->state = HYB_STATE_STOP_REQ;
-		while (self->state != HYB_STATE_STOPPED)
-			gf_sleep(10);
-	}
-}
-
-/**********************************************************************************************************************/
-
-static GF_Err FM_FAKE_PUSH_Connect(GF_HYBMEDIA *self, GF_ClientService *service, const char *url)
-{
-	u32 i;
-	FM_FAKE_PUSH *priv;
-
-	if (!self)
-		return GF_BAD_PARAM;
-
-	if (!service)
-		return GF_BAD_PARAM;
-
-	priv = (FM_FAKE_PUSH*)self->private_data;
-	if (!priv)
-		return GF_BAD_PARAM;
-
-	self->owner = service;
-
-	/*set audio preloaded data*/
-	memset(self->private_data, 0, sizeof(FM_FAKE_PUSH));
-	for (i=0; i<(FM_FAKE_PUSH_FRAME_LEN*8)/FM_FAKE_PUSH_BITS; i++) {
-		if (((2*i)/(FM_FAKE_PUSH_CHAN_NUM*100))%2) /*100Hz*/
-			*((FM_FAKE_PUSH_TYPE*)((FM_FAKE_PUSH*)self->private_data)->buffer10+i) = 1 << (FM_FAKE_PUSH_BITS-1);
-	}
-
-	assert(!priv->th);
-	priv->th = gf_th_new("HYB-FM fake audio generation thread");
-	self->state = HYB_STATE_PAUSE;
-	gf_th_run(priv->th, audio_gen_th, self);
-
-	return GF_OK;
-}
-
-/**********************************************************************************************************************/
-
-static GF_Err FM_FAKE_PUSH_Disconnect(GF_HYBMEDIA *self)
-{
-	FM_FAKE_PUSH *priv = (FM_FAKE_PUSH*)self->private_data;
-
-	audio_gen_stop(self);
-	gf_th_del(priv->th);
-#ifdef EXT_MEDIA_LOAD_THREADED
-	gf_th_del(priv->media_th);
-#endif
-	priv->th = NULL;
-
-	self->owner = NULL;
-	return GF_OK;
-}
-
-/**********************************************************************************************************************/
-
-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;
-	}
-
-	return GF_OK;
-}
-
-/**********************************************************************************************************************/
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-20xx
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Hybrid Media input module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+/*hybrid media interface implementation generating fake audio consisting in beeps every second in push mode*/
+
+#include <gpac/thread.h>
+#include <gpac/modules/service.h>
+#include <time.h>
+#include "hyb_in.h"
+
+/**********************************************************************************************************************/
+
+#define EXT_MEDIA_LOAD_THREADED
+
+/**********************************************************************************************************************/
+
+#define FM_FAKE_PUSH_AUDIO_FREQ 22050
+#define FM_FAKE_PUSH_CHAN_NUM	2
+#define FM_FAKE_PUSH_BITS		16
+#define FM_FAKE_PUSH_TYPE		s16
+#define FM_FAKE_PUSH_FRAME_DUR	60		/*in ms*/
+#define FM_FAKE_PUSH_FRAME_LEN	((FM_FAKE_PUSH_FRAME_DUR*FM_FAKE_PUSH_CHAN_NUM*FM_FAKE_PUSH_BITS*FM_FAKE_PUSH_AUDIO_FREQ)/(1000*8))		/*in bytes*/
+
+/**********************************************************************************************************************/
+
+typedef struct s_FM_FAKE_PUSH {
+	u64 PTS;
+	unsigned char buffer10[FM_FAKE_PUSH_FRAME_LEN]; /*played 10 percent of time*/
+	unsigned char buffer90[FM_FAKE_PUSH_FRAME_LEN]; /*played 90 percent of time*/
+
+	GF_Thread *th;
+#ifdef EXT_MEDIA_LOAD_THREADED
+	GF_Thread *media_th;
+#endif
+} FM_FAKE_PUSH;
+FM_FAKE_PUSH FM_FAKE_PUSH_private_data;
+
+/**********************************************************************************************************************/
+
+static Bool FM_FAKE_PUSH_CanHandleURL(const char *url);
+static GF_ObjectDescriptor* FM_FAKE_PUSH_GetOD(void);
+static GF_Err FM_FAKE_PUSH_Connect(GF_HYBMEDIA *self, GF_ClientService *service, const char *url);
+static GF_Err FM_FAKE_PUSH_Disconnect(GF_HYBMEDIA *self);
+static GF_Err FM_FAKE_PUSH_SetState(GF_HYBMEDIA *self, const GF_NET_CHAN_CMD state);
+
+GF_HYBMEDIA master_fm_fake_push = {
+	"Fake FM (push mode)",		/*name*/
+	FM_FAKE_PUSH_CanHandleURL,	/*CanHandleURL()*/
+	FM_FAKE_PUSH_GetOD,			/*GetOD()*/
+	FM_FAKE_PUSH_Connect,		/*Connect()*/
+	FM_FAKE_PUSH_Disconnect,	/*Disconnect()*/
+	FM_FAKE_PUSH_SetState,		/*SetState()*/
+	NULL,						/*GetData()*/
+	NULL,						/*ReleaseData()*/
+	HYB_PUSH,					/*data_mode*/
+	&FM_FAKE_PUSH_private_data	/*private_data*/
+};
+
+/**********************************************************************************************************************/
+
+static Bool FM_FAKE_PUSH_CanHandleURL(const char *url)
+{
+	if (!strnicmp(url, "fm://fake_push", 14))
+		return 1;
+
+	return 0;
+}
+
+/**********************************************************************************************************************/
+
+static GF_ESD* get_esd()
+{
+	GF_BitStream *dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	GF_ESD *esd = gf_odf_desc_esd_new(0);
+
+	esd->ESID = 1;
+	esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+	esd->decoderConfig->objectTypeIndication = GPAC_OTI_RAW_MEDIA_STREAM;
+	esd->decoderConfig->avgBitrate = esd->decoderConfig->maxBitrate = 0;
+	esd->slConfig->timestampResolution = FM_FAKE_PUSH_AUDIO_FREQ;
+
+	/*Decoder Specific Info for raw media*/
+	gf_bs_write_u32(dsi, FM_FAKE_PUSH_AUDIO_FREQ);	/*u32 sample_rate*/
+	gf_bs_write_u16(dsi, FM_FAKE_PUSH_CHAN_NUM);	/*u16 nb_channels*/
+	gf_bs_write_u16(dsi, FM_FAKE_PUSH_BITS);		/*u16 nb_bits_per_sample*/
+	gf_bs_write_u32(dsi, FM_FAKE_PUSH_FRAME_LEN);	/*u32 frame_size*/
+	gf_bs_write_u32(dsi, 0);						/*u32 channel_config*/
+	gf_bs_get_content(dsi, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
+	gf_bs_del(dsi);
+
+	return esd;
+}
+
+/**********************************************************************************************************************/
+
+static GF_ObjectDescriptor* FM_FAKE_PUSH_GetOD(void)
+{
+	/*declare object to terminal*/
+	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
+	GF_ESD *esd = get_esd();
+	od->objectDescriptorID = 1;
+	gf_list_add(od->ESDescriptors, esd);
+	return od;
+}
+
+/**********************************************************************************************************************/
+
+static GF_Err GetData(const GF_HYBMEDIA *self, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr)
+{
+	u64 delta_pts = (FM_FAKE_PUSH_FRAME_DUR*FM_FAKE_PUSH_AUDIO_FREQ)/1000;
+	assert(!(FM_FAKE_PUSH_FRAME_DUR*FM_FAKE_PUSH_AUDIO_FREQ%1000));
+
+	/*write SL header*/
+	memset(out_sl_hdr, 0, sizeof(GF_SLHeader));
+	out_sl_hdr->compositionTimeStampFlag = 1;
+	out_sl_hdr->compositionTimeStamp = ((FM_FAKE_PUSH*)self->private_data)->PTS;
+	out_sl_hdr->accessUnitStartFlag = 1;
+
+	/*write audio data*/
+	if ((((FM_FAKE_PUSH*)self->private_data)->PTS%(10*delta_pts))) {
+		*out_data_ptr = ((FM_FAKE_PUSH*)self->private_data)->buffer90;
+	} else {
+		*out_data_ptr = ((FM_FAKE_PUSH*)self->private_data)->buffer10;
+	}
+	*out_data_size = FM_FAKE_PUSH_FRAME_LEN;
+	((FM_FAKE_PUSH*)self->private_data)->PTS += delta_pts;
+
+	return GF_OK;
+}
+
+/**********************************************************************************************************************/
+
+u32 ext_media_load_th(void *par) {
+	GF_HYBMEDIA *self = (GF_HYBMEDIA*) par;
+	/*declare object to terminal*/
+	GF_ObjectDescriptor *od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
+	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);
+	return 0;
+}
+
+static u32 audio_gen_th(void *par) 
+{
+	GF_Err e;
+	char *data;
+	u32 data_size, init_time;
+	volatile s32 time_to_wait = 0;
+	GF_SLHeader slh;
+	GF_HYBMEDIA *self = (GF_HYBMEDIA*) par;
+	FM_FAKE_PUSH *fm_fake_push = (FM_FAKE_PUSH*)self->private_data;
+	memset(&slh, 0, sizeof(GF_SLHeader));
+
+	{
+		/*for hybrid scenarios: add an external media*/
+		if (1) {
+#ifdef EXT_MEDIA_LOAD_THREADED
+			GF_Thread **th = &((FM_FAKE_PUSH*)self->private_data)->media_th;
+			assert(*th == NULL);	//once at a time
+			*th = gf_th_new("HYB-FM fake external media load thread");
+			gf_th_run(*th, ext_media_load_th, par);
+#else
+			ext_media_load_th(par);
+#endif
+			gf_sleep(2000); //TODO: remove the sleep
+		}
+
+		if (0) {
+			time_t now;
+			struct tm *now_tm;
+			time(&now);
+			now_tm = gmtime(&now);
+			{
+				GF_NetworkCommand com;
+				memset(&com, 0, sizeof(com));
+				com.command_type = GF_NET_CHAN_MAP_TIME;
+
+				com.map_time.media_time = now_tm->tm_hour*3600+now_tm->tm_min*60+now_tm->tm_sec;
+				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_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));
+			}
+		}
+
+		/*initialize clock*/
+		init_time = gf_sys_clock();
+	}
+
+	while (self->state >= 0) /*pause or play*/
+	{
+		if (self->state == HYB_STATE_PAUSE) {
+			gf_sleep(10);
+			init_time = (u32)(gf_sys_clock() - ((u64)slh.compositionTimeStamp*1000)/FM_FAKE_PUSH_AUDIO_FREQ - 50/*50ms delay*/);	/*pause: won't wait at resume*/
+			continue;
+		}
+
+#if 0
+		time_to_wait = (s32)(init_time + ((u64)slh.compositionTimeStamp*1000)/FM_FAKE_PUSH_AUDIO_FREQ - gf_sys_clock());
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] FM_FAKE_PUSH - %d ms before next AU\n", time_to_wait));
+		if (time_to_wait > 0) {
+			if (time_to_wait > 1000) /*TODO: understand the big shifts when playing icecasts contents*/
+				GF_LOG(GF_LOG_WARNING, GF_LOG_MODULE, ("[HYB_IN] FM_FAKE_PUSH - audio asked to sleep for %d ms\n", time_to_wait));
+			gf_sleep(time_to_wait);
+		}
+#endif
+
+		e = GetData(self, &data, &data_size, &slh);
+		gf_term_on_sl_packet(self->owner, self->channel, data, data_size, &slh, e);
+	}
+
+	self->state = HYB_STATE_STOPPED;
+
+	return 0;
+}
+
+/**********************************************************************************************************************/
+
+static void audio_gen_stop(GF_HYBMEDIA *self)
+{
+	if (self->state >= 0) { /*only when playing*/
+		self->state = HYB_STATE_STOP_REQ;
+		while (self->state != HYB_STATE_STOPPED)
+			gf_sleep(10);
+	}
+}
+
+/**********************************************************************************************************************/
+
+static GF_Err FM_FAKE_PUSH_Connect(GF_HYBMEDIA *self, GF_ClientService *service, const char *url)
+{
+	u32 i;
+	FM_FAKE_PUSH *priv;
+
+	if (!self)
+		return GF_BAD_PARAM;
+
+	if (!service)
+		return GF_BAD_PARAM;
+
+	priv = (FM_FAKE_PUSH*)self->private_data;
+	if (!priv)
+		return GF_BAD_PARAM;
+
+	self->owner = service;
+
+	/*set audio preloaded data*/
+	memset(self->private_data, 0, sizeof(FM_FAKE_PUSH));
+	for (i=0; i<(FM_FAKE_PUSH_FRAME_LEN*8)/FM_FAKE_PUSH_BITS; i++) {
+		if (((2*i)/(FM_FAKE_PUSH_CHAN_NUM*100))%2) /*100Hz*/
+			*((FM_FAKE_PUSH_TYPE*)((FM_FAKE_PUSH*)self->private_data)->buffer10+i) = 1 << (FM_FAKE_PUSH_BITS-1);
+	}
+
+	assert(!priv->th);
+	priv->th = gf_th_new("HYB-FM fake audio generation thread");
+	self->state = HYB_STATE_PAUSE;
+	gf_th_run(priv->th, audio_gen_th, self);
+
+	return GF_OK;
+}
+
+/**********************************************************************************************************************/
+
+static GF_Err FM_FAKE_PUSH_Disconnect(GF_HYBMEDIA *self)
+{
+	FM_FAKE_PUSH *priv = (FM_FAKE_PUSH*)self->private_data;
+
+	audio_gen_stop(self);
+	gf_th_del(priv->th);
+#ifdef EXT_MEDIA_LOAD_THREADED
+	gf_th_del(priv->media_th);
+#endif
+	priv->th = NULL;
+
+	self->owner = NULL;
+	return GF_OK;
+}
+
+/**********************************************************************************************************************/
+
+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;
+	}
+
+	return GF_OK;
+}
+
+/**********************************************************************************************************************/

gpac-0.5.0.svn4668.tar.bz2/modules/hyb_in/fm_mmbtools.c -> gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/fm_mmbtools.c Changed

@@ -1,29 +1,29 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-20xx
- *					All rights reserved
- *
- *  This file is part of GPAC / Hybrid Media input module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-
-/*hybrid media interface implementation using MMB Tools from the Communication Research Center Canada (http://mmbtools.crc.ca/)*/
-
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-20xx
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Hybrid Media input module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+/*hybrid media interface implementation using MMB Tools from the Communication Research Center Canada (http://mmbtools.crc.ca/)*/
+
+

gpac-0.5.0.svn4668.tar.bz2/modules/hyb_in/hyb_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/hyb_in.c Changed

@@ -1,312 +1,312 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-20xx
- *					All rights reserved
- *
- *  This file is part of GPAC / Hybrid Media input module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include "hyb_in.h"
-
-/*register by hand existing masters*/
-extern GF_HYBMEDIA master_fm_mmbtools;
-extern GF_HYBMEDIA master_fm_fake_pull;
-extern GF_HYBMEDIA master_fm_fake_push;
-
-GF_HYBMEDIA* hyb_masters[] = {
-	&master_fm_fake_pull,
-	&master_fm_fake_push,
-#ifdef GPAC_ANDROID
-	&master_fm_mmbtools,
-#endif
-};
-
-typedef struct {
-	/*GPAC Service object (i.e. how this module is seen by the terminal)*/
-	GF_ClientService *service;
-
-	/*This Hybrid media architecture assumes there is a master media*/
-	GF_HYBMEDIA* master;
-
-} GF_HYB_In;
-
-
-static u32 HYB_RegisterMimeTypes(const GF_InputService *plug)
-{
-	if (!plug)
-		return 0;
-
-	return 1;
-}
-
-static Bool HYB_CanHandleURL(GF_InputService *plug, const char *url)
-{
-	u32 i;
-	const size_t nb_masters = sizeof(hyb_masters) / sizeof(GF_HYBMEDIA*);
-
-	for (i=0; i<nb_masters; i++) {
-		if (hyb_masters[i]->CanHandleURL(url))
-			return 1;
-	}
-
-	return 0;
-}
-
-static GF_Err hybmedia_sanity_check(GF_HYBMEDIA *master)
-{
-	/*these checks need to be upgraded when the interface changes*/
-	if (master->data_mode != HYB_PUSH && master->data_mode != HYB_PULL)
-		return GF_BAD_PARAM;
-
-	if (!master->name) goto error_exit;
-	if (!master->CanHandleURL) goto error_exit;
-	if (!master->GetOD) goto error_exit;
-	if (!master->Connect) goto error_exit;
-	if (!master->Disconnect) goto error_exit;
-
-	if (master->data_mode == HYB_PUSH) {
-		if (!master->SetState) goto error_exit;
-	}
-
-	if (master->data_mode == HYB_PULL) {
-		if (!master->GetData) goto error_exit;
-		if (!master->ReleaseData) goto error_exit;
-	}
-
-	return GF_OK;
-
-error_exit:
-	return GF_SERVICE_ERROR;
-}
-
-static GF_Err HYB_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
-{
-	u32 i;
-	GF_Err e = GF_OK;
-	const size_t nb_masters = sizeof(hyb_masters) / sizeof(GF_HYBMEDIA*);
-
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Connection request from service %p for %s\n", serv, url));
-
-	if (!hyb_in || !serv || !url) return GF_BAD_PARAM;
-	hyb_in->service = serv;
-
-	/*choose the master service*/
-	for (i=0; i<nb_masters; i++) {
-		if (hyb_masters[i]->CanHandleURL(url)) {
-			hyb_in->master = hyb_masters[i];
-			break;
-		}
-	}
-	assert(hyb_in->master);
-
-	/*sanity check about the master*/
-	e = hybmedia_sanity_check(hyb_in->master);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - object \"%s\" failed the sanity checks\n", hyb_in->master->name));
-		gf_term_on_connect(hyb_in->service, NULL, e);
-		return e;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Selected master object \"%s\" for URL: %s\n", hyb_in->master->name, url));
-
-	/*connect the master*/
-	e = hyb_in->master->Connect(hyb_in->master, hyb_in->service, url);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - cannot connect service, wrong URL %s\n", url));
-		gf_term_on_connect(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);
-
-	return GF_OK;
-}
-
-static GF_Err HYB_CloseService(GF_InputService *plug)
-{
-	GF_Err e;
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Close Service (%p) request from terminal\n", ((GF_HYB_In*)plug->priv)->service));
-
-	/*force to stop and disconnect the master*/
-	hyb_in->master->SetState(hyb_in->master, GF_NET_CHAN_STOP);
-	e = hyb_in->master->Disconnect(hyb_in->master);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - cannot disconnect service %p\n", hyb_in->service));
-		gf_term_on_connect(hyb_in->service, NULL, GF_BAD_PARAM);
-		return e;
-	}
-
-	gf_term_on_disconnect(hyb_in->service, NULL, GF_OK);
-
-	return GF_OK;
-}
-
-static GF_Descriptor *HYB_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Service Description request from terminal for %s\n", sub_url));
-
-	return NULL;
-}
-
-static GF_Err HYB_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
-{
-	GF_HYB_In *hyb_in;
-	GF_HYBMEDIA *master;
-
-	if (!plug || !plug->priv)
-		return GF_SERVICE_ERROR;
-	
-	hyb_in = (GF_HYB_In*)plug->priv;
-	master = (GF_HYBMEDIA*)hyb_in->master;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Connection request from service %p for %s\n", channel, url));
-	
-	master->channel = channel;
-	gf_term_on_connect(hyb_in->service, channel, GF_OK);
-
-	return GF_OK;
-}
-
-static GF_Err HYB_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Disconnect Service (%p) request from terminal\n", hyb_in->service));
-
-	gf_term_on_disconnect(hyb_in->service, channel, GF_OK);
-	hyb_in->master->channel = NULL;
-
-	return GF_OK;
-}
-
-static GF_Err HYB_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
-{
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-
-	switch (com->command_type) {
-	case GF_NET_CHAN_SET_SPEED:
-		/*not implemented for push mode*/
-		assert(hyb_in->master->data_mode == HYB_PULL);
-		return GF_OK;
-	case GF_NET_CHAN_INTERACTIVE:
-		return GF_NOT_SUPPORTED;
-	case GF_NET_CHAN_BUFFER:
-		com->buffer.max = com->buffer.min = 0;
-		return GF_OK;
-	case GF_NET_CHAN_DURATION:
-		com->duration.duration = 0;
-		return GF_OK;
-	case GF_NET_CHAN_PLAY:
-	case GF_NET_CHAN_STOP:
-	case GF_NET_CHAN_PAUSE:
-	case GF_NET_CHAN_RESUME:
-		if (hyb_in->master->data_mode == HYB_PUSH)
-			return hyb_in->master->SetState(hyb_in->master, com->command_type);
-		return GF_OK;
-	case GF_NET_CHAN_SET_PULL:
-		if (hyb_in->master->data_mode == HYB_PULL)
-			return GF_OK;
-		else
-			return GF_NOT_SUPPORTED; /*we're in push mode*/
-	}
-
-	return GF_OK;
-}
-
-static Bool HYB_CanHandleURLInService(GF_InputService *plug, const char *url)
-{
-	return 0;
-}
-
-static GF_Err HYB_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
-{
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-	assert(hyb_in->master->data_mode == HYB_PULL && hyb_in->master->GetData && hyb_in->master->ReleaseData);
-
-	assert(((GF_HYB_In*)plug->priv)->master->channel == channel);
-	hyb_in->master->GetData(hyb_in->master, out_data_ptr, out_data_size, out_sl_hdr);
-	*sl_compressed = 0;
-	*out_reception_status = GF_OK;
-	*is_new_data = 1;
-	return GF_OK;
-}
-
-static GF_Err HYB_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-	assert(((GF_HYB_In*)plug->priv)->master->channel == channel);
-	return GF_OK;
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-	static u32 si [] = {
-		GF_NET_CLIENT_INTERFACE,
-		0
-	};
-	return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
- 	GF_HYB_In *hyb_in;
-	GF_InputService *plug;
-	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
-
-	GF_SAFEALLOC(plug, GF_InputService);
-	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC HYBRID MEDIA Loader", "gpac distribution")
-	plug->RegisterMimeTypes=	HYB_RegisterMimeTypes;
-	plug->CanHandleURL=			HYB_CanHandleURL;
-	plug->ConnectService=		HYB_ConnectService;
-	plug->CloseService=			HYB_CloseService;
-	plug->GetServiceDescriptor=	HYB_GetServiceDesc;
-	plug->ConnectChannel=		HYB_ConnectChannel;
-	plug->DisconnectChannel=	HYB_DisconnectChannel;
-	plug->ServiceCommand=		HYB_ServiceCommand;
-	plug->CanHandleURLInService=HYB_CanHandleURLInService;
-	plug->ChannelGetSLP=		HYB_ChannelGetSLP;
-	plug->ChannelReleaseSLP=	HYB_ChannelReleaseSLP;
-
-	GF_SAFEALLOC(hyb_in, GF_HYB_In);
-	plug->priv = hyb_in;
-
-	return (GF_BaseInterface *)plug;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("DeleteLoaderInterface %p: 1\n", ifce));
-	if (ifce->InterfaceType == GF_NET_CLIENT_INTERFACE) {
-		GF_InputService *plug = (GF_InputService*)ifce;
-		GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
-		gf_free(hyb_in);
-		plug->priv = NULL;
-		gf_free(plug);
-		GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("DeleteLoaderInterface %p: 2\n", ifce));
-	}
-}
-
-GPAC_MODULE_STATIC_DELARATION( hyb_in )
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-20xx
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Hybrid Media input module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "hyb_in.h"
+
+/*register by hand existing masters*/
+extern GF_HYBMEDIA master_fm_mmbtools;
+extern GF_HYBMEDIA master_fm_fake_pull;
+extern GF_HYBMEDIA master_fm_fake_push;
+
+GF_HYBMEDIA* hyb_masters[] = {
+	&master_fm_fake_pull,
+	&master_fm_fake_push,
+#ifdef GPAC_ANDROID
+	&master_fm_mmbtools,
+#endif
+};
+
+typedef struct {
+	/*GPAC Service object (i.e. how this module is seen by the terminal)*/
+	GF_ClientService *service;
+
+	/*This Hybrid media architecture assumes there is a master media*/
+	GF_HYBMEDIA* master;
+
+} GF_HYB_In;
+
+
+static u32 HYB_RegisterMimeTypes(const GF_InputService *plug)
+{
+	if (!plug)
+		return 0;
+
+	return 1;
+}
+
+static Bool HYB_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	u32 i;
+	const size_t nb_masters = sizeof(hyb_masters) / sizeof(GF_HYBMEDIA*);
+
+	for (i=0; i<nb_masters; i++) {
+		if (hyb_masters[i]->CanHandleURL(url))
+			return 1;
+	}
+
+	return 0;
+}
+
+static GF_Err hybmedia_sanity_check(GF_HYBMEDIA *master)
+{
+	/*these checks need to be upgraded when the interface changes*/
+	if (master->data_mode != HYB_PUSH && master->data_mode != HYB_PULL)
+		return GF_BAD_PARAM;
+
+	if (!master->name) goto error_exit;
+	if (!master->CanHandleURL) goto error_exit;
+	if (!master->GetOD) goto error_exit;
+	if (!master->Connect) goto error_exit;
+	if (!master->Disconnect) goto error_exit;
+
+	if (master->data_mode == HYB_PUSH) {
+		if (!master->SetState) goto error_exit;
+	}
+
+	if (master->data_mode == HYB_PULL) {
+		if (!master->GetData) goto error_exit;
+		if (!master->ReleaseData) goto error_exit;
+	}
+
+	return GF_OK;
+
+error_exit:
+	return GF_SERVICE_ERROR;
+}
+
+static GF_Err HYB_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	u32 i;
+	GF_Err e = GF_OK;
+	const size_t nb_masters = sizeof(hyb_masters) / sizeof(GF_HYBMEDIA*);
+
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Connection request from service %p for %s\n", serv, url));
+
+	if (!hyb_in || !serv || !url) return GF_BAD_PARAM;
+	hyb_in->service = serv;
+
+	/*choose the master service*/
+	for (i=0; i<nb_masters; i++) {
+		if (hyb_masters[i]->CanHandleURL(url)) {
+			hyb_in->master = hyb_masters[i];
+			break;
+		}
+	}
+	assert(hyb_in->master);
+
+	/*sanity check about the master*/
+	e = hybmedia_sanity_check(hyb_in->master);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - object \"%s\" failed the sanity checks\n", hyb_in->master->name));
+		gf_term_on_connect(hyb_in->service, NULL, e);
+		return e;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Selected master object \"%s\" for URL: %s\n", hyb_in->master->name, url));
+
+	/*connect the master*/
+	e = hyb_in->master->Connect(hyb_in->master, hyb_in->service, url);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - cannot connect service, wrong URL %s\n", url));
+		gf_term_on_connect(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);
+
+	return GF_OK;
+}
+
+static GF_Err HYB_CloseService(GF_InputService *plug)
+{
+	GF_Err e;
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Close Service (%p) request from terminal\n", ((GF_HYB_In*)plug->priv)->service));
+
+	/*force to stop and disconnect the master*/
+	hyb_in->master->SetState(hyb_in->master, GF_NET_CHAN_STOP);
+	e = hyb_in->master->Disconnect(hyb_in->master);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[HYB_IN] Error - cannot disconnect service %p\n", hyb_in->service));
+		gf_term_on_connect(hyb_in->service, NULL, GF_BAD_PARAM);
+		return e;
+	}
+
+	gf_term_on_disconnect(hyb_in->service, NULL, GF_OK);
+
+	return GF_OK;
+}
+
+static GF_Descriptor *HYB_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Service Description request from terminal for %s\n", sub_url));
+
+	return NULL;
+}
+
+static GF_Err HYB_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	GF_HYB_In *hyb_in;
+	GF_HYBMEDIA *master;
+
+	if (!plug || !plug->priv)
+		return GF_SERVICE_ERROR;
+	
+	hyb_in = (GF_HYB_In*)plug->priv;
+	master = (GF_HYBMEDIA*)hyb_in->master;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Connection request from service %p for %s\n", channel, url));
+	
+	master->channel = channel;
+	gf_term_on_connect(hyb_in->service, channel, GF_OK);
+
+	return GF_OK;
+}
+
+static GF_Err HYB_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[HYB_IN] Received Channel Disconnect Service (%p) request from terminal\n", hyb_in->service));
+
+	gf_term_on_disconnect(hyb_in->service, channel, GF_OK);
+	hyb_in->master->channel = NULL;
+
+	return GF_OK;
+}
+
+static GF_Err HYB_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+
+	switch (com->command_type) {
+	case GF_NET_CHAN_SET_SPEED:
+		/*not implemented for push mode*/
+		assert(hyb_in->master->data_mode == HYB_PULL);
+		return GF_OK;
+	case GF_NET_CHAN_INTERACTIVE:
+		return GF_NOT_SUPPORTED;
+	case GF_NET_CHAN_BUFFER:
+		com->buffer.max = com->buffer.min = 0;
+		return GF_OK;
+	case GF_NET_CHAN_DURATION:
+		com->duration.duration = 0;
+		return GF_OK;
+	case GF_NET_CHAN_PLAY:
+	case GF_NET_CHAN_STOP:
+	case GF_NET_CHAN_PAUSE:
+	case GF_NET_CHAN_RESUME:
+		if (hyb_in->master->data_mode == HYB_PUSH)
+			return hyb_in->master->SetState(hyb_in->master, com->command_type);
+		return GF_OK;
+	case GF_NET_CHAN_SET_PULL:
+		if (hyb_in->master->data_mode == HYB_PULL)
+			return GF_OK;
+		else
+			return GF_NOT_SUPPORTED; /*we're in push mode*/
+	}
+
+	return GF_OK;
+}
+
+static Bool HYB_CanHandleURLInService(GF_InputService *plug, const char *url)
+{
+	return 0;
+}
+
+static GF_Err HYB_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
+{
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+	assert(hyb_in->master->data_mode == HYB_PULL && hyb_in->master->GetData && hyb_in->master->ReleaseData);
+
+	assert(((GF_HYB_In*)plug->priv)->master->channel == channel);
+	hyb_in->master->GetData(hyb_in->master, out_data_ptr, out_data_size, out_sl_hdr);
+	*sl_compressed = 0;
+	*out_reception_status = GF_OK;
+	*is_new_data = 1;
+	return GF_OK;
+}
+
+static GF_Err HYB_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+	assert(((GF_HYB_In*)plug->priv)->master->channel == channel);
+	return GF_OK;
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+		GF_NET_CLIENT_INTERFACE,
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+ 	GF_HYB_In *hyb_in;
+	GF_InputService *plug;
+	if (InterfaceType != GF_NET_CLIENT_INTERFACE) return NULL;
+
+	GF_SAFEALLOC(plug, GF_InputService);
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC HYBRID MEDIA Loader", "gpac distribution")
+	plug->RegisterMimeTypes=	HYB_RegisterMimeTypes;
+	plug->CanHandleURL=			HYB_CanHandleURL;
+	plug->ConnectService=		HYB_ConnectService;
+	plug->CloseService=			HYB_CloseService;
+	plug->GetServiceDescriptor=	HYB_GetServiceDesc;
+	plug->ConnectChannel=		HYB_ConnectChannel;
+	plug->DisconnectChannel=	HYB_DisconnectChannel;
+	plug->ServiceCommand=		HYB_ServiceCommand;
+	plug->CanHandleURLInService=HYB_CanHandleURLInService;
+	plug->ChannelGetSLP=		HYB_ChannelGetSLP;
+	plug->ChannelReleaseSLP=	HYB_ChannelReleaseSLP;
+
+	GF_SAFEALLOC(hyb_in, GF_HYB_In);
+	plug->priv = hyb_in;
+
+	return (GF_BaseInterface *)plug;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("DeleteLoaderInterface %p: 1\n", ifce));
+	if (ifce->InterfaceType == GF_NET_CLIENT_INTERFACE) {
+		GF_InputService *plug = (GF_InputService*)ifce;
+		GF_HYB_In *hyb_in = (GF_HYB_In*)plug->priv;
+		gf_free(hyb_in);
+		plug->priv = NULL;
+		gf_free(plug);
+		GF_LOG(GF_LOG_MEDIA, GF_LOG_ERROR, ("DeleteLoaderInterface %p: 2\n", ifce));
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( hyb_in )

gpac-0.5.0.svn4668.tar.bz2/modules/hyb_in/hyb_in.h -> gpac-0.5.0.svn5178.tar.bz2/modules/hyb_in/hyb_in.h Changed

@@ -1,96 +1,96 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Romain Bouqueau
- *			Copyright (c) Telecom ParisTech 2010-20xx
- *					All rights reserved
- *
- *  This file is part of GPAC / Hybrid Media input module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef _HYB_IN_H
-#define _HYB_IN_H
-
-#include <gpac/modules/codec.h>
-#include <gpac/modules/service.h>
-#include <gpac/constants.h>
-
-
-typedef enum {
-	HYB_STATE_STOPPED  = -2,	/*thread received HYB_STATE_STOP_REQ and stopped*/
-	HYB_STATE_STOP_REQ = -1,	/*user asked to stop*/
-	HYB_STATE_PAUSE    = 0,		/*default state*/
-	//HYB_STATE_PLAY_REQ = 1,	/*user asked to play*/
-	HYB_STATE_PLAYING  = 2,		/*thread received HYB_STATE_PLAY_REQ and has started playing*/
-} HYB_STATE;
-
-typedef enum {
-	HYB_PUSH = 0,	/*threaded*/
-	HYB_PULL,		/*not threaded*/
-} HYB_DATA_MODE;
-
-/*base structure for media hybridation*/
-typedef struct s_GF_HYBMEDIA {
-
-	/*object description*/
-	const char* name;
-
-	/* *** static methods *** */
-	
-	/*is url handled by this service?*/
-	Bool (*CanHandleURL)(const char *url);
-	
-	/*retrieve object descriptor*/
-	GF_ObjectDescriptor* (*GetOD)(void);
-
-
-	/* *** other methods *** */
-	
-	/*create/destroy the object and all its data*/
-	GF_Err (*Connect)   (struct s_GF_HYBMEDIA *self, GF_ClientService *service, const char *url);
-	GF_Err (*Disconnect)(struct s_GF_HYBMEDIA *self);
-
-	/*request state from */
-	GF_Err (*SetState)(struct s_GF_HYBMEDIA *self, const GF_NET_CHAN_CMD state);
-	
-	/*in case data retrieval paradigm is pull these two functions shall not be NULL*/
-	GF_Err (*GetData)    (struct s_GF_HYBMEDIA *self, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr); /*only available when data_mode is pull*/
-	GF_Err (*ReleaseData)(struct s_GF_HYBMEDIA *self); /*only available when data_mode is pull*/
-
-
-	/* *** statically initialized data *** */
-
-	/*data retrieval mode: HYB_PUSH or HYB_PULL*/
-	HYB_DATA_MODE data_mode;
-
-	/*pivate data which type depends on dynamic considerations*/
-	void *private_data;
-
-
-	/* *** dynamically initialized data *** */
-
-	/*object state: play/stop/pause/...*/
-	HYB_STATE state;
-
-	/*object carrying us (needed to communicate with the player)*/
-	GF_ClientService *owner;
-	LPNETCHANNEL channel;
-
-} GF_HYBMEDIA;
-
-#endif
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Romain Bouqueau
+ *			Copyright (c) Telecom ParisTech 2010-20xx
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Hybrid Media input module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _HYB_IN_H
+#define _HYB_IN_H
+
+#include <gpac/modules/codec.h>
+#include <gpac/modules/service.h>
+#include <gpac/constants.h>
+
+
+typedef enum {
+	HYB_STATE_STOPPED  = -2,	/*thread received HYB_STATE_STOP_REQ and stopped*/
+	HYB_STATE_STOP_REQ = -1,	/*user asked to stop*/
+	HYB_STATE_PAUSE    = 0,		/*default state*/
+	//HYB_STATE_PLAY_REQ = 1,	/*user asked to play*/
+	HYB_STATE_PLAYING  = 2,		/*thread received HYB_STATE_PLAY_REQ and has started playing*/
+} HYB_STATE;
+
+typedef enum {
+	HYB_PUSH = 0,	/*threaded*/
+	HYB_PULL,		/*not threaded*/
+} HYB_DATA_MODE;
+
+/*base structure for media hybridation*/
+typedef struct s_GF_HYBMEDIA {
+
+	/*object description*/
+	const char* name;
+
+	/* *** static methods *** */
+	
+	/*is url handled by this service?*/
+	Bool (*CanHandleURL)(const char *url);
+	
+	/*retrieve object descriptor*/
+	GF_ObjectDescriptor* (*GetOD)(void);
+
+
+	/* *** other methods *** */
+	
+	/*create/destroy the object and all its data*/
+	GF_Err (*Connect)   (struct s_GF_HYBMEDIA *self, GF_ClientService *service, const char *url);
+	GF_Err (*Disconnect)(struct s_GF_HYBMEDIA *self);
+
+	/*request state from */
+	GF_Err (*SetState)(struct s_GF_HYBMEDIA *self, const GF_NET_CHAN_CMD state);
+	
+	/*in case data retrieval paradigm is pull these two functions shall not be NULL*/
+	GF_Err (*GetData)    (struct s_GF_HYBMEDIA *self, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr); /*only available when data_mode is pull*/
+	GF_Err (*ReleaseData)(struct s_GF_HYBMEDIA *self); /*only available when data_mode is pull*/
+
+
+	/* *** statically initialized data *** */
+
+	/*data retrieval mode: HYB_PUSH or HYB_PULL*/
+	HYB_DATA_MODE data_mode;
+
+	/*pivate data which type depends on dynamic considerations*/
+	void *private_data;
+
+
+	/* *** dynamically initialized data *** */
+
+	/*object state: play/stop/pause/...*/
+	HYB_STATE state;
+
+	/*object carrying us (needed to communicate with the player)*/
+	GF_ClientService *owner;
+	LPNETCHANNEL channel;
+
+} GF_HYBMEDIA;
+
+#endif

gpac-0.5.0.svn4668.tar.bz2/modules/img_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/img_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/img_in/img_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/img_in/img_in.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ismacryp/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/ismacryp/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ismacryp/isma_ea.c -> gpac-0.5.0.svn5178.tar.bz2/modules/ismacryp/isma_ea.c Changed

@@ -51,6 +51,13 @@
 	u32 nb_allow_play;
 	Bool is_oma;
 	u32 preview_range;
+	/*for Common Enxryption*/
+	Bool is_cenc;
+	Bool is_cbc;
+	Bool first_crypted_samp;
+	u32 KID_count;
+	bin128 *KIDs;
+	bin128 *keys;
 } ISMAEAPriv;
 
 
@@ -76,7 +83,7 @@
 	}
 	/*note that gpac doesn't have TLS support -> not really usefull. As a general remark, ISMACryp
 	is supported as a proof of concept, crypto and IPMP being the last priority on gpac...*/
-	GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[ISMA E&A] Fetching ISMACryp key for channel %d\n", ch->esd->ESID) );
+	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);
 	if (!sess) return GF_IO_ERR;
@@ -268,7 +275,273 @@
 }
 #endif
 
-static GF_Err ISMA_Process(GF_IPMPTool *plug, GF_IPMPEvent *evt)
+static GF_Err CENC_Setup(ISMAEAPriv *priv, GF_IPMPEvent *evt) 
+{
+	GF_CENCConfig *cfg = (GF_CENCConfig*)evt->config_data;
+	u32 i;
+
+	priv->state = ISMAEA_STATE_ERROR;
+
+	if ((cfg->scheme_type != GF_4CC('c', 'e', 'n', 'c')) && (cfg->scheme_type != GF_4CC('c','b','c','1'))) return GF_NOT_SUPPORTED;
+	if (cfg->scheme_version != 0x00010000) return GF_NOT_SUPPORTED;
+
+	for (i = 0; i < cfg->PSSH_count; i++) {
+		GF_NetComDRMConfigPSSH *pssh = &cfg->PSSHs[i];
+		char szSystemID[33];
+		u32 j;
+
+		memset(szSystemID, 0, 33);
+		for (j=0; j<16; j++) {
+			sprintf(szSystemID+j*2, "%02X", (unsigned char) pssh->SystemID[j]);
+		}
+
+		/*SystemID for GPAC Player: 67706163-6365-6E63-6472-6D746F6F6C31*/
+		if (strcmp(szSystemID, "6770616363656E6364726D746F6F6C31")) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] System ID %s not supported\n", szSystemID));
+			continue;
+		}
+		else {
+			u8 cypherOffset;
+			bin128 cypherKey, cypherIV;
+			GF_Crypt *mc;
+
+			/*GPAC DRM TEST system info, used to validate cypher offset in CENC packager
+				keyIDs as usual (before private data)
+				URL len on 8 bits
+				URL
+				keys, cyphered with oyur magic key :)
+			*/
+			cypherOffset = pssh->private_data[0] + 1;
+			gf_bin128_parse("0x6770616363656E6364726D746F6F6C31", cypherKey);
+			gf_bin128_parse("0x00000000000000000000000000000001", cypherIV);
+
+			mc = gf_crypt_open("AES-128", "CTR");
+			if (!mc) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
+				return GF_IO_ERR;
+			}
+			gf_crypt_init(mc, cypherKey, 16, cypherIV);
+			gf_crypt_decrypt(mc, pssh->private_data+cypherOffset, pssh->private_data_size-cypherOffset);
+			gf_crypt_close(mc);
+
+			/*now we search a key*/
+			priv->KID_count = pssh->KID_count;
+			if (priv->KIDs) {
+				gf_free(priv->KIDs);
+				priv->KIDs = NULL;
+			}
+			priv->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
+			if (priv->keys) {
+				gf_free(priv->keys);
+				priv->keys = NULL;
+			}
+			priv->keys = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
+
+			memmove(priv->KIDs, pssh->KIDs, pssh->KID_count*sizeof(bin128));
+			memmove(priv->keys, pssh->private_data + cypherOffset, pssh->KID_count*sizeof(bin128));
+		}
+	}
+
+	if (cfg->scheme_type == GF_4CC('c', 'e', 'n', 'c'))
+		priv->is_cenc = GF_TRUE;
+	else
+		priv->is_cbc = GF_TRUE;
+
+	priv->state = ISMAEA_STATE_SETUP;
+	//priv->nb_allow_play = 1;
+	return GF_OK;
+}
+
+static GF_Err CENC_Access(ISMAEAPriv *priv, GF_IPMPEvent *evt)
+{	
+	if (evt->event_type==GF_IPMP_TOOL_GRANT_ACCESS) {
+		if (priv->state != ISMAEA_STATE_SETUP) return GF_SERVICE_ERROR;
+		assert(!priv->crypt);
+
+		//if (!priv->nb_allow_play) return GF_AUTHENTICATION_FAILURE;
+		//priv->nb_allow_play--;
+		
+		/*open decrypter - we do NOT initialize decrypter; it wil be done when we decrypt the first crypted sample*/
+		if (priv->is_cenc)
+			priv->crypt = gf_crypt_open("AES-128", "CTR");
+		else
+			priv->crypt = gf_crypt_open("AES-128", "CBC");
+		if (!priv->crypt) return GF_IO_ERR;
+
+		priv->first_crypted_samp = GF_TRUE;
+
+		priv->state = ISMAEA_STATE_PLAY;
+		return GF_OK;
+	}
+	if (evt->event_type==GF_IPMP_TOOL_RELEASE_ACCESS) {
+		if (priv->state != ISMAEA_STATE_PLAY) return GF_SERVICE_ERROR;
+		if (priv->crypt) gf_crypt_close(priv->crypt);
+		priv->crypt = NULL;
+		priv->state = ISMAEA_STATE_SETUP;
+		return GF_OK;
+	}
+	return GF_BAD_PARAM;
+}
+
+static GF_Err CENC_ProcessData(ISMAEAPriv *priv, GF_IPMPEvent *evt)
+{
+	GF_Err e;
+	GF_BitStream *pleintext_bs, *cyphertext_bs, *sai_bs;
+	char IV[17];
+	bin128 KID;
+	char *buffer;
+	u32 max_size, i, subsample_count;
+	u64 BSO;
+	GF_CENCSampleAuxInfo *sai;
+
+	e = GF_OK;
+	pleintext_bs = cyphertext_bs = sai_bs = NULL;
+	buffer = NULL;
+	max_size = 4096;
+
+	if (!priv->crypt) return GF_SERVICE_ERROR;
+	
+	if (!evt->is_encrypted || !evt->IV_size) 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);
+	pleintext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	buffer = (char*)gf_malloc(sizeof(char) * max_size);
+
+	sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
+	if (!sai) {
+		e = GF_IO_ERR;
+		goto exit;
+	}
+	memset(sai, 0, sizeof(GF_CENCSampleAuxInfo));
+	sai->IV_size = evt->IV_size;
+	/*read sample auxiliary information from bitstream*/
+	gf_bs_read_data(sai_bs,  (char *)KID, 16);
+	gf_bs_read_data(sai_bs, (char *)sai->IV, sai->IV_size);
+	sai->subsample_count = gf_bs_read_u16(sai_bs);
+	if (sai->subsample_count) {
+		sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
+		for (i = 0; i < sai->subsample_count; i++) {
+			sai->subsamples[i].bytes_clear_data = gf_bs_read_u16(sai_bs);
+			sai->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(sai_bs);
+		}
+	}
+
+
+	for (i = 0; i < priv->KID_count; i++) {
+		if (!strncmp((const char *)KID, (const char *)priv->KIDs[i], 16)) {
+			memmove(priv->key, priv->keys[i], 16);
+			break;
+		}
+	}
+
+	if (priv->first_crypted_samp) {
+		memmove(IV, sai->IV, sai->IV_size);
+		if (sai->IV_size == 8)
+			memset(IV+8, 0, sizeof(char)*8);
+		e = gf_crypt_init(priv->crypt, priv->key, 16, IV);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 AES-128 %s (%s)\n", priv->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
+			e = GF_IO_ERR;
+			goto exit;
+		}
+		priv->first_crypted_samp = GF_FALSE;
+	} else {
+		if (priv->is_cenc) {
+			GF_BitStream *bs;
+			bs = gf_bs_new(IV, 17, GF_BITSTREAM_WRITE);
+			gf_bs_write_u8(bs, 0);	/*begin of counter*/
+			gf_bs_write_data(bs,(char *)sai->IV, sai->IV_size);
+			if (sai->IV_size == 8)
+				gf_bs_write_u64(bs, 0); /*0-padded if IV_size == 8*/
+			gf_bs_del(bs);
+			gf_crypt_set_state(priv->crypt, IV, 17);
+		}
+		e = gf_crypt_set_key(priv->crypt, priv->key, 16, IV);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", priv->is_cenc ? "CTR" : "CBC", gf_error_to_string(e)) );
+			e = GF_IO_ERR;
+			goto exit;
+		}
+	}
+
+	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);
+
+		/*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);
+			}
+		}
+
+		subsample_count++;
+	}
+
+	if (buffer) gf_free(buffer);
+	gf_bs_get_content(pleintext_bs, &buffer, &evt->data_size);
+	memmove(evt->data, buffer, evt->data_size);
+
+exit:
+	if (pleintext_bs) gf_bs_del(pleintext_bs);
+	if (sai_bs) gf_bs_del(sai_bs);
+	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
+	if (buffer) gf_free(buffer);
+	if (sai && sai->subsamples) gf_free(sai->subsamples);
+	if (sai) gf_free(sai);
+	return e;
+}
+
+static GF_Err IPMP_Process(GF_IPMPTool *plug, GF_IPMPEvent *evt)
 {
 	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
 
@@ -278,17 +551,22 @@
 #ifdef OMA_DRM_MP4MC
 		if (evt->config_data_code == GF_4CC('o','d','r','m')) return OMA_DRM_Setup(priv, evt);
 #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_oma) {
+		if (priv->is_cenc || priv->is_cbc) {
+			return CENC_Access(priv, evt);
+		} else if (priv->is_oma) {
 		} else {
 			return ISMA_Access(priv, evt);
 		}
 		break;
 	case GF_IPMP_TOOL_PROCESS_DATA:
-		if (priv->is_oma) {
+		if (priv->is_cenc || priv->is_cbc) {
+			return CENC_ProcessData(priv, evt);
+		} else if (priv->is_oma) {
 			if (evt->is_encrypted) {
 				evt->restart_requested = GF_TRUE;
 				return GF_EOS;
@@ -300,16 +578,18 @@
 	return GF_OK;
 }
 
-void DeleteISMACrypTool(GF_IPMPTool *plug)
+void DeleteIPMPTool(GF_IPMPTool *plug)
 {
 	ISMAEAPriv *priv = (ISMAEAPriv *)plug->udta;
 	/*in case something went wrong*/
 	if (priv->crypt) gf_crypt_close(priv->crypt);
+	if (priv->KIDs) gf_free(priv->KIDs);
+	if (priv->keys) gf_free(priv->keys);
 	gf_free(priv);
 	gf_free(plug);
 }
 
-GF_IPMPTool *NewISMACrypTool()
+GF_IPMPTool *NewIPMPTool()
 {
 	ISMAEAPriv *priv;
 	GF_IPMPTool *tmp;
@@ -318,7 +598,7 @@
 	if (!tmp) return NULL;
 	GF_SAFEALLOC(priv, ISMAEAPriv);
 	tmp->udta = priv;
-	tmp->process = ISMA_Process;
+	tmp->process = IPMP_Process;
 	GF_REGISTER_MODULE_INTERFACE(tmp, GF_IPMP_TOOL_INTERFACE, "GPAC ISMACryp tool", "gpac distribution")
 	return (GF_IPMPTool *) tmp;
 }
@@ -343,7 +623,7 @@
 	switch (InterfaceType) {
 #ifndef GPAC_DISABLE_MCRYPT
 	case GF_IPMP_TOOL_INTERFACE:
-		return (GF_BaseInterface *)NewISMACrypTool();
+		return (GF_BaseInterface *)NewIPMPTool();
 #endif
 	default:
 		return NULL;
@@ -356,7 +636,7 @@
 	switch (ifce->InterfaceType) {
 #ifndef GPAC_DISABLE_MCRYPT
 	case GF_IPMP_TOOL_INTERFACE:
-		DeleteISMACrypTool((GF_IPMPTool *)ifce);
+		DeleteIPMPTool((GF_IPMPTool *)ifce);
 		break;
 #endif
 	}

gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/isom_in.h -> gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/isom_in.h Changed

@@ -39,6 +39,8 @@
 
 */
 
+//#define DASH_USE_PULL
+
 typedef struct
 {
 	GF_InputService *input;
@@ -55,7 +57,6 @@
 	/*remote file handling*/
 	GF_DownloadSession * dnload;
 	u64 missing_bytes, last_size;
-
 	Bool no_service_desc;
 	u32 base_track_id;
 
@@ -67,7 +68,12 @@
 	Bool use_memory;
 	/*0: segment is not opened - 1: segment is opened but can be refreshed incomplete file) - 2: segment is fully parsed, no need for refresh*/
 	u32 seg_opened;
+	Bool drop_next_segment;
+	Bool in_data_flush;
+	s32 has_pending_segments;
 
+	Bool clock_discontinuity;
+	Bool disconnected;
 } ISOMReader;
 
 
@@ -101,13 +107,16 @@
 	Bool to_init, is_playing, has_rap;
 	u8 streamType;
 	
-	Bool is_encrypted;
+	Bool is_encrypted, is_cenc;
 
 	/*cache stuff*/
 	u64 cache_seed_ts;
 	u32 frame_cts_offset;
 	u64 prev_dts, max_cts;
 	GF_ISOSample *cache_sample;
+
+	Bool buffering;
+	u32 buffer_min, buffer_max;
 } ISOMChannel;
 void isor_reset_reader(ISOMChannel *ch);
 void isor_reader_get_sample(ISOMChannel *ch);
@@ -127,6 +136,9 @@
 
 void send_proxy_command(ISOMReader *read, Bool is_disconnect, Bool is_add_media, GF_Err e, GF_Descriptor *desc, LPNETCHANNEL channel);
 
+void isor_send_cenc_config(ISOMChannel *ch);
+
+void isor_flush_data(ISOMReader *read, Bool check_buffer_level, Bool is_chunk_flush);
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 GF_BaseInterface *isow_load_cache();

gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/load.c -> gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/load.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/read.c -> gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/read.c Changed

@@ -114,6 +114,93 @@
 	read->input->query_proxy(read->input, &command);
 }
 
+void isor_check_buffer_level(ISOMReader *read)
+{
+	Double dld_time_remaining, mov_rate;
+	GF_NetworkCommand com;
+	u32 i, total, done, Bps;
+	u64 dur;
+	GF_NetIOStatus status;
+	Bool do_buffer = GF_FALSE;
+	if (!read->dnload) return;
+	if (!read->mov) return;
+
+	gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total, &done, &Bps, &status);
+	if (!Bps) return;
+
+	dld_time_remaining = total-done;
+	dld_time_remaining /= Bps;
+	mov_rate = total;
+	dur = gf_isom_get_duration(read->mov);
+	if (dur) {
+		mov_rate /= dur;
+		mov_rate *= gf_isom_get_timescale(read->mov);
+	}
+
+	for (i=0; i<gf_list_count(read->channels); i++) {
+		ISOMChannel *ch = gf_list_get(read->channels, i);
+		Double time_remain_ch = (Double) gf_isom_get_media_duration(read->mov, ch->track);
+		u32 buffer_level=0;
+		if (total==done) {
+			time_remain_ch = 0;
+			do_buffer = GF_FALSE;
+		} else if (ch->last_state == GF_EOS) {
+			time_remain_ch = 0;
+			do_buffer = GF_TRUE;
+		} else {
+			u64 data_offset;
+			u32 di, sn = ch->sample_num ? ch->sample_num : 1;
+			GF_ISOSample *samp = gf_isom_get_sample_info(read->mov, ch->track, sn, &di, &data_offset);
+			if (!samp) continue;
+
+			data_offset += samp->dataLength;
+
+			//we only send buffer on/off based on remainging playback time in channel
+#if 0
+			//we don't have enough data
+			if (((data_offset + ch->buffer_min * mov_rate/1000 > done))) {
+				do_buffer = GF_TRUE;
+			}
+			//we have enough buffer
+			else if ((data_offset + ch->buffer_max * mov_rate/1000 <= done)) {
+				do_buffer = GF_FALSE;
+			} 
+#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)) {
+				do_buffer = GF_TRUE;
+				buffer_level = (u32) (ch->buffer_max * time_remain_ch / dld_time_remaining);
+			} else {
+				buffer_level = (u32) (1000 * (data_offset - done)/mov_rate);
+				do_buffer = GF_FALSE;
+			}
+		}
+
+		if (do_buffer != ch->buffering) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[IsoMedia] Buffering %s at %d: %g sec still to download and %g sec still to play on track %d (movie rate %g - download rate %g kbps)\n", do_buffer ? "on" : "off", gf_sys_clock(), dld_time_remaining , time_remain_ch, ch->track_id, mov_rate*8/1000, Bps*8.0/1000));
+
+			memset(&com, 0, sizeof(GF_NetworkCommand));
+			com.command_type = do_buffer ? GF_NET_CHAN_PAUSE : GF_NET_CHAN_RESUME;
+			com.buffer.on_channel = ch->channel;
+			gf_term_on_command(read->service, &com, GF_OK);
+			ch->buffering = do_buffer;
+		} else if (ch->buffering) {
+			memset(&com, 0, sizeof(GF_NetworkCommand));
+			com.command_type = GF_NET_CHAN_BUFFER;
+			com.buffer.on_channel = ch->channel;
+			com.buffer.min = ch->buffer_min;
+			com.buffer.max = ch->buffer_max;
+			com.buffer.occupancy = buffer_level;
+			gf_term_on_command(read->service, &com, GF_OK);
+		}
+	}
+}
+
 void isor_net_io(void *cbk, GF_NETIO_Parameter *param)
 {
 	GF_Err e;
@@ -175,6 +262,8 @@
 
 	/*service is opened, nothing to do*/
 	if (read->mov) {
+		isor_check_buffer_level(read);
+
 		/*end of chunk*/
 		if (read->frag_type && (param->reply==1) ) {
 			u64 bytesMissing = 0;
@@ -218,13 +307,14 @@
 	}
 	read->frag_type = gf_isom_is_fragmented(read->mov) ? 1 : 0;
 	
-	/*ok let's go*/
+	/*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->no_service_desc) isor_declare_objects(read);
 }
 
@@ -261,6 +351,8 @@
 	read->dnload = NULL;
 
 	read->base_track_id = 0;
+	if (!url) return GF_URL_ERROR;
+
 	strcpy(szURL, url);
 	tmp = strrchr(szURL, '.');
 	if (tmp) {
@@ -325,6 +417,7 @@
 	read = (ISOMReader *) plug->priv;
 	reply = GF_OK;
 
+	read->disconnected = GF_TRUE;
 	if (read->mov) gf_isom_close(read->mov);
 	read->mov = NULL;
 
@@ -560,9 +653,42 @@
 }
 
 
+void isor_send_cenc_config(ISOMChannel *ch)
+{
+	GF_NetworkCommand com;
+	u32 i;
+	
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.base.on_channel = ch->channel;
+	com.command_type = GF_NET_CHAN_DRM_CFG;
+	ch->is_encrypted = GF_TRUE;
+	
+	gf_isom_get_cenc_info(ch->owner->mov, ch->track, 1, NULL, &com.drm_cfg.scheme_type, &com.drm_cfg.scheme_version, NULL);
+
+	com.drm_cfg.PSSH_count = gf_isom_get_pssh_count(ch->owner->mov);
+	com.drm_cfg.PSSHs = gf_malloc(sizeof(GF_NetComDRMConfigPSSH)*(com.drm_cfg.PSSH_count) );
+
+	/*fill PSSH in the structure. We will free it in CENC_Setup*/
+	for (i=0; i<com.drm_cfg.PSSH_count; i++) {
+		GF_NetComDRMConfigPSSH *pssh = &com.drm_cfg.PSSHs[i];
+		gf_isom_get_pssh_info(ch->owner->mov, i+1, pssh->SystemID, &pssh->KID_count, (const bin128 **) & pssh->KIDs, (const u8 **) &pssh->private_data, &pssh->private_data_size);
+	}
+	//fixme - check MSE and EME
+#if 0
+	if (read->input->query_proxy && read->input->proxy_udta) {
+        read->input->query_proxy(read->input, &com);
+    } else 
+#endif
+		gf_term_on_command(ch->owner->service, &com, GF_OK);
+	//free our PSSH
+	if (com.drm_cfg.PSSHs) gf_free(com.drm_cfg.PSSHs);
+}
+
+
+
 GF_Err ISOR_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
 {
-	u32 ESID, base_track, count, i;
+	u32 ESID;
 	ISOMChannel *ch;
 	GF_NetworkCommand com;
 	u32 track;
@@ -635,25 +761,8 @@
 		ch->streamType = GF_STREAM_SCENE;
 		break;
 	case GF_ISOM_MEDIA_VISUAL:
-		count = gf_isom_get_track_count(ch->owner->mov);
-		base_track = 0;
-		for (i = 0; i < count; i++)
-		{
-			gf_isom_get_reference(ch->owner->mov, i+1, GF_ISOM_REF_BASE, 1, &base_track);
-			if (base_track)
-				break;
-		}
-		ch->base_track = base_track;
+		gf_isom_get_reference(ch->owner->mov, ch->track, GF_ISOM_REF_BASE, 1, &ch->base_track);
 		ch->next_track = 0;
-
-		/*set track to last layer (hopefully max quality)*/
-		if (base_track) {
-			for (i = 0; i < count; i++) {
-				gf_isom_get_reference(ch->owner->mov, i+1, GF_ISOM_REF_BASE, 1, &base_track);
-				if (base_track==ch->base_track)
-					ch->track = i+1;
-			}
-		}
 		/*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);
 		break;
@@ -712,6 +821,9 @@
             } else {
                 gf_term_on_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);
 		}
 	}
 	return e;
@@ -760,6 +872,7 @@
 	*out_data_size = 0;
 	*sl_compressed = GF_FALSE;
 	*out_reception_status = GF_OK;
+	*is_new_data = GF_FALSE;
 	ch = isor_get_channel(read, channel);
 	if (!ch) return GF_STREAM_NOT_FOUND;
 	if (!ch->is_playing) return GF_OK;
@@ -871,6 +984,7 @@
 
 	if (!plug || !plug->priv || !com) return GF_SERVICE_ERROR;
 	read = (ISOMReader *) plug->priv;
+	if (read->disconnected) return GF_OK;
 
 	if (com->command_type==GF_NET_SERVICE_INFO) {
 		u32 tag_len;
@@ -908,12 +1022,21 @@
 		for (i = 0; i < count; i++)
 		{
 			ch = (ISOMChannel *)gf_list_get(read->channels, i);
-			if (ch->base_track) {
+			if (gf_isom_has_scalable_layer(read->mov)) {
 				ch->next_track = gf_channel_switch_quality(ch, read->mov, com->switch_quality.up);
 			}
 		}
 		return GF_OK;
 	}
+	if (com->command_type == GF_NET_SERVICE_PROXY_DATA_RECEIVE) {
+		isor_flush_data(read, 1, com->proxy_data.is_chunk);
+		return GF_OK;
+	}
+	if (com->command_type == GF_NET_SERVICE_FLUSH_DATA) {
+		if (plug->query_proxy)
+			isor_flush_data(read, 0, 0);
+		return GF_OK;
+	}
 
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
 
@@ -926,15 +1049,22 @@
 		gf_isom_set_sample_padding(read->mov, ch->track, com->pad.padding_bytes);
 		return GF_OK;
 	case GF_NET_CHAN_SET_PULL:
+		//we don't pull in DASH base services, we flush as soon as we have a complete segment
+#ifndef DASH_USE_PULL
+		if (read->input->proxy_udta && !read->input->proxy_type) 
+			return GF_NOT_SUPPORTED;
+#endif
+
 		ch->is_pulling = 1;
 		return GF_OK;
 	case GF_NET_CHAN_INTERACTIVE:
 		return GF_OK;
 	case GF_NET_CHAN_BUFFER:
 		//dash or HTTP, do rebuffer if not disabled
-		if (plug->query_proxy || read->dnload) {
-			//if (!com->buffer.max) com->buffer.max = 1000;
-			//com->buffer.min = com->buffer.max;
+		if (plug->query_proxy) {
+		} else if (read->dnload) {
+			ch->buffer_min = com->buffer.min;
+			ch->buffer_max = com->buffer.max;
 		} else {
 			com->buffer.max = com->buffer.min = 0;
 		}
@@ -959,8 +1089,7 @@
 		}
 		return GF_OK;
 	case GF_NET_CHAN_PLAY:
-		if (!ch->is_pulling) return GF_NOT_SUPPORTED;
-		assert(!ch->is_playing);
+
 		isor_reset_reader(ch);
 		ch->speed = com->play.speed;
 		ch->start = ch->end = 0;
@@ -980,6 +1109,9 @@
 		ch->is_playing = 1;
 		if (com->play.dash_segment_switch) ch->wait_for_segment_switch = 1;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[IsoMedia] Starting channel playback "LLD" to "LLD" (%g to %g)\n", ch->start, ch->end, com->play.start_range, com->play.end_range));
+
+		//and check buffer level on play request
+		isor_check_buffer_level(read);
 		return GF_OK;
 	case GF_NET_CHAN_STOP:
 		isor_reset_reader(ch);
@@ -1005,6 +1137,8 @@
 			gf_odf_desc_del((GF_Descriptor *) dcd);
 		}
 		return GF_OK;
+	default:
+		break;
 	}
 	}
 	return GF_NOT_SUPPORTED;
@@ -1061,6 +1195,7 @@
 	GF_InputService *plug = (GF_InputService *) bi;
 	ISOMReader *read = (ISOMReader *)plug->priv;
 
+	if (read->segment_mutex) gf_mx_del(read->segment_mutex);
 	gf_list_del(read->channels);
 	gf_free(read);
 	gf_free(bi);

gpac-0.5.0.svn4668.tar.bz2/modules/isom_in/read_ch.c -> gpac-0.5.0.svn5178.tar.bz2/modules/isom_in/read_ch.c Changed

@@ -25,27 +25,37 @@
 
 
 #include "isom_in.h"
+#include <gpac/network.h>
+#include <time.h>
 
 #ifndef GPAC_DISABLE_ISOM
 
 
 void isor_reset_reader(ISOMChannel *ch)
 {
-	memset(&ch->current_slh, 0, sizeof(GF_SLHeader));
 	ch->last_state = GF_OK;
-	if (ch->sample) gf_isom_sample_del(&ch->sample);
+	isor_reader_release_sample(ch);
+
 	ch->sample = NULL;
 	ch->sample_num = 0;
 	ch->speed = 1.0;
 	ch->start = ch->end = 0;
 	ch->to_init = 1;
 	ch->is_playing = 0;
+	memset(&ch->current_slh, 0, sizeof(GF_SLHeader));
 }
 
-void isor_segment_switch_or_refresh(ISOMReader *read, u32 progressive_refresh)
+/*
+	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)
 {
 	GF_NetworkCommand param;
 	u32 i, count;
+	Bool scalable_segment = 0;
 	GF_Err e;
 
 	/*access to the segment switching must be protected in case several decoders are threaded on the file using GetSLPacket */
@@ -58,21 +68,30 @@
 
 	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;
+	
 	count = gf_list_count(read->channels);
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Refresh seg: progressive %d - seg opened %d\n", progressive_refresh , read->seg_opened));
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Refresh seg: refresh_type %d - seg opened %d\n", refresh_type , read->seg_opened));
 
-	if (progressive_refresh && !read->seg_opened)
-		progressive_refresh = 0;
+	if (refresh_type && !read->seg_opened)
+		refresh_type = 0;
 
-	if ((read->seg_opened==1) && !progressive_refresh) {
+	if ((read->seg_opened==1) && !refresh_type) {
 		gf_mx_v(read->segment_mutex);
 		return;
 	}
 
+	if (read->drop_next_segment) {
+		read->drop_next_segment = 0;
+		param.url_query.drop_first_segment = 1;
+	}
+
 	//if first time trying to fetch next segment, check if we have to discard it
-	if (!progressive_refresh && (read->seg_opened==2)) {
+	if (!refresh_type && (read->seg_opened==2)) {
+#ifdef DASH_USE_PULL
 		for (i=0; i<count; i++) {
 			ISOMChannel *ch = gf_list_get(read->channels, i);
 			/*check all playing channels are waiting for next segment*/
@@ -81,6 +100,7 @@
 				return;
 			}
 		}
+#endif
 
 		/*close current segment*/
 		gf_isom_release_segment(read->mov, 1);
@@ -91,29 +111,36 @@
 		param.url_query.drop_first_segment = 1;
 	}
 
-
+next_segment:
 	/*update current fragment if any*/
 	e = read->input->query_proxy(read->input, &param);
-	if (e ==GF_OK) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Next dash URL %s\n", param.url_query.next_url));
-
+	if (e == GF_OK) {
+		u64 timestamp, ntp;
+		u32 trackID = 0;
 		if (param.url_query.next_url){
 
+			//previously loaded file has been aborted, reload segment !
+			if (refresh_type && param.url_query.discontinuity_type) {
+				gf_isom_release_segment(read->mov, 1);
+				gf_isom_reset_fragment_info(read->mov, 1);
+				refresh_type = 0;
+			}
+
 			//refresh file
-			if (progressive_refresh) {
+			if (refresh_type) {
 				//the url is the current download or we just finished downloaded it, refresh the parsing.
-				if ((param.url_query.is_current_download || (read->seg_opened==1)) /*&& param.url_query.has_new_data*/) {
-					u64 bytesMissing;
+				if ((param.url_query.current_download || (read->seg_opened==1)) && param.url_query.has_new_data) {
+					u64 bytesMissing=0;
 					e = gf_isom_refresh_fragmented(read->mov, &bytesMissing, read->use_memory ? param.url_query.next_url : NULL);
 
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] LowLatency mode: Reparsing segment %s boxes at UTC "LLU"\n", param.url_query.next_url, gf_net_get_utc() ));
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[IsoMedia] LowLatency mode: Reparsing segment %s boxes at UTC "LLU" - "LLU" bytes still missing\n", param.url_query.next_url, gf_net_get_utc(), bytesMissing ));
 					for (i=0; i<count; i++) {
 						ISOMChannel *ch = gf_list_get(read->channels, i);
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] refresh track %d fragment - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
+						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[IsoMedia] refresh track %d fragment - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
 					}
 				}
 				//we did the last refresh and the segment is downloaded, move to fully parsed mode
-				if (! param.url_query.is_current_download) {
+				if (! param.url_query.current_download) {
 					read->seg_opened = 2;
 				}
 				gf_mx_v(read->segment_mutex);
@@ -122,8 +149,10 @@
 
 			//we have to open the file
 
-			if (param.url_query.discontinuity_type==2)
-				gf_isom_reset_fragment_info(read->mov);
+			if (param.url_query.discontinuity_type==2) {
+				gf_isom_reset_fragment_info(read->mov, 0);
+				read->clock_discontinuity = 1;
+			}
 
 			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));
@@ -131,9 +160,9 @@
 				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);
 			}
 
-			e = gf_isom_open_segment(read->mov, param.url_query.next_url, param.url_query.start_range, param.url_query.end_range);
+			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 (progressive_refresh && (e==GF_ISOM_INCOMPLETE_FILE)) {
+			if (param.url_query.current_download  && (e==GF_ISOM_INCOMPLETE_FILE)) {
 				e = GF_OK;
 			}
 
@@ -148,23 +177,72 @@
 #endif
 
 			if (e<0) {
+				gf_isom_release_segment(read->mov, 1);
+				//gf_isom_reset_fragment_info(read->mov, 1);
+				read->drop_next_segment = 1;
+				//error opening the segment, reset everything ...
+				gf_isom_reset_fragment_info(read->mov, 0);
+				for (i=0; i<count; i++) {
+					ISOMChannel *ch = gf_list_get(read->channels, i);
+					ch->sample_num = 0;
+				}
+
 				//cannot open file, don't change our state
 				gf_mx_v(read->segment_mutex);
 				return;
 			}
 
 			//segment is the first in our cache, we may need a refresh
-			if (param.url_query.is_current_download ) {
+			if (param.url_query.current_download ) {
 				read->seg_opened = 1;
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Opening current segment in progressive mode (download in progress)\n"));
 			} else {
 				read->seg_opened = 2;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Opening current segment in npn-progressive mode (completely downloaded)\n"));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Opening current segment in non-progressive mode (completely downloaded)\n"));
+			}
+
+#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;
+				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 ));
 			}
+#endif
 
+			trackID = 0;
 			for (i=0; i<count; i++) {
 				ISOMChannel *ch = gf_list_get(read->channels, i);
 				ch->wait_for_segment_switch = 0;
+
+				if (scalable_segment) {
+					trackID = gf_isom_get_highest_track_in_scalable_segment(read->mov, ch->base_track);
+					if (trackID) {
+						ch->track_id = trackID;
+						ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
+					}
+				}
+				else if (ch->base_track) {
+					ch->track = ch->base_track;
+					ch->track_id = gf_isom_get_track_id(read->mov, ch->track);
+				}
+
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track %d - cur sample %d - new sample count %d\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track) ));
 				if (param.url_query.next_url_init_or_switch_segment) {
 					ch->track = gf_isom_get_track_by_id(read->mov, ch->track_id);
@@ -177,27 +255,45 @@
 						}
 					}
 
-					/*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);
-
 					/*we changed our moov structure, sample_num now starts from 0*/
 					ch->sample_num = 0;
-				} else {
-					/*no need to rewrite upcoming SPS/PPS into the samples*/
-					gf_isom_set_nalu_extract_mode(read->mov, ch->track, GF_ISOM_NALU_EXTRACT_DEFAULT);
 				}
+				//a loop was detected, our timing is no longer reliable if we use edit lists - just reset the sample time to tfdt ...
+				else if (param.url_query.discontinuity_type==2) {
+					ch->sample_num = 0;
+					if (ch->has_edit_list) {
+						ch->sample_time = gf_isom_get_current_tfdt(read->mov, ch->track);
+						//next read will query sample for ch->sample_time + 1
+						if (ch->sample_time) ch->sample_time--;
+					}
+				}
+				/*rewrite all upcoming SPS/PPS into the samples*/
+				gf_isom_set_nalu_extract_mode(read->mov, ch->track, GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG);
 				ch->last_state = GF_OK;
+
+				
+				if (ch->is_cenc) {
+					isor_send_cenc_config(ch);
+				}
+
 			}
 
 			read->use_memory = !strncmp(param.url_query.next_url, "gmem://", 7) ? GF_TRUE : GF_FALSE;
 		}
+		if (param.url_query.has_next) {
+			param.url_query.drop_first_segment = GF_FALSE;
+			param.url_query.dependent_representation_index++;
+			scalable_segment = 1;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Enhancement layer available in cache - refreshing it\n"));
+			goto next_segment;
+		}
 		read->waiting_for_data = GF_FALSE;
 	} else if (e==GF_EOS) {
 		/*consider we are done*/
 		read->frag_type = 2;
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] No more segments - done playing file\n"));
 	} else if (e==GF_BUFFER_TOO_SMALL){
-		if (progressive_refresh==0) {
+		if (refresh_type==0) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Next segment is not yet available\n"));
 			read->waiting_for_data = GF_TRUE;
 		} else {
@@ -214,7 +310,7 @@
 static void init_reader(ISOMChannel *ch)
 {
 	u32 ivar;
-	if (ch->wait_for_segment_switch) {
+	if (ch->is_pulling && ch->wait_for_segment_switch) {
 		isor_segment_switch_or_refresh(ch->owner, 0);
 		if (ch->wait_for_segment_switch) 
 			return;
@@ -254,7 +350,7 @@
 	if (!ch->sample) {
 		/*incomplete file - check if we're still downloading or not*/
 		if (gf_isom_get_missing_bytes(ch->owner->mov, ch->track)) {
-			u32 net_status;
+			GF_NetIOStatus net_status;
 			gf_dm_sess_get_stats(ch->owner->dnload, NULL, NULL, NULL, NULL, NULL, &net_status);
 			if (net_status == GF_NETIO_DATA_EXCHANGE) {
 				ch->last_state = GF_OK;
@@ -287,10 +383,8 @@
 		ch->track = ch->next_track;
 		ch->next_track = 0;
 	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Checking for next sample\n"));
 
-
-	if (ch->owner->seg_opened==1) {
+	if ((ch->owner->seg_opened==1) && ch->is_pulling) {
 		isor_segment_switch_or_refresh(ch->owner, 1);
 	}
 
@@ -395,12 +489,17 @@
 		if (gf_isom_get_missing_bytes(ch->owner->mov, ch->track)) {
 			ch->last_state = GF_ISOM_INCOMPLETE_FILE;
 			if (ch->owner->dnload) {
-				u32 net_status;
+				GF_NetIOStatus net_status;
 				gf_dm_sess_get_stats(ch->owner->dnload, NULL, NULL, NULL, NULL, NULL, &net_status);
 				if (net_status == GF_NETIO_DATA_EXCHANGE) {
 					ch->last_state = GF_OK;
+					if (!ch->has_edit_list) 
+						ch->sample_num--;
 				}
 			}
+			else if (ch->owner->input->query_proxy) {
+				ch->last_state = GF_OK;
+			}
 		} else if (!ch->sample_num || (ch->sample_num >= gf_isom_get_sample_count(ch->owner->mov, ch->track))) {
 			if (ch->owner->frag_type==1) {
 				//if segment is fully opened and no more data, this track is done, wait for next segment
@@ -411,19 +510,26 @@
 				/*if sample cannot be found and file is fragmented, rewind sample*/
 				if (ch->sample_num) ch->sample_num--;
 				ch->last_state = GF_OK;
-			} else {
+			} else if (!ch->owner->frag_type) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track #%d end of stream reached\n", ch->track));
 				ch->last_state = GF_EOS;
 			}
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Track #%d fail to fetch sample %d / %d: %s\n", ch->track, ch->sample_num, gf_isom_get_sample_count(ch->owner->mov, ch->track), gf_error_to_string(gf_isom_last_error(ch->owner->mov)) ));
 		}
-		if (ch->wait_for_segment_switch)
+		if (ch->wait_for_segment_switch && ch->is_pulling) {
 			isor_segment_switch_or_refresh(ch->owner, 0);
+			if (ch->owner->seg_opened) {
+				isor_reader_get_sample(ch);
+				return;
+			}
+		}
 		return;
 	}
 	ch->last_state = GF_OK;
+	ch->current_slh.accessUnitEndFlag = ch->current_slh.accessUnitStartFlag = 1;
 	ch->current_slh.accessUnitLength = ch->sample->dataLength;
+	ch->current_slh.au_duration = gf_isom_get_sample_duration(ch->owner->mov, ch->track, ch->sample_num);
 	/*still seeking or not ?*/
 	if (ch->start <= ch->sample->DTS + ch->sample->CTS_Offset) {
 		ch->current_slh.decodingTimeStamp = ch->sample->DTS;
@@ -436,6 +542,8 @@
 			ch->current_slh.decodingTimeStamp = ch->start;
 	}
 	ch->current_slh.randomAccessPointFlag = ch->sample->IsRAP;
+	ch->current_slh.OCRflag = ch->owner->clock_discontinuity ? 2 : 0;
+	ch->owner->clock_discontinuity = 0;
 
 	if (ch->end && (ch->end < ch->sample->DTS + ch->sample->CTS_Offset)) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] End of Channel "LLD" (CTS "LLD")\n", ch->end, ch->sample->DTS + ch->sample->CTS_Offset));
@@ -455,12 +563,49 @@
 			gf_isom_ismacryp_delete_sample(ismasamp);
 		} else {
 			ch->current_slh.isma_encrypted = 0;
+			/*in case of CENC: we write sample auxiliary information to slh->sai; its size is in saiz*/
+			if (gf_isom_is_cenc_media(ch->owner->mov, ch->track, 1)) {
+				GF_CENCSampleAuxInfo *sai;
+				u32 Is_Encrypted;
+				u8 IV_size;
+				bin128 KID;
+
+				gf_isom_get_sample_cenc_info(ch->owner->mov, ch->track, ch->sample_num, &Is_Encrypted, &IV_size, &KID);
+				ch->current_slh.IV_size = IV_size;
+				if (Is_Encrypted) {
+					ch->current_slh.cenc_encrypted = 1;
+					sai = NULL;
+					gf_isom_cenc_get_sample_aux_info(ch->owner->mov, ch->track, ch->sample_num, &sai, NULL);
+					if (sai) {
+						GF_BitStream *bs;
+						bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+						/*write sample auxiliary information*/
+						gf_bs_write_data(bs, (char *)KID, 16);
+						gf_bs_write_data(bs, (char *)sai->IV, IV_size);
+						gf_bs_write_u16(bs, sai->subsample_count);
+						for (ivar = 0; ivar < sai->subsample_count; ivar++) {
+							gf_bs_write_u16(bs, sai->subsamples[ivar].bytes_clear_data);
+							gf_bs_write_u32(bs, sai->subsamples[ivar].bytes_encrypted_data);
+						}
+						gf_bs_get_content(bs, &ch->current_slh.sai, &ch->current_slh.saiz);
+						gf_bs_del(bs);
+						gf_isom_cenc_samp_aux_info_del(sai);
+						sai = NULL;
+					}
+				}
+				else
+					ch->current_slh.cenc_encrypted = 0;
+			}
 		}
 	}
 }
 
 void isor_reader_release_sample(ISOMChannel *ch)
 {
+	if (ch->current_slh.sai) {
+		gf_free(ch->current_slh.sai);
+		ch->current_slh.sai = NULL;
+	}
 	if (ch->sample) gf_isom_sample_del(&ch->sample);
 	ch->sample = NULL;
 	ch->current_slh.AU_sequenceNumber++;
@@ -468,5 +613,124 @@
 }
 
 
+void isor_flush_data(ISOMReader *read, Bool check_buffer_level, Bool is_chunk_flush)
+{
+	u32 i, count;
+	GF_Err e = GF_OK;
+	Bool in_progressive_mode;
+	GF_NetworkCommand com;
+	ISOMChannel *ch;
+
+	if (read->in_data_flush) {
+		if (check_buffer_level && !is_chunk_flush) read->has_pending_segments++;
+		return;
+	}
+
+	//if another thread grabs the mutex at the same time, just return
+	if (!gf_mx_try_lock(read->segment_mutex)) {
+		if (check_buffer_level && !is_chunk_flush) read->has_pending_segments++;
+		return;
+	}
+	read->in_data_flush = 1;
+	count = gf_list_count(read->channels);
+
+	in_progressive_mode = (read->seg_opened==1) ? 1 : 0;
+
+	if (in_progressive_mode) {
+		//query from terminal - do nothing if we are not done downloading the segment - otherwise we could access media data while it is reallocated by the downloader
+		if (!check_buffer_level) {
+			read->in_data_flush = 0;
+			gf_mx_v(read->segment_mutex);
+			return;
+		}
+		//otherwise this is new chunk or end of chunk, process
+	}
+	//this is a new file, check buffer level 
+	else if (!is_chunk_flush && check_buffer_level) {
+		Bool buffer_full = 1;
+		for (i=0; i<count; i++) {
+			ch = (ISOMChannel *)gf_list_get(read->channels, i);
+			/*query buffer level on each channel, don't sleep if too low*/
+			memset(&com, 0, sizeof(GF_NetworkCommand));
+			com.command_type = GF_NET_BUFFER_QUERY;
+			com.base.on_channel = ch->channel;
+			gf_term_on_command(read->service, &com, GF_OK);
+			if ((com.buffer.occupancy < MAX(com.buffer.max, 1000) )) {
+				buffer_full = 0;
+				break;
+			}
+		}
+		if (buffer_full) {
+			read->has_pending_segments++;
+			read->in_data_flush = 0;
+			gf_mx_v(read->segment_mutex);
+			if (count) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[IsoMedia] Buffer level %d ms higher than max allowed %d ms - skipping dispatch\n", com.buffer.occupancy,  com.buffer.max));
+			}
+			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) {
+		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;
+ 
+	//update data
+	isor_segment_switch_or_refresh(read, in_progressive_mode);
+
+	//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);
+			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);
+		}
+	}
+
+	//done playing the file after notification from DASH client: 
+	if (read->seg_opened==2) {
+		GF_NetworkCommand param;
+		//drop this segment
+		memset(&param, 0, sizeof(GF_NetworkCommand));
+		param.command_type = GF_NET_SERVICE_QUERY_NEXT;
+		param.url_query.dependent_representation_index = 0;
+		param.url_query.drop_first_segment = 1;
+		e = read->input->query_proxy(read->input, &param);
+
+
+		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);
+			}
+		}
+
+		/*close current segment*/
+		gf_isom_release_segment(read->mov, 1);
+		read->seg_opened = 0;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[IsoMedia] Done playing segment \n"));
+	}
+	read->in_data_flush = 0;
+	gf_mx_v(read->segment_mutex);
+}
 
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4668.tar.bz2/modules/jack/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/jack/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/laser_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/laser_dec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/libplayer/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/libplayer/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/mp3_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/mp3_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/mp3_in/mp3_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/mp3_in/mp3_in.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/mpd_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/mpd_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/mpd_in/mpd_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/mpd_in/mpd_in.c Changed

@@ -30,7 +30,6 @@
 #include <gpac/dash.h>
 #include <gpac/internal/terminal_dev.h>
 
-
 typedef struct __mpd_module 
 {
     /* GPAC Service object (i.e. how this module is seen by the terminal)*/
@@ -45,19 +44,23 @@
 	Bool connection_ack_sent;
 	Bool in_seek;
 	Bool memory_storage;
-	Bool use_max_res, immediate_switch, use_low_latency;
-    Double previous_start_range;
+	Bool use_max_res, immediate_switch, allow_http_abort, enable_buffering;
+	u32 use_low_latency;
+	Double previous_start_range;
 	/*max width & height in all active representations*/
 	u32 width, height;
 } GF_MPD_In;
 
 typedef struct 
 {
+	GF_MPD_In *mpdin;
 	GF_InputService *segment_ifce;
 	Bool service_connected;
 	Bool service_descriptor_fetched;
 	Bool netio_assigned;
 	Bool has_new_data;
+	u32 idx;
+	GF_DownloadSession *sess;
 } GF_MPDGroup;
 
 const char * MPD_MPD_DESC = "MPEG-DASH Streaming";
@@ -96,9 +99,20 @@
 	return gf_dash_check_mpd_root_type(url);
 }
 
+static void MPD_NotifyData(GF_MPDGroup *group, Bool chunk_flush)
+{
+	GF_NetworkCommand com;
+	memset(&com, 0, sizeof(GF_NetworkCommand));
+	com.proxy_data.command_type = GF_NET_SERVICE_PROXY_DATA_RECEIVE;
+	com.proxy_data.is_chunk = chunk_flush;
+	com.proxy_data.is_live = gf_dash_is_dynamic_mpd(group->mpdin->dash);
+	group->segment_ifce->ServiceCommand(group->segment_ifce, &com);
+}
+
 static GF_Err MPD_ClientQuery(GF_InputService *ifce, GF_NetworkCommand *param)
 {
 	u32 i;
+	GF_Err e;
 	GF_MPD_In *mpdin = (GF_MPD_In *) ifce->proxy_udta;
     if (!param || !ifce || !ifce->proxy_udta) return GF_BAD_PARAM;
 
@@ -130,16 +144,19 @@
 		GF_MPDGroup *group=NULL;
 		const char *src_url;
 		Bool discard_first_cache_entry = param->url_query.drop_first_segment;
+		Bool check_current_download = param->url_query.current_download;
         u32 timer = gf_sys_clock();
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Query Next request from input service %s\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;
 			group = gf_dash_get_group_udta(mpdin->dash, i);
@@ -153,6 +170,11 @@
 		if (!group) {
 			return GF_SERVICE_ERROR;
 		}
+		//update group idx
+		if (group->idx != group_idx) {
+			group->idx = group_idx;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] New AdaptationSet detected after MPD update ?\n"));
+		}
 
 		if (discard_first_cache_entry) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Discarding first segment in cache\n"));
@@ -182,23 +204,25 @@
 				return GF_EOS;
 			}
 
-			if (mpdin->use_low_latency) {
-				gf_dash_group_probe_current_download_segment_location(mpdin->dash, group_idx, &param->url_query.next_url, NULL, &param->url_query.next_url_init_or_switch_segment, &src_url);
+			if (check_current_download && mpdin->use_low_latency) {
+				Bool is_switched=GF_FALSE;
+				gf_dash_group_probe_current_download_segment_location(mpdin->dash, group_idx, &param->url_query.next_url, NULL, &param->url_query.next_url_init_or_switch_segment, &src_url, &is_switched);
 
 				if (param->url_query.next_url) {
-					param->url_query.is_current_download = 1;
+					param->url_query.current_download = 1;
 					param->url_query.has_new_data = group->has_new_data;
+					param->url_query.discontinuity_type = is_switched ? 1 : 0;
+					if (gf_dash_group_loop_detected(mpdin->dash, group_idx))
+						param->url_query.discontinuity_type = 2;
 					group->has_new_data = 0;
 					return GF_OK;
 				}
 	            return GF_BUFFER_TOO_SMALL;
 			}
-			param->url_query.is_current_download = 0;
-
             return GF_BUFFER_TOO_SMALL;
         }
 	
-		param->url_query.is_current_download = 0;
+		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"));
@@ -207,25 +231,30 @@
             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)));
         }
 
-		gf_dash_group_get_next_segment_location(mpdin->dash, group_idx, &param->url_query.next_url, &param->url_query.start_range, &param->url_query.end_range, 
+		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);
+								&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		
+		{
             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] Switching segment playback to %s (Media Range: "LLD"-"LLD") at UTC "LLU" ms\n", src_url, param->url_query.start_range, param->url_query.end_range, gf_net_get_utc() ));
+	            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] Switching segment playback to %s at UTC "LLU" ms\n", src_url, gf_net_get_utc()));
+	            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] segment start time %g sec\n", gf_dash_group_current_segment_start_time(mpdin->dash, group_idx) ));
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Waited %d ms - Elements in cache: %u/%u\n\tCache file name %s\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 ));
-        }
-	    return GF_OK;
+			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
     }
 
 
@@ -251,6 +280,8 @@
 				group->segment_ifce = segment_ifce;
 				group->segment_ifce->proxy_udta = mpdin;
 				group->segment_ifce->query_proxy = MPD_ClientQuery;
+				group->mpdin = mpdin;
+				group->idx = group_index;
 				gf_dash_set_group_udta(mpdin->dash, group_index, group);
 				return GF_OK;
 			}
@@ -267,6 +298,8 @@
 				group->segment_ifce = ifce;
 				group->segment_ifce->proxy_udta = mpdin;
 				group->segment_ifce->query_proxy = MPD_ClientQuery;
+				group->mpdin = mpdin;
+				group->idx = group_index;
 				gf_dash_set_group_udta(mpdin->dash, group_index, group);
 				return GF_OK;
 			}
@@ -283,9 +316,12 @@
 {
 	GF_Channel *ch;
 	if (!channel) {
-		if (gf_dash_is_group_selected(mpdin->dash, 0)) {
-			GF_MPDGroup *mudta = gf_dash_get_group_udta(mpdin->dash, 0);
-			return mudta ? mudta->segment_ifce : NULL;
+		u32 i;
+		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
+			if (gf_dash_is_group_selectable(mpdin->dash, i)) {
+				GF_MPDGroup *mudta = gf_dash_get_group_udta(mpdin->dash, i);
+				if (mudta && mudta->segment_ifce) return mudta->segment_ifce;
+			}
 		}
 		return NULL;
 	}
@@ -332,12 +368,39 @@
 static void mpdin_dash_segment_netio(void *cbk, GF_NETIO_Parameter *param)
 {
 	GF_MPDGroup *group = (GF_MPDGroup *)cbk;
+
+	if (param->msg_type == GF_NETIO_PARSE_HEADER) {
+		if (!strcmp(param->name, "Dash-Newest-Segment")) {
+			gf_dash_resync_to_segment(group->mpdin->dash, param->value, gf_dm_sess_get_header(param->sess, "Dash-Oldest-Segment") );
+		}
+	}
+
 	if (param->msg_type == GF_NETIO_DATA_EXCHANGE) {
 		group->has_new_data = 1;
+
+		if (param->reply) {
+			u32 bytes_per_sec;
+			const char *url;
+			gf_dm_sess_get_stats(group->sess, NULL, &url, NULL, NULL, &bytes_per_sec, NULL);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] End of chunk received for %s at UTC "LLU" ms - estimated bandwidth %d kbps - chunk start at UTC "LLU"\n", url, gf_net_get_utc(), 8*bytes_per_sec/1000, gf_dm_sess_get_utc_start(group->sess)));
+
+			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);
+	}
+	if (param->msg_type == GF_NETIO_DATA_TRANSFERED) {
+		u32 bytes_per_sec;
+		const char *url;
+		gf_dm_sess_get_stats(group->sess, NULL, &url, NULL, NULL, &bytes_per_sec, NULL);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] End of file %s download at UTC "LLU" ms - estimated bandwidth %d kbps - started file or last chunk at UTC "LLU"\n", url, gf_net_get_utc(), 8*bytes_per_sec/1000, gf_dm_sess_get_utc_start(group->sess)));
 	}
 }
 
-
 void mpdin_dash_io_delete_cache_file(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *cache_url)
 {
 	gf_dm_delete_cached_file_entry_session((GF_DownloadSession *)session, cache_url);
@@ -359,7 +422,7 @@
 	}
 	if (group) {
 		group->netio_assigned = GF_TRUE;
-		sess = gf_term_download_new(mpdin->service, url, flags, mpdin_dash_segment_netio, group);
+		group->sess = sess = gf_term_download_new(mpdin->service, url, flags, mpdin_dash_segment_netio, group);
 	} else {
 		sess = gf_term_download_new(mpdin->service, url, flags, NULL, NULL);
 	}
@@ -378,8 +441,9 @@
 	if (group_idx>=0) {
 		GF_MPD_In *mpdin = (GF_MPD_In *)dashio->udta;
 		GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, group_idx);
-		if (!group->netio_assigned) {
+		if (group && !group->netio_assigned) {
 			group->netio_assigned = GF_TRUE;
+			group->sess = (GF_DownloadSession *)session;
 			gf_dm_sess_reassign((GF_DownloadSession *)session, 0xFFFFFFFF, mpdin_dash_segment_netio, group);
 		}
 	}
@@ -409,6 +473,19 @@
 {
 	return gf_dm_sess_mime_type((GF_DownloadSession *)session);
 }
+
+const char *mpdin_dash_io_get_header_value(GF_DASHFileIO *dashio, GF_DASHFileIOSession session, const char *header_name)
+{
+	return gf_dm_sess_get_header((GF_DownloadSession *)session, header_name);
+}
+
+u64 mpdin_dash_io_get_utc_start_time(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	return gf_dm_sess_get_utc_start((GF_DownloadSession *)session);
+}
+
+
+
 u32 mpdin_dash_io_get_bytes_per_sec(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
 {
 	u32 bps=0;
@@ -423,8 +500,16 @@
     gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, &size, NULL, NULL, NULL);
 	return size;
 }
+u32 mpdin_dash_io_get_bytes_done(GF_DASHFileIO *dashio, GF_DASHFileIOSession session)
+{
+	u32 size=0;
+//	GF_DownloadSession *sess = (GF_DownloadSession *)session;
+    gf_dm_sess_get_stats((GF_DownloadSession *)session, NULL, NULL, NULL, &size, NULL, NULL);
+	return size;
+}
+
 
-GF_Err mpdin_dash_io_on_dash_event(GF_DASHFileIO *dashio, GF_DASHEventType dash_evt, GF_Err error_code)
+GF_Err mpdin_dash_io_on_dash_event(GF_DASHFileIO *dashio, GF_DASHEventType dash_evt, s32 group_idx, GF_Err error_code)
 {
 	GF_Err e;
 	u32 i;
@@ -433,21 +518,30 @@
 	if (dash_evt==GF_DASH_EVENT_PERIOD_SETUP_ERROR) {
 		if (!mpdin->connection_ack_sent) {
 	        gf_term_on_connect(mpdin->service, NULL, error_code);
-			mpdin->connection_ack_sent=1;
+			mpdin->connection_ack_sent= GF_TRUE;
 		}
 		return GF_OK;
 	}
 
 	if (dash_evt==GF_DASH_EVENT_SELECT_GROUPS) {
-		const char *opt;
-		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
-			/*todo: select groups based on user criteria*/
-			gf_dash_group_select(mpdin->dash, i, 1);
-		}
-		opt = gf_modules_get_option((GF_BaseInterface *)mpdin->plug, "Systems", "Language3CC");
-		if (opt && strcmp(opt, "und"))
-			gf_dash_groups_set_language(mpdin->dash, 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;
+			//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 (buffer_ms) {
+				gf_dash_set_user_buffer(mpdin->dash, buffer_ms);
+			}
+		}
+		//let the player decide which group to play: we declare everything
 		return GF_OK;
 	}
 
@@ -457,7 +551,8 @@
 		/*select input services if possible*/
 		for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
 			const char *mime, *init_segment;			
-			if (!gf_dash_is_group_selected(mpdin->dash, i))
+			//let the player decide which group to play
+			if (!gf_dash_is_group_selectable(mpdin->dash, i))
 				continue;
 
 			mime = gf_dash_group_get_segment_mime(mpdin->dash, i);
@@ -466,21 +561,21 @@
 			if (e != GF_OK) {
 				gf_dash_group_select(mpdin->dash, i, 0);
 			} else {
+				u32 w, h;
 				/*connect our media service*/
 				GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, i);
+				gf_dash_group_get_video_info(mpdin->dash, i, &w, &h);
+				if (w && h && w>mpdin->width && h>mpdin->height) {
+					mpdin->width = w;
+					mpdin->height = h;
+				}
+
 				e = group->segment_ifce->ConnectService(group->segment_ifce, mpdin->service, init_segment);
 				if (e) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[MPD_IN] Unable to connect input service to %s\n", init_segment));
 					gf_dash_group_select(mpdin->dash, i, 0);
 				} else {
-					u32 w, h;
 					group->service_connected = 1;
-					w = h = 0;
-					gf_dash_group_get_video_info(mpdin->dash, i, &w, &h);
-					if (w && h && w>mpdin->width && h>mpdin->height) {
-						mpdin->width = w;
-						mpdin->height = h;
-					}
 				}
 			}
 		}
@@ -520,6 +615,13 @@
 		u32 tot, done;
 		gf_dash_get_buffer_info_buffering(mpdin->dash, &tot, &done);
 		fprintf(stderr, "DASH: Buffering %g%% out of %d ms\n", (100.0*done)/tot, tot);
+		return GF_OK;
+	}
+	if (dash_evt==GF_DASH_EVENT_SEGMENT_AVAILABLE) {
+		if (group_idx>=0) {
+			GF_MPDGroup *group = gf_dash_get_group_udta(mpdin->dash, group_idx);
+			if (group) MPD_NotifyData(group, 0);
+		}
 	}
 	return GF_OK;
 }
@@ -530,11 +632,13 @@
     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;
 	GF_DASHInitialSelectionMode first_select_mode;
-	Bool keep_files, disable_switching, enable_buffering;
+	Bool keep_files, disable_switching;
 
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Service Connection request (%p) from terminal for %s\n", serv, url));
+	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;
 
@@ -552,8 +656,11 @@
 	mpdin->dash_io.get_url = mpdin_dash_io_get_url;
 	mpdin->dash_io.get_cache_name = mpdin_dash_io_get_cache_name;
 	mpdin->dash_io.get_mime = mpdin_dash_io_get_mime;
+	mpdin->dash_io.get_header_value = mpdin_dash_io_get_header_value;
+	mpdin->dash_io.get_utc_start_time = mpdin_dash_io_get_utc_start_time;
 	mpdin->dash_io.get_bytes_per_sec = mpdin_dash_io_get_bytes_per_sec;
 	mpdin->dash_io.get_total_size = mpdin_dash_io_get_total_size;
+	mpdin->dash_io.get_bytes_done = mpdin_dash_io_get_bytes_done;
 	mpdin->dash_io.on_dash_event = mpdin_dash_io_on_dash_event;
 
 	max_cache_duration = 0;
@@ -590,20 +697,42 @@
 	mpdin->memory_storage = (opt && !strcmp(opt, "yes")) ? 1 : 0;
 
 	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution");
-	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution", "yes");
-	mpdin->use_max_res = (!opt || !strcmp(opt, "yes")) ? 1 : 0;
+	if (!opt) {
+#if defined(_WIN32_WCE) || defined(GPAC_ANDROID) || defined(GPAC_IPHONE) 
+		opt = "yes";
+#else
+		opt = "no";
+#endif
+		gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseMaxResolution", opt);
+	}
+	mpdin->use_max_res = !strcmp(opt, "yes") ? 1 : 0;
 
 	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", "yes");
-	enable_buffering = (opt && !strcmp(opt, "yes")) ? 1 : 0;
+	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", "LowLatency");
 	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "LowLatency", "no");
-	mpdin->use_low_latency = (opt && !strcmp(opt, "yes")) ? GF_TRUE : GF_FALSE;
+
+	if (opt && !strcmp(opt, "chunk") ) mpdin->use_low_latency = 1;
+	else if (opt && !strcmp(opt, "always") ) mpdin->use_low_latency = 2;
+	else mpdin->use_low_latency = 0;
+
+	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;
@@ -612,8 +741,8 @@
 	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, enable_buffering, init_timeshift);
+	
+	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);
 
 	if (!mpdin->dash) {
         GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD_IN] Error - cannot create DASH Client for %s\n", url));
@@ -621,6 +750,42 @@
 		return GF_OK;
 	}
 
+	gf_dash_set_utc_shift(mpdin->dash, shift_utc_ms);
+	gf_dash_enable_utc_drift_compensation(mpdin->dash, use_server_utc);
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "UseScreenResolution");
+	//default mode is no for the time being
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "UseScreenResolution", "no");
+	if (!opt || !strcmp(opt, "yes")) {
+		GF_NetworkCommand com;
+		memset(&com, 0, sizeof(GF_NetworkCommand));
+		com.base.command_type = GF_NET_SERVICE_MEDIA_CAP_QUERY;
+		gf_term_on_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);
+		}
+	}
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "TimeBetween404");
+	if (opt) {
+		gf_dash_set_min_timeout_between_404(mpdin->dash, atoi(opt));
+	}
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "SegmentExpirationThreshold");
+	if (opt) {
+		gf_dash_set_segment_expiration_threshold(mpdin->dash, atoi(opt));
+	}
+
+
+	opt = gf_modules_get_option((GF_BaseInterface *)plug, "DASH", "DebugAdaptationSet");
+	if (!opt) gf_modules_set_option((GF_BaseInterface *)plug, "DASH", "DebugAdaptationSet", "-1");
+	debug_adaptation_set = opt ? atoi(opt) : -1;
+
+	gf_dash_debug_group(mpdin->dash, debug_adaptation_set);
+
 	/*dash thread starts at the end of gf_dash_open */
 	e = gf_dash_open(mpdin->dash, url);
 	if (e) {
@@ -639,8 +804,10 @@
 	for (i=0; i<gf_dash_get_group_count(mpdin->dash); i++) {
 		GF_Descriptor *desc;
 		GF_MPDGroup *mudta;
+#if 0
 		if (!gf_dash_is_group_selected(mpdin->dash, i))
 			continue;
+#endif
 		mudta = gf_dash_get_group_udta(mpdin->dash, i);
 		if (!mudta) continue;
 		if (mudta->service_descriptor_fetched) continue;
@@ -696,7 +863,7 @@
     }
 	/*we could get it from MPD*/
     case GF_NET_SERVICE_HAS_AUDIO:
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] Received Has Audio command from terminal on Service (%p)\n", mpdin->service));
+	case GF_NET_SERVICE_FLUSH_DATA:
 		if (segment_ifce) {
 	        /* defer to the real input service */
 		    return segment_ifce->ServiceCommand(segment_ifce, com);
@@ -711,6 +878,9 @@
 	case GF_NET_SERVICE_QUALITY_SWITCH:
 		gf_dash_switch_quality(mpdin->dash, com->switch_quality.up, mpdin->immediate_switch);
         return GF_OK;
+
+	default:
+		break;
 	}
 	/*not supported*/
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
@@ -723,10 +893,15 @@
         /* we are interactive (that's the whole point of MPD) */
         return GF_OK;
 
-	/*we should get it from MPD minBufferTime*/
 	case GF_NET_CHAN_BUFFER:
-        return segment_ifce->ServiceCommand(segment_ifce, com);
-        break;
+		/*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)) { 
+				com->buffer.min = 1;
+			}
+		}
+        return GF_OK;
 
 	case GF_NET_CHAN_DURATION:
 		/* Ignore the duration given by the input service and use the one given in the MPD
@@ -763,12 +938,18 @@
 
 			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);
 				com->play.dash_segment_switch = gf_dash_group_segment_switch_forced(mpdin->dash, idx);
 			}
 
 			/*don't forward commands, 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);
 		}
 
 		return segment_ifce->ServiceCommand(segment_ifce, com);
@@ -818,7 +999,7 @@
 	*/
 	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_SERVICE_ERROR;
+	if (!plug || !plug->priv) return GF_FALSE;
 	if (gf_dash_get_url(mpdin->dash) && !strcmp(gf_dash_get_url(mpdin->dash) , url)) {
 		return 1;
 	} else {

gpac-0.5.0.svn4668.tar.bz2/modules/mpegts_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/mpegts_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/mpegts_in/mpegts_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/mpegts_in/mpegts_in.c Changed

@@ -34,7 +34,8 @@
 
 static const char * MIMES[] = { "video/mpeg-2", "video/mp2t", "video/mpeg", NULL};
 
-#define M2TS_BUFFER_MAX 200
+//when regulating data rate from file using PCR, this is the maximum sleep we tolerate
+#define M2TS_MAX_SLEEP 200
 
 typedef struct {
 	char *fragment;
@@ -56,6 +57,7 @@
 	Bool is_connected;
 	Bool low_latency_mode;
 	Bool in_segment_download;
+	Bool first_segment_fetched;
 
 	Bool epg_requested;
 	Bool has_eit;
@@ -70,6 +72,9 @@
 	/*pick first pcr pid for regulation*/
 	u32 regulation_pcr_pid;
 
+	Bool skip_regulation;
+	Bool has_pending_segments;
+
 	Bool hybrid_on;
 }M2TSIn;
 
@@ -192,6 +197,10 @@
 		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_HEVC;
 		break;
+	case GF_M2TS_VIDEO_SHVC:
+		esd->decoderConfig->streamType = GF_STREAM_VISUAL;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SHVC;
+		break;
 	case GF_M2TS_AUDIO_MPEG1:
 		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_MPEG1;
@@ -220,6 +229,10 @@
 		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
 		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AAC_MPEG4;
 		break;
+	case GF_M2TS_AUDIO_AC3:
+		esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+		esd->decoderConfig->objectTypeIndication = GPAC_OTI_AUDIO_AC3;
+		break;
 	case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
 	default:
 		gf_odf_desc_del((GF_Descriptor *)esd);
@@ -259,6 +272,9 @@
 	esd = MP2TS_GetESD(m2ts, stream, dsi, dsi_size);
 	if (!esd) return NULL;
 
+	if (stream->program->is_scalable)
+		esd->has_ref_base = GF_TRUE;
+
 	/*declare object to terminal*/
 	od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
 	gf_list_add(od->ESDescriptors, esd);
@@ -314,8 +330,17 @@
 #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->owner->query_proxy) 
+	if (m2ts->ts->file || m2ts->ts->dnload) 
 		m2ts->ts->file_regulate = 1;
+		
+	for (i=0; i<count; i++) {
+		GF_M2TS_ES *es = gf_list_get(prog->streams, i);
+		if (es->pid==prog->pmt_pid) continue;
+		if (((GF_M2TS_PES *)es)->depends_on_pid ) {
+			prog->is_scalable = GF_TRUE;
+			break;
+		}
+	}
 
 	for (i=0; i<count; i++) {
 		GF_M2TS_ES *es = gf_list_get(prog->streams, i);
@@ -396,12 +421,10 @@
 	esd->decoderConfig->objectTypeIndication = GPAC_OTI_PRIVATE_SCENE_EPG;
 	esd->decoderConfig->bufferSizeDB = 0;
 
-	/*we only use AUstart indicator
+	/*we only use AUstart indicator*/
 	esd->slConfig->useAccessUnitStartFlag = 1;
-	esd->slConfig->useAccessUnitEndFlag = 0;
 	esd->slConfig->useRandomAccessPointFlag = 1;
-	esd->slConfig->AUSeqNumLength = 0;
-	esd->slConfig->timestampResolution = 90000;*/
+	esd->slConfig->timestampResolution = 90000;
 
 	/*declare object to terminal*/
 	od = (GF_ObjectDescriptor*)gf_odf_desc_new(GF_ODF_OD_TAG);
@@ -444,6 +467,16 @@
 			if (!stricmp((const char *) sdt->service, req_prog->fragment)) req_prog->id = sdt->service_id;
 			else if (sdt->service_id==prog_id)  req_prog->id = sdt->service_id;
 		}
+		if (!req_prog->id) {
+			count = gf_list_count(m2ts->ts->programs);
+			for (j=0; j<count; j++) {
+				GF_M2TS_Program *ts_prog = gf_list_get(m2ts->ts->programs, j);
+				if (prog_id==ts_prog->number) {
+					req_prog->id = prog_id;
+					break;
+					}
+			}
+		}
 		if (req_prog->id) {
 			GF_M2TS_Program *ts_prog;
 			count = gf_list_count(m2ts->ts->programs);
@@ -559,7 +592,7 @@
 	case GF_M2TS_EVT_PES_PCK:
 		MP2TS_SendPacket(m2ts, param);
 		break;
-	case GF_M2TS_EVT_SL_PCK:
+	case GF_M2TS_EVT_SL_PCK: /* DMB specific */
 		MP2TS_SendSLPacket(m2ts, param);
 		break;
 	case GF_M2TS_EVT_EOS:
@@ -634,7 +667,7 @@
 						diff = (u32) pcr_diff - (stb - ts->stb_at_last_pcr);
 					}
 				}
-				if (diff<0) {
+				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));
 				} else if (diff>0) {
 					u32 sleep_for=1;
@@ -644,17 +677,20 @@
 					/*query buffer level, don't sleep if too low*/
 					GF_NetworkCommand com;
 					com.command_type = GF_NET_BUFFER_QUERY;
+					com.base.on_channel = NULL;
 					while (ts->run_state) {
 						gf_term_on_command(m2ts->service, &com, GF_OK);
-						if (com.buffer.occupancy < M2TS_BUFFER_MAX) {
+						if (!com.buffer.occupancy || (com.buffer.occupancy < com.buffer.max)) {
 							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Demux not going to sleep: buffer occupancy %d ms\n", com.buffer.occupancy));
 							break;
 						}
 						/*We don't sleep for the entire buffer occupancy, because we would take
 						the risk of starving the audio chains. We try to keep buffers half full*/
+						sleep_for = MIN(com.buffer.occupancy/2, M2TS_MAX_SLEEP);
+
 #ifndef GPAC_DISABLE_LOG
 						if (!nb_sleep) {
-							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Demux going to sleep (buffer occupancy %d ms)\n", com.buffer.occupancy));
+							GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[M2TS In] Demux going to sleep for %d ms (buffer occupancy %d ms)\n", sleep_for, com.buffer.occupancy));
 						}
 						nb_sleep++;
 #endif
@@ -665,7 +701,6 @@
 						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->nb_pck = 0;
 					ts->pcr_last = pcr;
 					ts->stb_at_last_pcr = gf_sys_clock();
 				} else {
@@ -709,24 +744,32 @@
 		break;
 	case GF_M2TS_EVT_TOT:
 		break;
-	}
-}
 
-#if 0
-static void M2TS_OnEventPCR(GF_M2TS_Demuxer *ts, u32 evt_type, void *param)
-{
-	if (evt_type==GF_M2TS_EVT_PES_PCR) {
-//		M2TSIn *m2ts = ts->user;
-		GF_M2TS_PES_PCK *pck = param;
-		if (!ts->nb_playing) {
-			ts->nb_playing = pck->stream->pid;
-			ts->end_range = (u32) (pck->PTS / 90);
-		} else if (ts->nb_playing == pck->stream->pid) {
-			ts->start_range = (u32) (pck->PTS / 90);
+	case GF_M2TS_EVT_DURATION_ESTIMATED:
+	{
+		u32 i, count;
+		GF_NetworkCommand com;
+		memset(&com, 0, sizeof(com));
+		com.command_type = GF_NET_CHAN_DURATION;
+		com.duration.duration = (Double) ((GF_M2TS_PES_PCK *) param)->PTS;
+		com.duration.duration /= 1000;
+		count = gf_list_count(ts->programs);
+		for (i=0; i<count; i++) {
+			GF_M2TS_Program *prog = gf_list_get(ts->programs, i);
+			u32 j, count2;
+			count2 = gf_list_count(prog->streams);
+			for (j=0; j<count2; j++) {
+				GF_M2TS_ES * stream = gf_list_get(prog->streams, j);
+				if (stream->user) {
+					com.base.on_channel = stream->user;
+					gf_term_on_command(m2ts->service, &com, GF_OK);
+				}
+			}
 		}
 	}
+		break;
+	}
 }
-#endif
 
 void m2ts_net_io(void *cbk, GF_NETIO_Parameter *param)
 {
@@ -791,7 +834,13 @@
 	}
 }
 
-static GF_Err M2TS_QueryNextFile(void *udta, u32 query_type, const char **out_url, u64 *out_start_range, u64 *out_end_range, Bool *is_refresh)
+/*for DASH - query_type is:
+	0: query init range
+	1: query next segment
+	2: query next segment except currently downloading one
+	3: drop next segment
+*/
+static GF_Err M2TS_QueryNextFile(void *udta, u32 query_type, const char **out_url, u64 *out_start_range, u64 *out_end_range, u32 *refresh_type)
 {
 	GF_NetworkCommand param;
 	GF_Err query_ret;
@@ -803,9 +852,10 @@
 	if (out_start_range) *out_start_range = 0;
 	if (out_end_range) *out_end_range = 0;
 
+	memset(&param, 0, sizeof(GF_NetworkCommand));
 	param.command_type = (query_type==0) ? GF_NET_SERVICE_QUERY_INIT_RANGE : GF_NET_SERVICE_QUERY_NEXT;
-	param.url_query.next_url = NULL;
-	param.url_query.drop_first_segment = (query_type==1) ? 1 : 0;
+	param.url_query.drop_first_segment = (query_type==3) ? 1 : 0;
+	param.url_query.current_download = (query_type==2) ? 0 : 1;
 
 	//we are downloading the segment we play, don't delete it
 	if (m2ts->in_segment_download)
@@ -814,7 +864,7 @@
 	query_ret = m2ts->owner->query_proxy(m2ts->owner, &param);
 
 	if ((query_ret==GF_BUFFER_TOO_SMALL) && query_type && !param.url_query.next_url){
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] Cannot query next file: not yet downloaded\n"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[M2TS In] Cannot query next file: not yet downloaded\n"));
 	} else if ((query_ret==GF_OK) && query_type && !param.url_query.next_url){
 		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] Cannot query next file: no file provided but no error raised\n"));
 	} else if (query_ret) {
@@ -825,22 +875,22 @@
 		if (out_end_range) *out_end_range = param.url_query.end_range;
 
 		/*the segment is being downloaded now, start monitoring refresh*/
-		if (param.url_query.is_current_download) {
+		if (param.url_query.current_download) {
 			m2ts->low_latency_mode = 1;
-			if (is_refresh) *is_refresh = GF_TRUE;
+			if (refresh_type) *refresh_type = 1;
 			if (!m2ts->in_segment_download || param.url_query.has_new_data) {
 				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] progressive loading of TS segments\n"));
 			}
 			//state "in progress"
-		m2ts->in_segment_download = 1;
+			m2ts->in_segment_download = 1;
 		} else {
-			if (is_refresh) {
+			if (refresh_type) {
 				//segment done downloading but was in progress mode: do a final refresh
 				if (m2ts->in_segment_download) {
 					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[M2TS In] End of progressive loading of TS segments\n"));
-					*is_refresh = GF_TRUE;
+					*refresh_type = 2;
 				} else {
-					*is_refresh = GF_FALSE;
+					*refresh_type = 0;
 				}
 			}
 			m2ts->in_segment_download = 0;
@@ -849,6 +899,61 @@
 	return query_ret;
 }
 
+void m2ts_flush_data(M2TSIn *m2ts, u32 flush_type)
+{
+	u64 start_byterange, end_byterange;
+	GF_Err e = GF_OK;
+	u32 refresh_type = 0;
+	const char *url;
+
+	gf_mx_p(m2ts->mx);
+
+	//check buffer level when start of new segment
+	if (flush_type<=1) {
+		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);
+		if (com.buffer.occupancy && (com.buffer.occupancy >= com.buffer.max)) {
+			//count completed segment that were not dispatched
+			if (flush_type==1)
+				m2ts->has_pending_segments++;
+			
+			gf_mx_v(m2ts->mx);
+			return;
+		}
+	}
+	else if (flush_type==2) {
+		if (! m2ts->has_pending_segments) {
+			gf_mx_v(m2ts->mx);
+			return;
+		}
+	}
+
+	e = M2TS_QueryNextFile(m2ts, (flush_type==2) ? 2 : 1, &url, &start_byterange, &end_byterange, &refresh_type);
+	if (e) {
+		gf_mx_v(m2ts->mx);
+		return;
+	}
+	gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, refresh_type, 0);
+
+	//done, drop segment 
+	if (!m2ts->in_segment_download) {
+		e = M2TS_QueryNextFile(m2ts, 3, &url, &start_byterange, &end_byterange, &refresh_type);
+
+		if (m2ts->has_pending_segments)
+			m2ts->has_pending_segments--;
+
+		if (e==GF_EOS) {
+			gf_m2ts_demux_file(m2ts->ts, NULL, 0, 0, 0, 1);
+		}
+
+	}
+	gf_mx_v(m2ts->mx);
+}
+
+
 static GF_Err M2TS_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
 {
 	GF_Err e;	
@@ -867,10 +972,6 @@
 	m2ts->ts->record_to = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "M2TS", "RecordTo");
 
 	m2ts->service = serv;
-	if (m2ts->owner->query_proxy) {
-		m2ts->ts->query_next = M2TS_QueryNextFile;
-		m2ts->ts->query_udta = m2ts;
-	}
 
 	opt = gf_modules_get_option((GF_BaseInterface *)m2ts->owner, "DSMCC", "Activated");
 	if (opt && !strcmp(opt, "yes")) {
@@ -886,7 +987,20 @@
 			e = gf_m2ts_demuxer_play(m2ts->ts);
 		}
 	} else {
-		e = gf_m2ts_demuxer_setup(m2ts->ts,url,0);
+		//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;
+				M2TS_QueryNextFile(m2ts, 0, NULL, &start_byterange, &end_byterange, NULL);
+				e = gf_m2ts_demux_file(m2ts->ts, url, start_byterange, end_byterange, 0, 0);
+			} else {
+				e = GF_OK;
+			}
+			m2ts->ts->run_state = 1;
+		} else {
+			e = gf_m2ts_demuxer_setup(m2ts->ts,url,0);
+		}
 	}
 
 	if (e) {
@@ -900,9 +1014,11 @@
 	M2TSIn *m2ts = plug->priv;
 	GF_M2TS_Demuxer* ts = m2ts->ts;
 
-	gf_m2ts_demuxer_close(ts);	
-	
+	if (!plug->query_proxy)
+		gf_m2ts_demuxer_close(ts);	
 	
+	m2ts->ts->run_state = 0;
+
 	if (ts->dnload) gf_term_download_del(ts->dnload);
 	ts->dnload = NULL;
 
@@ -990,11 +1106,12 @@
 	}
 
 	/* restart the thread if the same service is reused and if the previous thread terminated */
-	if (m2ts->ts->run_state == 2) {
-		m2ts->ts->file_regulate = 0;
-		gf_m2ts_demuxer_play(m2ts->ts);
+	if (!plug->query_proxy) {
+		if (m2ts->ts->run_state == 2) {
+			m2ts->ts->file_regulate = 0;
+			gf_m2ts_demuxer_play(m2ts->ts);
+		}
 	}
-
 	return NULL;
 }
 
@@ -1053,8 +1170,6 @@
 			/*we try to play the highest layer*/
 			if (pes->program->pid_playing < pes->pid)
 				pes->program->pid_playing = pes->pid;
-			if (pes->depends_on_pid)
-				pes->program->is_scalable = GF_TRUE;
 		}
 	}
 	gf_term_on_connect(m2ts->service, channel, e);
@@ -1142,6 +1257,17 @@
 		}
 		return GF_OK;
 	}
+	if (com->command_type == GF_NET_SERVICE_PROXY_DATA_RECEIVE) {
+		m2ts_flush_data(m2ts, com->proxy_data.is_chunk);
+		return GF_OK;
+	}
+	if (com->command_type == GF_NET_SERVICE_FLUSH_DATA) {
+		if (plug->query_proxy)
+			m2ts_flush_data(m2ts, 2);
+		return GF_OK;
+	}
+
+
 	if (!com->base.on_channel) return GF_NOT_SUPPORTED;
 	switch (com->command_type) {
 	/*we cannot pull complete AUs from the stream*/
@@ -1149,16 +1275,13 @@
 		return GF_NOT_SUPPORTED;
 	/*we cannot seek stream by stream*/
 	case GF_NET_CHAN_INTERACTIVE:
+		if (m2ts->ts->file) return GF_OK;
 		return GF_NOT_SUPPORTED;
 	case GF_NET_CHAN_BUFFER:
+		//do not override config 
 		if (ts->dnload || plug->query_proxy) {
 			if (!com->buffer.max) com->buffer.max = 1000;
-			com->buffer.min = com->buffer.max;
-		} else if (ts->file) {
-			com->buffer.max = M2TS_BUFFER_MAX;
 		}
-		if (m2ts->low_latency_mode)
-			com->buffer.max = M2TS_BUFFER_MAX;
 		return GF_OK;
 	case GF_NET_CHAN_DURATION:
 		com->duration.duration = ts->duration;
@@ -1180,12 +1303,14 @@
 			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 (ts->query_next && ts->file) 
+			if (plug->query_proxy && ts->file) 
 				ts->segment_switch = 1;
 
 			/*start demuxer*/
-			if (ts->run_state!=1) {
-				return gf_m2ts_demuxer_play(ts);
+			if (!plug->query_proxy) {
+				if (ts->run_state!=1) {
+					gf_m2ts_demuxer_play(ts);
+				}
 			}
 		}
 		ts->nb_playing++;
@@ -1202,13 +1327,15 @@
 		if (ts->nb_playing)
 		  ts->nb_playing--;
 		/*stop demuxer*/
-		if (!ts->nb_playing && (ts->run_state==1)) {
-			ts->run_state=0;
-			while (ts->run_state!=2) gf_sleep(2);
-			if (gf_list_count(m2ts->ts->requested_progs)) {
-				ts->file_regulate = 0;
-				gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
-				return gf_m2ts_demuxer_play(ts);
+		if (!plug->query_proxy) {
+			if (!ts->nb_playing && (ts->run_state==1)) {
+				ts->run_state=0;
+				while (ts->run_state!=2) gf_sleep(2);
+				if (gf_list_count(m2ts->ts->requested_progs)) {
+					ts->file_regulate = 0;
+					gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);
+					return gf_m2ts_demuxer_play(ts);
+				}
 			}
 		}
 		gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_SKIP);

gpac-0.5.0.svn4668.tar.bz2/modules/mse_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/mse_in/Makefile Changed

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

gpac-0.5.0.svn4668.tar.bz2/modules/mse_in/mse_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/mse_in/mse_in.c Changed

@@ -1,369 +1,366 @@
-/*
- *          GPAC - Multimedia Framework C SDK
- *
- *          Authors: Cyril Concolato, Jean Le Feuvre
- *          Copyright (c) Telecom ParisTech 2013-
- *                  All rights reserved
- *
- *  This file is part of GPAC / Media Source input module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <gpac/modules/service.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/html5_mse.h>
-
-typedef struct __mse_module 
-{
-    GF_HTML_MediaSource *mediasource;
-    GF_InputService *plug;
-} GF_MSE_In;
-
-static u32 MSE_RegisterMimeTypes(const GF_InputService *plug)
-{
-	return 0;
-}
-
-static Bool MSE_CanHandleURL(GF_InputService *plug, const char *url)
-{
-    if (!plug || !url)
-      return GF_FALSE;
-    if (!strncmp(url, "blob:", 5)) {
-        return GF_TRUE;
-    } else {
-        return GF_FALSE;
-    }
-}
-
-static GF_HTML_SourceBuffer *MSE_GetSourceBufferForChannel(GF_HTML_MediaSource *mediasource, LPNETCHANNEL channel)
-{
-    if (gf_list_count(mediasource->sourceBuffers.list)) {
-        GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(mediasource->sourceBuffers.list, 0);
-        if (sb) return sb;
-    }
-    return NULL;
-}
-
-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;
-}
-
-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;
-}
-
-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=%ud", &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 (%p) request from terminal for %s\n", channel, url));
-            return sb->parser->ConnectChannel(sb->parser, channel, url, upstream);
-        }
-    } else {
-        return GF_BAD_PARAM;
-    }
-}
-
-static GF_Err MSE_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
-{
-    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-    GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
-    if (!plug || !plug->priv || !sb || !sb->parser) return GF_SERVICE_ERROR;
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Disconnect channel (%p) request from terminal \n", channel));
-    return sb->parser->DisconnectChannel(sb->parser, channel);
-}
-
-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 (%p) from terminal for %s\n", serv, url));
-
-    if (!msein|| !serv || !url) return GF_BAD_PARAM;
-
-    {
-        GF_DOM_Event            mse_event;
-        GF_Node                 *media_node;
-        GF_HTML_MediaSource     *ms = NULL;
-
-        sscanf(url, "blob:%p", &ms);
-        msein->mediasource = ms;
-        ms->service = serv;
-        ms->readyState = 1;
-
-        memset(&mse_event, 0, sizeof(GF_DOM_Event));
-        mse_event.type = GF_EVENT_HTML_MSE_SOURCE_OPEN;
-        ms->target = gf_mo_event_target_get(serv->owner->mo, 0);
-        media_node = (GF_Node *)gf_event_target_get_node(ms->target);
-        ms->node = media_node;
-        gf_dom_event_fire(media_node, &mse_event);
-        //gf_mo_event_target_remove_by_node(serv->owner->mo, media_node);
-        //ms->target = gf_mo_event_target_add_object(serv->owner->mo, ms);
-        //sg_fire_dom_event(ms->target, &mse_event, media_node->sgprivate->scenegraph, NULL);
-    }
-    return GF_OK;
-}
-
-static GF_Descriptor *MSE_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
-{
-    //GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
-    //if (msein->mediasource && gf_list_count(msein->mediasource->sourceBuffers.list)) 
-    //{
-    //    GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(msein->mediasource->sourceBuffers.list, 0);
-    //    if (!sb->service_desc) 
-    //    { 
-    //        /* WARNING: we should not reach this point, the descriptor should be fetched upon MSE connection */
-    //        sb->service_desc = (GF_ObjectDescriptor *)sb->parser->GetServiceDescriptor(sb->parser, expect_type, sub_url);
-    //    } 
-    //    return (GF_Descriptor *)sb->service_desc;
-    //}
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Service Description request from terminal for %s\n", sub_url));
-    return NULL;
-}
-
-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 (%p) request from terminal\n", msein->mediasource->service));
-
-    gf_term_on_disconnect(msein->mediasource->service, NULL, GF_OK);
-
-    return GF_OK;
-}
-
-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)\n", msein->mediasource->service));
-        return GF_NOT_SUPPORTED;
-    case GF_NET_SERVICE_HAS_AUDIO:
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Has Audio command from terminal on Service (%p)\n", msein->mediasource->service));
-        return GF_OK;
-    case GF_NET_SERVICE_QUALITY_SWITCH:
-        return GF_NOT_SUPPORTED;
-    }
-
-    if (!com->base.on_channel) return GF_NOT_SUPPORTED;
-    sb = MSE_GetSourceBufferForChannel(msein->mediasource, com->base.on_channel);
-    if (!sb || !sb->parser) return GF_NOT_SUPPORTED;
-
-    switch (com->command_type) {
-    case GF_NET_CHAN_PLAY:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_STOP:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_PAUSE:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_RESUME:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_SET_SPEED:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_CONFIG:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_DURATION:
-        /* Ignore the duration given by the input service and 
-           Note: the duration of the initial segment will be 0 anyway (in MP4).*/
-        com->duration.duration = 0;
-        return GF_OK;
-
-    case GF_NET_CHAN_BUFFER:
-        com->buffer.max = com->buffer.min = 0;
-        return GF_OK;
-
-    case GF_NET_CHAN_BUFFER_QUERY:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_GET_DSI:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_SET_PADDING:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_SET_PULL:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    case GF_NET_CHAN_INTERACTIVE:
-        /* we are interactive */
-        return GF_OK;
-
-    case GF_NET_CHAN_GET_PIXEL_AR:
-        return sb->parser->ServiceCommand(sb->parser, com);
-
-    default:
-        return sb->parser->ServiceCommand(sb->parser, com);
-    }
-}
-
-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_Packet *packet;
-    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_mx_p(track->buffer_mutex);
-    packet = (GF_MSE_Packet *)gf_list_get(track->buffer, 0);
-    if (packet)
-    {
-        *out_data_ptr = packet->data;
-        *out_data_size = packet->size;
-        *out_sl_hdr = packet->sl_header;
-        *sl_compressed = packet->is_compressed;
-        *out_reception_status = packet->status;
-        *is_new_data = packet->is_new_data;
-        packet->is_new_data = GF_FALSE;
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Sending AU to decoder with TS: %g (%d frames)\n", (packet->sl_header.compositionTimeStamp*1.0/track->timescale), gf_list_count(track->buffer)));
-    } else {
-        *out_data_ptr = NULL;
-        *out_data_size = 0;
-        *sl_compressed = GF_FALSE;
-        *out_reception_status = GF_OK;
-        *is_new_data = GF_FALSE;
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_In] No AU for decoder\n"));
-    }
-    gf_mx_v(track->buffer_mutex);
-    return GF_OK;
-}
-
-static GF_Err MSE_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
-{
-    GF_MSE_Packet *packet;
-    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_mx_p(track->buffer_mutex);
-    packet = (GF_MSE_Packet *)gf_list_get(track->buffer, 0);
-    if (packet)
-    {
-        gf_list_rem(track->buffer, 0);
-        gf_free(packet->data);
-        gf_free(packet);
-    }
-    gf_mx_v(track->buffer_mutex);
-    return GF_OK;
-}
-
-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 Can Handle URL In Service (%p) request from terminal for %s\n", msein->mediasource->service, url));
-    if (!plug || !plug->priv) return GF_FALSE;
-    return GF_TRUE;
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces()
-{
-    static u32 si [] = {
-        GF_NET_CLIENT_INTERFACE,
-        0
-    };
-    return si;
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType)
-{
-    GF_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;
-
-    if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
-
-    msein = (GF_MSE_In*) ((GF_InputService*)bi)->priv;
-    assert(msein);
-    gf_free(msein);
-    gf_free(bi);
-}
-
-GPAC_MODULE_STATIC_DELARATION( mse_in )
-
-
-
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato, Jean Le Feuvre
+ *          Copyright (c) Telecom ParisTech 2013-
+ *                  All rights reserved
+ *
+ *  This file is part of GPAC / Media Source input module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/modules/service.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/html5_mse.h>
+
+typedef struct __mse_module 
+{
+    GF_HTML_MediaSource *mediasource;
+    GF_InputService *plug;
+} GF_MSE_In;
+
+/* The MSE plugin has no MIME type associated, it cannot handle basic media resources (it needs a blob)*/
+static u32 MSE_RegisterMimeTypes(const GF_InputService *plug)
+{
+	return 0;
+}
+
+/* Only Blob URL are supported */
+static Bool MSE_CanHandleURL(GF_InputService *plug, const char *url)
+{
+    if (!plug || !url)
+      return GF_FALSE;
+    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received CanHandleURL request from terminal for URL '%s'\n", url));
+    if (!strncmp(url, "blob:", 5)) {
+        return GF_TRUE;
+    } else {
+        return GF_FALSE;
+    }
+}
+
+/* Returns the source buffer associated with the terminal channel */
+static GF_HTML_SourceBuffer *MSE_GetSourceBufferForChannel(GF_HTML_MediaSource *mediasource, LPNETCHANNEL channel)
+{
+	GF_Channel *ch;
+	if (!channel || !mediasource) {
+		return NULL;
+	} else {
+		u32 i;
+		GF_InputService *parser;
+		ch = (GF_Channel *) channel;
+		assert(ch->odm && ch->odm->OD);
+		parser = (GF_InputService *) ch->odm->OD->service_ifce;
+		if (!parser) return NULL;
+		for (i = 0; i < gf_list_count(mediasource->sourceBuffers.list); i++) {
+			GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(mediasource->sourceBuffers.list, i);
+			if (sb && sb->parser && sb->parser == parser) return sb;
+		}
+		return NULL;
+	}
+}
+
+/* For a given source buffer, returns the media track associated with the terminal channel object 
+   Association is saved during the ConnectChannel operation */
+static GF_HTML_Track *MSE_GetTrackForChannel(GF_HTML_SourceBuffer *sb, LPNETCHANNEL channel)
+{
+    u32 i;
+    u32 count;
+    count = gf_list_count(sb->tracks);
+    for (i = 0; i < count; i++)
+    {
+        GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
+        if (track->channel == channel)
+        {
+            return track;
+        }
+    }
+    return NULL;
+}
+
+/* For a given source buffer, returns the media track associated with the given ESID
+   Association is saved when the initialisation segment has been parsed */
+static GF_HTML_Track *gf_mse_get_track_by_esid(GF_HTML_SourceBuffer *sb, u32 ESID)
+{
+    GF_HTML_Track *track;
+    u32 i;
+    u32 count;
+    count = gf_list_count(sb->tracks);
+    for (i=0; i<count; i++)
+    {
+        track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
+        if (track->bin_id == ESID)
+        {
+            return track;
+        }
+    }
+    return NULL;
+}
+
+/* We connect the channel only if the sourcebuffer has been created,
+   and a track with the right ESID has been found in the init segment */
+static GF_Err MSE_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+    u32 ESID;
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
+    if (!plug || !plug->priv || !sb || !sb->parser) return GF_SERVICE_ERROR;
+    if (strstr(url, "ES_ID")) {
+        GF_HTML_Track *track;
+        sscanf(url, "ES_ID=%u", &ESID);
+        track = gf_mse_get_track_by_esid(sb, ESID);
+        if (!track) {
+            return GF_BAD_PARAM;
+        } else {
+            track->channel = channel;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Channel Connection request on Service %p from terminal for URL '%s#%s'\n", channel, msein->mediasource->blobURI, url));
+            return sb->parser->ConnectChannel(sb->parser, channel, url, upstream);
+        }
+    } else {
+        return GF_BAD_PARAM;
+    }
+}
+
+static GF_Err MSE_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    GF_HTML_Track *track;
+	GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
+    if (!plug || !plug->priv || !sb || !sb->parser) return GF_SERVICE_ERROR;
+	track = MSE_GetTrackForChannel(sb, channel);
+	if (track) {
+		track->channel = NULL;
+	}
+    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Disconnect channel request on Service %p from terminal for channel %p\n", msein->mediasource->service, channel));
+    return sb->parser->DisconnectChannel(sb->parser, channel);
+}
+
+/* Upon service connection, if the URL is a blobURL, we do the following:
+   - get the associated MediaSource object, mark it as used
+   - trigger a source event to the media node associated with the service */
+static GF_Err MSE_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Service Connection request on Service %p from terminal for URL '%s'\n", serv, url));
+    if (!msein|| !serv || !url) {
+		return GF_BAD_PARAM;
+	} else {
+        GF_HTML_MediaSource     *ms = NULL;
+
+        sscanf(url, "blob:%p", &ms);
+        msein->mediasource = ms;
+		ms->reference_count++;
+        ms->service = serv;
+		gf_mse_mediasource_open(ms, serv->owner->mo);
+	    return GF_OK;
+    }
+}
+
+/* There is no service description (no MPEG-4 IOD) for this module, the associated scene will be generated dynamically */
+static GF_Descriptor *MSE_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Service Description request on Service %p from terminal for URL '%s'\n", msein->mediasource->service, sub_url));
+    return NULL;
+}
+
+/* Indicate that the media source object is unused anymore */
+static GF_Err MSE_CloseService(GF_InputService *plug)
+{
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    assert( msein );
+    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Close Service request on Service %p from terminal for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
+	if (msein->mediasource) {
+		gf_term_on_disconnect(msein->mediasource->service, NULL, GF_OK);
+		gf_mse_mediasource_del(msein->mediasource, GF_FALSE);
+		msein->mediasource = NULL;
+	}
+    return GF_OK;
+}
+
+/* Forward all the commands received from the the terminal 
+   to the parser associated with the channel on which the command is received */
+static GF_Err MSE_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    GF_HTML_SourceBuffer *sb = NULL;
+
+    if (!plug || !plug->priv || !com ) return GF_SERVICE_ERROR;
+
+    /* channel independant commands */
+    switch (com->command_type) {
+    case GF_NET_SERVICE_INFO:
+        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received Info command from terminal on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
+        return GF_NOT_SUPPORTED;
+    case GF_NET_SERVICE_HAS_AUDIO:
+        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received HasAudio command from terminal on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
+        return GF_OK;
+    case GF_NET_SERVICE_QUALITY_SWITCH:
+        return GF_NOT_SUPPORTED;
+	case GF_NET_SERVICE_FLUSH_DATA:
+		return GF_NOT_SUPPORTED;
+    default:
+        break;
+    }
+
+    if (!com->base.on_channel) {
+        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received unknown command %d from terminal on Service %p for URL '%s'\n", com->command_type, msein->mediasource->service, msein->mediasource->blobURI));
+		return GF_NOT_SUPPORTED;
+	}
+    sb = MSE_GetSourceBufferForChannel(msein->mediasource, com->base.on_channel);
+    if (!sb || !sb->parser) {
+        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] SourceBuffer not ready on Service %p for URL '%s'\n", msein->mediasource->service, msein->mediasource->blobURI));
+		return GF_NOT_SUPPORTED;
+	}
+
+    switch (com->command_type) {
+    case GF_NET_CHAN_PLAY:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_STOP:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_PAUSE:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_RESUME:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_SET_SPEED:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_CONFIG:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_DURATION:
+        /* Ignore the duration given by the input service and 
+           Note: the duration of the initial segment will be 0 anyway (in MP4).*/
+        com->duration.duration = 0;
+        return GF_OK;
+
+    case GF_NET_CHAN_BUFFER:
+        com->buffer.max = com->buffer.min = 0;
+        return GF_OK;
+
+    case GF_NET_CHAN_BUFFER_QUERY:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_GET_DSI:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_SET_PADDING:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_SET_PULL:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    case GF_NET_CHAN_INTERACTIVE:
+        /* we are interactive */
+        return GF_OK;
+
+    case GF_NET_CHAN_GET_PIXEL_AR:
+        return sb->parser->ServiceCommand(sb->parser, com);
+
+    default:
+        return sb->parser->ServiceCommand(sb->parser, com);
+    }
+}
+
+/* Forward the request for a new packet to the track (ask the parser to parse a new buffer or use already parsed AU) */
+static GF_Err MSE_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, 
+								GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
+{
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
+    GF_HTML_Track *track = MSE_GetTrackForChannel(sb, channel);
+    if (!plug || !plug->priv || !sb || !sb->parser || !track) return GF_SERVICE_ERROR;
+	gf_mse_track_buffer_get_next_packet(track, out_data_ptr, out_data_size, out_sl_hdr, sl_compressed, out_reception_status, is_new_data);
+    return GF_OK;
+}
+
+/* Indicate to the track that a packet can be released (and potentially deleted) */
+static GF_Err MSE_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
+{
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    GF_HTML_SourceBuffer *sb = MSE_GetSourceBufferForChannel(msein->mediasource, channel);
+    GF_HTML_Track *track = MSE_GetTrackForChannel(sb, channel);
+    if (!plug || !plug->priv || !sb || !sb->parser || !track) return GF_SERVICE_ERROR;
+	gf_mse_track_buffer_release_packet(track);
+    return GF_OK;
+}
+
+/* This module can only handle one blobURL at a time */
+static Bool MSE_CanHandleURLInService(GF_InputService *plug, const char *url)
+{
+    GF_MSE_In *msein = (GF_MSE_In*) plug->priv;
+    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Received CanHandleURLInService request on service %p from terminal for URL '%s'\n", msein->mediasource->service, url));
+    if (!plug || !plug->priv) return GF_FALSE;
+	if (!strcmp(url, msein->mediasource->blobURI)) {
+		return GF_TRUE;
+	} else {
+		return GF_FALSE;
+	}
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+    static u32 si [] = {
+        GF_NET_CLIENT_INTERFACE,
+        0
+    };
+    return si;
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+    GF_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;
+
+    if (bi->InterfaceType!=GF_NET_CLIENT_INTERFACE) return;
+
+    msein = (GF_MSE_In*) ((GF_InputService*)bi)->priv;
+    assert(msein);
+    gf_free(msein);
+    gf_free(bi);
+}
+
+GPAC_MODULE_STATIC_DELARATION( mse_in )

gpac-0.5.0.svn4668.tar.bz2/modules/odf_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/odf_dec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ogg/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/ogg/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ogg/ogg_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/ogg/ogg_in.c Changed

@@ -113,7 +113,8 @@
 
 	/*remote file, check if we use cache*/
 	if (read->is_remote) {
-		u32 total_size, status;
+		u32 total_size;
+		GF_NetIOStatus status;
 		e = gf_dm_sess_get_stats(read->dnload, NULL, NULL, &total_size, NULL, NULL, &status);
 		/*not ready*/
 		if ((e<GF_OK) || (status > GF_NETIO_DATA_EXCHANGE)) return 0;
@@ -223,7 +224,7 @@
 	memset(info, 0, sizeof(OGGInfo));
 
 	/*vorbis*/
-	if ((oggpacket->bytes >= 7) && !strncmp(&oggpacket->packet[1], "vorbis", 6)) {
+	if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[1], "vorbis", 6)) {
 		info->streamType = GF_STREAM_AUDIO;
 		oggpack_readinit(&opb, oggpacket->packet, oggpacket->bytes);
 		oggpack_adv( &opb, 88);
@@ -235,7 +236,7 @@
 		info->type = OGG_VORBIS;
 	}
 	/*speex*/
-	else if ((oggpacket->bytes >= 7) && !strncmp(&oggpacket->packet[0], "Speex", 5)) {
+	else if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[0], "Speex", 5)) {
 		info->streamType = GF_STREAM_AUDIO;
 		oggpack_readinit(&opb, oggpacket->packet, oggpacket->bytes);
 		oggpack_adv(&opb, 224);
@@ -246,19 +247,19 @@
 		info->num_init_headers = 1;
 	}
 	/*flac*/
-	else if ((oggpacket->bytes >= 4) && !strncmp(&oggpacket->packet[0], "fLaC", 4)) {
+	else if ((oggpacket->bytes >= 4) && !strncmp((char *) &oggpacket->packet[0], "fLaC", 4)) {
 		info->streamType = GF_STREAM_AUDIO;
 		info->type = 3;
 		info->num_init_headers = OGG_FLAC;
 	}
 	/*theora*/
-	else if ((oggpacket->bytes >= 7) && !strncmp(&oggpacket->packet[1], "theora", 6)) {
+	else if ((oggpacket->bytes >= 7) && !strncmp((char *) &oggpacket->packet[1], "theora", 6)) {
 		GF_BitStream *bs;
 		u32 fps_numerator, fps_denominator, keyframe_freq_force;
 
 		info->streamType = GF_STREAM_VISUAL;
 		info->type = OGG_THEORA;
-		bs = gf_bs_new(oggpacket->packet, oggpacket->bytes, GF_BITSTREAM_READ);
+		bs = gf_bs_new((char *) oggpacket->packet, oggpacket->bytes, GF_BITSTREAM_READ);
 		gf_bs_read_int(bs, 56);
 		gf_bs_read_int(bs, 8); /* major version num */
 		gf_bs_read_int(bs, 8); /* minor version num */
@@ -401,8 +402,8 @@
 		slh.randomAccessPointFlag = 1;
 		slh.compositionTimeStampFlag = 1;
 		slh.compositionTimeStamp = st->ogg_ts;
-		gf_term_on_sl_packet(read->service, st->ch, oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
-		st->ogg_ts += gf_vorbis_check_frame(&st->vp, oggpacket->packet, oggpacket->bytes);
+		gf_term_on_sl_packet(read->service, st->ch, (char *) oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
+		st->ogg_ts += gf_vorbis_check_frame(&st->vp, (char *) oggpacket->packet, oggpacket->bytes);
 	}
 	else if (st->info.type==OGG_THEORA) {
 		oggpack_buffer opb;
@@ -414,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, oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
+			gf_term_on_sl_packet(read->service, st->ch, (char *) oggpacket->packet, oggpacket->bytes, &slh, GF_OK);
 			st->ogg_ts += 1000;
 		}
 	}
@@ -460,7 +461,7 @@
 		while (ogg_stream_packetout(&st->os, &oggpacket ) > 0 ) {
 			GF_BitStream *bs;
 			if (st->info.type==OGG_VORBIS)
-				gf_vorbis_parse_header(&st->vp, oggpacket.packet, oggpacket.bytes);
+				gf_vorbis_parse_header(&st->vp, (char *) oggpacket.packet, oggpacket.bytes);
 
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 			if (st->dsi) {
@@ -470,7 +471,7 @@
 				st->dsi_len=0;
 			}
 			gf_bs_write_u16(bs, oggpacket.bytes);
-			gf_bs_write_data(bs, oggpacket.packet, oggpacket.bytes);
+			gf_bs_write_data(bs, (char *) oggpacket.packet, oggpacket.bytes);
 			gf_bs_get_content(bs, (char **)&st->dsi, &st->dsi_len);
 			gf_bs_del(bs);
 			st->parse_headers--;

gpac-0.5.0.svn4668.tar.bz2/modules/ogg/ogg_load.c -> gpac-0.5.0.svn5178.tar.bz2/modules/ogg/ogg_load.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/opencv_is/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/opencv_is/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/openhevc_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/openhevc_dec/Makefile Changed

@@ -1,51 +1,49 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/openhevc_dec
-
-CFLAGS=$(OPTFLAGS) -I"$(SRC_PATH)/include" $(OHEVC_CFLAGS)
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-EXTRALIBS+= -L../../bin/gcc -lgpac $(OHEVC_LDFLAGS)
-
-#common obj
-OBJS= openhevc_dec.o
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_openhevc_dec.$(DYN_LIB_SUFFIX)
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
-
-
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/openhevc_dec
+
+CFLAGS=$(OPTFLAGS) -I"$(SRC_PATH)/include" $(OHEVC_CFLAGS)
+
+ifeq ($(CONFIG_LINUX), yes)
+LDFLAGS+=-Wl,-Bsymbolic
+endif
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+EXTRALIBS+= -L../../bin/gcc -lgpac $(OHEVC_LDFLAGS)
+
+#common obj
+OBJS= openhevc_dec.o
+
+SRCS := $(OBJS:.o=.c) 
+
+LIB=gm_openhevc_dec.$(DYN_LIB_SUFFIX)
+
+
+all: $(LIB)
+
+
+$(LIB): $(OBJS)
+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend	
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-0.5.0.svn4668.tar.bz2/modules/openhevc_dec/openhevc_dec.c -> gpac-0.5.0.svn5178.tar.bz2/modules/openhevc_dec/openhevc_dec.c Changed

@@ -1,447 +1,547 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2010-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / OpenSVC Decoder module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-
-#include <gpac/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-#include <gpac/internal/media_dev.h>
-
-#include "openHevcWrapper.h"
-
-
-#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__)
-#  pragma comment(lib, "libLibOpenHevcWrapper")
-#endif
-
-typedef struct
-{
-	u16 ES_ID;
-	u32 width, stride, height, out_size, pixel_ar, layer, nb_threads;
-
-	Bool is_init;
-	Bool state_found;
-
-	u32 nalu_size_length;
-	u32 restart_from;
-
-	GF_ESD *esd;
-	OpenHevc_Handle openHevcHandle;
-} HEVCDec;
-
-static GF_Err HEVC_ConfigureStream(HEVCDec *ctx, GF_ESD *esd)
-{
-	ctx->ES_ID = esd->ESID;
-	ctx->width = ctx->height = ctx->out_size = 0;
-	ctx->state_found = GF_FALSE;
-	
-	ctx->openHevcHandle = libOpenHevcInit(ctx->nb_threads);
-	ctx->is_init = GF_TRUE;
-
-	if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-		u32 i, j;
-		GF_HEVCConfig *cfg = gf_odf_hevc_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;
-
-		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);
-				libOpenHevcDecode(ctx->openHevcHandle, sl->data, sl->size, 0);
-
-				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
-					HEVCState hevc;
-					s32 idx = gf_media_hevc_read_sps(sl->data, sl->size, &hevc);
-					ctx->width = hevc.sps[idx].width;
-					ctx->height = hevc.sps[idx].height;
-				}
-			}
-		}
-		ctx->state_found = GF_TRUE;
-		gf_odf_hevc_cfg_del(cfg);
-	} else {
-		ctx->nalu_size_length = 0;
-	}
-
-	ctx->stride = ctx->width;
-	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-	return GF_OK;
-}
-
-
-static GF_Err HEVC_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	const char *sOpt;
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-
-	/*that's a bit crude ...*/
-	if (gf_modules_get_option((GF_BaseInterface *)ifcg, "Systems", "DrawLateFrames")==NULL)
-		gf_modules_set_option((GF_BaseInterface *)ifcg, "Systems", "DrawLateFrames", "yes");
-
-	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "NumThreads");
-	if (!sOpt) {
-		gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "NumThreads", "1");
-		ctx->nb_threads = 1;
-	} else {
-		ctx->nb_threads = atoi(sOpt);
-	}
-
-	/*not supported in this version*/
-	if (esd->dependsOnESID) return GF_NOT_SUPPORTED;
-
-	ctx->esd = esd;
-	return HEVC_ConfigureStream(ctx, esd);
-}
-
-
-static GF_Err HEVC_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-
-	if (ctx->is_init) {
-		libOpenHevcClose(ctx->openHevcHandle);
-		ctx->is_init = GF_FALSE;
-	}
-	fprintf(stderr, "closing hevc dec\n");
-	ctx->width = ctx->height = ctx->out_size = 0;
-	return GF_OK;
-}
-
-static GF_Err HEVC_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->stride;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = GF_PIXEL_YV12;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = 4;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 32;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err HEVC_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-	switch (capability.CapCode) {
-    case GF_CODEC_WAIT_RAP:
-            libOpenHevcFlush(ctx->openHevcHandle);
-        return GF_OK;
-	case GF_CODEC_MEDIA_SWITCH_QUALITY:
-		/*todo - update temporal filtering*/
-		if (capability.cap.valueInt) {
-		} else {
-		}
-		return GF_OK;
-	}
-	/*return unsupported to avoid confusion by the player (like color space changing ...) */
-	return GF_NOT_SUPPORTED;
-
-}
-
-static GF_Err HEVC_flush_picture(HEVCDec *ctx, char *outBuffer, u32 *outBufferLength )
-{
-	unsigned int a_w, a_h, a_stride;
-    OpenHevc_Frame_cpy openHevcFrame;
-	u8 *pY, *pU, *pV;
-
-	libOpenHevcGetPictureInfo(ctx->openHevcHandle, &openHevcFrame.frameInfo);
-
-
-	a_w      = openHevcFrame.frameInfo.nWidth;
-    a_h      = openHevcFrame.frameInfo.nHeight;
-    a_stride = openHevcFrame.frameInfo.nYPitch;
-
-    if ((ctx->width != a_w) || (ctx->height!=a_h) || (ctx->stride != a_stride)) {
-		ctx->width = a_w;
-		ctx->stride = a_stride;
-		ctx->height = a_h;
-		ctx->out_size = ctx->stride * a_w * 3 / 2;
-		/*always force layer resize*/
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-    pY = outBuffer;
-    pU = outBuffer + ctx->stride * ctx->height;
-    pV = outBuffer + 5*ctx->stride * ctx->height/4;
-    openHevcFrame.pvY = (void*) pY;
-    openHevcFrame.pvU = (void*) pU;
-    openHevcFrame.pvV = (void*) pV;
-    *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)
-{
-	GF_Err e;
-	unsigned int got_pic;
-    OpenHevc_Frame_cpy openHevcFrame;
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-	u8 *pY, *pU, *pV, *ptr;
-	u32 nb_pics=0;
-	u32 input_data_consumed = 0;
-	u32 sc_size, i, nalu_size;
-
-
-	if (!inBuffer) {
-		pY = outBuffer;
-		pU = outBuffer + ctx->stride * ctx->height;
-		pV = outBuffer + 5*ctx->stride * ctx->height/4;
-	    openHevcFrame.pvY = (void*) pY;
-	    openHevcFrame.pvU = (void*) pU;
-	    openHevcFrame.pvV = (void*) pV;
-	    *outBufferLength = 0;
-
-		if ( libOpenHevcDecode(ctx->openHevcHandle, NULL, 0, 0) ) {
-			if (libOpenHevcGetOutputCpy(ctx->openHevcHandle, 1, &openHevcFrame)) {
-				*outBufferLength = ctx->out_size;
-			}
-		}
- 		return GF_OK;
-	}
-
-	if (!ES_ID || (ES_ID!=ctx->ES_ID) ) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-	if (*outBufferLength < ctx->out_size) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	nb_pics = 0;
-	if (ctx->restart_from) {
-		inBuffer += ctx->restart_from;
-		inBufferLength -= ctx->restart_from;
-		ctx->restart_from = 0;
-
-		e = HEVC_flush_picture(ctx, outBuffer, outBufferLength);
-		if (e) return e;
-		nb_pics ++;
-	}
-
-	got_pic = 0;
-
-	sc_size = 0;
-	nalu_size = 0;
-	ptr = inBuffer;
-	if (!ctx->nalu_size_length) {
-		u32 size = gf_media_nalu_next_start_code(inBuffer, inBufferLength, &sc_size);
-		if (sc_size) {
-			ptr += size+sc_size;
-			inBufferLength-=size+sc_size;
-		}
-	}
-
-	while (inBufferLength) {
-
-		if (ctx->nalu_size_length) {
-			for (i=0; i<ctx->nalu_size_length; i++) {
-				nalu_size = (nalu_size<<8) + ptr[i];
-			}
-			ptr += ctx->nalu_size_length;
-		} else {
-			nalu_size = gf_media_nalu_next_start_code(ptr, inBufferLength, &sc_size);
-		}
-
-		//fprintf(stderr, "HEVC decode NAL type %d size %d\n", (ptr[0] & 0x7E) >> 1, nalu_size);
-
-		if (!ctx->state_found) {
-			u8 nal_type = (ptr[0] & 0x7E) >> 1;
-			switch (nal_type) {
-			case GF_HEVC_NALU_VID_PARAM:
-			case GF_HEVC_NALU_SEQ_PARAM:
-			case GF_HEVC_NALU_PIC_PARAM:
-				ctx->state_found = GF_TRUE;
-				break;
-			}
-		}
-
-		if (ctx->state_found) {
-			got_pic = libOpenHevcDecode(ctx->openHevcHandle, ptr, nalu_size, 0);
-			if (got_pic) {
-				nb_pics ++;
-				e = HEVC_flush_picture(ctx, outBuffer, outBufferLength);
-				if (e) {
-					if (e==GF_BUFFER_TOO_SMALL) {
-						if (ctx->nalu_size_length) {
-							ctx->restart_from = nalu_size + ctx->nalu_size_length;
-						} else {
-							ctx->restart_from = input_data_consumed + sc_size;
-						}
-					}
-					return e;
-				}
-				got_pic = 0;
-			}
-		}
-
-		ptr += nalu_size;
-		if (ctx->nalu_size_length) {
-			if (inBufferLength < nalu_size + ctx->nalu_size_length) break;
-			inBufferLength -= nalu_size + ctx->nalu_size_length;
-			input_data_consumed += nalu_size + ctx->nalu_size_length;
-		} else {
-			if (!sc_size || (inBufferLength < nalu_size + sc_size)) break;
-			inBufferLength -= nalu_size + sc_size;
-			ptr += sc_size;
-			input_data_consumed += sc_size;
-		}
-	}
-	if (!nb_pics && (got_pic==0)) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-    
-	return GF_OK;
-}
-
-static u32 HEVC_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_HEVC:
-		return GF_CODEC_SUPPORTED;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *HEVC_GetCodecName(GF_BaseDecoder *dec)
-{
-	HEVCDec *ctx = (HEVCDec*) dec->privateStack;
-	return libOpenHevcVersion(ctx->openHevcHandle);
-}
-
-GF_BaseDecoder *NewHEVCDec()
-{
-	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*/	
-	ifcd->AttachStream = HEVC_AttachStream;
-	ifcd->DetachStream = HEVC_DetachStream;
-	ifcd->GetCapabilities = HEVC_GetCapabilities;
-	ifcd->SetCapabilities = HEVC_SetCapabilities;
-	ifcd->GetName = HEVC_GetCodecName;
-	ifcd->CanHandleStream = HEVC_CanHandleStream;
-	ifcd->ProcessData = HEVC_ProcessData;
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteHEVCDec(GF_BaseDecoder *ifcg)
-{
-	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si; 
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewHEVCDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE: 
-		DeleteHEVCDec((GF_BaseDecoder*)ifce);
-		break;
-#endif
-	}
-}
-
-GPAC_MODULE_STATIC_DELARATION( openhevc )
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre 
+ *			Copyright (c) Telecom ParisTech 2010-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / OpenSVC Decoder module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#include <gpac/modules/codec.h>
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+#include <gpac/internal/media_dev.h>
+#include <openHevcWrapper.h>
+
+#define OPEN_SHVC
+
+#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)
+{
+}
+void libOpenHevcSetViewLayers(OpenHevc_Handle openHevcHandle, int val)
+{
+}
+#endif
+
+typedef struct
+{
+	u16 ES_ID;
+	u32 width, stride, height, out_size, pixel_ar, layer, nb_threads, luma_bpp, chroma_bpp;
+
+	Bool output_as_8bit;
+	Bool is_init;
+	Bool had_pic;
+
+	u32 nalu_size_length;
+	u32 threading_type;
+	Bool direct_output, has_pic;
+
+	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;
+} HEVCDec;
+
+
+
+static GF_Err HEVC_ConfigureStream(HEVCDec *ctx, GF_ESD *esd)
+{
+    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;
+   
+    
+	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) {
+					idx = gf_media_hevc_read_sps(sl->data, sl->size, &hevc);
+					ctx->width = MAX(hevc.sps[idx].width, ctx->width);
+					ctx->height = MAX(hevc.sps[idx].height, ctx->height);
+					ctx->luma_bpp = MAX(hevc.sps[idx].bit_depth_luma, ctx->luma_bpp);
+					ctx->chroma_bpp = MAX(hevc.sps[idx].bit_depth_chroma, ctx->chroma_bpp);
+
+					if (hdr & 0x1f8) {
+						ctx->nb_layers ++;
+                    }
+				}
+	            else if (ar->type==GF_HEVC_NALU_VID_PARAM) {
+					gf_media_hevc_read_vps(sl->data, sl->size, &hevc);
+				}
+	            else if (ar->type==GF_HEVC_NALU_PIC_PARAM) {
+					gf_media_hevc_read_pps(sl->data, sl->size, &hevc);
+				}
+            }
+        }
+		gf_odf_hevc_cfg_del(cfg);
+    } else {
+		ctx->nalu_size_length = 0;
+		ctx->nb_layers = 2;
+	}
+
+
+    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) ) {	
+		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);
+	}
+
+    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;
+
+	if (ctx->output_as_8bit && (ctx->stride>ctx->width)) {
+		ctx->stride /=2;
+		ctx->out_size /= 2;
+		ctx->chroma_bpp = ctx->luma_bpp = 8;
+		ctx->conv_to_8bit = 1;
+	}
+	return GF_OK;
+}
+
+static GF_Err HEVC_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
+{
+	GF_SystemRTInfo rti;
+	const char *sOpt;
+	u32 nb_threads = 1;
+	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
+
+	if (gf_sys_get_rti(0, &rti, 0) ) {
+		nb_threads = (rti.nb_cores>1) ? rti.nb_cores-1 : 1;
+	}
+
+	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "NumThreads");
+	if (!sOpt) {
+		char szO[100];
+		sprintf(szO, "%d", nb_threads);
+		gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "NumThreads", szO);
+		ctx->nb_threads = nb_threads;
+		GF_LOG(GF_LOG_CODEC, GF_LOG_INFO, ("[OpenHEVC] Initializing with %d threads\n", ctx->nb_threads));
+	} else {
+		ctx->nb_threads = atoi(sOpt);
+		if (ctx->nb_threads > nb_threads) {
+			GF_LOG(GF_LOG_CODEC, GF_LOG_WARNING, ("[OpenHEVC] Initializing with %d threads but only %d available cores detected on the system\n", ctx->nb_threads, rti.nb_cores));
+		}
+	}
+
+	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ThreadingType");
+	if (sOpt && !strcmp(sOpt, "wpp")) ctx->threading_type = 2;
+	else if (sOpt && !strcmp(sOpt, "frame+wpp")) ctx->threading_type = 4;
+	else {
+		ctx->threading_type = 1;
+		if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "ThreadingType", "frame");
+	}
+	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "Systems", "Output8bit");
+	if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "Systems", "Output8bit", (ctx->display_bpp>8) ? "no" : "yes");
+	if (sOpt && !strcmp(sOpt, "yes")) ctx->output_as_8bit = 1;
+
+	sOpt = gf_modules_get_option((GF_BaseInterface *)ifcg, "OpenHEVC", "CBUnits");
+	if (!sOpt) gf_modules_set_option((GF_BaseInterface *)ifcg, "OpenHEVC", "CBUnits", "4");
+	if (sOpt) ctx->output_cb_size = atoi(sOpt);
+	if (!ctx->output_cb_size) ctx->output_cb_size = 4;
+
+
+
+	/*once base layer is configured, nothing to do on enhancement*/
+	if (esd->dependsOnESID) return GF_OK;
+
+	ctx->esd = esd;
+	return HEVC_ConfigureStream(ctx, esd);
+}
+
+
+static GF_Err HEVC_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
+{
+	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
+
+	if (ctx->is_init) {
+		libOpenHevcClose(ctx->openHevcHandle);
+		ctx->is_init = GF_FALSE;
+	}
+	ctx->width = ctx->height = ctx->out_size = 0;
+	if (ctx->conv_buffer) gf_free(ctx->conv_buffer);
+	ctx->conv_buffer = NULL;
+	return GF_OK;
+}
+
+
+static GF_Err HEVC_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
+{
+	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
+
+	switch (capability->CapCode) {
+	case GF_CODEC_RESILIENT:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_WIDTH:
+		capability->cap.valueInt = ctx->width;
+		break;
+	case GF_CODEC_HEIGHT:
+		capability->cap.valueInt = ctx->height;
+		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;
+		}
+		break;
+	case GF_CODEC_PAR:
+		capability->cap.valueInt = ctx->pixel_ar;
+		break;
+	case GF_CODEC_OUTPUT_SIZE:
+		capability->cap.valueInt = ctx->out_size;
+		break;
+	case GF_CODEC_PIXEL_FORMAT:
+		capability->cap.valueInt = (ctx->luma_bpp==10) ? GF_PIXEL_YV12_10 : GF_PIXEL_YV12;
+		break;
+	case GF_CODEC_BUFFER_MIN:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_BUFFER_MAX:
+		capability->cap.valueInt = ctx->output_cb_size;
+		break;
+	case GF_CODEC_WANTS_THREAD:
+		capability->cap.valueBool= GF_TRUE;
+		break;
+	case GF_CODEC_PADDING_BYTES:
+		capability->cap.valueInt = 32;
+		break;
+	case GF_CODEC_REORDER:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_DIRECT_OUTPUT:
+		capability->cap.valueBool = 1;
+		break;
+	/*not known at our level...*/
+	case GF_CODEC_CU_DURATION:
+	default:
+		capability->cap.valueInt = 0;
+		break;
+	}
+	return GF_OK;
+}
+static GF_Err HEVC_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
+{
+	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
+	switch (capability.CapCode) {
+	case GF_CODEC_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_MEDIA_SWITCH_QUALITY:
+		/*switch up*/
+		if (capability.cap.valueInt) {
+            ctx->base_only = GF_FALSE;
+			libOpenHevcSetViewLayers(ctx->openHevcHandle, 1);		
+//			libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 1);
+		} else {
+            ctx->base_only = GF_TRUE;
+			libOpenHevcSetViewLayers(ctx->openHevcHandle, 0);		
+//			libOpenHevcSetActiveDecoders(ctx->openHevcHandle, 0);
+		}
+		return GF_OK;
+	case GF_CODEC_DIRECT_OUTPUT:
+		ctx->direct_output = GF_TRUE;
+		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 ...) */
+	return GF_NOT_SUPPORTED;
+
+}
+
+static GF_Err HEVC_flush_picture(HEVCDec *ctx, char *outBuffer, u32 *outBufferLength )
+{
+	unsigned int a_w, a_h, a_stride, bit_depth;
+    OpenHevc_Frame_cpy openHevcFrame;
+
+	libOpenHevcGetPictureInfo(ctx->openHevcHandle, &openHevcFrame.frameInfo);
+
+
+	a_w      = openHevcFrame.frameInfo.nWidth;
+    a_h      = openHevcFrame.frameInfo.nHeight;
+    a_stride = openHevcFrame.frameInfo.nYPitch;
+	bit_depth = openHevcFrame.frameInfo.nBitDepth;
+
+	if (!ctx->output_as_8bit) {
+		if ((ctx->luma_bpp>8) || (ctx->chroma_bpp>8)) a_stride *= 2;
+	} else {
+		if (bit_depth>8) {
+			bit_depth=8;
+
+			ctx->conv_to_8bit = 1;
+		}
+	}
+
+	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;
+		ctx->out_size = ctx->stride * a_w * 3 / 2;
+		ctx->had_pic = GF_TRUE;
+		ctx->luma_bpp = ctx->chroma_bpp = bit_depth;
+		/*always force layer resize*/
+		*outBufferLength = ctx->out_size;
+
+		if (ctx->conv_to_8bit && ctx->direct_output) {
+			ctx->conv_buffer = gf_realloc(ctx->conv_buffer, sizeof(char)*ctx->out_size);
+		}
+		return GF_BUFFER_TOO_SMALL;
+	}
+	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;
+			}
+		} 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;
+			}
+		}
+	}
+    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)
+{
+	GF_Err e;
+	int got_pic;
+	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
+
+	if (!inBuffer) {
+		if ( libOpenHevcDecode(ctx->openHevcHandle, NULL, 0, 0) ) {
+			return HEVC_flush_picture(ctx, outBuffer, outBufferLength);
+		}
+ 		return GF_OK;
+	}
+
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("HEVC: Decoding AU %d bytes\n", inBufferLength));
+
+	if (!ES_ID || (ES_ID!=ctx->ES_ID) ) {
+		*outBufferLength = 0;
+		return GF_OK;
+	}
+	if (*outBufferLength < ctx->out_size) {
+		*outBufferLength = ctx->out_size;
+		return GF_BUFFER_TOO_SMALL;
+	}
+
+	*outBufferLength = 0;
+
+	if (ctx->had_pic) {
+		ctx->had_pic = 0;
+		return HEVC_flush_picture(ctx, outBuffer, outBufferLength);
+	}
+	
+	got_pic = libOpenHevcDecode(ctx->openHevcHandle, (u8 *) inBuffer, inBufferLength, 0);
+	if (got_pic>0) {
+		e = HEVC_flush_picture(ctx, outBuffer, outBufferLength);
+		if (e) return e;
+		got_pic = 0;
+	}
+	return GF_OK;
+}
+
+
+static GF_Err HEVC_GetOutputBuffer(GF_MediaDecoder *ifcg, u16 ESID, u8 **pY_or_RGB, u8 **pU, u8 **pV)
+{
+	s32 res;
+    OpenHevc_Frame openHevcFrame;
+	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
+	if (!ctx->has_pic) return GF_BAD_PARAM;
+	ctx->has_pic = GF_FALSE;
+
+	if (ctx->conv_buffer) {
+		*pY_or_RGB = (u8 *) ctx->conv_buffer;
+		*pU = (u8 *) ctx->conv_buffer + ctx->stride * ctx->height;
+		*pV = (u8 *) ctx->conv_buffer + 5*ctx->stride * ctx->height/4;
+		return GF_OK;
+	}
+
+	res = libOpenHevcGetOutput(ctx->openHevcHandle, 1, &openHevcFrame);
+	if ((res<=0) || !openHevcFrame.pvY || !openHevcFrame.pvU || !openHevcFrame.pvV)
+		return GF_SERVICE_ERROR;
+
+	*pY_or_RGB = (u8 *) openHevcFrame.pvY;
+	*pU = (u8 *) openHevcFrame.pvU;
+	*pV = (u8 *) openHevcFrame.pvV;
+	return GF_OK;
+}
+
+
+
+static u32 HEVC_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
+{
+	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
+
+	/*media type query*/
+	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
+
+	switch (esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_VIDEO_HEVC:
+	case GPAC_OTI_VIDEO_SHVC:
+		return GF_CODEC_SUPPORTED;
+	}
+	return GF_CODEC_NOT_SUPPORTED;
+}
+
+static const char *HEVC_GetCodecName(GF_BaseDecoder *dec)
+{
+	HEVCDec *ctx = (HEVCDec*) dec->privateStack;
+	return libOpenHevcVersion(ctx->openHevcHandle);
+}
+
+GF_BaseDecoder *NewHEVCDec()
+{
+	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*/	
+	ifcd->AttachStream = HEVC_AttachStream;
+	ifcd->DetachStream = HEVC_DetachStream;
+	ifcd->GetCapabilities = HEVC_GetCapabilities;
+	ifcd->SetCapabilities = HEVC_SetCapabilities;
+	ifcd->GetName = HEVC_GetCodecName;
+	ifcd->CanHandleStream = HEVC_CanHandleStream;
+	ifcd->ProcessData = HEVC_ProcessData;
+	ifcd->GetOutputBuffer = HEVC_GetOutputBuffer;
+	return (GF_BaseDecoder *) ifcd;
+}
+
+void DeleteHEVCDec(GF_BaseDecoder *ifcg)
+{
+	HEVCDec *ctx = (HEVCDec*) ifcg->privateStack;
+	gf_free(ctx);
+	gf_free(ifcg);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces() 
+{
+	static u32 si [] = {
+#ifndef GPAC_DISABLE_AV_PARSERS
+		GF_MEDIA_DECODER_INTERFACE,
+#endif
+		0
+	};
+	return si; 
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewHEVCDec();
+#endif
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+	case GF_MEDIA_DECODER_INTERFACE: 
+		DeleteHEVCDec((GF_BaseDecoder*)ifce);
+		break;
+#endif
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( openhevc )

gpac-0.5.0.svn4668.tar.bz2/modules/opensvc_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/opensvc_dec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/opensvc_dec/opensvc_dec.c -> gpac-0.5.0.svn5178.tar.bz2/modules/opensvc_dec/opensvc_dec.c Changed

@@ -80,13 +80,14 @@
 
 		/*decode all NALUs*/
 		count = gf_list_count(cfg->sequenceParameterSets);
-        SetCommandLayer(Layer, 255, 0, &i, 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, par_n=0, par_d=0;
+			u32 w=0, h=0, sid;
+            s32 par_n=0, par_d=0;
 			GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-			gf_avc_get_sps_info(slc->data, slc->size, &slc->id, &w, &h, &par_n, &par_d);
+			gf_avc_get_sps_info(slc->data, slc->size, &sid, &w, &h, &par_n, &par_d);
 #endif
 			/*by default use the base layer*/
 			if (!i) {
@@ -97,7 +98,7 @@
 						ctx->pixel_ar = (par_n<<16) || par_d;
 				}
 			}
-			res = decodeNAL(ctx->codec, slc->data, slc->size, &Picture, Layer);
+			res = decodeNAL(ctx->codec, (unsigned char *) slc->data, slc->size, &Picture, Layer);
 			if (res<0) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding SPS %d\n", res));
 			}
@@ -109,7 +110,7 @@
 			u32 sps_id, pps_id;
 			GF_AVCConfigSlot *slc = gf_list_get(cfg->pictureParameterSets, i);
 			gf_avc_get_pps_info(slc->data, slc->size, &pps_id, &sps_id);
-			res = decodeNAL(ctx->codec, slc->data, slc->size, &Picture, Layer);
+			res = decodeNAL(ctx->codec, (unsigned char *) slc->data, slc->size, &Picture, Layer);
 			if (res<0) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC Decoder] Error decoding PPS %d\n", res));
 			}
@@ -233,7 +234,7 @@
 		return GF_BUFFER_TOO_SMALL;
 	}
 
-	ctx->MaxDqId = GetDqIdMax(inBuffer, inBufferLength, ctx->nalu_size_length, ctx->DqIdTable, ctx->nalu_size_length ? 1 : 0);
+	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) 
@@ -249,12 +250,12 @@
 
 	got_pic = 0;
 	nalu_size = 0;
-	ptr = inBuffer;
+	ptr = (u8 *) inBuffer;
 
 	if (!ctx->nalu_size_length) {
 		u32 size;
 		sc_size = 0;
-		size = gf_media_nalu_next_start_code(inBuffer, inBufferLength, &sc_size);
+		size = gf_media_nalu_next_start_code((u8 *) inBuffer, inBufferLength, &sc_size);
 		if (sc_size) {
 			ptr += size+sc_size;
 			assert(inBufferLength >= size+sc_size);

gpac-0.5.0.svn4668.tar.bz2/modules/osd/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/osd/Makefile Changed

@@ -1,53 +1,47 @@
-include ../../config.mak
-
-vpath %.c $(SRC_PATH)/modules/osd
-
-CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
-
-ifeq ($(DEBUGBUILD), yes)
-CFLAGS+=-g
-LDFLAGS+=-g
-endif
-
-ifeq ($(GPROFBUILD), yes)
-CFLAGS+=-pg
-LDFLAGS+=-pg
-endif
-
-LINKLIBS= -lgpac
-LOCAL_LIB=../../bin/gcc
-
-#common objects
-OBJS=osd.o
-
-SRCS := $(OBJS:.o=.c) 
-
-LIB=gm_osd.$(DYN_LIB_SUFFIX)
-
-
-all: $(LIB)
-
-
-$(LIB): $(OBJS)
-	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS)
-
-
-clean: 
-	rm -f $(OBJS) ../../bin/gcc/$(LIB)
-
-dep: depend
-
-depend:
-	rm -f .depend	
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
-
-distclean: clean
-	rm -f Makefile.bak .depend
-
-
-
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+include ../../config.mak
+
+vpath %.c $(SRC_PATH)/modules/osd
+
+CFLAGS= $(OPTFLAGS) -I"$(SRC_PATH)/include"
+
+ifeq ($(DEBUGBUILD), yes)
+CFLAGS+=-g
+LDFLAGS+=-g
+endif
+
+ifeq ($(GPROFBUILD), yes)
+CFLAGS+=-pg
+LDFLAGS+=-pg
+endif
+
+LINKLIBS= -lgpac
+LOCAL_LIB=../../bin/gcc
+
+#common objects
+OBJS=osd.o
+
+SRCS := $(OBJS:.o=.c) 
+
+LIB=gm_osd.$(DYN_LIB_SUFFIX)
+
+
+all: $(LIB)
+
+
+$(LIB): $(OBJS)
+	$(CC) $(SHFLAGS) $(LDFLAGS) -o ../../bin/gcc/$@ $(OBJS) $(EXTRALIBS) -L$(LOCAL_LIB) $(LINKLIBS)
+
+
+clean: 
+	rm -f $(OBJS) ../../bin/gcc/$(LIB)
+
+dep: depend
+
+depend:
+	rm -f .depend	
+	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+
+distclean: clean
+	rm -f Makefile.bak .depend
+
+-include .depend

gpac-0.5.0.svn4668.tar.bz2/modules/osd/osd.c -> gpac-0.5.0.svn5178.tar.bz2/modules/osd/osd.c Changed

@@ -1,303 +1,303 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2011-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / User Event Recorder sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <gpac/modules/term_ext.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/nodes_mpeg4.h>
-
-
-typedef struct
-{
-	GF_ObjectManager *odm;
-	GF_Terminal *term;
-	GF_TermEventFilter evt_filter;
-
-	/*some of our nodes*/
-	M_Switch *visible;
-	M_Transform2D *transform;
-	M_CompositeTexture2D *ct2d;
-	M_Text *text;
-
-	char statBuffer[100];
-	u32 refresh_time_ms;
-	GF_SystemRTInfo rti;
-} GF_OSD;
-
-static GFINLINE GF_Node *create_node(GF_OSD *osd, u32 tag, GF_Node *par)
-{
-	GF_Node *n = gf_node_new(osd->odm->subscene->graph, tag);
-	if (n) {
-		gf_node_init(n);
-		if (par) {
-			gf_node_list_add_child( & ((GF_ParentNode *)par)->children, n);
-			gf_node_register(n, par);
-		}
-	}
-	return n;
-}
-const char *osd_scene_graph = "\
-EXTERNPROTO Untransform [\
-    exposedField MFNode children []\
-]\
-[ \"urn:inet:gpac:builtin:Untransform\"]\
-OrderedGroup {\
- children [\
-  Untransform {\
-   children [\
-  DEF N1 Switch {\
-   whichChoice 0\
-   choice [\
-    DEF N2 Transform2D {\
-     children [\
-      Shape {\
-       appearance Appearance {\
-        material Material2D {\
-         transparency 0\
-         filled TRUE\
-        }\
-        texture DEF N3 CompositeTexture2D {\
-         pixelWidth 256\
-         pixelHeight 16\
-         children [\
-          Background2D {backColor 0.6 0.6 0.6}\
-          Shape {\
-           appearance Appearance {\
-            material Material2D {\
-             emissiveColor 0 0 0\
-             filled TRUE\
-            }\
-           }\
-           geometry DEF N4 Text {\
-            string [\"My Sample Text !\"]\
-            fontStyle FontStyle {\
-             size 12\
-             justify [\"MIDDLE\", \"MIDDLE\"]\
-             family [\"SANS\"]\
-            }\
-           }\
-          }\
-         ]\
-        }\
-       }\
-       geometry Bitmap {}\
-      }\
-     ]\
-    }\
-   ]\
-  }\
-   ]\
-  }\
- ]\
-}\
-";
-
-void osd_on_resize(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer)
-{
-	GF_DOMHandler *the_hdl = (GF_DOMHandler *) hdl;
-	GF_OSD *osd = the_hdl->evt_listen_obj;
-
-	if (osd->ct2d) {
-		//osd->ct2d->pixelWidth = FIX2INT(event->screen_rect.width);
-		gf_node_dirty_set((GF_Node *) osd->ct2d, GF_SG_NODE_DIRTY, 1);
-
-		if (osd->transform) {
-			osd->transform->translation.y = INT2FIX( (FIX2INT(event->screen_rect.height) - osd->ct2d->pixelHeight) / 2 ) ;
-			gf_node_dirty_set((GF_Node *) osd->transform, GF_SG_NODE_DIRTY, 1);
-		}
-	}
-}
-
-Bool osd_load_scene(GF_OSD *osd)
-{
-	GF_Node *n;
-	GF_List *nodes;
-	const char *opt;
-	GF_DOMHandler *hdl;
-	/*BT/VRML from string*/
-	GF_List *gf_sm_load_bt_from_string(GF_SceneGraph *in_scene, const char *node_str, Bool force_wrl);
-
-	/*create a new scene*/
-	osd->odm = gf_odm_new();
-	osd->odm->term = osd->term;
-	osd->odm->subscene = gf_scene_new(NULL);
-	osd->odm->subscene->root_od = osd->odm;
-	gf_sg_set_scene_size_info(osd->odm->subscene->graph, 0, 0, 1);
-
-	/*create a scene graph*/
-	nodes = gf_sm_load_bt_from_string(osd->odm->subscene->graph, osd_scene_graph, 0);
-	n = gf_list_get(nodes, 0);
-	gf_list_del(nodes);
-
-	if (!n) return 0;
-	
-	gf_sg_set_root_node(osd->odm->subscene->graph, n);
-	gf_sg_set_scene_size_info(osd->odm->subscene->graph, 0, 0, 1);
-
-	hdl = gf_dom_listener_build(n, GF_EVENT_RESIZE, 0);
-	hdl->handle_event = osd_on_resize;
-	hdl->evt_listen_obj = osd;
-
-	osd->visible = (M_Switch *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N1");
-	osd->transform = (M_Transform2D *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N2");
-	osd->ct2d = (M_CompositeTexture2D *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N3");
-	osd->text = (M_Text *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N4");
-	if (osd->text->string.vals[0]) {
-		gf_free(osd->text->string.vals[0]);
-		osd->text->string.vals[0] = NULL;
-	}
-	strcpy(osd->statBuffer, "Hello World !");
-	osd->text->string.vals[0] = osd->statBuffer;
-
-	opt = gf_cfg_get_key(osd->term->user->config, "OSD", "Visible");
-	if (!opt || strcmp(opt, "yes")) osd->visible->whichChoice = -1;
-
-
-	return 1;
-}
-
-
-Bool osd_on_event_play(void *udta, GF_Event *event, Bool consumed_by_compositor)
-{
-	GF_OSD* osd = (GF_OSD*)udta;
-	switch (event->type) {
-	case GF_EVENT_SCENE_SIZE:
-		gf_sg_set_scene_size_info(osd->odm->subscene->graph, event->size.width, event->size.height, 1);
-		break;
-	case GF_EVENT_KEYUP:
-		if ( (event->key.key_code == GF_KEY_I) && (event->key.flags & GF_KEY_MOD_CTRL)) {
-			if (osd->visible->whichChoice==0) {
-				osd->visible->whichChoice = -1;
-				gf_cfg_set_key(osd->term->user->config, "OSD", "Visible", "no");
-			} else {
-				osd->visible->whichChoice = 0;
-				gf_cfg_set_key(osd->term->user->config, "OSD", "Visible", "yes");
-			}
-			gf_node_dirty_set((GF_Node *) osd->visible, GF_SG_NODE_DIRTY, 1);
-		}
-		break;
-	}
-	return 0;
-}
-static Bool osd_process(GF_TermExt *termext, u32 action, void *param)
-{
-	const char *opt;
-	GF_OSD *osd = termext->udta;
-
-	switch (action) {
-	case GF_TERM_EXT_START:
-		osd->term = (GF_Terminal *) param;
-		opt = gf_modules_get_option((GF_BaseInterface*)termext, "OSD", "Enabled");
-		if (opt && strcmp(opt, "yes")) return 0;
-
-		/*load scene*/
-		if (! osd_load_scene(osd)) return 0;
-		/*attach scene to compositor*/
-		gf_sc_register_extra_graph(osd->term->compositor, osd->odm->subscene->graph, 0);
-
-
-		/*we are not threaded*/
-		termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
-
-		osd->refresh_time_ms = 500;
-		osd->evt_filter.on_event = osd_on_event_play;
-		osd->evt_filter.udta = osd;
-		gf_term_add_event_filter(osd->term, &osd->evt_filter);
-		return 1;
-
-	case GF_TERM_EXT_STOP:
-		osd->text->string.vals[0] = NULL;
-		/*remove scene to compositor*/
-		gf_sc_register_extra_graph(osd->term->compositor, osd->odm->subscene->graph, 1);
-		gf_odm_disconnect(osd->odm, 1);
-		osd->odm = NULL;
-
-		gf_term_remove_event_filter(osd->term, &osd->evt_filter);
-		osd->term = NULL;
-		break;
-
-	case GF_TERM_EXT_PROCESS:
-		/*flush all events until current time if reached*/
-		if ((osd->visible->whichChoice==0) && gf_sys_get_rti(osd->refresh_time_ms, &osd->rti, 0)) {
-			sprintf(osd->statBuffer, "CPU %02d - FPS %02.2f - MEM "LLU" KB", osd->rti.process_cpu_usage, gf_sc_get_fps(osd->term->compositor, 0), osd->rti.process_memory/1000);
-			gf_node_dirty_set((GF_Node *) osd->text, GF_SG_NODE_DIRTY, 1);
-		}
-		break;
-	}
-	return 0;
-}
-
-
-GF_TermExt *osd_new()
-{
-	GF_TermExt *dr;
-	GF_OSD *osd;
-	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
-	memset(dr, 0, sizeof(GF_TermExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC OnScreen Display", "gpac distribution");
-
-	GF_SAFEALLOC(osd, GF_OSD);
-	dr->process = osd_process;
-	dr->udta = osd;
-	return dr;
-}
-
-
-void osd_delete(GF_BaseInterface *ifce)
-{
-	GF_TermExt *dr = (GF_TermExt *) ifce;
-	GF_OSD *osd = dr->udta;
-	gf_free(osd);
-	gf_free(dr);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
-{
-	static u32 si [] = {
-		GF_TERM_EXT_INTERFACE,
-		0
-	};
-	return si; 
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
-{
-	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)osd_new();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_TERM_EXT_INTERFACE:
-		osd_delete(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DELARATION( osd )
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre 
+ *			Copyright (c) Telecom ParisTech 2011-2012
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / Sampe On-Scvreen Display sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/modules/term_ext.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/nodes_mpeg4.h>
+
+
+typedef struct
+{
+	GF_ObjectManager *odm;
+	GF_Terminal *term;
+	GF_TermEventFilter evt_filter;
+
+	/*some of our nodes*/
+	M_Switch *visible;
+	M_Transform2D *transform;
+	M_CompositeTexture2D *ct2d;
+	M_Text *text;
+
+	char statBuffer[100];
+	u32 refresh_time_ms;
+	GF_SystemRTInfo rti;
+} GF_OSD;
+
+static GFINLINE GF_Node *create_node(GF_OSD *osd, u32 tag, GF_Node *par)
+{
+	GF_Node *n = gf_node_new(osd->odm->subscene->graph, tag);
+	if (n) {
+		gf_node_init(n);
+		if (par) {
+			gf_node_list_add_child( & ((GF_ParentNode *)par)->children, n);
+			gf_node_register(n, par);
+		}
+	}
+	return n;
+}
+const char *osd_scene_graph = "\
+EXTERNPROTO Untransform [\
+    exposedField MFNode children []\
+]\
+[ \"urn:inet:gpac:builtin:Untransform\"]\
+OrderedGroup {\
+ children [\
+  Untransform {\
+   children [\
+  DEF N1 Switch {\
+   whichChoice 0\
+   choice [\
+    DEF N2 Transform2D {\
+     children [\
+      Shape {\
+       appearance Appearance {\
+        material Material2D {\
+         transparency 0\
+         filled TRUE\
+        }\
+        texture DEF N3 CompositeTexture2D {\
+         pixelWidth 256\
+         pixelHeight 16\
+         children [\
+          Background2D {backColor 0.6 0.6 0.6}\
+          Shape {\
+           appearance Appearance {\
+            material Material2D {\
+             emissiveColor 0 0 0\
+             filled TRUE\
+            }\
+           }\
+           geometry DEF N4 Text {\
+            string [\"My Sample Text !\"]\
+            fontStyle FontStyle {\
+             size 12\
+             justify [\"MIDDLE\", \"MIDDLE\"]\
+             family [\"SANS\"]\
+            }\
+           }\
+          }\
+         ]\
+        }\
+       }\
+       geometry Bitmap {}\
+      }\
+     ]\
+    }\
+   ]\
+  }\
+   ]\
+  }\
+ ]\
+}\
+";
+
+void osd_on_resize(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer)
+{
+	GF_DOMHandler *the_hdl = (GF_DOMHandler *) hdl;
+	GF_OSD *osd = the_hdl->evt_listen_obj;
+
+	if (osd->ct2d) {
+		//osd->ct2d->pixelWidth = FIX2INT(event->screen_rect.width);
+		gf_node_dirty_set((GF_Node *) osd->ct2d, GF_SG_NODE_DIRTY, 1);
+
+		if (osd->transform) {
+			osd->transform->translation.y = INT2FIX( (FIX2INT(event->screen_rect.height) - osd->ct2d->pixelHeight) / 2 ) ;
+			gf_node_dirty_set((GF_Node *) osd->transform, GF_SG_NODE_DIRTY, 1);
+		}
+	}
+}
+
+Bool osd_load_scene(GF_OSD *osd)
+{
+	GF_Node *n;
+	GF_List *nodes;
+	const char *opt;
+	GF_DOMHandler *hdl;
+	/*BT/VRML from string*/
+	GF_List *gf_sm_load_bt_from_string(GF_SceneGraph *in_scene, const char *node_str, Bool force_wrl);
+
+	/*create a new scene*/
+	osd->odm = gf_odm_new();
+	osd->odm->term = osd->term;
+	osd->odm->subscene = gf_scene_new(NULL);
+	osd->odm->subscene->root_od = osd->odm;
+	gf_sg_set_scene_size_info(osd->odm->subscene->graph, 0, 0, 1);
+
+	/*create a scene graph*/
+	nodes = gf_sm_load_bt_from_string(osd->odm->subscene->graph, osd_scene_graph, 0);
+	n = gf_list_get(nodes, 0);
+	gf_list_del(nodes);
+
+	if (!n) return 0;
+	
+	gf_sg_set_root_node(osd->odm->subscene->graph, n);
+	gf_sg_set_scene_size_info(osd->odm->subscene->graph, 0, 0, 1);
+
+	hdl = gf_dom_listener_build(n, GF_EVENT_RESIZE, 0);
+	hdl->handle_event = osd_on_resize;
+	hdl->evt_listen_obj = osd;
+
+	osd->visible = (M_Switch *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N1");
+	osd->transform = (M_Transform2D *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N2");
+	osd->ct2d = (M_CompositeTexture2D *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N3");
+	osd->text = (M_Text *)gf_sg_find_node_by_name(osd->odm->subscene->graph, "N4");
+	if (osd->text->string.vals[0]) {
+		gf_free(osd->text->string.vals[0]);
+		osd->text->string.vals[0] = NULL;
+	}
+	strcpy(osd->statBuffer, "Hello World !");
+	osd->text->string.vals[0] = osd->statBuffer;
+
+	opt = gf_cfg_get_key(osd->term->user->config, "OSD", "Visible");
+	if (!opt || strcmp(opt, "yes")) osd->visible->whichChoice = -1;
+
+
+	return 1;
+}
+
+
+Bool osd_on_event_play(void *udta, GF_Event *event, Bool consumed_by_compositor)
+{
+	GF_OSD* osd = (GF_OSD*)udta;
+	switch (event->type) {
+	case GF_EVENT_SCENE_SIZE:
+		gf_sg_set_scene_size_info(osd->odm->subscene->graph, event->size.width, event->size.height, 1);
+		break;
+	case GF_EVENT_KEYUP:
+		if ( (event->key.key_code == GF_KEY_I) && (event->key.flags & GF_KEY_MOD_CTRL)) {
+			if (osd->visible->whichChoice==0) {
+				osd->visible->whichChoice = -1;
+				gf_cfg_set_key(osd->term->user->config, "OSD", "Visible", "no");
+			} else {
+				osd->visible->whichChoice = 0;
+				gf_cfg_set_key(osd->term->user->config, "OSD", "Visible", "yes");
+			}
+			gf_node_dirty_set((GF_Node *) osd->visible, GF_SG_NODE_DIRTY, 1);
+		}
+		break;
+	}
+	return 0;
+}
+static Bool osd_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *opt;
+	GF_OSD *osd = termext->udta;
+
+	switch (action) {
+	case GF_TERM_EXT_START:
+		osd->term = (GF_Terminal *) param;
+		opt = gf_modules_get_option((GF_BaseInterface*)termext, "OSD", "Enabled");
+		if (opt && strcmp(opt, "yes")) return 0;
+
+		/*load scene*/
+		if (! osd_load_scene(osd)) return 0;
+		/*attach scene to compositor*/
+		gf_sc_register_extra_graph(osd->term->compositor, osd->odm->subscene->graph, 0);
+
+
+		/*we are not threaded*/
+		termext->caps |= GF_TERM_EXTENSION_NOT_THREADED;
+
+		osd->refresh_time_ms = 500;
+		osd->evt_filter.on_event = osd_on_event_play;
+		osd->evt_filter.udta = osd;
+		gf_term_add_event_filter(osd->term, &osd->evt_filter);
+		return 1;
+
+	case GF_TERM_EXT_STOP:
+		osd->text->string.vals[0] = NULL;
+		/*remove scene to compositor*/
+		gf_sc_register_extra_graph(osd->term->compositor, osd->odm->subscene->graph, 1);
+		gf_odm_disconnect(osd->odm, 1);
+		osd->odm = NULL;
+
+		gf_term_remove_event_filter(osd->term, &osd->evt_filter);
+		osd->term = NULL;
+		break;
+
+	case GF_TERM_EXT_PROCESS:
+		/*flush all events until current time if reached*/
+		if ((osd->visible->whichChoice==0) && gf_sys_get_rti(osd->refresh_time_ms, &osd->rti, 0)) {
+			sprintf(osd->statBuffer, "CPU %02d - FPS %02.2f - MEM "LLU" KB", osd->rti.process_cpu_usage, gf_sc_get_fps(osd->term->compositor, 0), osd->rti.process_memory/1000);
+			gf_node_dirty_set((GF_Node *) osd->text, GF_SG_NODE_DIRTY, 1);
+		}
+		break;
+	}
+	return 0;
+}
+
+
+GF_TermExt *osd_new()
+{
+	GF_TermExt *dr;
+	GF_OSD *osd;
+	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC OnScreen Display", "gpac distribution");
+
+	GF_SAFEALLOC(osd, GF_OSD);
+	dr->process = osd_process;
+	dr->udta = osd;
+	return dr;
+}
+
+
+void osd_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	GF_OSD *osd = dr->udta;
+	gf_free(osd);
+	gf_free(dr);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces() 
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si; 
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)osd_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		osd_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( osd )

gpac-0.5.0.svn4668.tar.bz2/modules/oss_audio/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/oss_audio/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACFileMediaServer.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACFileMediaServer.cpp Changed

@@ -67,12 +67,12 @@
 												const char*                   filter,
 												NPT_UInt32                    start_index,
 												NPT_UInt32                    req_count,
-												const NPT_List<NPT_String>&   sort_criteria,
+												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")) {
-		return PLT_FileMediaServer::OnBrowseDirectChildren(action, object_id, filter, start_index, req_count, sort_criteria, context);
+		return PLT_MediaServer::OnBrowseDirectChildren(action, object_id, filter, start_index, req_count, sort_criteria, context);
 	}
 
 	unsigned long cur_index = 0;
@@ -153,7 +153,11 @@
 		if (path == vfile.m_URI) {
 			NPT_Result res;
 			NPT_Position start, end;
+#if 0
 			PLT_HttpHelper::GetRange(request, start, end);
+#else
+			start = end = -1;
+#endif
 			res = ServeVirtualFile(response, &vfile, start, end, !request.GetMethod().Compare("HEAD"));
 			if (vfile.m_temporary) {
 				m_VirtualFiles.Remove(vfile);
@@ -163,23 +167,22 @@
 	}
 
     // File requested
-    NPT_String path = m_FileBaseUri.GetPath();
+    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_FileServer::ServeFile(response,
+
+			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) );
+#endif
+	} 
 
-    // Album Art requested
-    path = m_AlbumArtBaseUri.GetPath();
-    if (path.Compare(uri_path.Left(path.GetLength()), true) == 0) {
-        return OnAlbumArtRequest(response, file_path);
-    } 
     
     return NPT_FAILURE;
 }
@@ -262,7 +265,7 @@
         if (object->m_Title.GetLength() == 0) goto failure;
 
         /* Set the protocol Info from the extension */
-        resource.m_ProtocolInfo = PLT_ProtocolInfo(PLT_MediaItem::GetProtocolInfo(filepath, true, context));
+        resource.m_ProtocolInfo = PLT_ProtocolInfo(PLT_ProtocolInfo::GetProtocolInfo(filepath, true, context));
         if (!resource.m_ProtocolInfo.IsValid())  goto failure;
 
         /* Set the resource file size */
@@ -301,7 +304,8 @@
 			ip = *ipi;
 		}
 
-        /* Look to see if a metadatahandler exists for this extension */
+#if 0
+		/* Look to see if a metadatahandler exists for this extension */
         PLT_MetadataHandler* handler = NULL;
         NPT_Result res = NPT_ContainerFind(
             m_MetadataHandlers, 
@@ -334,10 +338,11 @@
                 handler->GetProtection(resource.m_Protection);
             }
 		}
-
+#endif
 		object->m_ObjectClass.type = PLT_MediaItem::GetUPnPClass(filepath, context);
 
-		resource.m_Uri = BuildResourceUri(m_FileBaseUri, ip.ToString(), url);
+		NPT_HttpUrl base_uri(m_FileRoot);
+		resource.m_Uri = BuildResourceUri(base_uri/*m_FileBaseUri*/, ip.ToString(), url);
 		object->m_Resources.Add(resource);
 
 	} else {
@@ -355,7 +360,13 @@
 #ifndef _WIN32_WCE
 		/* Get the number of children for this container */
         NPT_Cardinal count = 0;
-        if (with_count && NPT_SUCCEEDED(NPT_File::GetCount(__filepath, count))) {
+
+		// reset output params
+		count = 0;
+        if (with_count ) {
+			NPT_List<NPT_String> entries;
+			NPT_File::ListDir(__filepath, entries);    
+			count = entries.GetItemCount();
             ((PLT_MediaContainer*)object)->m_ChildrenCount = count;
         }
 #endif	//_WIN32_WCE
@@ -557,8 +568,6 @@
         } else {
             len = end_offset - start_offset + 1;
             response.SetStatus(206, "Partial Content");
-            PLT_HttpHelper::SetContentRange(response, start_offset, end_offset, total_len);
-
             entity->SetInputStream(stream);
             entity->SetContentLength(len);
         }

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACFileMediaServer.h -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACFileMediaServer.h Changed

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACMediaController.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACMediaController.cpp Changed

@@ -210,7 +210,7 @@
 
     if (!userdata) return;
 
-    PLT_BrowseDataReference* data = (PLT_BrowseDataReference*) userdata;
+    GPAC_BrowseDataReference* data = (GPAC_BrowseDataReference*) userdata;
     (*data)->res = res;
     if (NPT_SUCCEEDED(res) && info) {
         (*data)->info = *info;
@@ -275,7 +275,7 @@
 
 
 NPT_Result 
-GPAC_MediaController::Browse(PLT_BrowseDataReference& browse_data,
+GPAC_MediaController::Browse(GPAC_BrowseDataReference& browse_data,
                              PLT_DeviceDataReference& device, 
                              const char*              object_id, 
                              NPT_Int32                index, 
@@ -298,7 +298,7 @@
         browse_metadata,
         filter,
         sort,
-        new PLT_BrowseDataReference(browse_data));		
+        new GPAC_BrowseDataReference(browse_data));		
     NPT_CHECK_SEVERE(res);
 
     return WaitForResponse(browse_data->shared_var);
@@ -315,7 +315,7 @@
 
 
 	do {	
-        PLT_BrowseDataReference browse_data(new PLT_BrowseData());
+        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

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACMediaController.h -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACMediaController.h Changed

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACMediaRenderer.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACMediaRenderer.cpp Changed

@@ -72,20 +72,21 @@
 }
 
 NPT_Result
-GPAC_MediaRenderer::SetupServices(PLT_DeviceData& data)
+GPAC_MediaRenderer::SetupServices()
 {
     PLT_Service* service;
 
     {
         /* AVTransport */
         m_pAVService = new PLT_Service(
-            &data,
+            this,
             "urn:schemas-upnp-org:service:AVTransport:1", 
-            "urn:upnp-org:serviceId:AVT_1-0",
+            "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(m_pAVService->InitURLs("AVTransport", data.GetUUID()));
-        NPT_CHECK_FATAL(data.AddService(m_pAVService));
+        NPT_CHECK_FATAL(AddService(m_pAVService));
 
         m_pAVService->SetStateVariableRate("LastChange", NPT_TimeInterval(0.2f));
         m_pAVService->SetStateVariable("A_ARG_TYPE_InstanceID", "0"); 
@@ -147,12 +148,12 @@
     {
         /* ConnectionManager */
         service = new PLT_Service(
-            &data,
+            this,
             "urn:schemas-upnp-org:service:ConnectionManager:1", 
-            "urn:upnp-org:serviceId:CMGR_1-0");
+            "urn:upnp-org:serviceId:ConnectionManager",
+            "ConnectionManager");
         NPT_CHECK_FATAL(service->SetSCPDXML((const char*) RDR_ConnectionManagerSCPD));
-        NPT_CHECK_FATAL(service->InitURLs("ConnectionManager", data.GetUUID()));
-        NPT_CHECK_FATAL(data.AddService(service));
+        NPT_CHECK_FATAL(AddService(service));
 
         service->SetStateVariable("CurrentConnectionIDs", "0");
 
@@ -164,13 +165,13 @@
     {
         /* RenderingControl */
         service = new PLT_Service(
-            &data,
+            this,
             "urn:schemas-upnp-org:service:RenderingControl:1", 
-            "urn:upnp-org:serviceId:RCS_1-0",
+            "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(service->InitURLs("RenderingControl", data.GetUUID()));
-        NPT_CHECK_FATAL(data.AddService(service));
+        NPT_CHECK_FATAL(AddService(service));
 
         service->SetStateVariableRate("LastChange", NPT_TimeInterval(0.2f));
 
@@ -226,11 +227,10 @@
 </scpd>";
 
         /* MigrationService */
-        m_pMigrationService = new PLT_Service(&data, "urn:intermedia:service:migration:1", "urn:intermedia:service:migration.001");
+        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(m_pMigrationService->InitURLs("SessionMigration", data.GetUUID()));
-        NPT_CHECK_FATAL(data.AddService(m_pMigrationService));
+        NPT_CHECK_FATAL(AddService(m_pMigrationService));
 
         m_pMigrationService->SetStateVariable("MigrationStatus", "OK");
         m_pMigrationService->SetStateVariable("MigrationMetaData", "");
@@ -375,7 +375,7 @@
         }
     }
 
-    if (name.Compare("GetVolume", true) == 0) {
+    if ((name.Compare("GetVolume", true) == 0) || (name.Compare("GetVolumeRangeDB", true) == 0) ) {
         NPT_CHECK_SEVERE(action->SetArgumentsOutFromStateVariable());
         return NPT_SUCCESS;
     }
@@ -388,6 +388,9 @@
     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);
@@ -556,11 +559,21 @@
     return NPT_SUCCESS;
 }
 
+NPT_Result GPAC_MediaRenderer::OnSetVolumeDB(PLT_ActionReference& action)
+{
+    return NPT_SUCCESS;
+}
+
 NPT_Result GPAC_MediaRenderer::OnSetMute(PLT_ActionReference& action)
 {
     return NPT_SUCCESS;
 }
 
+NPT_Result GPAC_MediaRenderer::OnGetVolumeDBRange(PLT_ActionReference& action )
+{
+    return NPT_SUCCESS;
+}
+
 void GPAC_MediaRenderer::SetDuration(Double duration, Bool can_seek)
 {
 	char szVal[100];

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACMediaRenderer.h -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACMediaRenderer.h Changed

@@ -40,7 +40,7 @@
 class GF_UPnP;
 
 class GPAC_MediaRenderer  : public PLT_DeviceHost,
-                          public PLT_MediaRendererInterface
+                          public PLT_MediaRendererDelegate
 {
 public:
     GPAC_MediaRenderer (GF_UPnP *upnp, const char*          friendly_name,
@@ -49,7 +49,7 @@
                       unsigned int         port = 0);
 
     // PLT_DeviceHost methods
-    virtual NPT_Result SetupServices(PLT_DeviceData& data);
+    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)*/
@@ -77,7 +77,10 @@
     // 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:
 	GF_UPnP *m_pUPnP;

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GPACPlatinum.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GPACPlatinum.cpp Changed

@@ -28,6 +28,50 @@
  *
  */
 
+//declaration of export functions is done first due to a linker bug on OSX ...
+#include <gpac/modules/term_ext.h>
+
+GF_TermExt *upnp_new();
+void upnp_delete(GF_BaseInterface *ifce);
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+    
+    
+    GPAC_MODULE_EXPORT
+    const u32 *QueryInterfaces() 
+    {
+        static u32 si [] = {
+            GF_TERM_EXT_INTERFACE,
+            0
+        };
+        return si; 
+    }
+    
+    GPAC_MODULE_EXPORT
+    GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+    {
+        if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)upnp_new();
+        return NULL;
+    }
+    
+    GPAC_MODULE_EXPORT
+    void ShutdownInterface(GF_BaseInterface *ifce)
+    {
+        switch (ifce->InterfaceType) {
+            case GF_TERM_EXT_INTERFACE:
+                upnp_delete(ifce);
+                break;
+        }
+    }
+    
+    GPAC_MODULE_STATIC_DELARATION( platinum )
+    
+#ifdef __cplusplus
+}
+#endif
+
 
 #include "GPACPlatinum.h"
 
@@ -484,6 +528,9 @@
 	if (m_pAVCtrlPoint) delete m_pAVCtrlPoint;
 	/*this will delete all UPnP devices*/
 	delete m_pPlatinum;
+
+	/*final cleanup of UPnP lib*/
+    NPT_AutomaticCleaner::Shutdown();
 }
 
 
@@ -1277,9 +1324,8 @@
 	scpd_xml = NULL;
 	if ((argc>3) && JSVAL_IS_STRING(argv[3])) scpd_xml = SMJS_CHARS(c, argv[3]);
 
-	GPAC_Service* service = new GPAC_Service(device, type, id);
+	GPAC_Service* service = new GPAC_Service(device, type, id, name);
 	res = service->SetSCPDXML((const char*) scpd_xml ? scpd_xml : (char *)GENERIC_SCPDXML);
-	if (res == NPT_SUCCESS) res = service->InitURLs(name, device->GetUUID() );
 
 	SMJS_FREE(c, name);
 	SMJS_FREE(c, type);
@@ -1606,7 +1652,10 @@
 			opt = "no";
 			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[UPnP] Disabling UPnP - to enable it, modify section [UPnP] key \"Enabled\" in /Users/yourname/.gpacrc"));
 #else
-			opt = "yes";
+//			opt = "yes";
+			//UPnP is disabkled by default on all platforms until we have a more stable state on load and exit
+			opt = "no";
+			GF_LOG(GF_LOG_WARNING, GF_LOG_NETWORK, ("[UPnP] Disabling UPnP - to enable it, modify section [UPnP] key \"Enabled\" in /Users/yourname/.gpacrc"));
 #endif
 			gf_modules_set_option((GF_BaseInterface*)termext, "UPnP", "Enabled", opt);
 		}
@@ -1688,41 +1737,3 @@
 	gf_free(dr);
 }
 
-
-
-#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 )
-
-#ifdef __cplusplus
-}
-#endif

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GenericDevice.cpp -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GenericDevice.cpp Changed

@@ -31,7 +31,7 @@
 
 #include "GenericDevice.h"
 #include "GPACPlatinum.h"
-#include "PltXmlHelper.h"
+//#include "PltXmlHelper.h"
 
 NPT_SET_LOCAL_LOGGER("gpac.genericdevice")
 
@@ -550,7 +550,7 @@
 	SMJS_OBJ
 	PLT_Action *action = (PLT_Action *) SMJS_GET_PRIVATE(c, obj);
 	if (!action ) return JS_FALSE;
-	SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, action->GetError( code ) ) ) );
+	SMJS_SET_RVAL( STRING_TO_JSVAL( JS_NewStringCopyZ(c, action->GetError( &code ) ) ) );
 	return JS_TRUE;
 }
 
@@ -740,8 +740,8 @@
 }
 
 
-GPAC_Service::GPAC_Service(PLT_DeviceData* device, const char *type,  const char *id, const char *last_change_namespace)
-	: PLT_Service(device, type,  id, last_change_namespace)
+GPAC_Service::GPAC_Service(PLT_DeviceData* device, const char *type,  const char *id, const char *name, const char *last_change_namespace)
+	: PLT_Service(device, type,  id, name, last_change_namespace)
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
 	m_pObj = NULL;
@@ -846,13 +846,13 @@
 #endif
 
 NPT_Result
-GPAC_GenericDevice::SetupServices(PLT_DeviceData& data)
+GPAC_GenericDevice::SetupServices()
 {
 	u32 i, count;
 	count = gf_list_count(m_pServices);
 	for (i=0; i<count; i++) {
 		GPAC_Service *service = (GPAC_Service *)gf_list_get(m_pServices, i);
-	    data.AddService(service);
+	    AddService(service);
 	}
     return NPT_SUCCESS;
 }

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/GenericDevice.h -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/GenericDevice.h Changed

gpac-0.5.0.svn4668.tar.bz2/modules/platinum/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/platinum/Makefile Changed

@@ -2,7 +2,7 @@
 
 vpath %.c $(SRC_PATH)/modules/platinum
 
-CFLAGS= $(CPPFLAGS) -I"$(SRC_PATH)/include" -I$(SRC_PATH)/extra_lib/include/platinum/ -DGPAC_HAVE_CONFIG_H -I../..
+CFLAGS= $(CXXFLAGS) -I"$(SRC_PATH)/include" -I$(SRC_PATH)/extra_lib/include/platinum/ -DGPAC_HAVE_CONFIG_H -I../..
 
 ifeq ($(DEBUGBUILD), yes)
 CFLAGS+=-g
@@ -14,7 +14,7 @@
 LDFLAGS+=-pg
 endif
 
-LINKLIBS= -lgpac -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread
+LINKLIBS= -lgpac -lPlatinum -lPltMediaServer -lPltMediaConnect -lPltMediaRenderer -lNeptune -lZlib -lpthread -laxTLS
 LOCAL_LIB=../../bin/gcc -L../../extra_lib/lib/gcc
 
 #common objects
@@ -37,6 +37,10 @@
 #LDFLAGS+=-export-symbols platinum.def 
 endif
 
+ifeq ($(CONFIG_DARWIN), yes)
+LDFLAGS+=-framework Foundation
+endif
+
 
 all: $(LIB)
 
@@ -56,10 +60,4 @@
 distclean: clean
 	rm -f Makefile.bak .depend
 
-
-
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+-include .depend

gpac-0.5.0.svn4668.tar.bz2/modules/pulseaudio/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/pulseaudio/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/raw_out/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/raw_out/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/raw_out/raw_video.c -> gpac-0.5.0.svn5178.tar.bz2/modules/raw_out/raw_video.c Changed

@@ -27,6 +27,7 @@
 
 /*driver interfaces*/
 #include <gpac/modules/video_out.h>
+#include <gpac/modules/audio_out.h>
 #include <gpac/user.h>
 #include <gpac/list.h>
 #include <gpac/constants.h>
@@ -38,6 +39,9 @@
 	char *pixels;
 	u32 width, height;
 	u32 pixel_format, bpp;
+	Bool passthrough;
+
+	u32 sample_rate, nb_channels, chan_cfg;
 } RawContext;
 
 #define RAWCTX	RawContext *rc = (RawContext *)dr->opaque
@@ -53,9 +57,23 @@
 	return GF_OK;
 }
 
+static GF_Err RAW_BlitPassthrough(GF_VideoOutput *dr, GF_VideoSurface *video_src, GF_Window *src_wnd, GF_Window *dst_wnd, u32 overlay_type)
+{
+	return GF_OK;
+}
+
 GF_Err RAW_Setup(GF_VideoOutput *dr, void *os_handle, void *os_display, u32 init_flags)
 {
+	const char *opt;
 	RAWCTX;
+
+	opt = gf_modules_get_option((GF_BaseInterface *)dr, "RAWVideo", "RawOutput");
+	if (opt && !strcmp(opt, "null")) {
+		rc->passthrough = 1;
+		dr->Blit = RAW_BlitPassthrough;
+		dr->hw_caps |= GF_VIDEO_HW_HAS_RGB | GF_VIDEO_HW_HAS_RGBA | GF_VIDEO_HW_HAS_STRETCH | GF_VIDEO_HW_HAS_YUV | GF_VIDEO_HW_OPENGL | GF_VIDEO_HW_HAS_YUV_OVERLAY;
+	}
+
 	if (init_flags & GF_TERM_WINDOW_TRANSPARENT) {
 		rc->bpp = 4;
 		rc->pixel_format = GF_PIXEL_ARGB;
@@ -78,6 +96,12 @@
 
 static GF_Err RAW_Flush(GF_VideoOutput *dr, GF_Window *dest)
 {
+#if 0
+	RAWCTX;
+	char szName[1024];
+	sprintf(szName, "test%d.png", gf_sys_clock());
+	gf_img_png_enc_file(rc->pixels, rc->width, rc->height, rc->width*rc->bpp, rc->pixel_format, szName);
+#endif
 	return GF_OK;
 }
 
@@ -86,6 +110,7 @@
 	RAWCTX;
 	if (do_lock) {
 		if (!vi) return GF_BAD_PARAM;
+		memset(vi, 0, sizeof(GF_VideoSurface));
 		vi->height = rc->height;
 		vi->width = rc->width;
 		vi->video_buffer = rc->pixels;
@@ -132,13 +157,99 @@
 {
 	RawContext *rc;
 	GF_VideoOutput *driv = (GF_VideoOutput *) ifce;
-
-	RAW_Shutdown(driv);
 	rc = (RawContext *)driv->opaque;
 	gf_free(rc);
 	gf_free(driv);
 }
 
+
+static GF_Err RAW_AudioSetup(GF_AudioOutput *dr, void *os_handle, u32 num_buffers, u32 total_duration)
+{
+	return GF_OK;
+}
+
+static void RAW_AudioShutdown(GF_AudioOutput *dr)
+{
+}
+
+/*we assume what was asked is what we got*/
+static GF_Err RAW_ConfigureOutput(GF_AudioOutput *dr, u32 *SampleRate, u32 *NbChannels, u32 *nbBitsPerSample, u32 channel_cfg)
+{
+	RAWCTX;
+	rc->sample_rate = *SampleRate;
+	rc->nb_channels = *NbChannels;
+	rc->chan_cfg = channel_cfg;
+	return GF_OK;
+}
+
+static void RAW_WriteAudio(GF_AudioOutput *dr)
+{
+	char buf[4096];
+	dr->FillBuffer(dr->audio_renderer, buf, 4096);
+}
+
+static void RAW_Play(GF_AudioOutput *dr, u32 PlayType)
+{
+}
+
+static void RAW_SetVolume(GF_AudioOutput *dr, u32 Volume)
+{
+}
+
+static void RAW_SetPan(GF_AudioOutput *dr, u32 Pan)
+{
+}
+
+static GF_Err RAW_QueryOutputSampleRate(GF_AudioOutput *dr, u32 *desired_samplerate, u32 *NbChannels, u32 *nbBitsPerSample)
+{
+	return GF_OK;
+}
+
+static u32 RAW_GetAudioDelay(GF_AudioOutput *dr)
+{
+	return 0;
+}
+
+static u32 RAW_GetTotalBufferTime(GF_AudioOutput *dr)
+{
+	return 0;
+}
+
+void *NewRawAudioOutput()
+{
+	RawContext *ctx;
+	GF_AudioOutput *driv;
+	ctx = gf_malloc(sizeof(RawContext));
+	memset(ctx, 0, sizeof(RawContext));
+	driv = gf_malloc(sizeof(GF_AudioOutput));
+	memset(driv, 0, sizeof(GF_AudioOutput));
+	GF_REGISTER_MODULE_INTERFACE(driv, GF_AUDIO_OUTPUT_INTERFACE, "Raw Audio Output", "gpac distribution")
+
+	driv->opaque = ctx;
+
+	driv->SelfThreaded = 0;
+	driv->Setup = RAW_AudioSetup;
+	driv->Shutdown = RAW_AudioShutdown;
+	driv->ConfigureOutput = RAW_ConfigureOutput;
+	driv->GetAudioDelay = RAW_GetAudioDelay;
+	driv->GetTotalBufferTime = RAW_GetTotalBufferTime;
+	driv->SetVolume = RAW_SetVolume;
+	driv->SetPan = RAW_SetPan;
+	driv->Play = RAW_Play;
+	driv->QueryOutputSampleRate = RAW_QueryOutputSampleRate;
+	driv->WriteAudio = RAW_WriteAudio;
+	return driv;
+}
+
+void DeleteAudioOutput(void *ifce)
+{
+	GF_AudioOutput *dr = (GF_AudioOutput *) ifce;
+	RawContext *ctx = (RawContext*)dr->opaque;
+	gf_free(ctx);
+	gf_free(dr);
+}
+
+
 #ifndef GPAC_STANDALONE_RENDER_2D
 
 /*interface query*/
@@ -147,6 +258,7 @@
 {
 	static u32 si [] = {
 		GF_VIDEO_OUTPUT_INTERFACE,
+		GF_AUDIO_OUTPUT_INTERFACE,
 		0
 	};
 	return si; 
@@ -157,6 +269,7 @@
 GF_BaseInterface *LoadInterface(u32 InterfaceType)
 {
 	if (InterfaceType == GF_VIDEO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewRawVideoOutput();
+	if (InterfaceType == GF_AUDIO_OUTPUT_INTERFACE) return (GF_BaseInterface *) NewRawAudioOutput();
 	return NULL;
 }
 
@@ -168,6 +281,9 @@
 	case GF_VIDEO_OUTPUT_INTERFACE:
 		DeleteVideoOutput((GF_VideoOutput *)ifce);
 		break;
+	case GF_AUDIO_OUTPUT_INTERFACE:
+		DeleteAudioOutput((GF_AudioOutput *)ifce);
+		break;
 	}
 }

gpac-0.5.0.svn4668.tar.bz2/modules/redirect_av/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/redirect_av/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/redirect_av/ffmpeg_ts_muxer.c -> gpac-0.5.0.svn5178.tar.bz2/modules/redirect_av/ffmpeg_ts_muxer.c Changed

@@ -247,13 +247,21 @@
 	dump_format(ts->oc, 0, avr->destination, 1);
     GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] DUMPING to %s...\n", ts->destination));
 
+#if (LIBAVCODEC_VERSION_MAJOR<55)
     if (avcodec_open(ts->video_st->codec, avr->videoCodec) < 0) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] failed to open video codec\n"));
+#else
+	if (avcodec_open2(ts->video_st->codec, avr->videoCodec, NULL) < 0) {
+#endif
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] failed to open video codec\n"));
         return NULL;
     }
 #if REDIRECT_AV_AUDIO_ENABLED
+#if (LIBAVCODEC_VERSION_MAJOR<55)
     if (avcodec_open(ts->audio_st->codec, avr->audioCodec) < 0) {
-        GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("[AVRedirect] failed to open audio codec\n"));
+#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");

gpac-0.5.0.svn4668.tar.bz2/modules/redirect_av/redirect_av.c -> gpac-0.5.0.svn5178.tar.bz2/modules/redirect_av/redirect_av.c Changed

@@ -118,7 +118,7 @@
 #if REDIRECT_AV_AUDIO_ENABLED
 /**
  * This thread sends the frame to TS mux
- * \param Parameter The GF_AVRedirect pointer
+ * \param param The GF_AVRedirect pointer
  */
 static u32 audio_encoding_thread_run(void *param)
 {
@@ -133,7 +133,7 @@
     AVCodecContext * ctx = NULL;
     assert( avr );
 
-	outBuffSize = FF_MIN_BUFFER_SIZE;
+    outBuffSize = FF_MIN_BUFFER_SIZE;
 
     outBuff = gf_malloc(outBuffSize* sizeof(u8));
     inBuff = NULL;
@@ -227,7 +227,7 @@
 
 /**
  * This thread sends the frame to TS mux
- * \param Parameter The GF_AVRedirect pointer
+ * \param param The GF_AVRedirect pointer
  */
 static u32 video_encoding_thread_run(void *param)
 {
@@ -281,23 +281,37 @@
                     int written;
                     u32 sysclock_begin = gf_sys_clock(), sysclock_end=0;
                     avr->YUVpicture->pts = currentFrameTimeProcessed;
-                    written = avcodec_encode_video ( ctx, avr->videoOutbuf, avr->videoOutbufSize, avr->YUVpicture);
-					sysclock_end = gf_sys_clock();
+                    {
+                      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 {
+                    } else {
                         if (written>0)
                             ts_encode_video_frame(avr->ts_implementation, avr->videoOutbuf, written);
                         lastEncodedFrameTime = currentFrameTimeProcessed;
-					}
+                    }
                 }
             }
         }
         avr->frameTimeEncoded = currentFrameTimeProcessed;
-		gf_sleep(1);
+        gf_sleep(1);
     } /* End of main loop */
 exit:
     GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[AVRedirect] Ending video encoding thread...\n"));

gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/rtp_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_in.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/rtp_session.c -> gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_session.c Changed

@@ -35,7 +35,7 @@
 	gf_term_on_message(sess->owner->service, e, sMsg);
 }
 
-Bool RP_ProcessResponse(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
+GF_Err RP_ProcessResponse(RTSPSession *sess, GF_RTSPCommand *com, GF_Err e)
 {
 	if (!strcmp(com->method, GF_RTSP_DESCRIBE)) 
 		return RP_ProcessDescribe(sess, com, e);
@@ -102,15 +102,23 @@
 			sess->flags &= ~RTSP_WAIT_REPLY;
 			sess->command_time = 0;
 		} else {
+			u32 time_out = sess->owner->time_out;
 			/*evaluate timeout*/
 			time = gf_sys_clock() - sess->command_time;
+
+			if (!strcmp(com->method, GF_RTSP_DESCRIBE) && (time_out < 10000) ) time_out = 10000;
 			/*don't waste time waiting for teardown ACK, half a sec is enough. If server is not replying
 			in time it is likely to never reply (happens with RTP over RTSP) -> kill session 
 			and create new one*/
-			if (!strcmp(com->method, GF_RTSP_TEARDOWN) && (time>=500) ) time = sess->owner->time_out;
+			else if (!strcmp(com->method, GF_RTSP_TEARDOWN) && (time>=500) ) time = time_out;
+			
 			//signal what's going on
-			if (time >= sess->owner->time_out) {
-				if (!strcmp(com->method, GF_RTSP_TEARDOWN)) gf_rtsp_session_reset(sess->session, 1);
+			if (time >= time_out) {
+				if (!strcmp(com->method, GF_RTSP_TEARDOWN)) {
+					gf_rtsp_session_reset(sess->session, 1);
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_RTP, ("[RTP] Request Timeout for command %s after %d ms\n", com->method, time));
+				}
 
 				RP_ProcessResponse(sess, com, GF_IP_NETWORK_FAILURE);
 				RP_RemoveCommand(sess);

gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/rtp_signaling.c -> gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_signaling.c Changed

@@ -135,6 +135,10 @@
 	else if (ch->rtsp->flags & RTSP_FORCE_INTER) {
 		if (trans->Profile) gf_free(trans->Profile);
 		trans->Profile = gf_strdup(GF_RTSP_PROFILE_RTP_AVP_TCP);
+		//some servers expect the interleaved to be set during the setup request
+		trans->IsInterleaved = 1;
+		trans->rtpID = gf_list_find(ch->owner->channels, ch);
+		trans->rtcpID = trans->rtpID+1;
 		gf_rtp_setup_transport(ch->rtp_ch, trans, NULL);
 	}
 
@@ -145,7 +149,7 @@
 
 	/*turn off interleaving in case of re-setup, some servers don't like it (we still signal it
 	through RTP/AVP/TCP profile so it's OK)*/
-	trans->IsInterleaved = 0;
+//	trans->IsInterleaved = 0;
 	gf_list_add(com->Transports, trans);
 	if (strlen(ch->control)) com->ControlString = gf_strdup(ch->control);
 
@@ -224,7 +228,12 @@
 		const char *opt = gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(ch->owner->service), "Streaming", "ForceClientPorts");
 		if (opt && !stricmp(opt, "yes")) 
 			gf_rtp_get_ports(ch->rtp_ch, &trans->client_port_first, &trans->client_port_last);
-		
+
+		if (gf_rtp_is_interleaved(ch->rtp_ch) && !trans->IsInterleaved) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSP] Requested interleaved RTP over RTSP but server did not setup interleave - cannot process command\n"));
+			e = GF_REMOTE_SERVICE_ERROR;
+			continue;
+		}
 		e = gf_rtp_setup_transport(ch->rtp_ch, trans, gf_rtsp_get_server_name(sess->session));
 		if (!e) break;
 	}
@@ -242,9 +251,10 @@
 	}
 
 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) ) {
-		ch->flags |= RTP_CONNECTED;
+		if (!e) 
+			ch->flags |= RTP_CONNECTED;
 		RP_ConfirmChannelConnect(ch, e);
 	}
 	com->user_data = NULL;

gpac-0.5.0.svn4668.tar.bz2/modules/rtp_in/rtp_stream.c -> gpac-0.5.0.svn5178.tar.bz2/modules/rtp_in/rtp_stream.c Changed

@@ -207,6 +207,7 @@
 	if (conn && (!conn->host || !strcmp(conn->host, "0.0.0.0"))) conn = NULL;
 
 	if (!conn) conn = (GF_SDPConnection*)gf_list_get(media->Connections, 0);
+	if (conn && (!conn->host || !strcmp(conn->host, "0.0.0.0"))) conn = NULL;
 
 	if (!conn) {
 		/*RTSP RFC recommends an empty "c= " line but some server don't send it. Use session info (o=)*/
@@ -286,7 +287,7 @@
 	/*setup NAT keep-alive*/
 	ctrl = (char *) gf_modules_get_option((GF_BaseInterface *) gf_term_get_service_interface(rtp->service), "Streaming", "NATKeepAlive");
 	if (ctrl) gf_rtp_enable_nat_keepalive(tmp->rtp_ch, atoi(ctrl));
-	
+
 	tmp->range_start = Start;
 	tmp->range_end = End;
 	if (End != -1.0) tmp->flags |= RTP_HAS_RANGE;
@@ -300,9 +301,9 @@
 		tmp->status = RTP_SessionResume;
 	}
 
-	if (rvc_predef) { 
+	if (rvc_predef) {
 		tmp->depacketizer->sl_map.rvc_predef = rvc_predef ;
-	} else if (rvc_config_att) { 
+	} else if (rvc_config_att) {
 		char *rvc_data=NULL;
 		u32 rvc_size;
 		Bool is_gz = 0;
@@ -324,6 +325,10 @@
 		}
 		if (rvc_data) {
 			if (is_gz) {
+#ifdef GPAC_DISABLE_ZLIB
+				fprintf(stderr, "Error: no zlib support - RVC not supported in RTP\n");
+				return NULL;
+#endif
 				gf_gz_decompress_payload(rvc_data, rvc_size, &tmp->depacketizer->sl_map.rvc_config, &tmp->depacketizer->sl_map.rvc_config_size);
 				gf_free(rvc_data);
 			} else {
@@ -332,7 +337,7 @@
 			}
 		}
 	}
-	
+
 	return tmp;
 }
 
@@ -558,6 +563,7 @@
 			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);
 				ch->status = RTP_Unavailable;

gpac-0.5.0.svn4668.tar.bz2/modules/rvc_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/rvc_dec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/rvc_dec/rvc_dec.c -> gpac-0.5.0.svn5178.tar.bz2/modules/rvc_dec/rvc_dec.c Changed

@@ -1,453 +1,453 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre 
- *			Copyright (c) Telecom ParisTech 2010-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / OpenSVC Decoder module
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-
-#include <gpac/modules/codec.h>
-#include <gpac/avparse.h>
-#include <gpac/constants.h>
-
-#ifdef WIN32
-#define DllImport __declspec( dllimport )
-
-
-#if !defined(__GNUC__)
-#  pragma comment(lib, "RVCDecoder")
-#endif
-
-#else
-#define DllImport
-#endif
-
-
-
-typedef struct{
-	int Width;
-	int Height;
-	unsigned char* pY[1];
-	unsigned char* pU[1]; 
-	unsigned char* pV[1];
-} RVCFRAME;
-
-
-DllImport int rvc_init(char* XDF, char* VTLFolder, int isAVCFile);
-DllImport int rvc_decode(unsigned char* nal, int nal_length, char *outBuffer, int newBuffer);
-DllImport void rvc_close();
-
-
-typedef struct
-{
-	u16 ES_ID;
-	u32 width, stride, height, out_size, pixel_ar, layer;
-	Bool first_frame;
-
-	u32 nalu_size_length;
-
-	void *codec;
-} RVCDec;
-
-
-static GF_Err RVCD_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
-{
-	u32 i, count;
-	s32 res;
-	char Picture;
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-	char* VTLFolder; 
-	char *XDF_doc = NULL; 
-	int isAVCFile;
-
-	/*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"));
-		return GF_SERVICE_ERROR;
-	} else {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[RVC_Dec] Using VTL in %s\n", VTLFolder));
-	}
-
-	/*initialize RVC*/
-	if (esd->decoderConfig->predefined_rvc_config) {
-		char opt[100], *path;
-		FILE *f;
-		u32 size;
-		sprintf(opt, "Predefined_%d", esd->decoderConfig->predefined_rvc_config);
-		path = (char *) gf_modules_get_option((GF_BaseInterface *)ifcg, "RVCDecoder", (const char *)opt);
-		if (!opt) return GF_NOT_SUPPORTED;
-		f = fopen(path, "rt");
-		if (!f) return GF_NOT_SUPPORTED;
-		fseek(f, 0, SEEK_END);
-		size = ftell(f);
-		fseek(f, 0, SEEK_SET);
-		XDF_doc = gf_malloc(sizeof(char)*(size+1));
-		if (!XDF_doc) {
-			fclose(f);
-			return GF_OUT_OF_MEM;
-		}
-		fread(XDF_doc, 1, size, f);
-		fclose(f);
-		XDF_doc[size]=0;
-	} else {
-		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;
-
-	rvc_init(XDF_doc, VTLFolder, isAVCFile); //->data contains the uncompressed XDF
-
-	/*free data*/
-	gf_free(XDF_doc);
-	if (esd->decoderConfig->rvc_config) {
-		esd->decoderConfig->rvc_config->data = NULL;
-		esd->decoderConfig->rvc_config->dataLength = 0;
-	}
-		
-	/*decoder config not known, output buffers will be reconfigured at run-time*/
-	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) 
-		return GF_OK;
-
-	/*initialize the decoder */
-	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
-		GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
-		ctx->nalu_size_length = cfg->nal_unit_size;
-		
-		/*decode all NALUs*/
-		count = gf_list_count(cfg->sequenceParameterSets);
-		for (i=0; i<count; i++) {
-			u32 w, h, par_n, par_d;
-			GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
-
-			gf_avc_get_sps_info(slc->data, slc->size, &slc->id, &w, &h, &par_n, &par_d);
-			/*by default use the base layer*/
-			if (!i) {
-				if ((ctx->width<w) || (ctx->height<h)) {
-					ctx->width = w;
-					ctx->height = h;
-					if ( ((s32)par_n>0) && ((s32)par_d>0) )
-						ctx->pixel_ar = (par_n<<16) || par_d;
-				}
-			}
-			/* call decode - warning for AVC: the data blocks do not contain startcode prefixes (00000001), you may need to add them) */
-			
-			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));
-			}
-			
-		}
-
-		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_odf_avc_cfg_del(cfg);
-	} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
-		GF_M4VDecSpecInfo dsi;
-		GF_Err e;
-		/*decode DSI*/
-		e = gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-		if (e) return e;
-		if (!dsi.width || !dsi.height) return GF_NON_COMPLIANT_BITSTREAM;
-		ctx->width = dsi.width;
-		ctx->height = dsi.height;
-		ctx->pixel_ar = (dsi.par_num<<16) | dsi.par_den;
-		
-		
-		res = rvc_decode(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &Picture, 1);
-		if (res<0) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC 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));
-		}
-		
-	}
-	/*adjust stride to what you decoder uses*/
-	ctx->stride = ctx->width;
-	/*precompute output buffer size*/
-	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-	return GF_OK;
-}
-static GF_Err RVCD_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
-{
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-
-	//close RVC decoder
-	rvc_close();
-	ctx->codec = NULL;
-	ctx->width = ctx->height = ctx->out_size = 0;
-	return GF_OK;
-}
-static GF_Err RVCD_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
-{
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-
-	switch (capability->CapCode) {
-	case GF_CODEC_RESILIENT:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_WIDTH:
-		capability->cap.valueInt = ctx->width;
-		break;
-	case GF_CODEC_HEIGHT:
-		capability->cap.valueInt = ctx->height;
-		break;
-	case GF_CODEC_STRIDE:
-		capability->cap.valueInt = ctx->stride;
-		break;
-	case GF_CODEC_PAR:
-		capability->cap.valueInt = ctx->pixel_ar;
-		break;
-	case GF_CODEC_OUTPUT_SIZE:
-		capability->cap.valueInt = ctx->out_size;
-		break;
-	case GF_CODEC_PIXEL_FORMAT:
-		capability->cap.valueInt = GF_PIXEL_YV12;
-		break;
-	case GF_CODEC_BUFFER_MIN:
-		capability->cap.valueInt = 1;
-		break;
-	case GF_CODEC_BUFFER_MAX:
-		capability->cap.valueInt = 2;
-		break;
-	case GF_CODEC_PADDING_BYTES:
-		capability->cap.valueInt = 32;
-		break;
-	case GF_CODEC_REORDER:
-		capability->cap.valueInt = 1;
-		break;
-	/*not known at our level...*/
-	case GF_CODEC_CU_DURATION:
-	default:
-		capability->cap.valueInt = 0;
-		break;
-	}
-	return GF_OK;
-}
-static GF_Err RVCD_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
-{
-	return GF_NOT_SUPPORTED;
-}
-
-
-int bookmark = 0;
-
-static GF_Err RVCD_ProcessData(GF_MediaDecoder *ifcg, 
-		char *inBuffer, u32 inBufferLength,
-		u16 ES_ID,
-		char *outBuffer, u32 *outBufferLength,
-		u8 PaddingBits, u32 mmlevel)
-{
-	s32 got_pic;
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-
-	if (!ES_ID || (ES_ID!=ctx->ES_ID) /*|| !ctx->codec*/) {
-		*outBufferLength = 0;
-		return GF_OK;
-	}
-	if (*outBufferLength < ctx->out_size) {
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-
-	//if your decoder outputs directly in the memory passed, setup pointers for your decoder output picture
-
-	got_pic = 0;
-	
-	if (ctx->nalu_size_length) {
-		u32 i, nalu_size = 0;
-		u8 *ptr = inBuffer;
-		int nalNumber = 1;
-		
-		while (inBufferLength) {
-			for (i=0; i<ctx->nalu_size_length; i++) {
-				nalu_size = (nalu_size<<8) + ptr[i];
-			}
-			ptr += ctx->nalu_size_length;
-
-			//same remark as above regardin start codes
-			
-			if(nalNumber > bookmark){
-				got_pic = rvc_decode(ptr, nalu_size, outBuffer, !got_pic);
-				bookmark ++;
-				if(got_pic>1){
-					return GF_PACKED_FRAMES;
-				}
-			}else if(nalNumber == bookmark){
-				got_pic = rvc_decode(NULL, 0, outBuffer, !got_pic);
-				if(got_pic>1){
-					return GF_PACKED_FRAMES;
-				}
-			}
-			nalNumber ++;
-
-			ptr += nalu_size;
-			if (inBufferLength < nalu_size + ctx->nalu_size_length) 
-				break;
-
-			inBufferLength -= nalu_size + ctx->nalu_size_length;
-		}
-		bookmark = 0;
-
-	} else {
-		u32 nalu_size = 0;
-		u8 *ptr = inBuffer;
-		
-
-		got_pic = rvc_decode(ptr, inBufferLength, outBuffer, 1);
-	}
-
-	//if (got_pic!=1) return GF_OK;
-
-	/*if size changed during the decoding, resize the composition buffer*/
-	/*if ((pic.Width != ctx->width) || (pic.Height!=ctx->height)) 
-	{
-		ctx->width = pic.Width;
-		ctx->stride = pic.Width;
-		ctx->height = pic.Height;
-		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
-		*outBufferLength = ctx->out_size;
-		return GF_BUFFER_TOO_SMALL;
-	}
-	
-	*outBufferLength = ctx->out_size;*/
-
-	/*if your decoder does not output directly in the memory passed, copy over the data*/
-	
-	/*memcpy(outBuffer, pic.pY[0], ctx->stride*ctx->height); 
-	memcpy(outBuffer + ctx->stride * ctx->height, pic.pU[0], ctx->stride*ctx->height/4);
-	memcpy(outBuffer + 5*ctx->stride * ctx->height/4, pic.pV[0], ctx->stride*ctx->height/4);*/	
-
-	if(got_pic>1) return GF_PACKED_FRAMES;
-	return GF_OK;
-}
-
-static u32 RVCD_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
-{
-	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
-	/*media type query*/
-	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
-	switch (esd->decoderConfig->objectTypeIndication) {
-	case GPAC_OTI_VIDEO_AVC:
-	case GPAC_OTI_VIDEO_MPEG4_PART2:
-		if (!esd->decoderConfig->rvc_config && !esd->decoderConfig->predefined_rvc_config) return GF_CODEC_NOT_SUPPORTED;
-		return GF_CODEC_SUPPORTED+1;
-	}
-	return GF_CODEC_NOT_SUPPORTED;
-}
-
-static const char *RVCD_GetCodecName(GF_BaseDecoder *dec)
-{
-	return "RVC Decoder";
-}
-
-GF_BaseDecoder *NewRVCDec()
-{
-	GF_MediaDecoder *ifcd;
-	RVCDec *dec;
-	
-	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
-	GF_SAFEALLOC(dec, RVCDec);
-	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "RVC Decoder", "gpac distribution")
-
-	ifcd->privateStack = dec;
-
-	/*setup our own interface*/	
-	ifcd->AttachStream = RVCD_AttachStream;
-	ifcd->DetachStream = RVCD_DetachStream;
-	ifcd->GetCapabilities = RVCD_GetCapabilities;
-	ifcd->SetCapabilities = RVCD_SetCapabilities;
-	ifcd->GetName = RVCD_GetCodecName;
-	ifcd->CanHandleStream = RVCD_CanHandleStream;
-	ifcd->ProcessData = RVCD_ProcessData;
-	return (GF_BaseDecoder *) ifcd;
-}
-
-void DeleteRVCDec(GF_BaseDecoder *ifcg)
-{
-	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
-	gf_free(ctx);
-	gf_free(ifcg);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
-{
-	static u32 si [] = {
-#ifndef GPAC_DISABLE_AV_PARSERS
-		GF_MEDIA_DECODER_INTERFACE,
-#endif
-		0
-	};
-	return si; 
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
-{
-#ifndef GPAC_DISABLE_AV_PARSERS
-	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewRVCDec();
-#endif
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-#ifndef GPAC_DISABLE_AV_PARSERS
-	case GF_MEDIA_DECODER_INTERFACE: 
-		DeleteRVCDec((GF_BaseDecoder*)ifce);
-		break;
-#endif
-	}
-}
-
-
-GPAC_MODULE_STATIC_DELARATION( rev_dec )
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre 
+ *			Copyright (c) Telecom ParisTech 2010-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / OpenSVC Decoder module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#include <gpac/modules/codec.h>
+#include <gpac/avparse.h>
+#include <gpac/constants.h>
+
+#ifdef WIN32
+#define DllImport __declspec( dllimport )
+
+
+#if !defined(__GNUC__)
+#  pragma comment(lib, "RVCDecoder")
+#endif
+
+#else
+#define DllImport
+#endif
+
+
+
+typedef struct{
+	int Width;
+	int Height;
+	unsigned char* pY[1];
+	unsigned char* pU[1]; 
+	unsigned char* pV[1];
+} RVCFRAME;
+
+
+DllImport int rvc_init(char* XDF, char* VTLFolder, int isAVCFile);
+DllImport int rvc_decode(unsigned char* nal, int nal_length, char *outBuffer, int newBuffer);
+DllImport void rvc_close();
+
+
+typedef struct
+{
+	u16 ES_ID;
+	u32 width, stride, height, out_size, pixel_ar, layer;
+	Bool first_frame;
+
+	u32 nalu_size_length;
+
+	void *codec;
+} RVCDec;
+
+
+static GF_Err RVCD_AttachStream(GF_BaseDecoder *ifcg, GF_ESD *esd)
+{
+	u32 i, count;
+	s32 res;
+	char Picture;
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+	char* VTLFolder; 
+	char *XDF_doc = NULL; 
+	int isAVCFile;
+
+	/*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"));
+		return GF_SERVICE_ERROR;
+	} else {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[RVC_Dec] Using VTL in %s\n", VTLFolder));
+	}
+
+	/*initialize RVC*/
+	if (esd->decoderConfig->predefined_rvc_config) {
+		char opt[100], *path;
+		FILE *f;
+		u32 size;
+		sprintf(opt, "Predefined_%d", esd->decoderConfig->predefined_rvc_config);
+		path = (char *) gf_modules_get_option((GF_BaseInterface *)ifcg, "RVCDecoder", (const char *)opt);
+		if (!opt) return GF_NOT_SUPPORTED;
+		f = fopen(path, "rt");
+		if (!f) return GF_NOT_SUPPORTED;
+		fseek(f, 0, SEEK_END);
+		size = ftell(f);
+		fseek(f, 0, SEEK_SET);
+		XDF_doc = gf_malloc(sizeof(char)*(size+1));
+		if (!XDF_doc) {
+			fclose(f);
+			return GF_OUT_OF_MEM;
+		}
+		fread(XDF_doc, 1, size, f);
+		fclose(f);
+		XDF_doc[size]=0;
+	} else {
+		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;
+
+	rvc_init(XDF_doc, VTLFolder, isAVCFile); //->data contains the uncompressed XDF
+
+	/*free data*/
+	gf_free(XDF_doc);
+	if (esd->decoderConfig->rvc_config) {
+		esd->decoderConfig->rvc_config->data = NULL;
+		esd->decoderConfig->rvc_config->dataLength = 0;
+	}
+		
+	/*decoder config not known, output buffers will be reconfigured at run-time*/
+	if (!esd->decoderConfig->decoderSpecificInfo || !esd->decoderConfig->decoderSpecificInfo->data) 
+		return GF_OK;
+
+	/*initialize the decoder */
+	if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) {
+		GF_AVCConfig *cfg = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+		if (!cfg) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->nalu_size_length = cfg->nal_unit_size;
+		
+		/*decode all NALUs*/
+		count = gf_list_count(cfg->sequenceParameterSets);
+		for (i=0; i<count; i++) {
+			u32 w, h, par_n, par_d;
+			GF_AVCConfigSlot *slc = gf_list_get(cfg->sequenceParameterSets, i);
+
+			gf_avc_get_sps_info(slc->data, slc->size, &slc->id, &w, &h, &par_n, &par_d);
+			/*by default use the base layer*/
+			if (!i) {
+				if ((ctx->width<w) || (ctx->height<h)) {
+					ctx->width = w;
+					ctx->height = h;
+					if ( ((s32)par_n>0) && ((s32)par_d>0) )
+						ctx->pixel_ar = (par_n<<16) || par_d;
+				}
+			}
+			/* call decode - warning for AVC: the data blocks do not contain startcode prefixes (00000001), you may need to add them) */
+			
+			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));
+			}
+			
+		}
+
+		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_odf_avc_cfg_del(cfg);
+	} else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_MPEG4_PART2) {
+		GF_M4VDecSpecInfo dsi;
+		GF_Err e;
+		/*decode DSI*/
+		e = gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+		if (e) return e;
+		if (!dsi.width || !dsi.height) return GF_NON_COMPLIANT_BITSTREAM;
+		ctx->width = dsi.width;
+		ctx->height = dsi.height;
+		ctx->pixel_ar = (dsi.par_num<<16) | dsi.par_den;
+		
+		
+		res = rvc_decode(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &Picture, 1);
+		if (res<0) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[SVC 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));
+		}
+		
+	}
+	/*adjust stride to what you decoder uses*/
+	ctx->stride = ctx->width;
+	/*precompute output buffer size*/
+	ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+	return GF_OK;
+}
+static GF_Err RVCD_DetachStream(GF_BaseDecoder *ifcg, u16 ES_ID)
+{
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+
+	//close RVC decoder
+	rvc_close();
+	ctx->codec = NULL;
+	ctx->width = ctx->height = ctx->out_size = 0;
+	return GF_OK;
+}
+static GF_Err RVCD_GetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability *capability)
+{
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+
+	switch (capability->CapCode) {
+	case GF_CODEC_RESILIENT:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_WIDTH:
+		capability->cap.valueInt = ctx->width;
+		break;
+	case GF_CODEC_HEIGHT:
+		capability->cap.valueInt = ctx->height;
+		break;
+	case GF_CODEC_STRIDE:
+		capability->cap.valueInt = ctx->stride;
+		break;
+	case GF_CODEC_PAR:
+		capability->cap.valueInt = ctx->pixel_ar;
+		break;
+	case GF_CODEC_OUTPUT_SIZE:
+		capability->cap.valueInt = ctx->out_size;
+		break;
+	case GF_CODEC_PIXEL_FORMAT:
+		capability->cap.valueInt = GF_PIXEL_YV12;
+		break;
+	case GF_CODEC_BUFFER_MIN:
+		capability->cap.valueInt = 1;
+		break;
+	case GF_CODEC_BUFFER_MAX:
+		capability->cap.valueInt = 2;
+		break;
+	case GF_CODEC_PADDING_BYTES:
+		capability->cap.valueInt = 32;
+		break;
+	case GF_CODEC_REORDER:
+		capability->cap.valueInt = 1;
+		break;
+	/*not known at our level...*/
+	case GF_CODEC_CU_DURATION:
+	default:
+		capability->cap.valueInt = 0;
+		break;
+	}
+	return GF_OK;
+}
+static GF_Err RVCD_SetCapabilities(GF_BaseDecoder *ifcg, GF_CodecCapability capability)
+{
+	return GF_NOT_SUPPORTED;
+}
+
+
+int bookmark = 0;
+
+static GF_Err RVCD_ProcessData(GF_MediaDecoder *ifcg, 
+		char *inBuffer, u32 inBufferLength,
+		u16 ES_ID,
+		char *outBuffer, u32 *outBufferLength,
+		u8 PaddingBits, u32 mmlevel)
+{
+	s32 got_pic;
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+
+	if (!ES_ID || (ES_ID!=ctx->ES_ID) /*|| !ctx->codec*/) {
+		*outBufferLength = 0;
+		return GF_OK;
+	}
+	if (*outBufferLength < ctx->out_size) {
+		*outBufferLength = ctx->out_size;
+		return GF_BUFFER_TOO_SMALL;
+	}
+
+	//if your decoder outputs directly in the memory passed, setup pointers for your decoder output picture
+
+	got_pic = 0;
+	
+	if (ctx->nalu_size_length) {
+		u32 i, nalu_size = 0;
+		u8 *ptr = inBuffer;
+		int nalNumber = 1;
+		
+		while (inBufferLength) {
+			for (i=0; i<ctx->nalu_size_length; i++) {
+				nalu_size = (nalu_size<<8) + ptr[i];
+			}
+			ptr += ctx->nalu_size_length;
+
+			//same remark as above regardin start codes
+			
+			if(nalNumber > bookmark){
+				got_pic = rvc_decode(ptr, nalu_size, outBuffer, !got_pic);
+				bookmark ++;
+				if(got_pic>1){
+					return GF_PACKED_FRAMES;
+				}
+			}else if(nalNumber == bookmark){
+				got_pic = rvc_decode(NULL, 0, outBuffer, !got_pic);
+				if(got_pic>1){
+					return GF_PACKED_FRAMES;
+				}
+			}
+			nalNumber ++;
+
+			ptr += nalu_size;
+			if (inBufferLength < nalu_size + ctx->nalu_size_length) 
+				break;
+
+			inBufferLength -= nalu_size + ctx->nalu_size_length;
+		}
+		bookmark = 0;
+
+	} else {
+		u32 nalu_size = 0;
+		u8 *ptr = inBuffer;
+		
+
+		got_pic = rvc_decode(ptr, inBufferLength, outBuffer, 1);
+	}
+
+	//if (got_pic!=1) return GF_OK;
+
+	/*if size changed during the decoding, resize the composition buffer*/
+	/*if ((pic.Width != ctx->width) || (pic.Height!=ctx->height)) 
+	{
+		ctx->width = pic.Width;
+		ctx->stride = pic.Width;
+		ctx->height = pic.Height;
+		ctx->out_size = ctx->stride * ctx->height * 3 / 2;
+		*outBufferLength = ctx->out_size;
+		return GF_BUFFER_TOO_SMALL;
+	}
+	
+	*outBufferLength = ctx->out_size;*/
+
+	/*if your decoder does not output directly in the memory passed, copy over the data*/
+	
+	/*memcpy(outBuffer, pic.pY[0], ctx->stride*ctx->height); 
+	memcpy(outBuffer + ctx->stride * ctx->height, pic.pU[0], ctx->stride*ctx->height/4);
+	memcpy(outBuffer + 5*ctx->stride * ctx->height/4, pic.pV[0], ctx->stride*ctx->height/4);*/	
+
+	if(got_pic>1) return GF_PACKED_FRAMES;
+	return GF_OK;
+}
+
+static u32 RVCD_CanHandleStream(GF_BaseDecoder *dec, u32 StreamType, GF_ESD *esd, u8 PL)
+{
+	if (StreamType != GF_STREAM_VISUAL) return GF_CODEC_NOT_SUPPORTED;
+	/*media type query*/
+	if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
+	switch (esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_VIDEO_AVC:
+	case GPAC_OTI_VIDEO_MPEG4_PART2:
+		if (!esd->decoderConfig->rvc_config && !esd->decoderConfig->predefined_rvc_config) return GF_CODEC_NOT_SUPPORTED;
+		return GF_CODEC_SUPPORTED+1;
+	}
+	return GF_CODEC_NOT_SUPPORTED;
+}
+
+static const char *RVCD_GetCodecName(GF_BaseDecoder *dec)
+{
+	return "RVC Decoder";
+}
+
+GF_BaseDecoder *NewRVCDec()
+{
+	GF_MediaDecoder *ifcd;
+	RVCDec *dec;
+	
+	GF_SAFEALLOC(ifcd, GF_MediaDecoder);
+	GF_SAFEALLOC(dec, RVCDec);
+	GF_REGISTER_MODULE_INTERFACE(ifcd, GF_MEDIA_DECODER_INTERFACE, "RVC Decoder", "gpac distribution")
+
+	ifcd->privateStack = dec;
+
+	/*setup our own interface*/	
+	ifcd->AttachStream = RVCD_AttachStream;
+	ifcd->DetachStream = RVCD_DetachStream;
+	ifcd->GetCapabilities = RVCD_GetCapabilities;
+	ifcd->SetCapabilities = RVCD_SetCapabilities;
+	ifcd->GetName = RVCD_GetCodecName;
+	ifcd->CanHandleStream = RVCD_CanHandleStream;
+	ifcd->ProcessData = RVCD_ProcessData;
+	return (GF_BaseDecoder *) ifcd;
+}
+
+void DeleteRVCDec(GF_BaseDecoder *ifcg)
+{
+	RVCDec *ctx = (RVCDec*) ifcg->privateStack;
+	gf_free(ctx);
+	gf_free(ifcg);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces() 
+{
+	static u32 si [] = {
+#ifndef GPAC_DISABLE_AV_PARSERS
+		GF_MEDIA_DECODER_INTERFACE,
+#endif
+		0
+	};
+	return si; 
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+{
+#ifndef GPAC_DISABLE_AV_PARSERS
+	if (InterfaceType == GF_MEDIA_DECODER_INTERFACE) return (GF_BaseInterface *)NewRVCDec();
+#endif
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+	case GF_MEDIA_DECODER_INTERFACE: 
+		DeleteRVCDec((GF_BaseDecoder*)ifce);
+		break;
+#endif
+	}
+}
+
+
+GPAC_MODULE_STATIC_DELARATION( rev_dec )

gpac-0.5.0.svn4668.tar.bz2/modules/saf_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/saf_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/audio.c -> gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/audio.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/sdl_out.h -> gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/sdl_out.h Changed

gpac-0.5.0.svn4668.tar.bz2/modules/sdl_out/video.c -> gpac-0.5.0.svn5178.tar.bz2/modules/sdl_out/video.c Changed

@@ -364,14 +364,24 @@
 		evt->key_code = GF_KEY_ALT;
 		evt->flags = GF_KEY_EXT_RIGHT;
 		break;
-/*	case SDLK_LSUPER:
+#if (SDL_MAJOR_VERSION<=1) && (SDL_MINOR_VERSION<3)
+    case SDLK_LMETA:
+    case SDLK_LSUPER:
+#else
+    case SDLK_LGUI:
+#endif
 		evt->key_code = GF_KEY_META;
 		evt->flags = GF_KEY_EXT_LEFT;
 		break;
-	case SDLK_RSUPER:
+#if (SDL_MAJOR_VERSION<=1) && (SDL_MINOR_VERSION<3)
+    case SDLK_RMETA:
+    case SDLK_RSUPER:
+#else
+    case SDLK_RGUI:
+#endif
 		evt->key_code = GF_KEY_META;
 		evt->flags = GF_KEY_EXT_RIGHT;
-		break;*/
+		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;
@@ -500,6 +510,7 @@
 
 GF_Err SDLVid_ResizeWindow(GF_VideoOutput *dr, u32 width, u32 height)
 {
+	Bool hw_reset = GF_FALSE;
 	SDLVID();
 	GF_Event evt;
 	
@@ -548,7 +559,9 @@
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
 			}
+            GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
 		}
+
 		if ( !ctx->gl_context ) {
 			if (!(ctx->gl_context = SDL_GL_CreateContext(ctx->screen))) {
 				GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("[SDL] Cannot initialize gl context: %s\n", SDL_GetError()));
@@ -560,10 +573,12 @@
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
 			}
+			hw_reset = GF_TRUE;
 		}
         SDL_SetWindowSize(ctx->screen, width, height);
 				
 #else
+		hw_reset = GF_TRUE;
 		ctx->screen = SDL_SetVideoMode(width, height, 0, flags);
 #endif
 		assert(ctx->screen);
@@ -571,6 +586,7 @@
 		ctx->height = height;
 		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);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_MMIO, ("[SDL] 3D Setup done\n"));
 	} else {
@@ -593,9 +609,16 @@
 				gf_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
 			}
+            GF_LOG(GF_LOG_INFO, GF_LOG_MMIO, ("[SDL] Window created\n"));
 		}
 		if ( !ctx->renderer ) {
-            if (!(ctx->renderer = SDL_CreateRenderer(ctx->screen, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC))) {
+			u32 flags = SDL_RENDERER_ACCELERATED;
+			const char *opt = gf_modules_get_option((GF_BaseInterface *)dr, "Video", "DisableVSync");
+			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_mx_v(ctx->evt_mx);
 				return GF_IO_ERR;
@@ -621,14 +644,17 @@
 	const SDL_VideoInfo *vinf;
 #endif
 
+#ifdef WIN32
 	putenv("directx");
-	flags = SDL_WasInit(SDL_INIT_VIDEO);
+#endif
+	
+    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);
@@ -648,11 +674,13 @@
 	SDL_GetDesktopDisplayMode(0,&vinf);
 	dr->max_screen_width = vinf.w;
 	dr->max_screen_height = vinf.h;
+	dr->max_screen_bpp = 8;
 #else
 	vinf = SDL_GetVideoInfo();
 #if SDL_VERSION_ATLEAST(1, 2, 10)
 	dr->max_screen_width = vinf->current_w;
 	dr->max_screen_height = vinf->current_h;
+	dr->max_screen_bpp = 8;
 #else
 	{
 		SDL_Rect** modes;
@@ -674,6 +702,7 @@
 			}
 		}
 	}
+	dr->max_screen_bpp = 8;
 #endif /* versions prior to 1.2.10 do not have the size of screen */
 #endif
 
@@ -691,15 +720,16 @@
 {
 	SDLVid_DestroyObjects(ctx);
 #if SDL_VERSION_ATLEAST(2,0,0)
-	if ( ctx->gl_context )
+	if ( ctx->gl_context ) {
 		SDL_GL_DeleteContext(ctx->gl_context);
-	if ( ctx->renderer )
+        ctx->gl_context = NULL;
+    }
+	if ( ctx->renderer ) {
 		SDL_DestroyRenderer(ctx->renderer);
-	ctx->gl_context = NULL;
-	ctx->renderer = NULL;
-	ctx->screen = 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);
@@ -762,6 +792,7 @@
 #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;
@@ -784,6 +815,43 @@
 			sdl_translate_key(sdl_evt.key.keysym.sym, &gpac_evt.key);
 			gpac_evt.type = (sdl_evt.key.type==SDL_KEYDOWN) ? GF_EVENT_KEYDOWN : GF_EVENT_KEYUP;
 			dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+			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 defined(__DARWIN__) || defined(__APPLE__)
+				&& ctx->meta_down 
+#else
+				&& ctx->ctrl_down 
+#endif
+            ) {
+#if defined(__DARWIN__) || defined(__APPLE__)
+#else
+				gpac_evt.type = GF_EVENT_PASTE_TEXT;
+				gpac_evt.message.message = (const char *) SDL_GetClipboardText();
+				dr->on_event(dr->evt_cbk_hdl, &gpac_evt);
+				SDL_free((char *) gpac_evt.message.message);
+#endif
+			}
+			else if ((gpac_evt.type==GF_EVENT_KEYUP) && (gpac_evt.key.key_code==GF_KEY_C)	
+#if defined(__DARWIN__) || defined(__APPLE__)
+				&& ctx->meta_down 
+#else
+				&& ctx->ctrl_down 
+#endif
+            ) {
+			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 );
+#endif
+			}
+#endif
+
 #ifndef SDL_TEXTINPUTEVENT_TEXT_SIZE
 			if ((sdl_evt.key.type==SDL_KEYDOWN)
 				&& sdl_evt.key.keysym.unicode
@@ -1063,6 +1131,7 @@
 			GF_Event evt;
 			memset(&evt, 0, sizeof(GF_Event));
 			evt.type = GF_EVENT_VIDEO_SETUP;
+			evt.setup.opengl_mode = 3;
 			dr->on_event(dr->evt_cbk_hdl, &evt);
 		}
 	} else {
@@ -1159,6 +1228,7 @@
 	if (do_lock) {
 		if (!video_info) return GF_BAD_PARAM;
 		if (SDL_LockSurface(ctx->back_buffer)<0) return GF_IO_ERR;
+		memset(video_info, 0, sizeof(GF_VideoSurface));
 		video_info->width = ctx->back_buffer->w;
 		video_info->height = ctx->back_buffer->h;
 		video_info->pitch_x = 0;
@@ -1198,6 +1268,7 @@
 #endif
 
 		SDL_LockSurface(ctx->back_buffer);
+		memset(&src, 0, sizeof(GF_VideoSurface));
 		src.height = ctx->back_buffer->h;
 		src.width = ctx->back_buffer->w;
 		src.pitch_x = 0;
@@ -1208,11 +1279,12 @@
 #if SDL_VERSION_ATLEAST(2,0,0)
 		wndSurface  = SDL_GetWindowSurface(ctx->screen);
 		SDL_LockSurface(wndSurface);
+		memset(&dst, 0, sizeof(GF_VideoSurface));
 		dst.height = wndSurface->h;
 		dst.width = wndSurface->w;
 		dst.pitch_x = 0;
 		dst.pitch_y = wndSurface->pitch;
-		dst.pixel_format = SDLVid_MapPixelFormat(wndSurface->format, SDL_FALSE);
+		dst.pixel_format = SDLVid_MapPixelFormat(wndSurface->format, GF_FALSE);
 		dst.video_buffer = (char*)wndSurface->pixels;
 #else
 		SDL_LockSurface(ctx->screen);
@@ -1238,13 +1310,13 @@
 #endif
 		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();
+		SDL_ClearError();
 		if (!(tx = SDL_CreateTextureFromSurface(ctx->renderer, ctx->back_buffer))) {
-            GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("SDL_GetWindowSurface failed: %s\n", SDL_GetError()));
-            SDL_ClearError();
-        }
-        SDL_RenderCopy(ctx->renderer, tx, NULL, &rc);
-        SDL_DestroyTexture(tx);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("SDL_GetWindowSurface failed: %s\n", SDL_GetError()));
+			SDL_ClearError();
+		}
+		SDL_RenderCopy(ctx->renderer, tx, NULL, &rc);
+		SDL_DestroyTexture(tx);
 #else
 		SDL_BlitSurface(ctx->back_buffer, NULL, ctx->screen, &rc);
 #endif
@@ -1378,7 +1450,7 @@
 				SDLVid_ResetWindow(ctx);
 			}
 			ctx->output_3d_type = 1;
-            GF_LOG(GF_LOG_ERROR, 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);
@@ -1435,20 +1507,23 @@
 }
 
 
-static void copy_yuv(u8 *pYD, u8 *pVD, u8 *pUD, u32 pixel_format , u32 pitch_y, unsigned char *src, u32 src_stride, u32 src_pf,
-								 u32 src_width, u32 src_height, const GF_Window *src_wnd)
+static void copy_yuv(u8 *pYD, u8 *pVD, u8 *pUD, u32 pixel_format, u32 pitch_y, unsigned char *src, unsigned char *pU, unsigned char *pV, u32 src_stride, u32 src_pf, u32 src_width, u32 src_height, const GF_Window *src_wnd)
 {
-	unsigned char *pY, *pU, *pV;
+	unsigned char *pY;
 	pY = src;
-	pU = src + src_stride * src_height;
-	pV = src + 5*src_stride * src_height/4;
 
+	if (!pU || !pV) {
+		pU = src + src_stride * src_height;
+		pV = src + 5*src_stride * src_height/4;
+	}
 
-	pY = pY + src_stride * src_wnd->y + src_wnd->x;
-	/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
-	therefore force an even Y offset for U and V planes.*/
-	pU = pU + (src_stride * (src_wnd->y / 2) + src_wnd->x) / 2;
-	pV = pV + (src_stride * (src_wnd->y / 2) + src_wnd->x) / 2;
+	if (src_wnd->y || src_wnd->x) {
+		pY = pY + src_stride * src_wnd->y + src_wnd->x;
+		/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
+		therefore force an even Y offset for U and V planes.*/
+		pU = pU + (src_stride * (src_wnd->y / 2) + src_wnd->x) / 2;
+		pV = pV + (src_stride * (src_wnd->y / 2) + src_wnd->x) / 2;
+	}
 
 
 	/*complete source copy*/
@@ -1490,6 +1565,32 @@
 				pV += src_stride;
 			}
 		}
+	} else if (src_pf==GF_PIXEL_YV12_10){
+		u32 i, j;
+		for (i=0; i<src_wnd->h; i++) {
+			u16 *py = (u16 *) (pY + i*src_stride);
+			for (j=0; j<src_wnd->w; j++) {
+				*pYD = (*py) >> 2;
+				pYD ++;
+				py++;
+			}
+		}
+		for (i=0; i<src_wnd->h/2; i++) {
+			u16 *pu = (u16 *) (pU + i*src_stride/2);
+			for (j=0; j<src_wnd->w/2; j++) {
+				*pUD = (*pu) >> 2;
+				pUD ++;
+				pu++;
+			}
+		}
+		for (i=0; i<src_wnd->h/2; i++) {
+			u16 *pv = (u16 *) (pV + i*src_stride/2);
+			for (j=0; j<src_wnd->w/2; j++) {
+				*pVD = (*pv) >> 2;
+				pVD ++;
+				pv++;
+			}
+		}
 
 	} else {
 		u32 i;
@@ -1569,7 +1670,7 @@
 		pY = pixels;
 		pU = pixels + h*pitch;
 		pV = pixels + 5*h*pitch/4;
-		copy_yuv(pY, pU, pV, GF_PIXEL_YV12, pitch, (unsigned char *) video_src->video_buffer, video_src->pitch_y, video_src->pixel_format, video_src->width, video_src->height, src_wnd);
+		copy_yuv(pY, pU, pV, GF_PIXEL_YV12, pitch, (unsigned char *) video_src->video_buffer, (unsigned char *) video_src->u_ptr, (unsigned char *) video_src->v_ptr, video_src->pitch_y, video_src->pixel_format, video_src->width, video_src->height, src_wnd);
 
 		SDL_UnlockTexture(ctx->yuv_texture);
 
@@ -1578,7 +1679,7 @@
 		dstrc.x = dst_wnd->x;
 		dstrc.y = dst_wnd->y;
 
-        SDL_ClearError();
+		SDL_ClearError();
 		SDL_RenderCopy(ctx->renderer, ctx->yuv_texture, NULL, &dstrc);
 		SDL_RenderPresent(ctx->renderer);
 		return GF_OK;
@@ -1601,7 +1702,7 @@
 		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], 
-			video_src->video_buffer, video_src->pitch_y, video_src->pixel_format,
+			(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);

gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/rast_soft.h -> gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/rast_soft.h Changed

gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/raster_argb.c -> gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/raster_argb.c Changed

@@ -500,6 +500,7 @@
 
 
 
+
 /*
 		32 bit RGBA
 */
@@ -511,16 +512,30 @@
 	u8 srcg = GF_COL_G(src);
 	u8 srcb = GF_COL_B(src);
 	u8 dsta = dst[3];
+
 	srca = mul255(srca, alpha);
-	if (dsta) {
+	/*special case for RGBA: 
+		if dst alpha is 0, consider the surface is empty and copy pixel
+		if source alpha is 0xFF erase the entire pixel
+	*/
+	if (dsta && (srca!=0xFF) ) {
+		u8 final_a;
 		u8 dstr = dst[0];
 		u8 dstg = dst[1];
 		u8 dstb = dst[2];
-		dst[0] = mul255(srca, srcr - dstr) + dstr;
-		dst[1] = mul255(srca, srcg - dstg) + dstg;
-		dst[2] = mul255(srca, srcb - dstb) + dstb;
-		if (dsta==0xFF) dst[3] = (u8)0xFF;
-		else dst[3] = mul255(srca, srca) + mul255(255-srca, dsta);
+
+		//do the maths , so that the result of the blend follows the sam DST = SRC*apha + DST(1-alpha)
+		//it gives a transform alpha of Fa = SRCa + DSTa - SRCa*DSTa
+		//and an RGB Fc = (SRCa*SRCc + DSTa*DSTc - DSTc*(DSTa-SRCa)) / Fa
+		final_a = dsta + srca - mul255(dsta, srca);
+		if (final_a) {
+			dst[0] = (u8) ((srcr*srca + dstr*(dsta-srca)) / final_a);
+			dst[1] = (u8) ((srcg*srca + dstg*(dsta-srca)) / final_a);
+			dst[2] = (u8) ((srcb*srca + dstb*(dsta-srca)) / final_a);
+			dst[3] = final_a;
+		} else {
+			assert(0);
+		}
 	} else {
 		dst[0] = srcr;
 		dst[1] = srcg;
@@ -538,16 +553,28 @@
 
 	while (count) {
 		u8 dsta = dst[3];
-		/*special case for RGBA: if dst alpha is 0, consider the surface is empty and copy pixel*/
-		if (dsta) {
+		/*special case for RGBA: 
+			if dst alpha is 0, consider the surface is empty and copy pixel
+			if source alpha is 0xFF erase the entire pixel
+		*/
+		if ((dsta != 0) && (srca != 0xFF)) {
+			u8 final_a;
 			u8 dstr = dst[0];
 			u8 dstg = dst[1];
 			u8 dstb = dst[2];
-			dst[0] = (u8) mul255(srca, srcr - dstr) + dstr;
-			dst[1] = (u8) mul255(srca, srcg - dstg) + dstg;
-			dst[2] = (u8) mul255(srca, srcb - dstb) + dstb;
-			if (dsta==0xFF) dst[3] = (u8)0xFF;
-			else dst[3] = (u8) mul255(srca, srca) + mul255(255-srca, dsta);
+
+			//do the maths , so that the result of the blend follows the sam DST = SRC*apha + DST(1-alpha)
+			//it gives a transform alpha of Fa = SRCa + DSTa - SRCa*DSTa
+			//and an RGB Fc = (SRCa*SRCc + DSTa*DSTc - DSTc*(DSTa-SRCa)) / Fa
+			final_a = dsta + srca - mul255(dsta, srca);
+			if (final_a) {
+				dst[0] = (u8) ((srcr*srca + dstr*(dsta-srca)) / final_a);
+				dst[1] = (u8) ((srcg*srca + dstg*(dsta-srca)) / final_a);
+				dst[2] = (u8) ((srcb*srca + dstb*(dsta-srca)) / final_a);
+				dst[3] = final_a;
+			} else {
+				assert(0);
+			}
 		} else {
 			dst[0] = srcr;
 			dst[1] = srcg;
@@ -559,39 +586,26 @@
 	}
 }
 
+
 void evg_rgba_fill_const(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
 	u32 col = surf->fill_col;
 	u32 new_a, fin, col_no_a;
-	u8 a, r, g, b;
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u8 *p;
 	s32 i;
 	u32 len;
 
-	a = GF_COL_A(col);
-	r = GF_COL_R(col);
-	g = GF_COL_G(col);
-	b = GF_COL_B(col);
 	col_no_a = col & 0x00FFFFFF;
 
 	for (i=0; i<count; i++) {
 		p = dst + spans[i].x*surf->pitch_x;
 		len = spans[i].len;
 	
-		if (spans[i].coverage != 0xFF) {
-			new_a = spans[i].coverage;
-			fin = (new_a<<24) | col_no_a;
-			overmask_rgba_const_run(fin, p, surf->pitch_x, len);
-		} else {
-			while (len--) {
-				*(p) = r;
-				*(p+1) = g;
-				*(p+2) = b;
-				*(p+3) = a;
-				p += surf->pitch_x;
-			}
-		}
+		new_a = spans[i].coverage;
+		fin = (new_a<<24) | col_no_a;
+		//we must blend in all cases since we have to merge with the dst alpha
+		overmask_rgba_const_run(fin, p, surf->pitch_x, len);
 	}
 }
 
@@ -611,12 +625,11 @@
 	}
 }
 
-
 void evg_rgba_fill_var(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
 {
 	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
 	u8 *p;
-	u8 spanalpha, col_a;
+	u8 spanalpha;
 	s32 i;
 	u32 len;
 	u32 *col;
@@ -628,24 +641,40 @@
 		surf->sten->fill_run(surf->sten, surf, spans[i].x, y, len);
 		col = surf->stencil_pix_run;
 		while (len--) {
-			col_a = GF_COL_A(*col);
-			if (col_a) {
-				if ((spanalpha!=0xFF) || (col_a != 0xFF)) {
-					overmask_rgba(*col, p, spanalpha);
-				} else {
-					u32 _col = *col;
-					p[0] = GF_COL_R(_col);
-					p[1] = GF_COL_G(_col);
-					p[2] = GF_COL_B(_col);
-					p[3] = GF_COL_A(_col);
-				}
-			}
+			//we must blend in all cases since we have to merge with the dst alpha
+			overmask_rgba(*col, p, spanalpha);
 			col++;
 			p += surf->pitch_x;
 		}
 	}
 }
 
+
+void evg_rgba_fill_erase(s32 y, s32 count, EVG_Span *spans, EVGSurface *surf)
+{
+	u8 *dst = (u8 *) surf->pixels + y * surf->pitch_y;
+	u8 *p;
+	s32 i;
+	u32 len;
+
+	for (i=0; i<count; i++) {
+		p = dst + spans[i].x*surf->pitch_x;
+		len = spans[i].len;
+	
+		if (spans[i].coverage != 0xFF) {
+/*			while (len--) {
+				*p = 0xFF-spans[i].coverage;
+				p += surf->pitch_x;
+			}
+*/		} else {
+			while (len--) {
+				*(u32 *)p = 0;
+				p += surf->pitch_x;
+			}
+		}
+	}
+}
+
 GF_Err evg_surface_clear_rgba(GF_SURFACE surf, GF_IRect rc, GF_Color col)
 {
 	u8 *data;

gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/stencil.c -> gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/stencil.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/soft_raster/surface.c -> gpac-0.5.0.svn5178.tar.bz2/modules/soft_raster/surface.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/svg_in/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/svg_in/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/svg_in/svg_in.c -> gpac-0.5.0.svn5178.tar.bz2/modules/svg_in/svg_in.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/timedtext/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/timedtext/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/ui_rec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/ui_rec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/validator/validator.c -> gpac-0.5.0.svn5178.tar.bz2/modules/validator/validator.c Changed

@@ -1,1017 +1,1020 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2010-2012
- *			All rights reserved
- *
- *  This file is part of GPAC / Test Suite Validator Recorder sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <gpac/modules/term_ext.h>
-#include <gpac/internal/terminal_dev.h>
-#include <gpac/internal/compositor_dev.h>
-#include <gpac/internal/media_dev.h>
-#include <gpac/xml.h>
-#include <gpac/options.h>
-
-typedef struct __validation_module
-{
-    GF_Terminal *term;
-
-    Bool is_recording;
-    char *prev_fps;
-    char *prev_alias;
-
-    /* Clock used to synchronize events in recording and playback*/
-	GF_Clock *ck;
-
-    /* Next event to process */
-    Bool next_event_snapshot;
-	GF_Event next_event;
-    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_Validator;
-
-static void validator_xvs_close(GF_Validator *validator);
-static Bool validator_xvs_next(GF_Validator *validator, Bool reverse);
-
-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);
-}
-
-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);
-}
-
-static char *validator_create_snapshot(GF_Validator *validator) 
-{
-    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;
-}
-
-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;
-
-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;
-}
-
-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;
-    }
-}
-
-static void validator_on_video_reconfig(void *udta, u32 width, u32 height, u8 bpp)
-{
-}
-
-Bool validator_on_event_play(void *udta, GF_Event *event, Bool consumed_by_compositor)
-{
-	GF_Validator *validator = (GF_Validator *)udta;
-	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;
-		}
-		break;
-	case GF_EVENT_CLICK: 
-	case GF_EVENT_MOUSEUP:
-	case GF_EVENT_MOUSEDOWN: 
-	case GF_EVENT_MOUSEOVER: 
-	case GF_EVENT_MOUSEOUT:
-	case GF_EVENT_MOUSEMOVE:
-	case GF_EVENT_MOUSEWHEEL:
-	case GF_EVENT_KEYDOWN:
-	case GF_EVENT_TEXTINPUT:
-        return 1;
-	case GF_EVENT_KEYUP:
-        if ((event->key.key_code == GF_KEY_END)&&(event->key.flags & GF_KEY_MOD_CTRL)) { 
-            GF_Event evt;
-            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) 
-{
-    GF_XMLNode *evt_node;
-    GF_XMLAttribute *att;
-    
-    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_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: 
-	case GF_EVENT_MOUSEUP:
-	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;
-	/*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);
-        }
-		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);
-} 
-
-Bool validator_on_event_record(void *udta, GF_Event *event, Bool consumed_by_compositor)
-{
-	GF_Validator *validator = (GF_Validator *)udta;
-	Bool rec_event = 1;
-	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;
-		}
-		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;
-	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;
-                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);
-    }
-	return 0;
-}
-
-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++;
-    }
-}
-
-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;
-    }
-}
-
-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;
-    }
-}
-
-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 */
-		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;
-}
-
-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;
-}
-
-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;
-}
-
-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;
-    }
-}
-
-static Bool validator_load_event(GF_Validator *validator) 
-{
-    GF_XMLNode *event_node;
-    GF_XMLAttribute *att;
-    u32 att_index;
-
-	memset(&validator->next_event, 0, sizeof(GF_Event));
-	validator->evt_loaded = 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->evt_loaded = 1;
-    return 1;
-}
-
-static Bool validator_process(GF_TermExt *termext, u32 action, void *param)
-{
-	const char *opt;
-	GF_Validator *validator = termext->udta;
-
-	switch (action) {
-
-    /* Upon starting of the terminal, we parse (possibly an XVL file), an XVS file, and start the first test sequence */
-    case GF_TERM_EXT_START:
-		validator->term = (GF_Terminal *) param;
-
-		/* if the validator is loaded, we switch off anti-aliasing for image comparison and we put a low framerate, 
-		but we store the previous value to restore it upon termination of the validator */
-        opt = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Compositor", "FrameRate");
-        if (opt) validator->prev_fps = gf_strdup(opt);
-        opt = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias");
-        if (opt) validator->prev_alias = gf_strdup(opt);
-
-		/* Check if the validator should be loaded and in which 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")) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in recording mode.\n"));
-            validator->is_recording = 1;
-        } else if (!strcmp(opt, "Disable")) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator is disabled.\n"));
-            return 0;
-        } else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration using wrong mode, stopping.\n"));
-            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");
-			if (!validator->xvs_filename) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration without input, stopping.\n"));
-				return 0;
-			} else {
-				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using scenario file: %s\n", validator->xvs_filename));
-			}
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using scenario playlist: %s\n", validator->xvl_filename));
-		}
-
-		/* since we changed parameters of the compositor, we need to trigger a reconfiguration */
-        	gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", "5.0");
-        	gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", "None");
-        	gf_term_set_option(validator->term, GF_OPT_RELOAD_CONFIG, 1);
-
-		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;
-
-		/* 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);
-        }
-		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 */
-	case GF_TERM_EXT_STOP:
-        gf_term_remove_event_filter(validator->term, &validator->evt_filter);
-		validator_xvs_close(validator);
-        validator_xvl_close(validator);
-		validator->term = 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");
-		} else {
-			gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Disable");
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Stopping validator\n"));
-		if (validator->prev_fps) {
-			gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", validator->prev_fps);
-            gf_free(validator->prev_fps);
-            validator->prev_fps = NULL;
-		}
-        if (validator->prev_alias) {
-	        gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", validator->prev_alias);
-            gf_free(validator->prev_alias);
-            validator->prev_alias = NULL;
-        }
-		break;
-
-    /* When called in the main loop of the terminal, we don't do anything in the recording mode.
-       In the playing/validating mode, we need to check if an event needs to be dispatched or if snapshots need to be made,
-       until there is no more event, in which case we trigger either the load of the next XVS or the quit */
-	case GF_TERM_EXT_PROCESS:
-        /* 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;
-                    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;
-	}
-	return 0;
-}
-
-
-GF_TermExt *validator_new()
-{
-	GF_TermExt *dr;
-	GF_Validator *validator;
-	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
-	memset(dr, 0, sizeof(GF_TermExt));
-	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC Test Validator", "gpac distribution");
-
-	GF_SAFEALLOC(validator, GF_Validator);
-	dr->process = validator_process;
-	dr->udta = validator;
-	return dr;
-}
-
-
-void validator_delete(GF_BaseInterface *ifce)
-{
-	GF_TermExt *dr = (GF_TermExt *) ifce;
-	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(dr);
-}
-
-GPAC_MODULE_EXPORT
-const u32 *QueryInterfaces() 
-{
-	static u32 si [] = {
-		GF_TERM_EXT_INTERFACE,
-		0
-	};
-	return si; 
-}
-
-GPAC_MODULE_EXPORT
-GF_BaseInterface *LoadInterface(u32 InterfaceType) 
-{
-	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)validator_new();
-	return NULL;
-}
-
-GPAC_MODULE_EXPORT
-void ShutdownInterface(GF_BaseInterface *ifce)
-{
-	switch (ifce->InterfaceType) {
-	case GF_TERM_EXT_INTERFACE:
-		validator_delete(ifce);
-		break;
-	}
-}
-
-GPAC_MODULE_STATIC_DELARATION( validator )
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2010-2012
+ *			All rights reserved
+ *
+ *  This file is part of GPAC / Test Suite Validator Recorder sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/modules/term_ext.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/xml.h>
+#include <gpac/options.h>
+
+typedef struct __validation_module
+{
+    GF_Terminal *term;
+
+    Bool is_recording;
+    char *prev_fps;
+    char *prev_alias;
+
+    /* Clock used to synchronize events in recording and playback*/
+	GF_Clock *ck;
+
+    /* Next event to process */
+    Bool next_event_snapshot;
+	GF_Event next_event;
+    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_Validator;
+
+static void validator_xvs_close(GF_Validator *validator);
+static Bool validator_xvs_next(GF_Validator *validator, Bool reverse);
+
+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);
+}
+
+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);
+}
+
+static char *validator_create_snapshot(GF_Validator *validator) 
+{
+    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;
+}
+
+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;
+
+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;
+}
+
+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;
+    }
+}
+
+static void validator_on_video_reconfig(void *udta, u32 width, u32 height, u8 bpp)
+{
+}
+
+Bool validator_on_event_play(void *udta, GF_Event *event, Bool consumed_by_compositor)
+{
+	GF_Validator *validator = (GF_Validator *)udta;
+	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;
+		}
+		break;
+	case GF_EVENT_CLICK: 
+	case GF_EVENT_MOUSEUP:
+	case GF_EVENT_MOUSEDOWN: 
+	case GF_EVENT_MOUSEOVER: 
+	case GF_EVENT_MOUSEOUT:
+	case GF_EVENT_MOUSEMOVE:
+	case GF_EVENT_MOUSEWHEEL:
+	case GF_EVENT_KEYDOWN:
+	case GF_EVENT_TEXTINPUT:
+        return 1;
+	case GF_EVENT_KEYUP:
+        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;
+	}
+	return 0;
+}
+
+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);
+
+    switch (event->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_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: 
+	case GF_EVENT_MOUSEUP:
+	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;
+	/*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);
+        }
+		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);
+} 
+
+Bool validator_on_event_record(void *udta, GF_Event *event, Bool consumed_by_compositor)
+{
+	GF_Validator *validator = (GF_Validator *)udta;
+	Bool rec_event = 1;
+	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;
+		}
+		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;
+	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;
+				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;
+	}
+    if (rec_event) {
+        validator_xvs_add_event_dom(validator, event);
+    }
+	return 0;
+}
+
+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++;
+    }
+}
+
+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;
+    }
+}
+
+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;
+    }
+}
+
+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 */
+		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;
+}
+
+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;
+}
+
+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;
+}
+
+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;
+    }
+}
+
+static Bool validator_load_event(GF_Validator *validator) 
+{
+    GF_XMLNode *event_node;
+    GF_XMLAttribute *att;
+    u32 att_index;
+
+	memset(&validator->next_event, 0, sizeof(GF_Event));
+	validator->evt_loaded = 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->evt_loaded = 1;
+    return 1;
+}
+
+static Bool validator_process(GF_TermExt *termext, u32 action, void *param)
+{
+	const char *opt;
+	GF_Validator *validator = termext->udta;
+
+	switch (action) {
+
+    /* Upon starting of the terminal, we parse (possibly an XVL file), an XVS file, and start the first test sequence */
+    case GF_TERM_EXT_START:
+		validator->term = (GF_Terminal *) param;
+
+		/* if the validator is loaded, we switch off anti-aliasing for image comparison and we put a low framerate, 
+		but we store the previous value to restore it upon termination of the validator */
+        opt = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Compositor", "FrameRate");
+        if (opt) validator->prev_fps = gf_strdup(opt);
+        opt = (char *)gf_modules_get_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias");
+        if (opt) validator->prev_alias = gf_strdup(opt);
+
+		/* Check if the validator should be loaded and in which 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")) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator starting in recording mode.\n"));
+            validator->is_recording = 1;
+        } else if (!strcmp(opt, "Disable")) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator is disabled.\n"));
+            return 0;
+        } else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration using wrong mode, stopping.\n"));
+            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");
+			if (!validator->xvs_filename) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_MODULE, ("Validator configuration without input, stopping.\n"));
+				return 0;
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using scenario file: %s\n", validator->xvs_filename));
+			}
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Validator using scenario playlist: %s\n", validator->xvl_filename));
+		}
+
+		/* since we changed parameters of the compositor, we need to trigger a reconfiguration */
+        	gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", "5.0");
+        	gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", "None");
+        	gf_term_set_option(validator->term, GF_OPT_RELOAD_CONFIG, 1);
+
+		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;
+
+		/* 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);
+        }
+		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 */
+	case GF_TERM_EXT_STOP:
+        gf_term_remove_event_filter(validator->term, &validator->evt_filter);
+		validator_xvs_close(validator);
+        validator_xvl_close(validator);
+		validator->term = 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");
+		} else {
+			gf_modules_set_option((GF_BaseInterface*)termext, "Validator", "Mode", "Disable");
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("Stopping validator\n"));
+		if (validator->prev_fps) {
+			gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "FrameRate", validator->prev_fps);
+            gf_free(validator->prev_fps);
+            validator->prev_fps = NULL;
+		}
+        if (validator->prev_alias) {
+	        gf_modules_set_option((GF_BaseInterface*)termext, "Compositor", "AntiAlias", validator->prev_alias);
+            gf_free(validator->prev_alias);
+            validator->prev_alias = NULL;
+        }
+		break;
+
+    /* When called in the main loop of the terminal, we don't do anything in the recording mode.
+       In the playing/validating mode, we need to check if an event needs to be dispatched or if snapshots need to be made,
+       until there is no more event, in which case we trigger either the load of the next XVS or the quit */
+	case GF_TERM_EXT_PROCESS:
+        /* 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;
+					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);
+                    }
+                }
+            }
+		}
+		break;
+	}
+	return 0;
+}
+
+
+GF_TermExt *validator_new()
+{
+	GF_TermExt *dr;
+	GF_Validator *validator;
+	dr = (GF_TermExt*)gf_malloc(sizeof(GF_TermExt));
+	memset(dr, 0, sizeof(GF_TermExt));
+	GF_REGISTER_MODULE_INTERFACE(dr, GF_TERM_EXT_INTERFACE, "GPAC Test Validator", "gpac distribution");
+
+	GF_SAFEALLOC(validator, GF_Validator);
+	dr->process = validator_process;
+	dr->udta = validator;
+	return dr;
+}
+
+
+void validator_delete(GF_BaseInterface *ifce)
+{
+	GF_TermExt *dr = (GF_TermExt *) ifce;
+	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(dr);
+}
+
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces() 
+{
+	static u32 si [] = {
+		GF_TERM_EXT_INTERFACE,
+		0
+	};
+	return si; 
+}
+
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType) 
+{
+	if (InterfaceType == GF_TERM_EXT_INTERFACE) return (GF_BaseInterface *)validator_new();
+	return NULL;
+}
+
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_TERM_EXT_INTERFACE:
+		validator_delete(ifce);
+		break;
+	}
+}
+
+GPAC_MODULE_STATIC_DELARATION( validator )

gpac-0.5.0.svn5178.tar.bz2/modules/vtt_in Added

gpac-0.5.0.svn5178.tar.bz2/modules/vtt_in/Makefile Added

gpac-0.5.0.svn5178.tar.bz2/modules/vtt_in/vtt_dec.c Added

@@ -0,0 +1,396 @@
+/*
+ *					GPAC Multimedia Framework
+ *
+ *			Authors: Cyril Concolato 
+ *			Copyright (c) Telecom ParisTech 2013-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / VTT Loader/Decoder module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <gpac/constants.h>
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/isomedia_dev.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/nodes_svg.h>
+#include <gpac/webvtt.h>
+
+#ifndef GPAC_DISABLE_VTT
+
+typedef struct {
+	GF_BaseInterface *module;
+
+	/* Object Type Indication to distinguish between WebVTT content passsed to the decoder as:
+	   - a single file (GPAC_OTI_PRIVATE_SCENE_VTT)
+	   - character strings (GPAC_OTI_SCENE_VTT)
+	   - ISO sample (GPAC_OTI_SCENE_VTT_MP4)
+	*/
+	u32 oti;
+
+	/* Boolean indicating if there is already a WebVTT stream attached to this decoder */
+	Bool is_stream_attached;
+
+	/* ID of the Elementary Stream on which this stream depends (if any)
+	   0 if no dependency */
+	u32 base_es_id;
+
+	/* file_name of the VTT file when parsing a input text file 
+	   not used when parsing from MP4 or from a stream */
+	char *file_name;
+	u64 file_size;
+	u64 file_pos;
+
+	/* config of the VTT file when parsing an MP4 file 
+	   not used when parsing from text file or from a stream */
+	char *config;
+
+	/* Boolean indicating if a progressive download/parsing is required */
+	Bool use_progressive;
+
+	/* Scene to which this WebVTT stream is linked */
+	GF_Scene *scene;
+
+	/* Terminal to which this WebVTT stream is linked */
+	GF_Terminal *terminal;
+
+	GF_List *cues;
+
+	/* Scene graph for the subtitle content */
+	GF_SceneGraph *sg;
+	Bool has_rendering_script;
+} VTTDec;
+
+
+#define VTT_BUFFER_SIZE 4096
+
+/* Checks that the file is fully downloaded
+   requires that the file_size is given in the DecoderSpecificInfo */
+static Bool vtt_check_download(VTTDec *vttdec)
+{
+	u64 size;
+	FILE *f = gf_f64_open(vttdec->file_name, "rt");
+	if (!f) return GF_FALSE;
+	gf_f64_seek(f, 0, SEEK_END);
+	size = gf_f64_tell(f);
+	fclose(f);
+	if (size==vttdec->file_size) return GF_TRUE;
+	return GF_FALSE;
+}
+
+
+static GF_Err VTT_ProcessData(GF_SceneDecoder *plug, const char *inBuffer, u32 inBufferLength,
+							  u16 ES_ID, u32 stream_time, u32 mmlevel)
+{
+	GF_Err e = GF_OK;
+	VTTDec *vttdec = (VTTDec *)plug->privateStack;
+	if (!vttdec->has_rendering_script) return GF_BAD_PARAM;
+
+	if (stream_time==(u32)-1) {
+		/* TODO */
+		return GF_OK;
+	}
+
+	switch (vttdec->oti) {
+	case GPAC_OTI_PRIVATE_SCENE_VTT:
+		/*full parsing*/
+		if (vttdec->file_size) {
+			/*init step*/
+			if (!vttdec->use_progressive) {
+				/*not done yet*/
+				if (!vtt_check_download(vttdec)) return GF_OK;
+				/* TODO: parse */
+			} else {
+				/* TODO: parse what you can */
+			}
+		}
+		break;
+
+	case GPAC_OTI_SCENE_VTT:
+		/* TODO: try to parse a cue from the given string */
+		break;
+
+	case GPAC_OTI_SCENE_VTT_MP4:
+		{ 
+			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);
+		}
+		break;
+
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	return e;
+}
+
+void VTT_load_script(VTTDec *vttdec, GF_SceneGraph *graph)
+{
+	GF_Node *n, *root;
+	GF_FieldInfo info;
+	const char *path;
+	FILE *jsfile;
+
+	if (!graph) return;
+	gf_sg_add_namespace(graph, "http://www.w3.org/2000/svg", NULL);
+	gf_sg_add_namespace(graph, "http://www.w3.org/1999/xlink", "xlink");
+	gf_sg_add_namespace(graph, "http://www.w3.org/2001/xml-events", "ev");
+	gf_sg_set_scene_size_info(graph, 800, 600, GF_TRUE);
+
+	/* modify the scene with an Inline/Animation pointing to the VTT Renderer */
+	n = root = gf_node_new(graph, TAG_SVG_svg);
+	gf_node_register(root, NULL);
+	gf_sg_set_root_node(graph, root);
+	gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_viewBox, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(n, &info, "0 0 320 240", 0);
+	gf_node_get_attribute_by_name(n, "xmlns", 0, GF_TRUE, GF_FALSE, &info);
+	gf_svg_parse_attribute(n, &info, "http://www.w3.org/2000/svg", 0);
+	gf_node_init(n);
+
+	n = gf_node_new(graph, TAG_SVG_script);
+	gf_node_register(n, root);
+	gf_node_list_add_child(&((GF_ParentNode *)root)->children, n);
+	path = gf_modules_get_option((GF_BaseInterface *)vttdec->module, "WebVTT", "RenderingScript");
+	if (!path) {
+		/* try to find the JS renderer in the default GPAC installation folder */
+		const char *startuppath = gf_modules_get_option((GF_BaseInterface *)vttdec->module, "General", "StartupFile");
+		path = gf_url_concatenate(startuppath, "webvtt-renderer.js");
+		jsfile = gf_f64_open(path, "rt");
+		if (jsfile) {
+			gf_modules_set_option((GF_BaseInterface *)vttdec->module, "WebVTT", "RenderingScript", path);
+			fclose(jsfile);
+		} else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[WebVTT] Cannot find Rendering Script - check config file\n"));
+			return;
+		}
+	}
+	jsfile = gf_f64_open(path, "rt");
+	if (jsfile) {
+		fclose(jsfile);
+		gf_node_get_attribute_by_tag(n, TAG_XLINK_ATT_href, GF_TRUE, GF_FALSE, &info);
+		gf_svg_parse_attribute(n, &info, (char *) path, 0);
+		vttdec->has_rendering_script = GF_TRUE;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[WebVTT] Cannot open Rendering Script - %s\n", path));
+		return;
+	}
+	gf_node_init(n);
+
+}
+
+static GF_Err VTT_AttachScene(GF_SceneDecoder *plug, GF_Scene *scene, Bool is_scene_decoder)
+{
+	VTTDec *vttdec = (VTTDec *)plug->privateStack;
+	/*WebVTT cannot be a root scene object*/
+	//if (is_scene_decoder) return GF_BAD_PARAM;
+	vttdec->scene = scene;
+	vttdec->terminal = scene->root_od->term;
+
+	vttdec->sg = gf_sg_new_subscene(vttdec->scene->graph);
+	VTT_load_script(vttdec, vttdec->sg);
+	//vtt_create_text_node(vttdec, 2000, GF_TRUE);
+	return GF_OK;
+}
+
+static void VTT_CleanExtraScene(VTTDec *vttdec)
+{
+	/* Cleaning scene graph related data */
+	if (vttdec->sg) {
+		gf_scene_register_extra_graph(vttdec->scene, vttdec->sg, GF_TRUE);
+		gf_sg_del(vttdec->sg);
+		vttdec->sg = NULL;
+	}
+}
+
+static GF_Err VTT_ReleaseScene(GF_SceneDecoder *plug)
+{
+	VTTDec *vttdec = (VTTDec *)plug->privateStack;
+
+	VTT_CleanExtraScene(vttdec);
+	vttdec->scene = NULL;
+	vttdec->terminal = NULL;
+
+	return GF_OK;
+}
+
+static void VTT_ReadFileNameFromDSI(VTTDec *vttdec, GF_DefaultDescriptor *dsi)
+{
+	GF_BitStream *bs;
+	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
+	vttdec->file_size = gf_bs_read_u32(bs);
+	vttdec->file_pos = 0;
+	gf_bs_del(bs);
+	vttdec->file_name =  (char *) gf_malloc(sizeof(char)*(1 + dsi->dataLength - sizeof(u32)) );
+	memcpy(vttdec->file_name, dsi->data + sizeof(u32), dsi->dataLength - sizeof(u32) );
+	vttdec->file_name[dsi->dataLength - sizeof(u32) ] = 0;
+}
+
+static void VTT_ReadConfigFromDSI(VTTDec *vttdec, GF_DefaultDescriptor *dsi)
+{
+	GF_BitStream *bs;
+	u32 entry_type;
+
+	bs = gf_bs_new(dsi->data, dsi->dataLength, GF_BITSTREAM_READ);
+	entry_type = gf_bs_read_u32(bs);
+	if (entry_type == GF_ISOM_BOX_TYPE_WVTT) {
+		GF_Box *b;
+		gf_isom_parse_box(&b, bs);
+		vttdec->config = ((GF_StringBox *)b)->string;
+		((GF_StringBox *)b)->string = NULL;
+		gf_isom_box_del(b);
+	} 
+	gf_bs_del(bs);
+}
+
+static GF_Err VTT_AttachStream(GF_BaseDecoder *plug, GF_ESD *esd)
+{
+	VTTDec *vttdec = (VTTDec *)plug->privateStack;
+	/* This is a down stream */
+	if (esd->decoderConfig->upstream) return GF_NOT_SUPPORTED;
+	/* Only process one stream at a time*/
+	if (vttdec->is_stream_attached) return GF_NOT_SUPPORTED;
+
+	/* decSpecInfo is not null only when reading from an SVG file (local or distant, cached or not) */
+	switch (esd->decoderConfig->objectTypeIndication) {
+	case GPAC_OTI_SCENE_VTT:
+		/*no decSpecInfo defined for streaming VTT*/
+		break;
+	case GPAC_OTI_SCENE_VTT_MP4:
+		/* decSpecInfo for VTT in MP4 contains WVTT config box */
+		if (!esd->decoderConfig->decoderSpecificInfo) return GF_NON_COMPLIANT_BITSTREAM;
+		VTT_ReadConfigFromDSI(vttdec, esd->decoderConfig->decoderSpecificInfo);
+		break;
+	case GPAC_OTI_PRIVATE_SCENE_VTT:
+	default:
+		if (!esd->decoderConfig->decoderSpecificInfo) return GF_NON_COMPLIANT_BITSTREAM;
+		VTT_ReadFileNameFromDSI(vttdec, esd->decoderConfig->decoderSpecificInfo);
+		break;
+	}
+	vttdec->oti = esd->decoderConfig->objectTypeIndication;
+	vttdec->is_stream_attached = GF_TRUE;
+
+	if (!esd->dependsOnESID) vttdec->base_es_id = esd->ESID;
+
+	return GF_OK;
+}
+
+static GF_Err VTT_DetachStream(GF_BaseDecoder *plug, u16 ES_ID)
+{
+	VTTDec *vttdec = (VTTDec *)plug->privateStack;
+	if (vttdec->file_name) gf_free(vttdec->file_name);
+	VTT_CleanExtraScene(vttdec);
+	vttdec->file_name = NULL;
+	vttdec->is_stream_attached = GF_FALSE;
+
+	return GF_OK;
+}
+
+const char *VTT_GetName(struct _basedecoder *plug)
+{
+	VTTDec *vttdec = (VTTDec *)plug->privateStack;
+	if (vttdec->oti==GPAC_OTI_PRIVATE_SCENE_VTT) return "GPAC WebVTT Parser";
+	if (vttdec->oti==GPAC_OTI_SCENE_VTT) return "GPAC WebVTT Streaming Parser";
+	if (vttdec->oti==GPAC_OTI_SCENE_VTT_MP4) return "GPAC WebVTT/MP4 Parser";
+	return "INTERNAL ERROR";
+}
+
+static u32 VTT_CanHandleStream(GF_BaseDecoder *ifce, u32 StreamType, GF_ESD *esd, u8 PL)
+{
+	if (StreamType==GF_STREAM_TEXT) {
+		/*media type query*/
+		if (!esd) return GF_CODEC_STREAM_TYPE_SUPPORTED;
+		switch (esd->decoderConfig->objectTypeIndication) {
+		case GPAC_OTI_SCENE_VTT:
+		case GPAC_OTI_SCENE_VTT_MP4:
+			return GF_CODEC_SUPPORTED;
+		default:	
+			return GF_CODEC_NOT_SUPPORTED;
+		}
+	}
+	return GF_CODEC_NOT_SUPPORTED;
+}
+
+static GF_Err VTT_GetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability *cap)
+{
+	cap->cap.valueInt = 0;
+	/* TODO */
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_Err VTT_SetCapabilities(GF_BaseDecoder *plug, GF_CodecCapability capability)
+{
+	VTTDec *vttdec = (VTTDec *)plug->privateStack;
+	if (capability.CapCode==GF_CODEC_ABORT) {
+		/* TODO */
+	} else if (capability.CapCode==GF_CODEC_SHOW_SCENE) {
+		if (capability.cap.valueInt) {
+			gf_scene_register_extra_graph(vttdec->scene, vttdec->sg, GF_FALSE);
+		} else {
+			gf_scene_register_extra_graph(vttdec->scene, vttdec->sg, GF_TRUE);
+		}
+	}
+	return GF_OK;
+}
+
+GF_BaseInterface *NewVTTDec()
+{
+	VTTDec *vttdec;
+	GF_SceneDecoder *sdec;
+
+	GF_SAFEALLOC(sdec, GF_SceneDecoder)
+	GF_REGISTER_MODULE_INTERFACE(sdec, GF_SCENE_DECODER_INTERFACE, "GPAC WebVTT Parser", "gpac distribution");
+
+	GF_SAFEALLOC(vttdec, VTTDec);
+	vttdec->cues = gf_list_new();
+	vttdec->module = (GF_BaseInterface *)sdec;
+
+	sdec->privateStack = vttdec;
+	sdec->CanHandleStream	= VTT_CanHandleStream;
+	sdec->AttachStream		= VTT_AttachStream;
+	sdec->DetachStream		= VTT_DetachStream;
+	sdec->AttachScene		= VTT_AttachScene;
+	sdec->ReleaseScene		= VTT_ReleaseScene;
+	sdec->ProcessData		= VTT_ProcessData;
+	sdec->GetName			= VTT_GetName;
+	sdec->SetCapabilities	= VTT_SetCapabilities;
+	sdec->GetCapabilities	= VTT_GetCapabilities;
+	return (GF_BaseInterface *)sdec;
+}
+
+void DeleteVTTDec(GF_BaseDecoder *plug)
+{
+	VTTDec *dec= (VTTDec *)plug->privateStack;
+	gf_list_del(dec->cues);
+	gf_free(dec);
+	gf_free(plug);
+}
+
+#endif

gpac-0.5.0.svn5178.tar.bz2/modules/vtt_in/vtt_in.c Added

@@ -0,0 +1,441 @@
+/*
+ *					GPAC Multimedia Framework
+ *
+ *			Authors: Cyril Concolato 
+ *			Copyright (c) Telecom ParisTech 2013-
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / VTT Loader/Decoder module
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <gpac/internal/terminal_dev.h>
+#include <gpac/scene_manager.h>
+#include <gpac/constants.h>
+#include <gpac/modules/js_usr.h>
+
+#ifndef GPAC_DISABLE_VTT
+
+typedef struct
+{
+	/* Counter-part object in the terminal */
+	GF_ClientService *service;
+	/* Channel object associated to this object */
+	LPNETCHANNEL channel;
+
+	/*file downloader*/
+	GF_DownloadSession * dnload;
+
+	Bool needs_connection;
+
+	/* Header for the SL packets created by this module and sent out to the terminal */
+	GF_SLHeader sl_hdr;
+} VTTIn;
+
+const char * VTT_MIME_TYPES[] = {
+  "text/vtt", "vtt", "VTT SubTitles",
+  NULL
+};
+
+static u32 VTT_RegisterMimeTypes(const GF_InputService *plug){
+	u32 i;
+	if (!plug) return 0;
+	for (i = 0 ; VTT_MIME_TYPES[i]; i+=3){
+		gf_term_register_mime_type(plug, VTT_MIME_TYPES[i], VTT_MIME_TYPES[i+1], VTT_MIME_TYPES[i+2]);
+	}
+	return i/3;
+}
+
+static Bool VTT_CanHandleURL(GF_InputService *plug, const char *url)
+{
+	const char *sExt;
+	u32 i;
+	if (!plug || !url) return GF_FALSE;
+	sExt = strrchr(url, '.');
+	if (!sExt) return GF_FALSE;
+	for (i = 0 ; VTT_MIME_TYPES[i]; i+=3){
+	  if (gf_term_check_extension(plug, VTT_MIME_TYPES[i], VTT_MIME_TYPES[i+1], VTT_MIME_TYPES[i+2], sExt)) return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+static Bool VTT_is_local(const char *url)
+{
+	if (!url)	return GF_FALSE;
+	if (!strnicmp(url, "file://", 7)) return GF_TRUE;
+	if (strstr(url, "://")) return GF_FALSE;
+	return GF_TRUE;
+}
+
+void VTT_NetIO(void *cbk, GF_NETIO_Parameter *param)
+{
+	GF_Err e;
+	const char *szCache;
+	GF_InputService *plug = (GF_InputService *)cbk;
+	VTTIn *vttin = (VTTIn *) plug->priv;
+
+	if (!vttin)	return;
+	gf_term_download_update_stats(vttin->dnload);
+
+	e = param->error;
+	/*done*/
+	if (param->msg_type==GF_NETIO_DATA_TRANSFERED) {
+		szCache = gf_dm_sess_get_cache_name(vttin->dnload);
+		if (!szCache) e = GF_IO_ERR;
+		else {
+			//e = TTIn_LoadFile(plug, szCache, 1);
+		}
+	}
+	else if (param->msg_type==GF_NETIO_DATA_EXCHANGE) {
+		return;
+	}
+
+	/*OK confirm*/
+	if (vttin->needs_connection) {
+		vttin->needs_connection = GF_FALSE;
+		gf_term_on_connect(vttin->service, NULL, e);
+		//if (!e && !vttin->od_done) tti_setup_object(vttin);
+	}
+}
+
+void VTT_download_file(GF_InputService *plug, const char *url)
+{
+	VTTIn *vttin = (VTTIn *) plug->priv;
+        if (!plug || !url)
+          return;
+	vttin->needs_connection = GF_TRUE;
+	vttin->dnload = gf_term_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);
+	} else {
+		/*start our download (threaded)*/
+		gf_dm_sess_process(vttin->dnload);
+	}
+	/*service confirm is done once fetched*/
+}
+
+static GF_Err VTT_ConnectService(GF_InputService *plug, GF_ClientService *serv, const char *url)
+{
+	GF_Err e;
+	VTTIn *vttin = (VTTIn *)plug->priv;
+        if (!plug || !url)
+          return GF_BAD_PARAM;
+	vttin->service = serv;
+
+	if (vttin->dnload) gf_term_download_del(vttin->dnload);
+	vttin->dnload = NULL;
+
+	/*remote fetch*/
+	if (!VTT_is_local(url)) {
+		VTT_download_file(plug, url);
+		return GF_OK;
+	} else {
+		e = GF_OK;
+		//e = TTIn_LoadFile(plug, url, 0);
+		gf_term_on_connect(serv, NULL, e);
+		//if (!e && !vttin->od_done) tti_setup_object(vttin);
+	}
+	return GF_OK;
+}
+
+static GF_Err VTT_CloseService(GF_InputService *plug)
+{
+	VTTIn *vttin;
+	if (!plug)	return GF_BAD_PARAM;
+	
+	vttin = (VTTIn *)plug->priv;
+	if (!vttin)	return GF_BAD_PARAM;
+
+	//if (vttin->szFile) {
+	//	gf_delete_file(vttin->szFile);
+	//	gf_free(vttin->szFile);
+	//}
+	//vttin->szFile = NULL;
+
+	if (vttin->dnload) {
+		gf_term_download_del(vttin->dnload);
+	}
+	vttin->dnload = NULL;
+
+	if (vttin->service) {
+		gf_term_on_disconnect(vttin->service, NULL, GF_OK);
+	}
+	vttin->service = NULL;
+	
+	return GF_OK;
+}
+
+static GF_Descriptor *VTT_GetServiceDesc(GF_InputService *plug, u32 expect_type, const char *sub_url)
+{
+	VTTIn *vttin;
+	if (!plug)	return NULL;
+	vttin = (VTTIn *)plug->priv;
+	if (!vttin)	return NULL;
+	/*visual object*/
+	switch (expect_type) {
+	case GF_MEDIA_OBJECT_UNDEF:
+	case GF_MEDIA_OBJECT_UPDATES:
+	case GF_MEDIA_OBJECT_TEXT:
+	{
+		GF_ObjectDescriptor *od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
+		//GF_ESD *esd = tti_get_esd(vttin);
+		//od->objectDescriptorID = esd->ESID;
+		//gf_list_add(od->ESDescriptors, esd);
+		//vttin->od_done = 1;
+		return (GF_Descriptor *) od;
+	}
+	default:
+		return NULL;
+	}
+	return NULL;
+}
+
+static GF_Err VTT_ConnectChannel(GF_InputService *plug, LPNETCHANNEL channel, const char *url, Bool upstream)
+{
+	u32 ES_ID;
+	GF_Err e;
+	VTTIn *vttin = (VTTIn *)plug->priv;
+	if (!vttin)	return GF_BAD_PARAM;
+	e = GF_SERVICE_ERROR;
+	if (!vttin || vttin->channel==channel) goto exit;
+
+	e = GF_STREAM_NOT_FOUND;
+	ES_ID = 0;
+	if (strstr(url, "ES_ID")) sscanf(url, "ES_ID=%ud", &ES_ID);
+
+	if (ES_ID==1) {
+		vttin->channel = channel;
+		e = GF_OK;
+	}
+
+exit:
+	gf_term_on_connect(vttin->service, channel, e);
+	return e;
+}
+
+static GF_Err VTT_DisconnectChannel(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	VTTIn *vttin = (VTTIn *)plug->priv;
+	GF_Err e = GF_STREAM_NOT_FOUND;
+
+	if (!vttin)	return GF_BAD_PARAM;
+
+	if (vttin->channel == channel) {
+		vttin->channel = NULL;
+		e = GF_OK;
+	}
+	gf_term_on_disconnect(vttin->service, channel, e);
+	return GF_OK;
+}
+
+static GF_Err VTT_ServiceCommand(GF_InputService *plug, GF_NetworkCommand *com)
+{
+	//VTTIn *vttin = (VTTIn *)plug->priv;
+
+	//if (!vttin)	return GF_BAD_PARAM;
+	//if (!com->base.on_channel) return GF_NOT_SUPPORTED;
+	//switch (com->command_type) {
+	//case GF_NET_CHAN_SET_PADDING:
+	//	gf_isom_set_sample_padding(vttin->mp4, vttin->tt_track, com->pad.padding_bytes);
+	//	return GF_OK;
+	//case GF_NET_CHAN_DURATION:
+	//	com->duration.duration = (Double) (s64) gf_isom_get_media_duration(vttin->mp4, vttin->tt_track);
+	//	com->duration.duration /= gf_isom_get_media_timescale(vttin->mp4, vttin->tt_track);
+	//	return GF_OK;
+	//case GF_NET_CHAN_PLAY:
+	//	vttin->start_range = (com->play.start_range>0) ? (u32) (com->play.start_range * 1000) : 0;
+	//	if (vttin->channel == com->base.on_channel) {
+	//		vttin->samp_num = 0;
+	//		if (vttin->samp) gf_isom_sample_del(&vttin->samp);
+	//	}
+	//	return GF_OK;
+	//case GF_NET_CHAN_STOP:
+	//	return GF_OK;
+	//default:
+	//	return GF_OK;
+	//}
+	return GF_OK;
+}
+
+static GF_Err VTT_ChannelGetSLP(GF_InputService *plug, LPNETCHANNEL channel, char **out_data_ptr, u32 *out_data_size, GF_SLHeader *out_sl_hdr, Bool *sl_compressed, GF_Err *out_reception_status, Bool *is_new_data)
+{
+	//VTTIn *vttin = (VTTIn *)plug->priv;
+
+	//*out_reception_status = GF_OK;
+	//*sl_compressed = GF_FALSE;
+	//*is_new_data = GF_FALSE;
+
+	//memset(&vttin->sl_hdr, 0, sizeof(GF_SLHeader));
+	//vttin->sl_hdr.randomAccessPointFlag = 1;
+	//vttin->sl_hdr.compositionTimeStampFlag = 1;
+	//vttin->sl_hdr.accessUnitStartFlag = vttin->sl_hdr.accessUnitEndFlag = 1;
+
+	///*fetching es data*/
+	//if (vttin->channel == channel) {
+	//	if (vttin->samp_num>=gf_isom_get_sample_count(vttin->mp4, vttin->tt_track)) {
+	//		*out_reception_status = GF_EOS;
+	//		return GF_OK;
+	//	}
+
+	//	if (!vttin->samp) {
+	//		u32 di;
+	//		if (vttin->start_range) {
+	//			u32 di;
+	//			*out_reception_status = gf_isom_get_sample_for_movie_time(vttin->mp4, vttin->tt_track, vttin->start_range, &di, GF_ISOM_SEARCH_SYNC_BACKWARD, &vttin->samp, &vttin->samp_num);
+	//			vttin->start_range = 0;
+	//		} else {
+	//			vttin->samp = gf_isom_get_sample(vttin->mp4, vttin->tt_track, vttin->samp_num+1, &di);
+	//		}
+	//		if (!vttin->samp) {
+	//			*out_reception_status = GF_CORRUPTED_DATA;
+	//			return GF_OK;
+	//		}
+	//		*is_new_data = 1;
+	//	}
+	//	vttin->sl_hdr.compositionTimeStamp = vttin->sl_hdr.decodingTimeStamp = vttin->samp->DTS;
+	//	*out_data_ptr = vttin->samp->data;
+	//	*out_data_size = vttin->samp->dataLength;
+	//	*out_sl_hdr = vttin->sl_hdr;
+	//	return GF_OK;
+	//}
+	return GF_STREAM_NOT_FOUND;
+}
+
+static GF_Err VTT_ChannelReleaseSLP(GF_InputService *plug, LPNETCHANNEL channel)
+{
+	//VTTIn *vttin = (VTTIn *)plug->priv;
+	//if (vttin->channel == channel) {
+	//	if (!vttin->samp) return GF_BAD_PARAM;
+	//	gf_isom_sample_del(&vttin->samp);
+	//	vttin->samp = NULL;
+	//	vttin->samp_num++;
+	//	return GF_OK;
+	//}
+	return GF_OK;
+}
+
+static void *NewVTTInput()
+{
+	VTTIn *priv;
+	GF_InputService *plug;
+	GF_SAFEALLOC(plug, GF_InputService);
+	GF_REGISTER_MODULE_INTERFACE(plug, GF_NET_CLIENT_INTERFACE, "GPAC SubTitle Reader", "gpac distribution")
+
+	plug->RegisterMimeTypes = VTT_RegisterMimeTypes;
+	plug->CanHandleURL = VTT_CanHandleURL;
+	plug->CanHandleURLInService = NULL;
+	plug->ConnectService = VTT_ConnectService;
+	plug->CloseService = VTT_CloseService;
+	plug->GetServiceDescriptor = VTT_GetServiceDesc;
+	plug->ConnectChannel = VTT_ConnectChannel;
+	plug->DisconnectChannel = VTT_DisconnectChannel;
+	plug->ChannelGetSLP = VTT_ChannelGetSLP;
+	plug->ChannelReleaseSLP = VTT_ChannelReleaseSLP;
+	plug->ServiceCommand = VTT_ServiceCommand;
+
+	GF_SAFEALLOC(priv, VTTIn);
+	plug->priv = priv;
+	return plug;
+}
+
+void DeleteVTTInput(void *ifce)
+{
+	VTTIn *vttin;
+	GF_InputService *plug = (GF_InputService *)ifce;
+	if (!plug)
+		return;
+	vttin = (VTTIn *)plug->priv;
+	if (vttin){
+		VTT_CloseService(plug);
+		gf_free(vttin);
+	}
+	plug->priv = NULL;
+	gf_free(plug);
+}
+
+void *NewVTTDec();
+void DeleteVTTDec(GF_BaseDecoder *plug);
+//GF_JSUserExtension *NewVTTJS();
+//void DeleteVTTJS(GF_BaseInterface *ifce);
+
+/*interface create*/
+GPAC_MODULE_EXPORT
+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_JS_USER_EXT_INTERFACE: return (GF_BaseInterface *)NewVTTJS();
+	default: return NULL;
+	}
+}
+
+
+/*interface destroy*/
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+	switch (ifce->InterfaceType) {
+	case GF_SCENE_DECODER_INTERFACE:
+		DeleteVTTDec((GF_BaseDecoder *)ifce);
+		break;
+	case GF_NET_CLIENT_INTERFACE:
+		DeleteVTTInput(ifce);
+		break;
+	//case GF_JS_USER_EXT_INTERFACE: 
+	//	DeleteVTTJS(ifce);
+	//	break;
+	}
+}
+
+#else
+
+
+/*interface create*/
+GPAC_MODULE_EXPORT
+GF_BaseInterface *LoadInterface(u32 InterfaceType)
+{
+	return NULL;
+}
+
+
+/*interface destroy*/
+GPAC_MODULE_EXPORT
+void ShutdownInterface(GF_BaseInterface *ifce)
+{
+}
+
+#endif
+
+/*interface query*/
+GPAC_MODULE_EXPORT
+const u32 *QueryInterfaces()
+{
+	static u32 si [] = {
+#if !defined(GPAC_DISABLE_VTT)
+		GF_SCENE_DECODER_INTERFACE,
+		GF_NET_CLIENT_INTERFACE,
+//		GF_JS_USER_EXT_INTERFACE,
+#endif
+		0
+	};
+	return si;
+}
+
+GPAC_MODULE_STATIC_DELARATION( vtt_in )

gpac-0.5.0.svn4668.tar.bz2/modules/wav_out/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/wav_out/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/widgetman/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/widgetman/widget.c -> gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/widget.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/widgetman/widgetman.c -> gpac-0.5.0.svn5178.tar.bz2/modules/widgetman/widgetman.c Changed

gpac-0.5.0.svn4668.tar.bz2/modules/wiiis/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/wiiis/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/x11_out/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/x11_out/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/modules/x11_out/x11_out.c -> gpac-0.5.0.svn5178.tar.bz2/modules/x11_out/x11_out.c Changed

@@ -29,6 +29,7 @@
 #include <gpac/user.h>
 #include <sys/time.h>
 #include <X11/XKBlib.h>
+#include <X11/Xatom.h>
 
 
 void X11_SetupWindow (GF_VideoOutput * vout);
@@ -567,13 +568,14 @@
 		    /* 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:
+		  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);
@@ -587,6 +589,60 @@
 					vout->on_event (vout->evt_cbk_hdl, &evt);
 				}
 			}
+
+			if (evt.key.key_code==GF_KEY_CONTROL) xWindow->ctrl_down = (xevent.type==KeyPress) ? 1 : 0;
+			else if (evt.key.key_code==GF_KEY_ALT) xWindow->alt_down = (xevent.type==KeyPress) ? 1 : 0;
+			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);
+			    }
+			}	
+			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 ((clipb_atom != None) && XGetSelectionOwner(xWindow->display, clipb_atom) != the_window) {
+			        		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:
@@ -650,8 +706,9 @@
 		  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;
@@ -671,16 +728,22 @@
   GF_Event evt;
   XWindow *xWin = (XWindow *)vout->opaque;
 
-  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;
+  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);
-  memset(&evt, 0, sizeof(GF_Event));
+
   evt.type = GF_EVENT_VIDEO_SETUP;
   vout->on_event (vout->evt_cbk_hdl,&evt);
   xWin->is_init = 1;
@@ -939,7 +1002,7 @@
 	X11VID ();
 	xWindow->fullscreen = bFullScreenOn;
 #ifdef GPAC_HAS_OPENGL
-	if (xWindow->output_3d_mode==1) X11_ReleaseGL(xWindow);
+//	if (xWindow->output_3d_mode==1) X11_ReleaseGL(xWindow);
 #endif
 
 	if (bFullScreenOn) {
@@ -991,6 +1054,7 @@
 
 	if (do_lock) {
 		if (!vi) return GF_BAD_PARAM;
+		memset(vi, 0, sizeof(GF_VideoSurface));
 		if (xWindow->surface) {
 			vi->width = xWindow->surface->width;
 			vi->height = xWindow->surface->height;
@@ -1097,6 +1161,8 @@
 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;
+
 	/*
 	 * Full screen wnd
 	 */
@@ -1278,7 +1344,7 @@
 #ifdef GPAC_HAS_OPENGL
 	{
 	  int attribs[64];
-	  int i, nb_bits;
+	  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 */
@@ -1286,30 +1352,81 @@
           if (!sOpt){
              gf_modules_set_option((GF_BaseInterface *)vout, "Video", "GLNbBitsPerComponent", "8");
           }
+retry_8bpp:
 	  i=0;
-	  attribs[i++] = GLX_RGBA;
+	  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;
-	  sOpt = gf_modules_get_option((GF_BaseInterface *)vout, "Video", "GLNbBitsDepth");
-	  nb_bits = sOpt ? atoi(sOpt) : 16;
+	  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_bits;
+		  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++] = None;
-	  xWindow->glx_visualinfo = glXChooseVisual(xWindow->display, xWindow->screennum, attribs);
+	  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"));
 	  }

gpac-0.5.0.svn4668.tar.bz2/modules/x11_out/x11_out.h -> gpac-0.5.0.svn5178.tar.bz2/modules/x11_out/x11_out.h Changed

gpac-0.5.0.svn4668.tar.bz2/modules/xvid_dec/Makefile -> gpac-0.5.0.svn5178.tar.bz2/modules/xvid_dec/Makefile Changed

gpac-0.5.0.svn4668.tar.bz2/packagers/win32_64/nsis/gpac_installer.nsi -> gpac-0.5.0.svn5178.tar.bz2/packagers/win32_64/nsis/gpac_installer.nsi Changed

@@ -279,6 +279,7 @@
   File "${GPAC_ROOT}\gui\gui.js"
   File "${GPAC_ROOT}\gui\gwlib.js"
   File "${GPAC_ROOT}\gui\mpegu-core.js"
+  File "${GPAC_ROOT}\gui\webvtt-renderer.js"
   SetOutPath $INSTDIR\gui\icons
   File /r /x .svn ${GPAC_ROOT}\gui\icons\*
   SetOutPath $INSTDIR\gui\extensions
@@ -348,8 +349,12 @@
   SectionIn 1
   File "${GPAC_BIN}\gm_ffmpeg_in.dll"
   File "${GPAC_BIN}\avcodec-*.dll"
+  File "${GPAC_BIN}\avdevice-*.dll"
+  File "${GPAC_BIN}\avfilter-*.dll"
   File "${GPAC_BIN}\avformat-*.dll"
   File "${GPAC_BIN}\avutil-*.dll"
+  File "${GPAC_BIN}\postproc-*.dll"
+  File "${GPAC_BIN}\swresample-*.dll"
   File "${GPAC_BIN}\swscale-*.dll"
 SectionEnd
 
@@ -388,6 +393,11 @@
   File "${GPAC_BIN}\gm_svg_in.dll"
 SectionEnd
 
+Section "WebVTT" SecWebVTT
+  SectionIn 1
+  File "${GPAC_BIN}\gm_vtt_in.dll"
+SectionEnd
+
 Section "GDI+" SecGDIP
   SectionIn 1
   call InsertGDIPLUS
@@ -471,6 +481,7 @@
   SetOutPath $INSTDIR
   File "${GPAC_BIN}\MP4Box.exe"
   File "${GPAC_BIN}\MP42TS.exe"
+  File "${GPAC_BIN}\dashcast.exe"
 
   Push $INSTDIR
   Call AddToPath
@@ -621,6 +632,7 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecM2TS} "Support for MPEG-2 Transport Stream"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecRTP} "Support for RTP and RTSP IP streaming"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecSVG} "Support for SVG including progressive loading"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecWebVTT} "Support for WebVTT subtitles"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecGDIP} "GDIPlus-based rasterizer"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecG2DS} "GPAC software rasterizer"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecFT} "FreeType font parsing"

gpac-0.5.0.svn4668.tar.bz2/packagers/win32_64/nsis/readme.txt -> gpac-0.5.0.svn5178.tar.bz2/packagers/win32_64/nsis/readme.txt Changed

@@ -1,13 +1,13 @@
-GPAC: NSIS installer manual
-==========================
-
-Recommended
------------
-
-Please execute the "generate_installer.bat" file at the root GPAC directory. The revision and version will be retrieved.
-
-
-Alternative (developers only)
------------------------------
-
-Launching the NSIS installer the "bin\win32\release\nsis_install" will generate an unversion installer. The DATE/HOUR will be included in the installer file. Use it in case you're making some experimental developments.
+GPAC: NSIS installer manual
+==========================
+
+Recommended
+-----------
+
+Please execute the "generate_installer.bat" file at the root GPAC directory. The revision and version will be retrieved.
+
+
+Alternative (developers only)
+-----------------------------
+
+Launching the NSIS installer the "bin\win32\release\nsis_install" will generate an unversion installer. The DATE/HOUR will be included in the installer file. Use it in case you're making some experimental developments.

gpac-0.5.0.svn4668.tar.bz2/regression_tests/bifs/bifs-2D-interactivity-mousesensor.bt -> gpac-0.5.0.svn5178.tar.bz2/regression_tests/bifs/bifs-2D-interactivity-mousesensor.bt Changed

gpac-0.5.0.svn4668.tar.bz2/regression_tests/bifs/bifs-2D-texturing-compositetexture2D-transparent.bt -> gpac-0.5.0.svn5178.tar.bz2/regression_tests/bifs/bifs-2D-texturing-compositetexture2D-transparent.bt Changed

gpac-0.5.0.svn5178.tar.bz2/regression_tests/dom Added

gpac-0.5.0.svn5178.tar.bz2/regression_tests/dom/gpac-dom-portability.js Added

@@ -0,0 +1,144 @@
+var window = (function (window) {
+if (!!window.setTimeout) return;
+var DEBUG = false;
+var svgNS = 'http://www.w3.org/2000/svg';
+var xlinkNS = 'http://www.w3.org/1999/xlink';
+var intervalIds=[];
+var timeoutIds=[];
+
+window.console = {};
+console.log = function (str) { alert(str); };
+
+function createAnimStruct(timeout, isIndefinite) {
+  var defs = document.createElementNS(svgNS, 'defs');
+  document.documentElement.appendChild(defs);
+  var g = document.createElementNS(svgNS, 'g');
+  defs.appendChild(g);
+  g.setAttributeNS(svgNS, 'display', 'none');
+  var anim = document.createElementNS(svgNS, 'animate');  
+  anim.setAttributeNS(svgNS, 'attributeName', 'display');
+  anim.setAttributeNS(svgNS, 'begin', 'indefinite');
+  anim.setAttributeNS(svgNS, 'end', 'indefinite');
+  anim.setAttributeNS(svgNS, 'dur', (+timeout)/1000);
+  if (isIndefinite) {
+    anim.setAttributeNS(svgNS, 'repeatCount', 'indefinite');
+  }
+  g.appendChild(anim);
+  anim.setAttributeNS(svgNS, 'to', 'inline');
+  return { root: defs, anim: anim};
+}
+
+var setTimer = function (useRepeatEvent, timers, callback, timeout) {
+  var args = Array.prototype.slice(arguments, 4);
+  var obj = createAnimStruct(timeout, useRepeatEvent);
+  obj.id = timers.length;
+  if (DEBUG) 
+    console.log("Creating "+(useRepeatEvent ? "Interval ":"")+"Timer "+obj.id+" with arguments: "+Array.prototype.slice(arguments,0));
+  obj.endEventCallback = function (event) { 
+						  if (DEBUG) 
+							window.console.log((useRepeatEvent ? "Interval ":"")+"Timeout "+obj.id+" reached");
+						  if (!useRepeatEvent) {
+						    document.documentElement.removeChild(obj.root);
+						  }	
+						  var newargs = [].concat(args);									
+						  callback.apply(this, newargs);
+						};
+  obj.anim.addEventListener((useRepeatEvent ? 'repeatEvent' : 'endEvent'), obj.endEventCallback, false);
+  obj.anim.beginElement();
+  timers.push(obj);
+  return obj.id;
+
+}
+
+window.setTimeout = function (callback, timeout) {
+  return setTimer(false, timeoutIds, callback, timeout);
+  // var args = Array.prototype.slice(arguments, 2);
+  // var obj = createAnimStruct(timeout, false);
+  // obj.id = timeoutIds.length;
+  // if (DEBUG) 
+    // console.log("Creating Timer "+obj.id+" with arguments: "+Array.prototype.slice(arguments,0));
+  // obj.endEventCallback = function (event) { 
+						  // if (DEBUG) 
+							// window.console.log("Timeout "+obj.id+" reached");
+						  // document.documentElement.removeChild(obj.root);
+						  // var newargs = [].concat(args);									
+						  // callback.apply(this, newargs);
+						// };
+  // obj.anim.addEventListener('endEvent', obj.endEventCallback, false);
+  // obj.anim.beginElement();
+  // timeoutIds.push(obj);
+  // return obj.id;
+}
+
+window.setInterval = function (callback, timeout) {
+  return setTimer(true, intervalIds, callback, timeout);
+  // var args = Array.prototype.slice(arguments, 2);
+  // var obj = createAnimStruct(timeout, true);
+  // obj.id = intervalIds.length;
+  // if (DEBUG) 
+    // window.console.log("Creating Interval Timer "+obj.id+" with arguments: "+Array.prototype.slice(arguments,0));
+  // obj.intervalCallback = function (event) { 
+							 // if (DEBUG) 
+							   // window.console.log("Interval "+obj.id+" reached");
+							 // var newargs = [].concat(args);									
+							 // callback.apply(this, newargs); 
+						   // };
+  // obj.anim.addEventListener('repeatEvent', obj.intervalCallback, false);
+  // obj.anim.beginElement();
+  // intervalIds.push(obj);
+  // return obj.id;
+}
+
+var clearTimer = function(useRepeatEvent, timers, id) {
+  if (DEBUG) 
+    window.console.log("Clearing "+(useRepeatEvent ? "Interval ":"")+"Timer "+id+" with id: "+id);
+  var obj = timers[id];
+  if (obj) {
+    if (obj.id != id) {
+      window.console.log("Mismatch in ids while clearing timer: "+id+" vs. "+obj.id);
+	}
+    obj.anim.removeEventListener((useRepeatEvent ? 'repeatEvent' : 'endEvent'), obj.endEventCallback);
+    document.documentElement.removeChild(obj.root);
+	timers[id] = null;
+  }
+}
+
+window.clearTimeout = function (id) {
+  return clearTimer(false, timeoutIds, id);
+  // if (DEBUG) 
+    // window.console.log("Clearing Timer "+id+" with arguments: "+Array.prototype.slice(arguments,0));
+  // var timerObj = timeoutIds[id];
+  // if (timerObj) {
+    // if (timerObj.id != id) {
+      // window.console.log("Mismatch in ids while clearing Timer: "+id+" vs. "+timerObj.id);
+	// }
+    // timerObj.anim.removeEventListener('endEvent', timerObj.endEventCallback);
+    // document.documentElement.removeChild(timerObj.root);
+	// timeoutIds[id] = null;
+  // }
+}
+
+window.clearInterval = function (id) {
+  return clearTimer(true, intervalIds, id);
+  // if (DEBUG) 
+    // window.console.log("Clearing Interval Timer with arguments: "+Array.prototype.slice(arguments,0));
+  // var intervalObj = intervalIds[id];
+  // if (intervalObj) {
+    // if (timerObj.id != id) {
+      // window.console.log("Mismatch in ids while clearing Interval Timer: "+id+" vs. "+intervalObj.id);
+	// }
+    // intervalObj.anim.removeEventListener('repeatEvent', intervalObj.intervalCallback);
+    // document.documentElement.removeChild(intervalObj.root);
+  // }
+}
+
+window.printObject = function (obj) {
+  window.console.log("Enumerating object: "+obj);
+  for (var key in obj) {
+    window.console.log("Property "+key+": "+obj[key]);
+  }
+  window.console.log("done.");
+}
+
+return window;
+})(window ? window : this);

gpac-0.5.0.svn5178.tar.bz2/regression_tests/dom/gpac-html-portability.js Added

@@ -0,0 +1,96 @@
+if (!Uint8Array) {
+var Uint8Array = function () {};
+Uint8Array.prototype = new ArrayBuffer();
+}
+
+(function () {
+if (typeof(gpac) == "undefined") return;
+console.log ("Using GPAC HTML Portability script");
+var DEBUG = false;
+document.createElementOrig = document.createElement;
+document.createElement = function (str) { 
+  var e;
+  if (str == "div" ) { e = document.createElementOrig("g"); }
+  else if (str == "table" ) { e = document.createElementOrig("textArea"); e.setAttribute("width", "500");  }
+  else if (str == "tr" ) { e = document.createElementOrig("tspan"); e.break = true;}
+  else if (str == "td" ) { e = document.createElementOrig("tspan"); }
+  else if (str == "h1" || str == "h2" || str == "h3" || str == "h4" ) { e = document.createElementOrig("text"); }
+  else if ( str == "a" ) { e = document.createElementOrig("tspan"); }
+  else if ( str == "span" ) { e = document.createElementOrig("tspan"); }
+  else if (str == "textarea") { e = document.createElementOrig("textArea"); }		
+  else { e = document.createElementOrig(str); }
+  e.formerElementName = str;
+  if (DEBUG) 
+    console.log("created SVG element '"+e.tagName+"' for html tag '"+str+"'");
+  return e;
+}		
+
+document.body = document.documentElement;
+
+Node.__proto__.focus = function () { 
+  if (DEBUG)
+    console.log("focus called on node '"+this.tagName+"'"); 
+};	  
+
+SVGElement.__proto__.__defineSetter__("id", function (s) { 
+                                               if (DEBUG) 
+											     console.log("setting id on "+this.tagName+" with '"+s+"'"); 
+											   this.setAttribute("id", s); 
+											 } ); 
+SVGElement.__proto__.__defineGetter__("id", function () { 
+                                               if (DEBUG) 
+											     console.log("getting id on "+this.tagName); 
+											   return this.getAttribute("id"); 
+											 } );
+SVGElement.__proto__.__defineSetter__("innerHTML", function (s) { 
+												var t = s.replace(/&nbsp;/g, ' ');
+												t = t.replace(/&amp;/g, '&');
+                                                if (DEBUG) 
+											      console.log("setting innerHTML on "+this.tagName+" "+this.id+" with '"+t+"'"); 
+											    this.textContent = t;
+											 } ); 
+SVGElement.__proto__.__defineGetter__("innerHTML", function () { 
+                                               if (DEBUG) 
+											     console.log("getting innerHTML on "+this.tagName); 
+											   return this.textContent; 
+											 } );
+SVGElement.__proto__.__defineSetter__("classList", function (s) { 
+                                               if (DEBUG) 
+											     console.log("setting classList on "+this.tagName+" with '"+s+"'"); 
+											   this.setAttribute("classList", s); 
+											 } ); 
+SVGElement.__proto__.__defineGetter__("classList", function () { 
+                                               if (DEBUG) 
+											     console.log("getting classList on "+this.tagName); 
+											   return this.getAttribute("classList"); 
+											 } );
+SVGElement.__proto__.__defineSetter__("onclick", function (callback) { 
+                                             if (DEBUG) 
+											   console.log("setting onclick on "+this.tagName+" with callback "+callback); 
+											 var f = function (event) { 
+											   if (DEBUG) 
+												 console.log("Element "+(event.target.tagName)+" clicked, calling "+callback); 
+											   callback(event); 
+										     };
+											 this.addEventListener("click", f, false); 
+										    });	  
+											
+Node.__proto__.__defineSetter__("title", function (value) { 
+                                             if (DEBUG) 
+											   console.log("setting title on "+this.tagName+" with '"+value+"'"); 
+											 this.setAttribute("title", value);
+										    });	  											
+Node.__proto__.__defineSetter__("href", function (value) { 
+                                             if (DEBUG) 
+											   console.log("setting href on "+this.tagName+" with '"+value+"'"); 
+											 this.setAttributeNS("http://www.w3.org/1999/xlink", "href", value);
+										    });	  																					
+
+document.getElementByIdOrig = document.getElementById;
+document.getElementById = function (id) { 
+  var e = document.getElementByIdOrig(id);
+  if (DEBUG) 
+    console.log("getting element by id '"+id+"' found '"+e+"'"+(e ? " of type '"+e.tagName+"'" : ""));
+  return e;
+}
+}) ();
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/basic_mediasource.js -> gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/basic_mediasource.js Changed

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/bind.js Added

@@ -0,0 +1,26 @@
+/* Replacement for the bind function if not supported
+ adopted from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind?redirectlocale=en-US&redirectslug=JavaScript%2FReference%2FGlobal_Objects%2FFunction%2Fbind
+*/
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function (oThis) {
+    if (typeof this !== "function") {
+      // closest thing possible to the ECMAScript 5 internal IsCallable function
+      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
+    }
+
+    var aArgs = Array.prototype.slice.call(arguments, 1), 
+        fToBind = this, 
+        fNOP = function () {},
+        fBound = function () {
+          return fToBind.apply(this instanceof fNOP && oThis
+                                 ? this
+                                 : oThis,
+                               aArgs.concat(Array.prototype.slice.call(arguments)));
+        };
+
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+
+    return fBound;
+  };
+}
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/counter-mp4-audio-segments-http.js Added

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/counter-mp4-av-segments-http.js Added

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/counter-mp4-video-segments-http.js Added

@@ -0,0 +1,36 @@
+/* Array representing the different files to download per quality */
+var counterVideoHTTPSegments = 
+	[ 
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
+		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
+		  segmentPrefix: "mp4-main-multi-h264bl_low-",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 60
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
+		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
+		  segmentPrefix: "mp4-main-multi-h264bl_mid-",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 60
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
+		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
+		  segmentPrefix: "mp4-main-multi-h264bl_hd-",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 60
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-main-multi/",
+		  initName: "mp4-main-multi-mpd-V-BS_init.mp4",
+		  segmentPrefix: "mp4-main-multi-h264bl_full-",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 60
+		}
+	];

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/counter-mp4-video-segments-live-nobs-http.js Added

@@ -0,0 +1,36 @@
+/* Array representing the different files to download per quality */
+var counterLiveNoBSVideoHTTPSegments = 
+	[ 
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live/",
+		  initName: "mp4-live-h264bl_low-.mp4",
+		  segmentPrefix: "mp4-live-h264bl_low-",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 60
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live/",
+		  initName: "mp4-live-h264bl_mid-.mp4",
+		  segmentPrefix: "mp4-live-h264bl_mid-",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 60
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live/",
+		  initName: "mp4-live-h264bl_hd-.mp4",
+		  segmentPrefix: "mp4-live-h264bl_hd-",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 60
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/DASH_CONFORMANCE/TelecomParisTech/mp4-live/",
+		  initName: "mp4-live-h264bl_full-.mp4",
+		  segmentPrefix: "mp4-live-h264bl_full-",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 60
+		}
+	];

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/counter-mp4-video-segments-local.js Added

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/file.json Added

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/file.txt Added

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/file.xml Added

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/gpac-mse-spatial.js Added

@@ -0,0 +1,55 @@
+function displaySpatialSets() {
+	var v = document.getElementById('v_thumb');
+	var vx = parseFloat(v.getAttribute("x"));
+	var vy = parseFloat(v.getAttribute("y"));
+	var vw = parseFloat(v.getAttribute("width"));
+	var vh = parseFloat(v.getAttribute("height"));
+	var g = document.getElementById('g_thumb');
+	var r;
+	var as;
+	for (var spatialIndex in spatialInfo.sets) {
+		as = spatialInfo.sets[spatialIndex];
+		r = document.createElement('rect');
+		g.appendChild(r);
+		r.setAttribute("fill", "none");
+		r.setAttribute("stroke", "red");
+		r.setAttribute("pointer-events", "all");
+		r.setAttribute("onclick", "changeVideo("+spatialIndex+")");
+		r.setAttribute("stroke-width", 1);
+		r.setAttribute("x", vx+vw*(as.x/spatialInfo.global.w));
+		r.setAttribute("y", vy+vh*(as.y/spatialInfo.global.h));
+		r.setAttribute("width", vw*(as.w/spatialInfo.global.w));
+		r.setAttribute("height", vh*(as.h/spatialInfo.global.h));
+	}		
+}
+
+function changeVideo(index) {
+	alert("Request to change main video to spatial region #"+index);
+	p1.changeSegmentList(spatialInfo.sets[index].representations);
+}
+
+// var spatialInfo = {
+	// global: { x: 0, y: 0, w: 800, h: 600 },
+	// sets: [
+		// { x:   0, y:   0, w: 400, h: 300, representations: redBullVideoHTTPSegments },
+		// { x: 400, y:   0, w: 400, h: 300, representations: redBullVideoHTTPSegments },
+		// { x:   0, y: 300, w: 400, h: 300, representations: redBullVideoHTTPSegments },
+		// { x: 400, y: 300, w: 400, h: 150, representations: redBullVideoHTTPSegments },
+		// { x: 400, y: 450, w: 400, h: 150, representations: redBullVideoHTTPSegments },		
+	// ]
+// }
+var spatialInfo = myanmarSpatialRepresentations;
+
+var p1 = new Player('v_main', 'info_main', 'timer_anim', myanmarTile1VideoSegmentsLocal);
+var p2 = new Player('v_thumb', 'info_thumb', 'timer_anim', myanmarFullVideoSegmentsLocal);	
+
+function wheelHandler(evt) {
+	alert("Wheel event: "+ evt.wheelDelta);
+	(evt.wheelDelta > 0 ? p1.switchUp() : p1.switchDown());
+}
+document.documentElement.addEventListener("wheel", wheelHandler);
+p1.play();
+p2.play();
+
+displaySpatialSets();
+

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/gpac-mse.js Added

@@ -0,0 +1,358 @@
+'use strict';
+/*****************************************************************************************
+ *
+ * Example code using the Media Source Extension API with GPAC
+ *
+ *****************************************************************************************/
+alert("Media Source Script loaded");
+
+var DEBUG = true;
+var UPDATE_TEXT_INFO = true;
+
+function reportMessage(msg) {
+	if (DEBUG) {
+		alert(msg);
+	}
+}
+
+function createLabel(x, y, fill, textContent)
+{
+    var label = document.createElement("text");
+	label.setAttribute("x", x);
+	label.setAttribute("y", y);
+	label.setAttribute("fill", fill);
+	label.textContent = textContent;
+	return label;
+}
+
+function createBar(x, y, w, h, fill) {
+    var bar = document.createElement("rect");
+	bar.setAttribute("x", x);
+	bar.setAttribute("y", y);
+	bar.setAttribute("width", w);
+	bar.setAttribute("height", h);
+	bar.setAttribute("rx", h/2);
+	bar.setAttribute("ry", h/2);
+	bar.setAttribute("fill", fill);
+	return bar;
+}
+
+Player.prototype.createInfoStructure = function(id) {
+	this.info = {};
+	var width = 330;
+    var ta;
+	var g = document.getElementById(id);
+    ta = document.createElement("textArea");
+    ta.setAttribute("x", 100);
+    ta.setAttribute("y", -50);
+	ta.setAttribute("width", width);
+    g.appendChild(ta);
+	/* status info */
+    this.info.se = document.createElement("tspan");
+    ta.appendChild(this.info.se);
+    ta.appendChild(document.createElement("tbreak"));
+	/* Quality info */
+    this.info.qe = document.createElement("tspan");
+    ta.appendChild(this.info.qe);
+    ta.appendChild(document.createElement("tbreak"));
+	/* Document time info */
+    this.info.dte = document.createElement("tspan");
+    //ta.appendChild(this.info.dte);
+    //ta.appendChild(document.createElement("tbreak"));
+	/* Video time info */
+    this.info.vte = document.createElement("tspan");
+    //ta.appendChild(this.info.vte);
+    //ta.appendChild(document.createElement("tbreak"));
+	/* Buffer info */
+    this.info.be = document.createElement("tspan");
+    //ta.appendChild(this.info.be);
+    //ta.appendChild(document.createElement("tbreak"));
+	/* URL info */
+    this.info.ue = document.createElement("tspan");
+    ta.appendChild(this.info.ue);
+
+	this.ui = {};
+    this.ui.playbackRect = createBar(10, 5, width-10, 5, "black");
+	g.appendChild(this.ui.playbackRect);
+	
+    this.ui.bufferedRect = createBar(10, 5, 0, 5, "url(#backColor)");
+	g.appendChild(this.ui.bufferedRect);
+	this.ui.bufferedRect.max = width;
+	
+    this.ui.zeroLabel = createLabel(0, 10, "black", '0');
+	g.appendChild(this.ui.zeroLabel);
+	
+    this.ui.playLabel = createLabel(0, 20, "black", '');
+	g.appendChild(this.ui.playLabel);
+
+    this.ui.playBar = createBar(0, 5, 1, 5, "black");
+	g.appendChild(this.ui.playBar);
+	
+    this.ui.startLabel = createLabel(0, 0, "black", '');
+	g.appendChild(this.ui.startLabel);
+
+    this.ui.endLabel = createLabel(width+5, 10, "black", 'end');
+	g.appendChild(this.ui.endLabel);
+}
+
+Player.prototype.updateInfo = function() {
+	if (!UPDATE_TEXT_INFO) return;
+	var start = 0;
+	var end = 1;
+	var nowVideo = this.v.currentTime.toFixed(3);
+//    this.info.dte.textContent = "Document time:" + document.documentElement.getCurrentTime();
+//    this.info.vte.textContent = "Video time: " + nowVideo;
+	if (this.qualityChangeRequested) {
+		this.info.qe.textContent = "Quality : " + (this.qualityIndex - this.qualityChangeRequested) + "/"+(this.segmentFiles.length-1)+", requested: "+this.qualityIndex;
+	} else {
+		this.info.qe.textContent = "Quality : " + this.qualityIndex + "/"+(this.segmentFiles.length-1);
+	}
+    if (this.sb != null && this.sb.buffered.length > 0) {
+		start = this.sb.buffered.start(0).toFixed(3);
+		end = this.sb.buffered.end(0).toFixed(3);
+        //this.info.be.textContent = "Media Data Buffered: (" + start + "," + end + ")";
+    } else {
+        //this.info.be.textContent = "empty buffer";
+    }
+	this.ui.playLabel.textContent = nowVideo;
+	this.ui.playLabel.setAttribute("x", nowVideo/end*this.ui.bufferedRect.max);
+	this.ui.playBar.setAttribute("x", 10+nowVideo/end*this.ui.bufferedRect.max);
+	this.ui.startLabel.textContent = start;
+	this.ui.endLabel.textContent = end;
+	this.ui.startLabel.setAttribute("x", 10+start/end*this.ui.bufferedRect.max);
+	this.ui.bufferedRect.setAttribute("x", 10+start/end*this.ui.bufferedRect.max);
+	this.ui.bufferedRect.setAttribute("width", (end - start)/end*this.ui.bufferedRect.max-10);
+}
+
+Player.prototype.updateDownloadInfo = function(index, url, done) {
+	if (!UPDATE_TEXT_INFO) return;
+    this.info.ue.textContent = "Segment #" + index + " ..." + url.slice(-30);
+	this.info.se.textContent = "Download Status:"+ (done ?" done" : " in progress");
+}
+
+Player.prototype.toggleQuality = function() {
+    reportMessage("[video "+this.v.getAttribute("id")+"] Toggling quality");
+	var newQuality = (this.qualityIndex + 1) % this.segmentFiles.length;
+	this.qualityChangeRequested = (newQuality - this.qualityIndex);
+    this.qualityIndex = newQuality;
+    this.updateInfo();
+}
+
+Player.prototype.switchUp = function() {
+    reportMessage("[video "+this.v.getAttribute("id")+"] Switching quality up");
+	if (this.qualityIndex < this.segmentFiles.length - 1) {
+		this.qualityIndex++;
+		this.qualityChangeRequested++;
+	}
+    this.updateInfo();
+}
+
+Player.prototype.switchDown = function() {
+    reportMessage("[video "+this.v.getAttribute("id")+"] Switching quality down");
+	if (this.qualityIndex > 0) {
+		this.qualityIndex--;
+		this.qualityChangeRequested--;
+	}
+    this.updateInfo();
+}
+
+Player.prototype.getNextSegment = function () {
+    /* apply the limit (if any) to the number of segments to download */
+    if (this.maxSeg > 0 && this.fileIndex >= this.maxSeg && this.playing) return;
+
+	if (!this.qualityChangeRequested) {
+		/* we increment the segment index only when we need a media segment (not an init segment) */
+		this.fileIndex++;
+	} 
+
+    /* apply the segment reordering pattern (if any) */
+    if (this.appendOrder != null && this.fileIndex < this.appendOrder.length) {
+        this.fileIndexReordered = this.appendOrder[this.fileIndex];
+        reportMessage("[video "+this.v.getAttribute("id")+"] Changing file index from: " + this.fileIndex + "to : " + this.fileIndexReordered);
+    } else {
+        this.fileIndexReordered = this.fileIndex;
+        reportMessage("[video "+this.v.getAttribute("id")+"] Using file index: " + this.fileIndex);
+    }
+
+    /* determine the url to use */
+    if (this.qualityChangeRequested || this.fileIndexReordered < this.segmentFiles[this.qualityIndex].segStartIndex) {
+        /* Setting the url with the initialization segment */
+        this.url = this.segmentFiles[this.qualityIndex].baseURL + this.segmentFiles[this.qualityIndex].initName;
+    }
+    else if (this.fileIndexReordered >= this.segmentFiles[this.qualityIndex].segStartIndex 
+	         && this.fileIndexReordered < this.segmentFiles[this.qualityIndex].segEndIndex) {
+        /* Setting the url with a regular media segment */
+        this.url = this.segmentFiles[this.qualityIndex].baseURL 
+		         + this.segmentFiles[this.qualityIndex].segmentPrefix 
+				 + this.fileIndexReordered 
+				 + this.segmentFiles[this.qualityIndex].segmentSuffix;
+    }
+
+    reportMessage("[video "+this.v.getAttribute("id")+"] Downloading resource from url: " + this.url);
+    /* starting the download */
+    if (this.url) {
+        this.updateDownloadInfo(this.fileIndexReordered, this.url);
+        this.xhr.url = this.url;
+		this.xhr.qualityChangeRequested = this.qualityChangeRequested;
+        this.xhr.open("GET", this.url);
+        this.xhr.responseType = "arraybuffer";
+        this.xhr.onreadystatechange = onDone;
+        this.xhr.send();
+    }
+
+    this.updateInfo();
+}
+
+function onDone(e) {
+    if (this.readyState == 4/*this.DONE*/) {
+        this.player.updateDownloadInfo(this.player.fileIndexReordered, this.url, true);
+        var arraybuffer = this.response;
+        reportMessage("[video "+this.player.v.getAttribute("id")+"] Received ArrayBuffer (size: " + arraybuffer.byteLength + ")");
+        /* Appending the downloaded segment to the SourceBuffer */
+        if (this.player.sb) {
+            /* if there is a discontinuity in the file index, we need to inform the SourceBuffer */
+            if (this.player.prevFileIndex != 0 && this.player.fileIndexReordered != this.player.prevFileIndex + 1) {
+                this.player.sb.abort("continuation");
+				reportMessage("[video "+this.player.v.getAttribute("id")+"] Changing append mode");
+            }
+            this.player.prevFileIndex = this.player.fileIndexReordered;
+            /* we assume everything will be fine with this append */
+            this.player.sb.appendBuffer(arraybuffer);
+			reportMessage("[video "+this.player.v.getAttribute("id")+"] Appending Buffer ArrayBuffer (size: " + arraybuffer.byteLength + ")");
+        }
+        this.player.url = null;
+		if (this.qualityChangeRequested != 0) {
+			this.player.qualityChangeRequested = 0;
+		}		
+		if (!this.player.use_regulation) {
+            this.player.getNextSegment();
+        }
+    }
+}
+
+Player.prototype.onSourceOpen = function (event) {
+    reportMessage("[video "+this.v.getAttribute("id")+"] MediaSource opened");
+    var ms = event.target;
+
+    reportMessage("[video "+this.v.getAttribute("id")+"] Adding Source Buffer of type video/mp4 to the MediaSource");
+    ms.player.sb = ms.addSourceBuffer("video/mp4");
+	ms.player.sb.id = ms.sourceBuffers.length;
+    ms.player.getNextSegment();
+}
+
+Player.prototype.checkBufferLevel = function() {
+    /* don't download a new segment if:
+    - the SourceBuffer is not created
+    - there is already a download going on */
+	reportMessage("[video "+this.v.getAttribute("id")+"] Checking buffer level on SourceBuffer "+this.sb+" "+this.url);
+    if (this.sb != null && this.url == null) {
+        if (this.sb.buffered.length > 0) {
+			if (this.v.currentTime >= this.sb.buffered.end(0)) {
+				this.pause();
+			} else {
+				reportMessage("[video "+this.v.getAttribute("id")+"] Video time "+this.v.currentTime + ", Source Buffer #"+this.sb.id+" buffered data range: (" + this.sb.buffered.start(0) + "," + this.sb.buffered.end(0) + ")");
+				if (this.sb.updating == false && this.sb.buffered.end(0) - this.v.currentTime < this.TIME_THRESOLD) {
+					reportMessage("[video "+this.v.getAttribute("id")+"] buffered attribute has not enough data, downloading new segment");
+					this.getNextSegment();
+				}
+			}
+        }
+        else {
+            if (!this.sb.updating) {
+                reportMessage("[video "+this.v.getAttribute("id")+"] buffered attribute has no data, downloading new segment");
+                this.getNextSegment();
+            } else {
+                reportMessage("[video "+this.v.getAttribute("id")+"] Source Buffer still updating");
+			}
+        }
+    }
+}
+
+/* Function called repeatedly to monitor the playback time versus download time difference 
+and to trigger a new download if needed */
+Player.prototype.repeatFunc = function() {
+	if (!this.playing) return;
+    this.updateInfo();
+	this.checkBufferLevel();
+}
+
+Player.prototype.play = function() {
+  reportMessage("[video "+this.v.getAttribute("id")+"] Starting video playback");
+  this.playing = true;
+  this.v.play();
+}
+
+Player.prototype.pause = function() {
+  reportMessage("[video "+this.v.getAttribute("id")+"] Pausing video playback");
+  this.playing = false;
+  this.v.pause();
+}
+
+Player.prototype.changeSegmentList = function(newSegments) {
+  this.segmentFiles = newSegments;
+  this.qualityChangeRequested++;
+}
+
+/* 
+   vId: id of the video element
+   iId: id of a group where debug info will be displayed 
+   aId: id of a animation used to refresh downloads
+*/
+function Player(vId, iId, aId, segmentFiles, segmentOrder) {
+	reportMessage("[video "+vId+"] Creating Player");
+	/* Boolean to define the download policy: 
+		- depending on the buffer occupancy (true) (see TIME_THRESOLD below), 
+		- as fast as possible (false) */
+	this.use_regulation = true;
+	/* difference in seconds between the latest media time downloaded and the media time being played, 
+	used to trigger a new download when the regulation mode is on */
+	this.TIME_THRESOLD = 2;
+	/* Current file being downloaded */
+	this.fileIndex = -1;
+	/* URL of the segment being downloaded */
+	this.url = null;
+	/* Current quality being downloaded */
+	this.qualityIndex = 0;
+	this.qualityChangeRequested = 0;
+	/* using 1 XHR for all downloads */
+	this.xhr = new XMLHttpRequest();
+	this.xhr.player = this;
+	/* The source buffer used by the player (only one at the moment) */
+	this.sb = null;
+	/* maximum number of segments to download */
+	this.maxSeg = Infinity;
+	this.playing = false;
+	/* Array representing the download order of each segments (for out-of-order append), 
+	  segments not listed are downloaded in the right order */
+	this.appendOrder = segmentOrder; 
+	this.fileIndexReordered = 0;
+	this.prevFileIndex =  0;
+	/* references to objects used to display information regarding this player */
+	this.info = null;
+
+	this.segmentFiles = segmentFiles;
+	
+    if (this.use_regulation) {
+        /* GPAC workaround: adding the event listener on the repeatEvent of a dummy animation to simulate window.setInterval */
+		var animation = document.getElementById(aId);
+        animation.addEventListener("repeatEvent", this.repeatFunc.bind(this));
+        reportMessage("[video "+vId+"] Using buffer regulation to download segments ");
+    } else {
+        reportMessage("[video "+vId+"] Not using any regulation - downloading segments as fast as possible");
+    }
+
+    this.createInfoStructure(iId);
+
+    reportMessage("[video "+vId+"] Creating new MediaSource");
+    this.ms = new MediaSource();
+	this.ms.player = this;
+
+    var bloburl = URL.createObjectURL(this.ms);
+    reportMessage("[video "+vId+"] Attaching Media Source " + bloburl + " to video element");
+
+    this.v = document.getElementById(vId);
+    this.ms.addEventListener("sourceopen", this.onSourceOpen.bind(this));
+    this.v.src = bloburl;
+
+	return this;
+}

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/implementation_notes.txt -> gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/implementation_notes.txt Changed

@@ -1,36 +1,36 @@
-Media Source Extension Remarks:
-- changed appending to updating (and related events)
-- Needs to know if a segment is a media segment or an initialization segment in advance
-- asynchronous parsing of the media segments
-- needs a parsing before playback
-- segment manipulation as a playback/playlist controller: entirely in JS (seamless ???)
-- implement MSE on top of DASH ?
-
-TODO:
- - out-of-order append
- - out-of-order erroneous append (media segment before init segment)
- - check updating status: append before updating is back to 0 (too many downloads at the same time)
- - muxed audio/video in one sourcebuffer
- - multiple sourcebuffers
- - MPEG-2 TS
- - timestampOffset
- - multiple audio
- - multiple video
- - text tracks
- - append with complete overlap
- - append with start overlap
- - append with end overlap
- - append with middle overlap
- - append with network error
- - append with decode error
- - removeSourceBuffer
- - endOfStream
- - appendStream
- - memory leaks (finalize JS objects)
- - appending multiple media fragments 
- - SVC ?
- - HEVC ?
- - EventTarget
- - GetSLP return Buffer too small & ch_buffer_off / ch_buffer_on
- - Continuity in merge process
+Media Source Extension Remarks:
+- changed appending to updating (and related events)
+- Needs to know if a segment is a media segment or an initialization segment in advance
+- asynchronous parsing of the media segments
+- needs a parsing before playback
+- segment manipulation as a playback/playlist controller: entirely in JS (seamless ???)
+- implement MSE on top of DASH ?
+
+TODO:
+ - out-of-order append
+ - out-of-order erroneous append (media segment before init segment)
+ - check updating status: append before updating is back to 0 (too many downloads at the same time)
+ - muxed audio/video in one sourcebuffer
+ - multiple sourcebuffers
+ - MPEG-2 TS
+ - timestampOffset
+ - multiple audio
+ - multiple video
+ - text tracks
+ - append with complete overlap
+ - append with start overlap
+ - append with end overlap
+ - append with middle overlap
+ - append with network error
+ - append with decode error
+ - removeSourceBuffer
+ - endOfStream
+ - appendStream
+ - memory leaks (finalize JS objects)
+ - appending multiple media fragments 
+ - SVC ?
+ - HEVC ?
+ - EventTarget
+ - GetSLP return Buffer too small & ch_buffer_off / ch_buffer_on
+ - Continuity in merge process
  - detect/react when first append is not an init segment.
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/mediaevents.js Added

@@ -0,0 +1,348 @@
+/* code retrieved and adapted from http://www.w3.org/2010/05/video/mediaevents.html */
+var svgNS = "http://www.w3.org/2000/svg";
+
+var interaction_buttons = [ 
+	{ text: "load()", action: load },
+	{ text: "play()", action: function() { document._video.play(); } },
+	{ text: "pause()", action: function() { document._video.pause(); } },
+	{ text: "currentTime+=10", action: function() { document._video.currentTime+=10; } },
+	{ text: "currentTime-=10", action: function() { document._video.currentTime-=10; } },
+	{ text: "playbackRate++", action: function() { document._video.playbackRate++; } },
+	{ text: "playbackRate--", action: function() { document._video.playbackRate--; } },
+	{ text: "playbackRate+=0.1", action: function() { document._video.playbackRate+=0.1; } },
+	{ text: "playbackRate-=0.1", action: function() { document._video.playbackRate-=0.1; } },
+	{ text: "volume+=0.1", action: function() { document._video.volume+=0.1; } },
+	{ text: "volume-=0.1", action: function() { document._video.volume-=0.1; } },
+	{ text: "muted=true", action: function() { document._video.muted=true; } },
+	{ text: "muted=false", action: function() { document._video.muted=false; } },
+	{ text: "Update", action: function() { update_properties(); } },
+	{ text: "Add Listeners", action: function() { init_events(); } },
+	{ text: "Remove Listeners", action: function() { remove_events(); } }
+];
+
+var movie_buttons = [ 
+	{ text: "Sintel Teaser", action: function() { switchVideo(0); } },
+	{ text: "Bunny trailer", action: function() { switchVideo(1); } },
+	{ text: "Bunny movie", action: function() { switchVideo(2); } },
+	{ text: "Test movie", action: function() { switchVideo(3); } },
+	{ text: "Local movie", action: function() { switchVideo(4); } }
+];
+
+var media_events = new Array();
+media_events["loadstart"] = 0;
+media_events["progress"] = 0;
+media_events["suspend"] = 0;
+media_events["abort"] = 0;
+media_events["error"] = 0;
+media_events["emptied"] = 0;
+media_events["stalled"] = 0;
+media_events["loadedmetadata"] = 0;
+media_events["loadeddata"] = 0;
+media_events["canplay"] = 0;
+media_events["canplaythrough"] = 0;
+media_events["playing"] = 0;
+media_events["waiting"] = 0;
+media_events["seeking"] = 0;
+media_events["seeked"] = 0;
+media_events["ended"] = 0;
+media_events["durationchange"] = 0;
+media_events["timeupdate"] = 0;
+media_events["play"] = 0;
+media_events["pause"] = 0;
+media_events["ratechange"] = 0;
+media_events["volumechange"] = 0;
+
+var media_controller_events = new Array();
+
+// was extracted from the spec in January 2013
+media_controller_events["emptied"] = 0;
+media_controller_events["loadedmetadata"] = 0;
+media_controller_events["loadeddata"] = 0;
+media_controller_events["canplay"] = 0;
+media_controller_events["canplaythrough"] = 0;
+media_controller_events["playing"] = 0;
+media_controller_events["ended"] = 0;
+media_controller_events["waiting"] = 0;
+media_controller_events["ended"] = 0;
+media_controller_events["durationchange"] = 0;
+media_controller_events["timeupdate"] = 0;
+media_controller_events["play"] = 0;
+media_controller_events["pause"] = 0;
+media_controller_events["ratechange"] = 0;
+media_controller_events["volumechange"] = 0;
+
+// was extracted from the spec in January 2013
+var media_properties = [ "error", "src", "currentSrc", "crossOrigin", "networkState", "preload", "buffered", "readyState", "seeking", "currentTime", "duration", "startDate", "paused", "defaultPlaybackRate", "playbackRate", "played", "seekable", "ended", "autoplay", "loop", "mediaGroup", "controller", "controls", "volume", "muted", "defaultMuted", "audioTracks", "videoTracks", "textTracks", "width", "height", "videoWidth", "videoHeight", "poster" ];
+
+var media_properties_elts = new Array();
+
+function init() {
+    document._video = document.getElementById("video");
+
+	createInteractionButtons();
+	createMovieButtons();
+	createEventTable();
+	createMediaProperties();
+
+    init_properties();
+}
+
+function createButtons(buttons, offset) {
+	var buttonsG = document.getElementById("buttons");
+	for (var i = 0; i < buttons.length; i++) {
+	   var g = document.createElementNS(svgNS, "g");
+	   g.setAttributeNS(svgNS, "transform", "translate(0, "+(offset+i*21)+")");
+	   buttonsG.appendChild(g);
+	
+	   var rect = document.createElementNS(svgNS, "rect");
+	   rect.setAttributeNS(svgNS, "width", "120");
+	   rect.setAttributeNS(svgNS, "height", "20");
+	   rect.setAttributeNS(svgNS, "fill", "lightgrey");
+	   rect.addEventListener("click", buttons[i].action, false);
+	   g.appendChild(rect);
+
+	   var text = document.createElementNS(svgNS, "text");
+	   text.setAttributeNS(svgNS, "x", "60");
+	   text.setAttributeNS(svgNS, "y", "15");
+	   text.setAttributeNS(svgNS, "text-align", "middle");
+	   text.setAttributeNS(svgNS, "text-anchor", "middle");
+	   text.textContent = buttons[i].text;
+	   g.appendChild(text);
+	}
+}
+
+function createInteractionButtons() {
+	createButtons(interaction_buttons, 0);
+}
+
+function createMovieButtons() {
+	createButtons(movie_buttons, 500);
+}
+
+function createMediaProperties() {
+	var propertiesG = document.getElementById("properties_table");
+	var title = document.createElementNS(svgNS, "text");
+	title.setAttributeNS(svgNS, "font-weight", "bold");
+	title.textContent = "Media Properties";
+	propertiesG.appendChild(title);
+	for (var i = 0; i < media_properties.length; i++) {
+	   var g = document.createElementNS(svgNS, "g");
+	   g.setAttributeNS(svgNS, "transform", "translate(0, "+((i+1)*21-10)+")");
+	   propertiesG.appendChild(g);
+	
+	   var rect = document.createElementNS(svgNS, "rect");
+	   rect.setAttributeNS(svgNS, "width", "120");
+	   rect.setAttributeNS(svgNS, "height", "20");
+	   rect.setAttributeNS(svgNS, "fill", "lightgrey");
+	   g.appendChild(rect);
+
+	   var label = document.createElementNS(svgNS, "text");
+	   label.setAttributeNS(svgNS, "x", "60");
+	   label.setAttributeNS(svgNS, "y", "15");
+	   label.setAttributeNS(svgNS, "text-align", "middle");
+	   label.setAttributeNS(svgNS, "text-anchor", "middle");
+	   label.textContent = media_properties[i];
+	   g.appendChild(label);
+	   
+	   var text = document.createElementNS(svgNS, "text");
+	   text.setAttributeNS(svgNS, "x", "130");
+	   text.setAttributeNS(svgNS, "y", "15");
+	   text.textContent = "?";
+	   g.appendChild(text);
+	   media_properties_elts[i] = text;
+	}
+}
+
+function createEventTableRow(event_name, yOffset) {
+	var table = document.getElementById("event_table");
+	var length = table.childNodes.length;
+
+	var row = document.createElementNS(svgNS, "g");
+	row.setAttributeNS(svgNS, "transform", "translate(0,"+(yOffset+length*21)+")");
+	table.appendChild(row);
+
+	var rect = document.createElementNS(svgNS, "rect");
+	rect.setAttributeNS(svgNS, "width", "120");
+	rect.setAttributeNS(svgNS, "height", "20");
+	rect.setAttributeNS(svgNS, "fill", "lightgrey");
+	row.appendChild(rect);
+
+	var label = document.createElementNS(svgNS, "text");
+	label.setAttributeNS(svgNS, "x", "60");
+	label.setAttributeNS(svgNS, "y", "15");
+	label.setAttributeNS(svgNS, "text-align", "middle");
+	label.setAttributeNS(svgNS, "text-anchor", "middle");
+	label.textContent = event_name;
+	row.appendChild(label);
+
+	var status = document.createElementNS(svgNS, "text");
+	status.setAttributeNS(svgNS, "x", "130");
+	status.setAttributeNS(svgNS, "y", "15");
+	status.textContent = "no event yet";
+	status.setAttributeNS(svgNS, "id", "e_"+event_name);
+	row.appendChild(status);
+}
+
+function createEventTable() {
+	var table = document.getElementById("event_table");
+	var title = document.createElementNS(svgNS, "text");
+	title.setAttributeNS(svgNS, "transform", "translate(0,0)");
+	title.setAttributeNS(svgNS, "font-weight", "bold");
+	title.textContent = "Media Events";
+	table.appendChild(title);
+	for (key in media_events) {	
+		createEventTableRow(key, -10);
+	}
+}
+
+function init_events() {
+    for (key in media_events) {	
+		document._video.addEventListener(key, capture, false);
+		alert("Added event '"+key+"' to the video element");
+    }
+}
+
+function remove_events() {
+    for (key in media_events) {	
+		document._video.removeEventListener(key, capture, false);
+		alert("Removed event '"+key+"' to the video element");
+    }
+}
+
+function init_properties() {
+	update_properties();
+}
+
+function pad(n, width, z) {
+	z = z || '0';
+	n = n + '';
+	return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n;
+}
+
+function time() {
+	var d = new Date();
+	var t = (pad(d.getHours(), 2)+':'+pad(d.getMinutes(), 2)+':'+pad(d.getSeconds(),2)+'.'+pad(d.getMilliseconds(), 3))
+	return t;
+}
+
+function readyStateString(i) {
+	switch (i) {
+		case 0: return "HAVE_NOTHING";
+		case 1: return "HAVE_METADATA";
+		case 2: return "HAVE_CURRENT_DATA";
+		case 3: return "HAVE_FUTURE_DATA";
+		case 4: return "HAVE_ENOUGH_DATA";
+		default: return "PROBLEM";
+	}
+}
+
+function networkStateString(i) {
+	switch (i) {
+		case 0: return "NETWORK_EMPTY";
+		case 1: return "NETWORK_IDLE";
+		case 2: return "NETWORK_LOADING";
+		case 3: return "NETWORK_NO_SOURCE";
+		default: return "PROBLEM";
+	}
+}
+
+function reportVideoStates() {
+	alert("Time "+time()+" networkState: "+networkStateString(document._video.networkState)+" readyState: "+readyStateString(document._video.readyState));
+}
+
+function capture(event) {
+	alert("Time "+time()+" event "+event.type);
+	reportVideoStates();
+    media_events[event.type] ++;
+    for (key in media_events) {	
+		var e = document.getElementById("e_" + key);
+		if (e) {
+			e.textContent = ""+media_events[key];
+			//if (media_events[key] > 0) e.className = "true";
+		}
+    }
+    update_properties();
+}
+
+function update_properties() {
+    var i = 0;
+	var j;
+    for (key in media_properties) {
+		var prop = document._video[media_properties[key]];
+		var val = prop;
+		if (prop == "[object TimeRanges]") {
+			val = "TimeRanges - length:"+prop.length;
+			for (j = 0; j < prop.length; j++) {
+			 val += ",("+prop.start(j)+";"+prop.end(j)+")";
+			}
+		}
+		if (prop == "[object VideoTrackList]") {
+			val = "VideoTrackList - length:"+prop.length;
+		}
+		if (prop == "[object AudioTrackList]") {
+			val = "AudioTrackList - length:"+prop.length;
+		}
+		if (prop == "[object TextTrackList]") {
+			val = "TextTrackList - length:"+prop.length;
+		}
+		media_properties_elts[i++].textContent = ""+val;
+    }
+    if (!!document._video.audioTracks) {
+		var td = document.getElementById("m_audiotracks");
+		td.textContent = ""+document._video.audioTracks.length;
+    }
+    if (!!document._video.videoTracks) {
+		var td = document.getElementById("m_videotracks");
+		td.textContent = ""+document._video.audioTracks.length;
+    }
+    if (!!document._video.textTracks) {
+		var td = document.getElementById("m_texttracks");
+		td.textContent = ""+document._video.audioTracks.length;
+    }
+}
+
+var videos = new Array();
+
+videos[0] = [
+	     "http://media.w3.org/2010/05/sintel/poster.png",
+	     "http://media.w3.org/2010/05/sintel/trailer.mp4",
+	     "http://media.w3.org/2010/05/sintel/trailer.ogv",
+	     "http://media.w3.org/2010/05/sintel/trailer.webm"
+	     ];
+videos[1] = [
+	     "http://media.w3.org/2010/05/bunny/poster.png",
+	     "http://media.w3.org/2010/05/bunny/trailer.mp4",
+	     "http://media.w3.org/2010/05/bunny/trailer.ogv"
+	     ];
+videos[2] = [
+	     "http://media.w3.org/2010/05/bunny/poster.png",
+	     "http://media.w3.org/2010/05/bunny/movie.mp4",
+	     "http://media.w3.org/2010/05/bunny/movie.ogv"
+	     ];
+videos[3] = [
+	     "http://media.w3.org/2010/05/video/poster.png",
+	     "http://media.w3.org/2010/05/video/movie_300.mp4",
+	     "http://media.w3.org/2010/05/video/movie_300.ogv",
+	     "http://media.w3.org/2010/05/video/movie_300.webm"
+	     ];
+videos[4] = [
+	     "http://media.w3.org/2010/05/bunny/poster.png",
+	     "http://127.0.0.1:8020/file.mp4",
+	     ];
+
+function switchVideo(n) {
+	reportVideoStates();
+	alert("Time "+time()+" switching video to "+videos[n][1]);
+
+    if (n >= videos.length) n = 0;
+
+    document._video.src = videos[n][1];
+}
+
+function load() {
+    document._video.load();
+	reportVideoStates();
+}
+
+init();
+//document.addEventListener("DOMContentLoaded", init, false);
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/mediaevents.svg Added

@@ -0,0 +1,29 @@
+
+<svg width="800" height="800" viewBox="0 0 800 800" 
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	 
+	
+    <g id="buttons" transform="translate(10,10)">
+    </g>
+	
+	<g id="properties_table" transform="translate(400, 20)">
+	</g>
+
+	<g transform="translate(160,0)">
+		<video id="video" controls="" preload="none" poster="http://media.w3.org/2010/05/sintel/poster.png" 
+		       width="200" height="200"/>
+	</g>
+	
+	<g id="tracksTable" transform="translate(160, 200)" onclick="alert('clicked');">
+		<text font-weight="bold">Number of tracks</text>
+		<text x="0" y="20" >Audio</text><text id="m_audiotracks" x="130" y="20">?</text>
+		<text x="0" y="40" >Video</text><text id="m_videotracks" x="130" y="40">?</text>
+		<text x="0" y="60" >Text </text><text id="m_texttracks"  x="130" y="60">?</text>
+		<text x="0" y="80" >Other</text><text id="m_othertracks" x="130" y="80">?</text>
+	</g>
+
+	<g id="event_table" transform="translate(160, 300)">
+	</g>
+
+	<script xlink:href="mediaevents.js"/>
+</svg>

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/mse.svg Added

@@ -0,0 +1,58 @@
+<svg width="800" height="800" viewBox="0 0 400 400" 
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 >
+
+  <defs>
+    <solidColor id="backColor" solid-color="blue"/>
+  </defs>
+  
+  
+
+  <g id="up_button" transform="translate(10,10)" onclick="p1.switchUp()">
+	  <rect id="r" fill="url(#backColor)" width="40" height="40" rx="5"/>
+	  <textArea text-align="center" width="40" height="40" font-size="30" font-weight="bold">+</textArea>
+  </g>
+  
+  <g id="up_button" transform="translate(60,10)" onclick="p1.switchDown()">
+	  <rect id="r" fill="url(#backColor)" width="40" height="40" rx="5"/>
+	  <textArea text-align="center" width="40" height="40" font-size="30" font-weight="bold">-</textArea>
+  </g>
+
+  
+  <g id="info_main"  transform="translate( 10, 60)"/>
+ 
+  <g transform="translate(10, 60)">
+    <video id="v_main"  x="0"   width="380" height="400"/>
+  </g>
+ 
+ 
+  <g>
+    <animate id="timer_anim" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
+  </g>	 
+	 
+  <script type="application/ecmascript" xlink:href="bind.js"/>
+  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-http.js"/>
+  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-local.js"/>
+  <script type="application/ecmascript" xlink:href="counter-mp4-audio-segments-http.js"/>
+  <script type="application/ecmascript" xlink:href="counter-mp4-av-segments-http.js"/>
+  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-live-nobs-http.js"/>
+  <script type="application/ecmascript" xlink:href="redbull-mp4-video-segments-http.js"/>  
+  <script type="application/ecmascript" xlink:href="redbull-mp4-audio-segments-http.js"/>  
+  <script type="application/ecmascript" xlink:href="myanmar-tiles.js"/>  
+  <script type="application/ecmascript" xlink:href="gpac-mse.js"/>
+  
+  <script type="application/ecmascript">
+    /* choose one of the segment source: 
+	    - counterAudioHTTPSegments, 
+		- counterAudioVideoHTTPSegments, 
+		- counterVideoHTTPSegments ,
+		- counterLiveNoBSVideoHTTPSegments,
+		- redBullAudioHTTPSegments
+		- or redBullVideoHTTPSegments */
+	var p1 = new Player('v_main', 'info_main', 'timer_anim', myanmarTile1VideoSegmentsLocal); 
+	p1.play();
+  </script>
+</svg>

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/myanmar-tiles.js Added

@@ -0,0 +1,135 @@
+/* Array representing the different files to download per quality */
+var myanmarFullVideoSegmentsLocal = 
+	[ 
+		{ 
+		  baseURL: "dash/full/",
+		  initName: "myanmar_360_60s_dashinit.mp4",
+		  segmentPrefix: "myanmar_360_60s_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 17
+		}
+	];
+
+var myanmarTile1VideoSegmentsLocal = 
+	[ 
+		{ 
+		  baseURL: "dash/t1/",
+		  initName: "myanmar_360_t1_dashinit.mp4",
+		  segmentPrefix: "myanmar_360_t1_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		},
+		{ 
+		  baseURL: "dash/t1/",
+		  initName: "myanmar_720_t1_dashinit.mp4",
+		  segmentPrefix: "myanmar_720_t1_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		},
+		{ 
+		  baseURL: "dash/t1/",
+		  initName: "myanmar_1080_t1_dashinit.mp4",
+		  segmentPrefix: "myanmar_1080_t1_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		}
+	];
+
+var myanmarTile2VideoSegmentsLocal = 
+	[ 
+		{ 
+		  baseURL: "dash/t2/",
+		  initName: "myanmar_360_t2_dashinit.mp4",
+		  segmentPrefix: "myanmar_360_t2_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		},
+		{ 
+		  baseURL: "dash/t2/",
+		  initName: "myanmar_720_t2_dashinit.mp4",
+		  segmentPrefix: "myanmar_720_t2_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		},
+		{ 
+		  baseURL: "dash/t2/",
+		  initName: "myanmar_1080_t2_dashinit.mp4",
+		  segmentPrefix: "myanmar_1080_t2_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		}
+	];
+
+var myanmarTile3VideoSegmentsLocal = 
+	[ 
+		{ 
+		  baseURL: "dash/t3/",
+		  initName: "myanmar_360_t3_dashinit.mp4",
+		  segmentPrefix: "myanmar_360_t3_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		},
+		{ 
+		  baseURL: "dash/t3/",
+		  initName: "myanmar_720_t3_dashinit.mp4",
+		  segmentPrefix: "myanmar_720_t3_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		},
+		{ 
+		  baseURL: "dash/t3/",
+		  initName: "myanmar_1080_t3_dashinit.mp4",
+		  segmentPrefix: "myanmar_1080_t3_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		}
+	];
+
+var myanmarTile4VideoSegmentsLocal = 
+	[ 
+		{ 
+		  baseURL: "dash/t4/",
+		  initName: "myanmar_360_t4_dashinit.mp4",
+		  segmentPrefix: "myanmar_360_t4_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		},
+		{ 
+		  baseURL: "dash/t4/",
+		  initName: "myanmar_720_t4_dashinit.mp4",
+		  segmentPrefix: "myanmar_720_t4_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		},
+		{ 
+		  baseURL: "dash/t4/",
+		  initName: "myanmar_1080_t4_dashinit.mp4",
+		  segmentPrefix: "myanmar_1080_t4_dash",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 1,
+		  segEndIndex: 39
+		}
+	];
+	
+var myanmarSpatialRepresentations = {
+	global: { x: 0, y: 0, w: 1280, h: 720 },
+	sets: [
+		{ x:   0, y:   0, w: 640, h: 360, representations: myanmarTile1VideoSegmentsLocal },
+		{ x: 640, y:   0, w: 640, h: 360, representations: myanmarTile2VideoSegmentsLocal },
+		{ x:   0, y: 360, w: 640, h: 360, representations: myanmarTile3VideoSegmentsLocal },
+		{ x: 640, y: 360, w: 640, h: 360, representations: myanmarTile4VideoSegmentsLocal }
+	]
+}
+

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/nodejs-byte-server.js Added

@@ -0,0 +1,71 @@
+var fs = require('fs')
+var http = require('http')
+var url_parser = require('url');
+
+var BUFFER_LENGTH = 2;
+var paused = true;
+var pausedAfterSend = false;
+
+function sendBytes(file) {
+	var length = BUFFER_LENGTH;
+	var buffer = new Buffer(length);
+	var offset = 0;
+	var bytesRead;
+
+	if (!paused) {
+		bytesRead = fs.readSync(file.fd, buffer, offset, length, file.position);
+		file.position += bytesRead;
+		
+		if (bytesRead == 0) {
+			file.res.end();
+			clearInterval(file.id);
+			console.log("Ending request "+file.position+"/"+file.size);
+		} else {
+			console.log("Sending byte "+file.position+"/"+file.size);
+			file.res.write(buffer);
+			if (pausedAfterSend) paused = true;
+		}
+	}
+}
+
+var app = function(req,res)
+{
+	console.log("Received request for file "+req.url);
+	var parsed_url = url_parser.parse(req.url, true);
+	var filename = '.'+parsed_url.pathname;
+	if (fs.existsSync(filename)) {	
+		var head = {};
+		var file = {};
+		file.position = 0;
+		file.fd = fs.openSync(filename, 'r');
+		file.res = res;
+		file.size = fs.statSync(filename).size;
+		if (filename.slice(-3) === "mp4") {
+			head['Content-Type'] = 'video/mp4';
+		}
+		head['Content-Length'] = file.size;
+		res.writeHead(200, head);
+		file.id = setInterval(sendBytes, 300, file);
+	}
+}
+
+http.createServer(app).listen(8020,"127.0.0.1")
+
+process.stdin.on('data', function(chunk) {
+	if (chunk.toString() == "b\r\n") {
+		BUFFER_LENGTH = 2;
+		console.log("New buffer size "+BUFFER_LENGTH);
+	} else if (chunk.toString() == "k\r\n") {
+		BUFFER_LENGTH = 1000;	
+		console.log("New buffer size "+BUFFER_LENGTH);
+	} else if (chunk.toString() == "M\r\n") {
+		BUFFER_LENGTH = 1000000;	
+		console.log("New buffer size "+BUFFER_LENGTH);
+	} else if (chunk.toString() == "p\r\n") {
+		paused = !paused;	
+	} else if (chunk.toString() == "P\r\n") {
+		pausedAfterSend = !pausedAfterSend;	
+	} else if (chunk.toString() == "q\r\n") {
+		process.exit();
+	}
+});
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/redbull-mp4-audio-segments-http.js Added

@@ -0,0 +1,36 @@
+/* Array representing the different files to download per quality */
+var redBullAudioHTTPSegments = 
+	[ 
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/audio/redbull_audio_10s/",
+		  initName: "redbull_audio_10sec_init.mp4",
+		  segmentPrefix: "64kbps/redbull_audio_64kbps_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/audio/redbull_audio_10s/",
+		  initName: "redbull_audio_10sec_init.mp4",
+		  segmentPrefix: "96kbps/redbull_audio_96kbps_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/audio/redbull_audio_10s/",
+		  initName: "redbull_audio_10sec_init.mp4",
+		  segmentPrefix: "128kbps/redbull_audio_128kbps_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/audio/redbull_audio_10s/",
+		  initName: "redbull_audio_10sec_init.mp4",
+		  segmentPrefix: "165kbps/redbull_audio_165kbps_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		}
+	];

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/redbull-mp4-video-segments-http.js Added

@@ -0,0 +1,140 @@
+/* Array representing the different files to download per quality */
+var redBullVideoHTTPSegments = 
+	[ 
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/100kbps/",
+		  initName: "redbull_240p_100kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_240p_100kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/150kbps/",
+		  initName: "redbull_240p_150kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_240p_150kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/200kbps/",
+		  initName: "redbull_360p_200kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_360p_200kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/250kbps/",
+		  initName: "redbull_360p_250kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_360p_250kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/300kbps/",
+		  initName: "redbull_360p_300kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_360p_300kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/400kbps/",
+		  initName: "redbull_360p_400kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_360p_400kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/500kbps/",
+		  initName: "redbull_10sec_set2_init.mp4",
+		  segmentPrefix: "redbull_480p_500kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/700kbps/",
+		  initName: "redbull_10sec_set2_init.mp4",
+		  segmentPrefix: "redbull_480p_700kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/900kbps/",
+		  initName: "redbull_10sec_set2_init.mp4",
+		  segmentPrefix: "redbull_480p_900kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/1200kbps/",
+		  initName: "redbull_10sec_set2_init.mp4",
+		  segmentPrefix: "redbull_480p_1200kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/1500kbps/",
+		  initName: "redbull_720p_1500kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_720p_1500kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/2000kbps/",
+		  initName: "redbull_720p_2000kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_720p_2000kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/2500kbps/",
+		  initName: "redbull_720p_2500kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_720p_2500kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/3000kbps/",
+		  initName: "redbull_1080p_3000kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_1080p_3000kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/4000kbps/",
+		  initName: "redbull_1080p_4000kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_1080p_4000kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/5000kbps/",
+		  initName: "redbull_1080p_5000kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_1080p_5000kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		},
+		{ 
+		  baseURL: "http://download.tsi.telecom-paristech.fr/gpac/dataset/dash/mmsys13/video/redbull_10sec/6000kbps/",
+		  initName: "redbull_1080p_6000kbps_10sec_segmentinit.mp4",
+		  segmentPrefix: "redbull_1080p_6000kbps_10sec_segment",
+		  segmentSuffix: ".m4s",
+		  segStartIndex: 2,
+		  segEndIndex: 525
+		}
+	];

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/spatial-mse.svg Added

@@ -0,0 +1,28 @@
+<svg width="800" height="800" viewBox="0 0 800 450" 
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+  <defs>
+    <solidColor id="backColor" solid-color="blue"/>
+  </defs>
+
+  
+  <g id="info_main"  transform="translate( 10, 60)"/>
+  <g id="info_thumb" transform="translate(410, 60)"/>
+
+  <g id="g_thumb">
+    <video id="v_main"  x="0"   y="160" width="380" height="180"/>
+    <video id="v_thumb" x="410" y="160" width="160" height="120"/>
+  </g>
+
+	
+  <g>
+    <animate id="timer_anim" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
+  </g>	 
+	 
+  <script type="application/ecmascript" xlink:href="bind.js"/>
+  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-http.js"/>
+  <script type="application/ecmascript" xlink:href="redbull-mp4-video-segments-http.js"/>
+  <script type="application/ecmascript" xlink:href="myanmar-tiles.js"/>
+  <script type="application/ecmascript" xlink:href="gpac-mse.js"/>
+  <script type="application/ecmascript" xlink:href="gpac-mse-spatial.js"/>
+</svg>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/two-videos.svg Added

@@ -0,0 +1,33 @@
+<svg width="800" height="800" viewBox="0 0 800 600" 
+     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 onwheel="(evt.wheelDelta > 0 ? p1.switchUp() : p1.switchDown());">
+
+  <defs>
+    <solidColor id="backColor" solid-color="blue"/>
+  </defs>
+
+  
+  <g id="info_main"  transform="translate( 10, 60)"/>
+  <g id="info_thumb" transform="translate(410, 60)"/>
+
+  <g transform="translate(0, 160)">
+    <video id="v_main"  x="0"   width="380" height="400"/>
+    <video id="v_thumb" x="410" width="380" height="400"/>
+  </g>
+  
+  <g>
+    <animate id="timer_anim" begin="0" dur="0.1" repeatCount="indefinite" attributeName="visibilty" from="visible" to="hidden" />
+  </g>	 
+	 
+  <script type="application/ecmascript" xlink:href="bind.js"/>
+  <script type="application/ecmascript" xlink:href="counter-mp4-video-segments-http.js"/>
+  <script type="application/ecmascript" xlink:href="redbull-mp4-video-segments-http.js"/>
+  <script type="application/ecmascript" xlink:href="video_html5_mse.js"/>
+  
+  <script type="application/ecmascript">
+	var p1 = new Player('v_main', 'info_main', 'timer_anim', counterVideoHTTPSegments);
+	var p2 = new Player('v_thumb', 'info_thumb', 'timer_anim', redBullVideoHTTPSegments);	
+	p1.play();
+	p2.play();
+  </script>
+</svg>
\ No newline at end of file

gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/xhr.js Added

@@ -0,0 +1,147 @@
+/*****************************************************************************************
+ * Testing XHR objects 
+ *****************************************************************************************/
+
+/* TextArea element to report debug messages */
+var tA = null;
+
+function report(msg) {
+	tA.appendChild(document.createElement('tbreak'));
+	tA.appendChild(document.createTextNode(msg));
+}
+
+function getResource(url, async, responseType, mime, doneCallback, xhr_reused)
+{
+  var xhr;
+  if (!xhr_reused) xhr = new XMLHttpRequest();
+  else xhr = xhr_reused;  
+  xhr.url = url;
+  xhr.open("GET", xhr.url, async);
+  xhr.responseType = responseType;
+  if (mime !== "") {
+	xhr.overrideMimeType(mime);
+  }
+  if (async) xhr.onreadystatechange = doneCallback;
+  report((async ? "Asynchronous" : "Synchronous" )+ " download of " + xhr.url + "," +
+         " expecting responseType \'" + responseType +"\'"+ ((mime !== "")?", with forced MIME type: '" + mime +"'":""));
+  xhr.send();
+  if (!async) doneCallback.call(xhr);
+  return xhr;
+}
+
+function onDone(e)
+{ 
+  if (this.readyState == this.DONE)
+  {
+	report("Download done: "+this.url);
+	report("responseType: "+this.responseType);
+	report("typeof(response): "+typeof(this.response));
+	report("responseText: "+this.responseText);
+	report("responseXML: "+this.responseXML);
+	report("response: "+this.response);
+	switch(this.responseType) {
+		case "":
+			break;
+		case "text":
+			break;
+		case "arraybuffer":
+			report("ArrayBuffer length:"+this.response.byteLength);
+			break;
+		case "json":
+			break;
+		case "document":
+			break;
+		case "blob":
+			break;
+		case "stream":
+			break;
+	}
+	report("");
+  }
+}
+
+function getResourceSimple(url, async, responseType, mime)
+{
+	getResource(url, async, (responseType == undefined ? "" : responseType), (mime == undefined ? "" : mime), onDone);
+}
+
+function getResourceAllWays(url, async)
+{
+  getResource(url, async, "",            "", onDone);
+  getResource(url, async, "text",        "", onDone);
+  getResource(url, async, "arraybuffer", "", onDone);
+  getResource(url, async, "json",        "", onDone);
+  getResource(url, async, "document",    "", onDone);
+  getResource(url, async, "blob",        "", onDone);
+  getResource(url, async, "stream",      "", onDone);
+
+  getResource(url, async, "",            "text/plain", onDone);
+  getResource(url, async, "text",        "text/plain", onDone);
+  getResource(url, async, "arraybuffer", "text/plain", onDone);
+  getResource(url, async, "json",        "text/plain", onDone);
+  getResource(url, async, "document",    "text/plain", onDone);
+  getResource(url, async, "blob",        "text/plain", onDone);
+  getResource(url, async, "stream",      "text/plain", onDone);
+
+  getResource(url, async, "",            "application/xml", onDone);
+  getResource(url, async, "text",        "application/xml", onDone);
+  getResource(url, async, "arraybuffer", "application/xml", onDone);
+  getResource(url, async, "json",        "application/xml", onDone);
+  getResource(url, async, "document",    "application/xml", onDone);
+  getResource(url, async, "blob",        "application/xml", onDone);
+  getResource(url, async, "stream",      "application/xml", onDone);
+
+  getResource(url, async, "",            "application/octet-stream", onDone);
+  getResource(url, async, "text",        "application/octet-stream", onDone);
+  getResource(url, async, "arraybuffer", "application/octet-stream", onDone);
+  getResource(url, async, "json",        "application/octet-stream", onDone);
+  getResource(url, async, "document",    "application/octet-stream", onDone);
+  getResource(url, async, "blob",        "application/octet-stream", onDone);
+  getResource(url, async, "stream",      "application/octet-stream", onDone);
+}
+
+function testAllLocal(filename, asyncDownload, getMethod, responseType, mime) {
+	getMethod(filename, asyncDownload, responseType, mime);
+//	getMethod("file://"+filename, asyncDownload, responseType, mime);
+//	getMethod("file://localhost/"+filename, asyncDownload, responseType, mime);
+}
+
+function test1() 
+{
+  var baseURL = "";"http://perso.telecom-paristech.fr/~concolat/html5_tests/";
+  var asyncDownload = false;
+  var testFunc = getResourceSimple; //getResourceAllWays;
+  report("Starting tests 1...");
+  testFunc(baseURL+"file.txt", asyncDownload);
+  testFunc(baseURL+"file.xml", asyncDownload, "document");
+  testFunc(baseURL+"file.mp4", asyncDownload, "arraybuffer");
+  testFunc(baseURL+"file.json", asyncDownload);
+/*  testAllLocal("file.txt", asyncDownload, testFunc);
+  testAllLocal("file.xml", asyncDownload, testFunc, "document");
+  testAllLocal("file.mp4", asyncDownload, testFunc, "arraybuffer");
+  testAllLocal("file.json", asyncDownload, testFunc);*/
+  report("end of tests 1.");
+}
+
+function test2() 
+{
+  var res;
+
+  report("Starting tests 2...");
+  var xhr = getResource("file.mp4", false, "arraybuffer", "application/octet-stream", onDone);
+  var res = xhr.response;
+  alert("Resource: "+res);
+  getResource("file.json", false, "arraybuffer", "application/octet-stream", onDone, xhr);
+  report("end of tests 2");
+}
+
+function init()
+{ 
+  tA = document.createElement('textArea');
+  document.documentElement.appendChild(tA);
+}
+
+alert("Script loaded"); 
+init();
+test1();
+

gpac-0.5.0.svn4668.tar.bz2/regression_tests/html5_video/xhr.svg -> gpac-0.5.0.svn5178.tar.bz2/regression_tests/html5_video/xhr.svg Changed

gpac-0.5.0.svn5178.tar.bz2/regression_tests/webvtt/counter.srt Added

@@ -0,0 +1,2400 @@
+1
+00:00,000 --> 00:01,000
+Cue 	1	Start Time	00:00,000
+
+2
+00:01,000 --> 00:02,000
+Cue 	2	Start Time	00:01,000
+
+3
+00:02,000 --> 00:03,000
+Cue 	3	Start Time	00:02,000
+
+4
+00:03,000 --> 00:04,000
+Cue 	4	Start Time	00:03,000
+
+5
+00:04,000 --> 00:05,000
+Cue 	5	Start Time	00:04,000
+
+6
+00:05,000 --> 00:06,000
+Cue 	6	Start Time	00:05,000
+
+7
+00:06,000 --> 00:07,000
+Cue 	7	Start Time	00:06,000
+
+8
+00:07,000 --> 00:08,000
+Cue 	8	Start Time	00:07,000
+
+9
+00:08,000 --> 00:09,000
+Cue 	9	Start Time	00:08,000
+
+10
+00:09,000 --> 00:10,000
+Cue 	10	Start Time	00:09,000
+
+11
+00:10,000 --> 00:11,000
+Cue 	11	Start Time	00:10,000
+
+12
+00:11,000 --> 00:12,000
+Cue 	12	Start Time	00:11,000
+
+13
+00:12,000 --> 00:13,000
+Cue 	13	Start Time	00:12,000
+
+14
+00:13,000 --> 00:14,000
+Cue 	14	Start Time	00:13,000
+
+15
+00:14,000 --> 00:15,000
+Cue 	15	Start Time	00:14,000
+
+16
+00:15,000 --> 00:16,000
+Cue 	16	Start Time	00:15,000
+
+17
+00:16,000 --> 00:17,000
+Cue 	17	Start Time	00:16,000
+
+18
+00:17,000 --> 00:18,000
+Cue 	18	Start Time	00:17,000
+
+19
+00:18,000 --> 00:19,000
+Cue 	19	Start Time	00:18,000
+
+20
+00:19,000 --> 00:20,000
+Cue 	20	Start Time	00:19,000
+
+21
+00:20,000 --> 00:21,000
+Cue 	21	Start Time	00:20,000
+
+22
+00:21,000 --> 00:22,000
+Cue 	22	Start Time	00:21,000
+
+23
+00:22,000 --> 00:23,000
+Cue 	23	Start Time	00:22,000
+
+24
+00:23,000 --> 00:24,000
+Cue 	24	Start Time	00:23,000
+
+25
+00:24,000 --> 00:25,000
+Cue 	25	Start Time	00:24,000
+
+26
+00:25,000 --> 00:26,000
+Cue 	26	Start Time	00:25,000
+
+27
+00:26,000 --> 00:27,000
+Cue 	27	Start Time	00:26,000
+
+28
+00:27,000 --> 00:28,000
+Cue 	28	Start Time	00:27,000
+
+29
+00:28,000 --> 00:29,000
+Cue 	29	Start Time	00:28,000
+
+30
+00:29,000 --> 00:30,000
+Cue 	30	Start Time	00:29,000
+
+31
+00:30,000 --> 00:31,000
+Cue 	31	Start Time	00:30,000
+
+32
+00:31,000 --> 00:32,000
+Cue 	32	Start Time	00:31,000
+
+33
+00:32,000 --> 00:33,000
+Cue 	33	Start Time	00:32,000
+
+34
+00:33,000 --> 00:34,000
+Cue 	34	Start Time	00:33,000
+
+35
+00:34,000 --> 00:35,000
+Cue 	35	Start Time	00:34,000
+
+36
+00:35,000 --> 00:36,000
+Cue 	36	Start Time	00:35,000
+
+37
+00:36,000 --> 00:37,000
+Cue 	37	Start Time	00:36,000
+
+38
+00:37,000 --> 00:38,000
+Cue 	38	Start Time	00:37,000
+
+39
+00:38,000 --> 00:39,000
+Cue 	39	Start Time	00:38,000
+
+40
+00:39,000 --> 00:40,000
+Cue 	40	Start Time	00:39,000
+
+41
+00:40,000 --> 00:41,000
+Cue 	41	Start Time	00:40,000
+
+42
+00:41,000 --> 00:42,000
+Cue 	42	Start Time	00:41,000
+
+43
+00:42,000 --> 00:43,000
+Cue 	43	Start Time	00:42,000
+
+44
+00:43,000 --> 00:44,000
+Cue 	44	Start Time	00:43,000
+
+45
+00:44,000 --> 00:45,000
+Cue 	45	Start Time	00:44,000
+
+46
+00:45,000 --> 00:46,000
+Cue 	46	Start Time	00:45,000
+
+47
+00:46,000 --> 00:47,000
+Cue 	47	Start Time	00:46,000
+
+48
+00:47,000 --> 00:48,000
+Cue 	48	Start Time	00:47,000
+
+49
+00:48,000 --> 00:49,000
+Cue 	49	Start Time	00:48,000
+
+50
+00:49,000 --> 00:50,000
+Cue 	50	Start Time	00:49,000
+
+51
+00:50,000 --> 00:51,000
+Cue 	51	Start Time	00:50,000
+
+52
+00:51,000 --> 00:52,000
+Cue 	52	Start Time	00:51,000
+
+53
+00:52,000 --> 00:53,000
+Cue 	53	Start Time	00:52,000
+
+54
+00:53,000 --> 00:54,000
+Cue 	54	Start Time	00:53,000
+
+55
+00:54,000 --> 00:55,000
+Cue 	55	Start Time	00:54,000
+
+56
+00:55,000 --> 00:56,000
+Cue 	56	Start Time	00:55,000
+
+57
+00:56,000 --> 00:57,000
+Cue 	57	Start Time	00:56,000
+
+58
+00:57,000 --> 00:58,000
+Cue 	58	Start Time	00:57,000
+
+59
+00:58,000 --> 00:59,000
+Cue 	59	Start Time	00:58,000
+
+60
+00:59,000 --> 01:00,000
+Cue 	60	Start Time	00:59,000
+
+61
+01:00,000 --> 01:01,000
+Cue 	61	Start Time	01:00,000
+
+62
+01:01,000 --> 01:02,000
+Cue 	62	Start Time	01:01,000
+
+63
+01:02,000 --> 01:03,000
+Cue 	63	Start Time	01:02,000
+
+64
+01:03,000 --> 01:04,000
+Cue 	64	Start Time	01:03,000
+
+65
+01:04,000 --> 01:05,000
+Cue 	65	Start Time	01:04,000
+
+66
+01:05,000 --> 01:06,000
+Cue 	66	Start Time	01:05,000
+
+67
+01:06,000 --> 01:07,000
+Cue 	67	Start Time	01:06,000
+
+68
+01:07,000 --> 01:08,000
+Cue 	68	Start Time	01:07,000
+
+69
+01:08,000 --> 01:09,000
+Cue 	69	Start Time	01:08,000
+
+70
+01:09,000 --> 01:10,000
+Cue 	70	Start Time	01:09,000
+
+71
+01:10,000 --> 01:11,000
+Cue 	71	Start Time	01:10,000
+
+72
+01:11,000 --> 01:12,000
+Cue 	72	Start Time	01:11,000
+
+73
+01:12,000 --> 01:13,000
+Cue 	73	Start Time	01:12,000
+
+74
+01:13,000 --> 01:14,000
+Cue 	74	Start Time	01:13,000
+
+75
+01:14,000 --> 01:15,000
+Cue 	75	Start Time	01:14,000
+
+76
+01:15,000 --> 01:16,000
+Cue 	76	Start Time	01:15,000
+
+77
+01:16,000 --> 01:17,000
+Cue 	77	Start Time	01:16,000
+
+78
+01:17,000 --> 01:18,000
+Cue 	78	Start Time	01:17,000
+
+79
+01:18,000 --> 01:19,000
+Cue 	79	Start Time	01:18,000
+
+80
+01:19,000 --> 01:20,000
+Cue 	80	Start Time	01:19,000
+
+81
+01:20,000 --> 01:21,000
+Cue 	81	Start Time	01:20,000
+
+82
+01:21,000 --> 01:22,000
+Cue 	82	Start Time	01:21,000
+
+83
+01:22,000 --> 01:23,000
+Cue 	83	Start Time	01:22,000
+
+84
+01:23,000 --> 01:24,000
+Cue 	84	Start Time	01:23,000
+
+85
+01:24,000 --> 01:25,000
+Cue 	85	Start Time	01:24,000
+
+86
+01:25,000 --> 01:26,000
+Cue 	86	Start Time	01:25,000
+
+87
+01:26,000 --> 01:27,000
+Cue 	87	Start Time	01:26,000
+
+88
+01:27,000 --> 01:28,000
+Cue 	88	Start Time	01:27,000
+
+89
+01:28,000 --> 01:29,000
+Cue 	89	Start Time	01:28,000
+
+90
+01:29,000 --> 01:30,000
+Cue 	90	Start Time	01:29,000
+
+91
+01:30,000 --> 01:31,000
+Cue 	91	Start Time	01:30,000
+
+92
+01:31,000 --> 01:32,000
+Cue 	92	Start Time	01:31,000
+
+93
+01:32,000 --> 01:33,000
+Cue 	93	Start Time	01:32,000
+
+94
+01:33,000 --> 01:34,000
+Cue 	94	Start Time	01:33,000
+
+95
+01:34,000 --> 01:35,000
+Cue 	95	Start Time	01:34,000
+
+96
+01:35,000 --> 01:36,000
+Cue 	96	Start Time	01:35,000
+
+97
+01:36,000 --> 01:37,000
+Cue 	97	Start Time	01:36,000
+
+98
+01:37,000 --> 01:38,000
+Cue 	98	Start Time	01:37,000
+
+99
+01:38,000 --> 01:39,000
+Cue 	99	Start Time	01:38,000
+
+100
+01:39,000 --> 01:40,000
+Cue 	100	Start Time	01:39,000
+
+101
+01:40,000 --> 01:41,000
+Cue 	101	Start Time	01:40,000
+
+102
+01:41,000 --> 01:42,000
+Cue 	102	Start Time	01:41,000
+
+103
+01:42,000 --> 01:43,000
+Cue 	103	Start Time	01:42,000
+
+104
+01:43,000 --> 01:44,000
+Cue 	104	Start Time	01:43,000
+
+105
+01:44,000 --> 01:45,000
+Cue 	105	Start Time	01:44,000
+
+106
+01:45,000 --> 01:46,000
+Cue 	106	Start Time	01:45,000
+
+107
+01:46,000 --> 01:47,000
+Cue 	107	Start Time	01:46,000
+
+108
+01:47,000 --> 01:48,000
+Cue 	108	Start Time	01:47,000
+
+109
+01:48,000 --> 01:49,000
+Cue 	109	Start Time	01:48,000
+
+110
+01:49,000 --> 01:50,000
+Cue 	110	Start Time	01:49,000
+
+111
+01:50,000 --> 01:51,000
+Cue 	111	Start Time	01:50,000
+
+112
+01:51,000 --> 01:52,000
+Cue 	112	Start Time	01:51,000
+
+113
+01:52,000 --> 01:53,000
+Cue 	113	Start Time	01:52,000
+
+114
+01:53,000 --> 01:54,000
+Cue 	114	Start Time	01:53,000
+
+115
+01:54,000 --> 01:55,000
+Cue 	115	Start Time	01:54,000
+
+116
+01:55,000 --> 01:56,000
+Cue 	116	Start Time	01:55,000
+
+117
+01:56,000 --> 01:57,000
+Cue 	117	Start Time	01:56,000
+
+118
+01:57,000 --> 01:58,000
+Cue 	118	Start Time	01:57,000
+
+119
+01:58,000 --> 01:59,000
+Cue 	119	Start Time	01:58,000
+
+120
+01:59,000 --> 02:00,000
+Cue 	120	Start Time	01:59,000
+
+121
+02:00,000 --> 02:01,000
+Cue 	121	Start Time	02:00,000
+
+122
+02:01,000 --> 02:02,000
+Cue 	122	Start Time	02:01,000
+
+123
+02:02,000 --> 02:03,000
+Cue 	123	Start Time	02:02,000
+
+124
+02:03,000 --> 02:04,000
+Cue 	124	Start Time	02:03,000
+
+125
+02:04,000 --> 02:05,000
+Cue 	125	Start Time	02:04,000
+
+126
+02:05,000 --> 02:06,000
+Cue 	126	Start Time	02:05,000
+
+127
+02:06,000 --> 02:07,000
+Cue 	127	Start Time	02:06,000
+
+128
+02:07,000 --> 02:08,000
+Cue 	128	Start Time	02:07,000
+
+129
+02:08,000 --> 02:09,000
+Cue 	129	Start Time	02:08,000
+
+130
+02:09,000 --> 02:10,000
+Cue 	130	Start Time	02:09,000
+
+131
+02:10,000 --> 02:11,000
+Cue 	131	Start Time	02:10,000
+
+132
+02:11,000 --> 02:12,000
+Cue 	132	Start Time	02:11,000
+
+133
+02:12,000 --> 02:13,000
+Cue 	133	Start Time	02:12,000
+
+134
+02:13,000 --> 02:14,000
+Cue 	134	Start Time	02:13,000
+
+135
+02:14,000 --> 02:15,000
+Cue 	135	Start Time	02:14,000
+
+136
+02:15,000 --> 02:16,000
+Cue 	136	Start Time	02:15,000
+
+137
+02:16,000 --> 02:17,000
+Cue 	137	Start Time	02:16,000
+
+138
+02:17,000 --> 02:18,000
+Cue 	138	Start Time	02:17,000
+
+139
+02:18,000 --> 02:19,000
+Cue 	139	Start Time	02:18,000
+
+140
+02:19,000 --> 02:20,000
+Cue 	140	Start Time	02:19,000
+
+141
+02:20,000 --> 02:21,000
+Cue 	141	Start Time	02:20,000
+
+142
+02:21,000 --> 02:22,000
+Cue 	142	Start Time	02:21,000
+
+143
+02:22,000 --> 02:23,000
+Cue 	143	Start Time	02:22,000
+
+144
+02:23,000 --> 02:24,000
+Cue 	144	Start Time	02:23,000
+
+145
+02:24,000 --> 02:25,000
+Cue 	145	Start Time	02:24,000
+
+146
+02:25,000 --> 02:26,000
+Cue 	146	Start Time	02:25,000
+
+147
+02:26,000 --> 02:27,000
+Cue 	147	Start Time	02:26,000
+
+148
+02:27,000 --> 02:28,000
+Cue 	148	Start Time	02:27,000
+
+149
+02:28,000 --> 02:29,000
+Cue 	149	Start Time	02:28,000
+
+150
+02:29,000 --> 02:30,000
+Cue 	150	Start Time	02:29,000
+
+151
+02:30,000 --> 02:31,000
+Cue 	151	Start Time	02:30,000
+
+152
+02:31,000 --> 02:32,000
+Cue 	152	Start Time	02:31,000
+
+153
+02:32,000 --> 02:33,000
+Cue 	153	Start Time	02:32,000
+
+154
+02:33,000 --> 02:34,000
+Cue 	154	Start Time	02:33,000
+
+155
+02:34,000 --> 02:35,000
+Cue 	155	Start Time	02:34,000
+
+156
+02:35,000 --> 02:36,000
+Cue 	156	Start Time	02:35,000
+
+157
+02:36,000 --> 02:37,000
+Cue 	157	Start Time	02:36,000
+
+158
+02:37,000 --> 02:38,000
+Cue 	158	Start Time	02:37,000
+
+159
+02:38,000 --> 02:39,000
+Cue 	159	Start Time	02:38,000
+
+160
+02:39,000 --> 02:40,000
+Cue 	160	Start Time	02:39,000
+
+161
+02:40,000 --> 02:41,000
+Cue 	161	Start Time	02:40,000
+
+162
+02:41,000 --> 02:42,000
+Cue 	162	Start Time	02:41,000
+
+163
+02:42,000 --> 02:43,000
+Cue 	163	Start Time	02:42,000
+
+164
+02:43,000 --> 02:44,000
+Cue 	164	Start Time	02:43,000
+
+165
+02:44,000 --> 02:45,000
+Cue 	165	Start Time	02:44,000
+
+166
+02:45,000 --> 02:46,000
+Cue 	166	Start Time	02:45,000
+
+167
+02:46,000 --> 02:47,000
+Cue 	167	Start Time	02:46,000
+
+168
+02:47,000 --> 02:48,000
+Cue 	168	Start Time	02:47,000
+
+169
+02:48,000 --> 02:49,000
+Cue 	169	Start Time	02:48,000
+
+170
+02:49,000 --> 02:50,000
+Cue 	170	Start Time	02:49,000
+
+171
+02:50,000 --> 02:51,000
+Cue 	171	Start Time	02:50,000
+
+172
+02:51,000 --> 02:52,000
+Cue 	172	Start Time	02:51,000
+
+173
+02:52,000 --> 02:53,000
+Cue 	173	Start Time	02:52,000
+
+174
+02:53,000 --> 02:54,000
+Cue 	174	Start Time	02:53,000
+
+175
+02:54,000 --> 02:55,000
+Cue 	175	Start Time	02:54,000
+
+176
+02:55,000 --> 02:56,000
+Cue 	176	Start Time	02:55,000
+
+177
+02:56,000 --> 02:57,000
+Cue 	177	Start Time	02:56,000
+
+178
+02:57,000 --> 02:58,000
+Cue 	178	Start Time	02:57,000
+
+179
+02:58,000 --> 02:59,000
+Cue 	179	Start Time	02:58,000
+
+180
+02:59,000 --> 03:00,000
+Cue 	180	Start Time	02:59,000
+
+181
+03:00,000 --> 03:01,000
+Cue 	181	Start Time	03:00,000
+
+182
+03:01,000 --> 03:02,000
+Cue 	182	Start Time	03:01,000
+
+183
+03:02,000 --> 03:03,000
+Cue 	183	Start Time	03:02,000
+
+184
+03:03,000 --> 03:04,000
+Cue 	184	Start Time	03:03,000
+
+185
+03:04,000 --> 03:05,000
+Cue 	185	Start Time	03:04,000
+
+186
+03:05,000 --> 03:06,000
+Cue 	186	Start Time	03:05,000
+
+187
+03:06,000 --> 03:07,000
+Cue 	187	Start Time	03:06,000
+
+188
+03:07,000 --> 03:08,000
+Cue 	188	Start Time	03:07,000
+
+189
+03:08,000 --> 03:09,000
+Cue 	189	Start Time	03:08,000
+
+190
+03:09,000 --> 03:10,000
+Cue 	190	Start Time	03:09,000
+
+191
+03:10,000 --> 03:11,000
+Cue 	191	Start Time	03:10,000
+
+192
+03:11,000 --> 03:12,000
+Cue 	192	Start Time	03:11,000
+
+193
+03:12,000 --> 03:13,000
+Cue 	193	Start Time	03:12,000
+
+194
+03:13,000 --> 03:14,000
+Cue 	194	Start Time	03:13,000
+
+195
+03:14,000 --> 03:15,000
+Cue 	195	Start Time	03:14,000
+
+196
+03:15,000 --> 03:16,000
+Cue 	196	Start Time	03:15,000
+
+197
+03:16,000 --> 03:17,000
+Cue 	197	Start Time	03:16,000
+
+198
+03:17,000 --> 03:18,000
+Cue 	198	Start Time	03:17,000
+
+199
+03:18,000 --> 03:19,000
+Cue 	199	Start Time	03:18,000
+
+200
+03:19,000 --> 03:20,000
+Cue 	200	Start Time	03:19,000
+
+201
+03:20,000 --> 03:21,000
+Cue 	201	Start Time	03:20,000
+
+202
+03:21,000 --> 03:22,000
+Cue 	202	Start Time	03:21,000
+
+203
+03:22,000 --> 03:23,000
+Cue 	203	Start Time	03:22,000
+
+204
+03:23,000 --> 03:24,000
+Cue 	204	Start Time	03:23,000
+
+205
+03:24,000 --> 03:25,000
+Cue 	205	Start Time	03:24,000
+
+206
+03:25,000 --> 03:26,000
+Cue 	206	Start Time	03:25,000
+
+207
+03:26,000 --> 03:27,000
+Cue 	207	Start Time	03:26,000
+
+208
+03:27,000 --> 03:28,000
+Cue 	208	Start Time	03:27,000
+
+209
+03:28,000 --> 03:29,000
+Cue 	209	Start Time	03:28,000
+
+210
+03:29,000 --> 03:30,000
+Cue 	210	Start Time	03:29,000
+
+211
+03:30,000 --> 03:31,000
+Cue 	211	Start Time	03:30,000
+
+212
+03:31,000 --> 03:32,000
+Cue 	212	Start Time	03:31,000
+
+213
+03:32,000 --> 03:33,000
+Cue 	213	Start Time	03:32,000
+
+214
+03:33,000 --> 03:34,000
+Cue 	214	Start Time	03:33,000
+
+215
+03:34,000 --> 03:35,000
+Cue 	215	Start Time	03:34,000
+
+216
+03:35,000 --> 03:36,000
+Cue 	216	Start Time	03:35,000
+
+217
+03:36,000 --> 03:37,000
+Cue 	217	Start Time	03:36,000
+
+218
+03:37,000 --> 03:38,000
+Cue 	218	Start Time	03:37,000
+
+219
+03:38,000 --> 03:39,000
+Cue 	219	Start Time	03:38,000
+
+220
+03:39,000 --> 03:40,000
+Cue 	220	Start Time	03:39,000
+
+221
+03:40,000 --> 03:41,000
+Cue 	221	Start Time	03:40,000
+
+222
+03:41,000 --> 03:42,000
+Cue 	222	Start Time	03:41,000
+
+223
+03:42,000 --> 03:43,000
+Cue 	223	Start Time	03:42,000
+
+224
+03:43,000 --> 03:44,000
+Cue 	224	Start Time	03:43,000
+
+225
+03:44,000 --> 03:45,000
+Cue 	225	Start Time	03:44,000
+
+226
+03:45,000 --> 03:46,000
+Cue 	226	Start Time	03:45,000
+
+227
+03:46,000 --> 03:47,000
+Cue 	227	Start Time	03:46,000
+
+228
+03:47,000 --> 03:48,000
+Cue 	228	Start Time	03:47,000
+
+229
+03:48,000 --> 03:49,000
+Cue 	229	Start Time	03:48,000
+
+230
+03:49,000 --> 03:50,000
+Cue 	230	Start Time	03:49,000
+
+231
+03:50,000 --> 03:51,000
+Cue 	231	Start Time	03:50,000
+
+232
+03:51,000 --> 03:52,000
+Cue 	232	Start Time	03:51,000
+
+233
+03:52,000 --> 03:53,000
+Cue 	233	Start Time	03:52,000
+
+234
+03:53,000 --> 03:54,000
+Cue 	234	Start Time	03:53,000
+
+235
+03:54,000 --> 03:55,000
+Cue 	235	Start Time	03:54,000
+
+236
+03:55,000 --> 03:56,000
+Cue 	236	Start Time	03:55,000
+
+237
+03:56,000 --> 03:57,000
+Cue 	237	Start Time	03:56,000
+
+238
+03:57,000 --> 03:58,000
+Cue 	238	Start Time	03:57,000
+
+239
+03:58,000 --> 03:59,000
+Cue 	239	Start Time	03:58,000
+
+240
+03:59,000 --> 04:00,000
+Cue 	240	Start Time	03:59,000
+
+241
+04:00,000 --> 04:01,000
+Cue 	241	Start Time	04:00,000
+
+242
+04:01,000 --> 04:02,000
+Cue 	242	Start Time	04:01,000
+
+243
+04:02,000 --> 04:03,000
+Cue 	243	Start Time	04:02,000
+
+244
+04:03,000 --> 04:04,000
+Cue 	244	Start Time	04:03,000
+
+245
+04:04,000 --> 04:05,000
+Cue 	245	Start Time	04:04,000
+
+246
+04:05,000 --> 04:06,000
+Cue 	246	Start Time	04:05,000
+
+247
+04:06,000 --> 04:07,000
+Cue 	247	Start Time	04:06,000
+
+248
+04:07,000 --> 04:08,000
+Cue 	248	Start Time	04:07,000
+
+249
+04:08,000 --> 04:09,000
+Cue 	249	Start Time	04:08,000
+
+250
+04:09,000 --> 04:10,000
+Cue 	250	Start Time	04:09,000
+
+251
+04:10,000 --> 04:11,000
+Cue 	251	Start Time	04:10,000
+
+252
+04:11,000 --> 04:12,000
+Cue 	252	Start Time	04:11,000
+
+253
+04:12,000 --> 04:13,000
+Cue 	253	Start Time	04:12,000
+
+254
+04:13,000 --> 04:14,000
+Cue 	254	Start Time	04:13,000
+
+255
+04:14,000 --> 04:15,000
+Cue 	255	Start Time	04:14,000
+
+256
+04:15,000 --> 04:16,000
+Cue 	256	Start Time	04:15,000
+
+257
+04:16,000 --> 04:17,000
+Cue 	257	Start Time	04:16,000
+
+258
+04:17,000 --> 04:18,000
+Cue 	258	Start Time	04:17,000
+
+259
+04:18,000 --> 04:19,000
+Cue 	259	Start Time	04:18,000
+
+260
+04:19,000 --> 04:20,000
+Cue 	260	Start Time	04:19,000
+
+261
+04:20,000 --> 04:21,000
+Cue 	261	Start Time	04:20,000
+
+262
+04:21,000 --> 04:22,000
+Cue 	262	Start Time	04:21,000
+
+263
+04:22,000 --> 04:23,000
+Cue 	263	Start Time	04:22,000
+
+264
+04:23,000 --> 04:24,000
+Cue 	264	Start Time	04:23,000
+
+265
+04:24,000 --> 04:25,000
+Cue 	265	Start Time	04:24,000
+
+266
+04:25,000 --> 04:26,000
+Cue 	266	Start Time	04:25,000
+
+267
+04:26,000 --> 04:27,000
+Cue 	267	Start Time	04:26,000
+
+268
+04:27,000 --> 04:28,000
+Cue 	268	Start Time	04:27,000
+
+269
+04:28,000 --> 04:29,000
+Cue 	269	Start Time	04:28,000
+
+270
+04:29,000 --> 04:30,000
+Cue 	270	Start Time	04:29,000
+
+271
+04:30,000 --> 04:31,000
+Cue 	271	Start Time	04:30,000
+
+272
+04:31,000 --> 04:32,000
+Cue 	272	Start Time	04:31,000
+
+273
+04:32,000 --> 04:33,000
+Cue 	273	Start Time	04:32,000
+
+274
+04:33,000 --> 04:34,000
+Cue 	274	Start Time	04:33,000
+
+275
+04:34,000 --> 04:35,000
+Cue 	275	Start Time	04:34,000
+
+276
+04:35,000 --> 04:36,000
+Cue 	276	Start Time	04:35,000
+
+277
+04:36,000 --> 04:37,000
+Cue 	277	Start Time	04:36,000
+
+278
+04:37,000 --> 04:38,000
+Cue 	278	Start Time	04:37,000
+
+279
+04:38,000 --> 04:39,000
+Cue 	279	Start Time	04:38,000
+
+280
+04:39,000 --> 04:40,000
+Cue 	280	Start Time	04:39,000
+
+281
+04:40,000 --> 04:41,000
+Cue 	281	Start Time	04:40,000
+
+282
+04:41,000 --> 04:42,000
+Cue 	282	Start Time	04:41,000
+
+283
+04:42,000 --> 04:43,000
+Cue 	283	Start Time	04:42,000
+
+284
+04:43,000 --> 04:44,000
+Cue 	284	Start Time	04:43,000
+
+285
+04:44,000 --> 04:45,000
+Cue 	285	Start Time	04:44,000
+
+286
+04:45,000 --> 04:46,000
+Cue 	286	Start Time	04:45,000
+
+287
+04:46,000 --> 04:47,000
+Cue 	287	Start Time	04:46,000
+
+288
+04:47,000 --> 04:48,000
+Cue 	288	Start Time	04:47,000
+
+289
+04:48,000 --> 04:49,000
+Cue 	289	Start Time	04:48,000
+
+290
+04:49,000 --> 04:50,000
+Cue 	290	Start Time	04:49,000
+
+291
+04:50,000 --> 04:51,000
+Cue 	291	Start Time	04:50,000
+
+292
+04:51,000 --> 04:52,000
+Cue 	292	Start Time	04:51,000
+
+293
+04:52,000 --> 04:53,000
+Cue 	293	Start Time	04:52,000
+
+294
+04:53,000 --> 04:54,000
+Cue 	294	Start Time	04:53,000
+
+295
+04:54,000 --> 04:55,000
+Cue 	295	Start Time	04:54,000
+
+296
+04:55,000 --> 04:56,000
+Cue 	296	Start Time	04:55,000
+
+297
+04:56,000 --> 04:57,000
+Cue 	297	Start Time	04:56,000
+
+298
+04:57,000 --> 04:58,000
+Cue 	298	Start Time	04:57,000
+
+299
+04:58,000 --> 04:59,000
+Cue 	299	Start Time	04:58,000
+
+300
+04:59,000 --> 05:00,000
+Cue 	300	Start Time	04:59,000
+
+301
+05:00,000 --> 05:01,000
+Cue 	301	Start Time	05:00,000
+
+302
+05:01,000 --> 05:02,000
+Cue 	302	Start Time	05:01,000
+
+303
+05:02,000 --> 05:03,000
+Cue 	303	Start Time	05:02,000
+
+304
+05:03,000 --> 05:04,000
+Cue 	304	Start Time	05:03,000
+
+305
+05:04,000 --> 05:05,000
+Cue 	305	Start Time	05:04,000
+
+306
+05:05,000 --> 05:06,000
+Cue 	306	Start Time	05:05,000
+
+307
+05:06,000 --> 05:07,000
+Cue 	307	Start Time	05:06,000
+
+308
+05:07,000 --> 05:08,000
+Cue 	308	Start Time	05:07,000
+
+309
+05:08,000 --> 05:09,000
+Cue 	309	Start Time	05:08,000
+
+310
+05:09,000 --> 05:10,000
+Cue 	310	Start Time	05:09,000
+
+311
+05:10,000 --> 05:11,000
+Cue 	311	Start Time	05:10,000
+
+312
+05:11,000 --> 05:12,000
+Cue 	312	Start Time	05:11,000
+
+313
+05:12,000 --> 05:13,000
+Cue 	313	Start Time	05:12,000
+
+314
+05:13,000 --> 05:14,000
+Cue 	314	Start Time	05:13,000
+
+315
+05:14,000 --> 05:15,000
+Cue 	315	Start Time	05:14,000
+
+316
+05:15,000 --> 05:16,000
+Cue 	316	Start Time	05:15,000
+
+317
+05:16,000 --> 05:17,000
+Cue 	317	Start Time	05:16,000
+
+318
+05:17,000 --> 05:18,000
+Cue 	318	Start Time	05:17,000
+
+319
+05:18,000 --> 05:19,000
+Cue 	319	Start Time	05:18,000
+
+320
+05:19,000 --> 05:20,000
+Cue 	320	Start Time	05:19,000
+
+321
+05:20,000 --> 05:21,000
+Cue 	321	Start Time	05:20,000
+
+322
+05:21,000 --> 05:22,000
+Cue 	322	Start Time	05:21,000
+
+323
+05:22,000 --> 05:23,000
+Cue 	323	Start Time	05:22,000
+
+324
+05:23,000 --> 05:24,000
+Cue 	324	Start Time	05:23,000
+
+325
+05:24,000 --> 05:25,000
+Cue 	325	Start Time	05:24,000
+
+326
+05:25,000 --> 05:26,000
+Cue 	326	Start Time	05:25,000
+
+327
+05:26,000 --> 05:27,000
+Cue 	327	Start Time	05:26,000
+
+328
+05:27,000 --> 05:28,000
+Cue 	328	Start Time	05:27,000
+
+329
+05:28,000 --> 05:29,000
+Cue 	329	Start Time	05:28,000
+
+330
+05:29,000 --> 05:30,000
+Cue 	330	Start Time	05:29,000
+
+331
+05:30,000 --> 05:31,000
+Cue 	331	Start Time	05:30,000
+
+332
+05:31,000 --> 05:32,000
+Cue 	332	Start Time	05:31,000
+
+333
+05:32,000 --> 05:33,000
+Cue 	333	Start Time	05:32,000
+
+334
+05:33,000 --> 05:34,000
+Cue 	334	Start Time	05:33,000
+
+335
+05:34,000 --> 05:35,000
+Cue 	335	Start Time	05:34,000
+
+336
+05:35,000 --> 05:36,000
+Cue 	336	Start Time	05:35,000
+
+337
+05:36,000 --> 05:37,000
+Cue 	337	Start Time	05:36,000
+
+338
+05:37,000 --> 05:38,000
+Cue 	338	Start Time	05:37,000
+
+339
+05:38,000 --> 05:39,000
+Cue 	339	Start Time	05:38,000
+
+340
+05:39,000 --> 05:40,000
+Cue 	340	Start Time	05:39,000
+
+341
+05:40,000 --> 05:41,000
+Cue 	341	Start Time	05:40,000
+
+342
+05:41,000 --> 05:42,000
+Cue 	342	Start Time	05:41,000
+
+343
+05:42,000 --> 05:43,000
+Cue 	343	Start Time	05:42,000
+
+344
+05:43,000 --> 05:44,000
+Cue 	344	Start Time	05:43,000
+
+345
+05:44,000 --> 05:45,000
+Cue 	345	Start Time	05:44,000
+
+346
+05:45,000 --> 05:46,000
+Cue 	346	Start Time	05:45,000
+
+347
+05:46,000 --> 05:47,000
+Cue 	347	Start Time	05:46,000
+
+348
+05:47,000 --> 05:48,000
+Cue 	348	Start Time	05:47,000
+
+349
+05:48,000 --> 05:49,000
+Cue 	349	Start Time	05:48,000
+
+350
+05:49,000 --> 05:50,000
+Cue 	350	Start Time	05:49,000
+
+351
+05:50,000 --> 05:51,000
+Cue 	351	Start Time	05:50,000
+
+352
+05:51,000 --> 05:52,000
+Cue 	352	Start Time	05:51,000
+
+353
+05:52,000 --> 05:53,000
+Cue 	353	Start Time	05:52,000
+
+354
+05:53,000 --> 05:54,000
+Cue 	354	Start Time	05:53,000
+
+355
+05:54,000 --> 05:55,000
+Cue 	355	Start Time	05:54,000
+
+356
+05:55,000 --> 05:56,000
+Cue 	356	Start Time	05:55,000
+
+357
+05:56,000 --> 05:57,000
+Cue 	357	Start Time	05:56,000
+
+358
+05:57,000 --> 05:58,000
+Cue 	358	Start Time	05:57,000
+
+359
+05:58,000 --> 05:59,000
+Cue 	359	Start Time	05:58,000
+
+360
+05:59,000 --> 06:00,000
+Cue 	360	Start Time	05:59,000
+
+361
+06:00,000 --> 06:01,000
+Cue 	361	Start Time	06:00,000
+
+362
+06:01,000 --> 06:02,000
+Cue 	362	Start Time	06:01,000
+
+363
+06:02,000 --> 06:03,000
+Cue 	363	Start Time	06:02,000
+
+364
+06:03,000 --> 06:04,000
+Cue 	364	Start Time	06:03,000
+
+365
+06:04,000 --> 06:05,000
+Cue 	365	Start Time	06:04,000
+
+366
+06:05,000 --> 06:06,000
+Cue 	366	Start Time	06:05,000
+
+367
+06:06,000 --> 06:07,000
+Cue 	367	Start Time	06:06,000
+
+368
+06:07,000 --> 06:08,000
+Cue 	368	Start Time	06:07,000
+
+369
+06:08,000 --> 06:09,000
+Cue 	369	Start Time	06:08,000
+
+370
+06:09,000 --> 06:10,000
+Cue 	370	Start Time	06:09,000
+
+371
+06:10,000 --> 06:11,000
+Cue 	371	Start Time	06:10,000
+
+372
+06:11,000 --> 06:12,000
+Cue 	372	Start Time	06:11,000
+
+373
+06:12,000 --> 06:13,000
+Cue 	373	Start Time	06:12,000
+
+374
+06:13,000 --> 06:14,000
+Cue 	374	Start Time	06:13,000
+
+375
+06:14,000 --> 06:15,000
+Cue 	375	Start Time	06:14,000
+
+376
+06:15,000 --> 06:16,000
+Cue 	376	Start Time	06:15,000
+
+377
+06:16,000 --> 06:17,000
+Cue 	377	Start Time	06:16,000
+
+378
+06:17,000 --> 06:18,000
+Cue 	378	Start Time	06:17,000
+
+379
+06:18,000 --> 06:19,000
+Cue 	379	Start Time	06:18,000
+
+380
+06:19,000 --> 06:20,000
+Cue 	380	Start Time	06:19,000
+
+381
+06:20,000 --> 06:21,000
+Cue 	381	Start Time	06:20,000
+
+382
+06:21,000 --> 06:22,000
+Cue 	382	Start Time	06:21,000
+
+383
+06:22,000 --> 06:23,000
+Cue 	383	Start Time	06:22,000
+
+384
+06:23,000 --> 06:24,000
+Cue 	384	Start Time	06:23,000
+
+385
+06:24,000 --> 06:25,000
+Cue 	385	Start Time	06:24,000
+
+386
+06:25,000 --> 06:26,000
+Cue 	386	Start Time	06:25,000
+
+387
+06:26,000 --> 06:27,000
+Cue 	387	Start Time	06:26,000
+
+388
+06:27,000 --> 06:28,000
+Cue 	388	Start Time	06:27,000
+
+389
+06:28,000 --> 06:29,000
+Cue 	389	Start Time	06:28,000
+
+390
+06:29,000 --> 06:30,000
+Cue 	390	Start Time	06:29,000
+
+391
+06:30,000 --> 06:31,000
+Cue 	391	Start Time	06:30,000
+
+392
+06:31,000 --> 06:32,000
+Cue 	392	Start Time	06:31,000
+
+393
+06:32,000 --> 06:33,000
+Cue 	393	Start Time	06:32,000
+
+394
+06:33,000 --> 06:34,000
+Cue 	394	Start Time	06:33,000
+
+395
+06:34,000 --> 06:35,000
+Cue 	395	Start Time	06:34,000
+
+396
+06:35,000 --> 06:36,000
+Cue 	396	Start Time	06:35,000
+
+397
+06:36,000 --> 06:37,000
+Cue 	397	Start Time	06:36,000
+
+398
+06:37,000 --> 06:38,000
+Cue 	398	Start Time	06:37,000
+
+399
+06:38,000 --> 06:39,000
+Cue 	399	Start Time	06:38,000
+
+400
+06:39,000 --> 06:40,000
+Cue 	400	Start Time	06:39,000
+
+401
+06:40,000 --> 06:41,000
+Cue 	401	Start Time	06:40,000
+
+402
+06:41,000 --> 06:42,000
+Cue 	402	Start Time	06:41,000
+
+403
+06:42,000 --> 06:43,000
+Cue 	403	Start Time	06:42,000
+
+404
+06:43,000 --> 06:44,000
+Cue 	404	Start Time	06:43,000
+
+405
+06:44,000 --> 06:45,000
+Cue 	405	Start Time	06:44,000
+
+406
+06:45,000 --> 06:46,000
+Cue 	406	Start Time	06:45,000
+
+407
+06:46,000 --> 06:47,000
+Cue 	407	Start Time	06:46,000
+
+408
+06:47,000 --> 06:48,000
+Cue 	408	Start Time	06:47,000
+
+409
+06:48,000 --> 06:49,000
+Cue 	409	Start Time	06:48,000
+
+410
+06:49,000 --> 06:50,000
+Cue 	410	Start Time	06:49,000
+
+411
+06:50,000 --> 06:51,000
+Cue 	411	Start Time	06:50,000
+
+412
+06:51,000 --> 06:52,000
+Cue 	412	Start Time	06:51,000
+
+413
+06:52,000 --> 06:53,000
+Cue 	413	Start Time	06:52,000
+
+414
+06:53,000 --> 06:54,000
+Cue 	414	Start Time	06:53,000
+
+415
+06:54,000 --> 06:55,000
+Cue 	415	Start Time	06:54,000
+
+416
+06:55,000 --> 06:56,000
+Cue 	416	Start Time	06:55,000
+
+417
+06:56,000 --> 06:57,000
+Cue 	417	Start Time	06:56,000
+
+418
+06:57,000 --> 06:58,000
+Cue 	418	Start Time	06:57,000
+
+419
+06:58,000 --> 06:59,000
+Cue 	419	Start Time	06:58,000
+
+420
+06:59,000 --> 07:00,000
+Cue 	420	Start Time	06:59,000
+
+421
+07:00,000 --> 07:01,000
+Cue 	421	Start Time	07:00,000
+
+422
+07:01,000 --> 07:02,000
+Cue 	422	Start Time	07:01,000
+
+423
+07:02,000 --> 07:03,000
+Cue 	423	Start Time	07:02,000
+
+424
+07:03,000 --> 07:04,000
+Cue 	424	Start Time	07:03,000
+
+425
+07:04,000 --> 07:05,000
+Cue 	425	Start Time	07:04,000
+
+426
+07:05,000 --> 07:06,000
+Cue 	426	Start Time	07:05,000
+
+427
+07:06,000 --> 07:07,000
+Cue 	427	Start Time	07:06,000
+
+428
+07:07,000 --> 07:08,000
+Cue 	428	Start Time	07:07,000
+
+429
+07:08,000 --> 07:09,000
+Cue 	429	Start Time	07:08,000
+
+430
+07:09,000 --> 07:10,000
+Cue 	430	Start Time	07:09,000
+
+431
+07:10,000 --> 07:11,000
+Cue 	431	Start Time	07:10,000
+
+432
+07:11,000 --> 07:12,000
+Cue 	432	Start Time	07:11,000
+
+433
+07:12,000 --> 07:13,000
+Cue 	433	Start Time	07:12,000
+
+434
+07:13,000 --> 07:14,000
+Cue 	434	Start Time	07:13,000
+
+435
+07:14,000 --> 07:15,000
+Cue 	435	Start Time	07:14,000
+
+436
+07:15,000 --> 07:16,000
+Cue 	436	Start Time	07:15,000
+
+437
+07:16,000 --> 07:17,000
+Cue 	437	Start Time	07:16,000
+
+438
+07:17,000 --> 07:18,000
+Cue 	438	Start Time	07:17,000
+
+439
+07:18,000 --> 07:19,000
+Cue 	439	Start Time	07:18,000
+
+440
+07:19,000 --> 07:20,000
+Cue 	440	Start Time	07:19,000
+
+441
+07:20,000 --> 07:21,000
+Cue 	441	Start Time	07:20,000
+
+442
+07:21,000 --> 07:22,000
+Cue 	442	Start Time	07:21,000
+
+443
+07:22,000 --> 07:23,000
+Cue 	443	Start Time	07:22,000
+
+444
+07:23,000 --> 07:24,000
+Cue 	444	Start Time	07:23,000
+
+445
+07:24,000 --> 07:25,000
+Cue 	445	Start Time	07:24,000
+
+446
+07:25,000 --> 07:26,000
+Cue 	446	Start Time	07:25,000
+
+447
+07:26,000 --> 07:27,000
+Cue 	447	Start Time	07:26,000
+
+448
+07:27,000 --> 07:28,000
+Cue 	448	Start Time	07:27,000
+
+449
+07:28,000 --> 07:29,000
+Cue 	449	Start Time	07:28,000
+
+450
+07:29,000 --> 07:30,000
+Cue 	450	Start Time	07:29,000
+
+451
+07:30,000 --> 07:31,000
+Cue 	451	Start Time	07:30,000
+
+452
+07:31,000 --> 07:32,000
+Cue 	452	Start Time	07:31,000
+
+453
+07:32,000 --> 07:33,000
+Cue 	453	Start Time	07:32,000
+
+454
+07:33,000 --> 07:34,000
+Cue 	454	Start Time	07:33,000
+
+455
+07:34,000 --> 07:35,000
+Cue 	455	Start Time	07:34,000
+
+456
+07:35,000 --> 07:36,000
+Cue 	456	Start Time	07:35,000
+
+457
+07:36,000 --> 07:37,000
+Cue 	457	Start Time	07:36,000
+
+458
+07:37,000 --> 07:38,000
+Cue 	458	Start Time	07:37,000
+
+459
+07:38,000 --> 07:39,000
+Cue 	459	Start Time	07:38,000
+
+460
+07:39,000 --> 07:40,000
+Cue 	460	Start Time	07:39,000
+
+461
+07:40,000 --> 07:41,000
+Cue 	461	Start Time	07:40,000
+
+462
+07:41,000 --> 07:42,000
+Cue 	462	Start Time	07:41,000
+
+463
+07:42,000 --> 07:43,000
+Cue 	463	Start Time	07:42,000
+
+464
+07:43,000 --> 07:44,000
+Cue 	464	Start Time	07:43,000
+
+465
+07:44,000 --> 07:45,000
+Cue 	465	Start Time	07:44,000
+
+466
+07:45,000 --> 07:46,000
+Cue 	466	Start Time	07:45,000
+
+467
+07:46,000 --> 07:47,000
+Cue 	467	Start Time	07:46,000
+
+468
+07:47,000 --> 07:48,000
+Cue 	468	Start Time	07:47,000
+
+469
+07:48,000 --> 07:49,000
+Cue 	469	Start Time	07:48,000
+
+470
+07:49,000 --> 07:50,000
+Cue 	470	Start Time	07:49,000
+
+471
+07:50,000 --> 07:51,000
+Cue 	471	Start Time	07:50,000
+
+472
+07:51,000 --> 07:52,000
+Cue 	472	Start Time	07:51,000
+
+473
+07:52,000 --> 07:53,000
+Cue 	473	Start Time	07:52,000
+
+474
+07:53,000 --> 07:54,000
+Cue 	474	Start Time	07:53,000
+
+475
+07:54,000 --> 07:55,000
+Cue 	475	Start Time	07:54,000
+
+476
+07:55,000 --> 07:56,000
+Cue 	476	Start Time	07:55,000
+
+477
+07:56,000 --> 07:57,000
+Cue 	477	Start Time	07:56,000
+
+478
+07:57,000 --> 07:58,000
+Cue 	478	Start Time	07:57,000
+
+479
+07:58,000 --> 07:59,000
+Cue 	479	Start Time	07:58,000
+
+480
+07:59,000 --> 08:00,000
+Cue 	480	Start Time	07:59,000
+
+481
+08:00,000 --> 08:01,000
+Cue 	481	Start Time	08:00,000
+
+482
+08:01,000 --> 08:02,000
+Cue 	482	Start Time	08:01,000
+
+483
+08:02,000 --> 08:03,000
+Cue 	483	Start Time	08:02,000
+
+484
+08:03,000 --> 08:04,000
+Cue 	484	Start Time	08:03,000
+
+485
+08:04,000 --> 08:05,000
+Cue 	485	Start Time	08:04,000
+
+486
+08:05,000 --> 08:06,000
+Cue 	486	Start Time	08:05,000
+
+487
+08:06,000 --> 08:07,000
+Cue 	487	Start Time	08:06,000
+
+488
+08:07,000 --> 08:08,000
+Cue 	488	Start Time	08:07,000
+
+489
+08:08,000 --> 08:09,000
+Cue 	489	Start Time	08:08,000
+
+490
+08:09,000 --> 08:10,000
+Cue 	490	Start Time	08:09,000
+
+491
+08:10,000 --> 08:11,000
+Cue 	491	Start Time	08:10,000
+
+492
+08:11,000 --> 08:12,000
+Cue 	492	Start Time	08:11,000
+
+493
+08:12,000 --> 08:13,000
+Cue 	493	Start Time	08:12,000
+
+494
+08:13,000 --> 08:14,000
+Cue 	494	Start Time	08:13,000
+
+495
+08:14,000 --> 08:15,000
+Cue 	495	Start Time	08:14,000
+
+496
+08:15,000 --> 08:16,000
+Cue 	496	Start Time	08:15,000
+
+497
+08:16,000 --> 08:17,000
+Cue 	497	Start Time	08:16,000
+
+498
+08:17,000 --> 08:18,000
+Cue 	498	Start Time	08:17,000
+
+499
+08:18,000 --> 08:19,000
+Cue 	499	Start Time	08:18,000
+
+500
+08:19,000 --> 08:20,000
+Cue 	500	Start Time	08:19,000
+
+501
+08:20,000 --> 08:21,000
+Cue 	501	Start Time	08:20,000
+
+502
+08:21,000 --> 08:22,000
+Cue 	502	Start Time	08:21,000
+
+503
+08:22,000 --> 08:23,000
+Cue 	503	Start Time	08:22,000
+
+504
+08:23,000 --> 08:24,000
+Cue 	504	Start Time	08:23,000
+
+505
+08:24,000 --> 08:25,000
+Cue 	505	Start Time	08:24,000
+
+506
+08:25,000 --> 08:26,000
+Cue 	506	Start Time	08:25,000
+
+507
+08:26,000 --> 08:27,000
+Cue 	507	Start Time	08:26,000
+
+508
+08:27,000 --> 08:28,000
+Cue 	508	Start Time	08:27,000
+
+509
+08:28,000 --> 08:29,000
+Cue 	509	Start Time	08:28,000
+
+510
+08:29,000 --> 08:30,000
+Cue 	510	Start Time	08:29,000
+
+511
+08:30,000 --> 08:31,000
+Cue 	511	Start Time	08:30,000
+
+512
+08:31,000 --> 08:32,000
+Cue 	512	Start Time	08:31,000
+
+513
+08:32,000 --> 08:33,000
+Cue 	513	Start Time	08:32,000
+
+514
+08:33,000 --> 08:34,000
+Cue 	514	Start Time	08:33,000
+
+515
+08:34,000 --> 08:35,000
+Cue 	515	Start Time	08:34,000
+
+516
+08:35,000 --> 08:36,000
+Cue 	516	Start Time	08:35,000
+
+517
+08:36,000 --> 08:37,000
+Cue 	517	Start Time	08:36,000
+
+518
+08:37,000 --> 08:38,000
+Cue 	518	Start Time	08:37,000
+
+519
+08:38,000 --> 08:39,000
+Cue 	519	Start Time	08:38,000
+
+520
+08:39,000 --> 08:40,000
+Cue 	520	Start Time	08:39,000
+
+521
+08:40,000 --> 08:41,000
+Cue 	521	Start Time	08:40,000
+
+522
+08:41,000 --> 08:42,000
+Cue 	522	Start Time	08:41,000
+
+523
+08:42,000 --> 08:43,000
+Cue 	523	Start Time	08:42,000
+
+524
+08:43,000 --> 08:44,000
+Cue 	524	Start Time	08:43,000
+
+525
+08:44,000 --> 08:45,000
+Cue 	525	Start Time	08:44,000
+
+526
+08:45,000 --> 08:46,000
+Cue 	526	Start Time	08:45,000
+
+527
+08:46,000 --> 08:47,000
+Cue 	527	Start Time	08:46,000
+
+528
+08:47,000 --> 08:48,000
+Cue 	528	Start Time	08:47,000
+
+529
+08:48,000 --> 08:49,000
+Cue 	529	Start Time	08:48,000
+
+530
+08:49,000 --> 08:50,000
+Cue 	530	Start Time	08:49,000
+
+531
+08:50,000 --> 08:51,000
+Cue 	531	Start Time	08:50,000
+
+532
+08:51,000 --> 08:52,000
+Cue 	532	Start Time	08:51,000
+
+533
+08:52,000 --> 08:53,000
+Cue 	533	Start Time	08:52,000
+
+534
+08:53,000 --> 08:54,000
+Cue 	534	Start Time	08:53,000
+
+535
+08:54,000 --> 08:55,000
+Cue 	535	Start Time	08:54,000
+
+536
+08:55,000 --> 08:56,000
+Cue 	536	Start Time	08:55,000
+
+537
+08:56,000 --> 08:57,000
+Cue 	537	Start Time	08:56,000
+
+538
+08:57,000 --> 08:58,000
+Cue 	538	Start Time	08:57,000
+
+539
+08:58,000 --> 08:59,000
+Cue 	539	Start Time	08:58,000
+
+540
+08:59,000 --> 09:00,000
+Cue 	540	Start Time	08:59,000
+
+541
+09:00,000 --> 09:01,000
+Cue 	541	Start Time	09:00,000
+
+542
+09:01,000 --> 09:02,000
+Cue 	542	Start Time	09:01,000
+
+543
+09:02,000 --> 09:03,000
+Cue 	543	Start Time	09:02,000
+
+544
+09:03,000 --> 09:04,000
+Cue 	544	Start Time	09:03,000
+
+545
+09:04,000 --> 09:05,000
+Cue 	545	Start Time	09:04,000
+
+546
+09:05,000 --> 09:06,000
+Cue 	546	Start Time	09:05,000
+
+547
+09:06,000 --> 09:07,000
+Cue 	547	Start Time	09:06,000
+
+548
+09:07,000 --> 09:08,000
+Cue 	548	Start Time	09:07,000
+
+549
+09:08,000 --> 09:09,000
+Cue 	549	Start Time	09:08,000
+
+550
+09:09,000 --> 09:10,000
+Cue 	550	Start Time	09:09,000
+
+551
+09:10,000 --> 09:11,000
+Cue 	551	Start Time	09:10,000
+
+552
+09:11,000 --> 09:12,000
+Cue 	552	Start Time	09:11,000
+
+553
+09:12,000 --> 09:13,000
+Cue 	553	Start Time	09:12,000
+
+554
+09:13,000 --> 09:14,000
+Cue 	554	Start Time	09:13,000
+
+555
+09:14,000 --> 09:15,000
+Cue 	555	Start Time	09:14,000
+
+556
+09:15,000 --> 09:16,000
+Cue 	556	Start Time	09:15,000
+
+557
+09:16,000 --> 09:17,000
+Cue 	557	Start Time	09:16,000
+
+558
+09:17,000 --> 09:18,000
+Cue 	558	Start Time	09:17,000
+
+559
+09:18,000 --> 09:19,000
+Cue 	559	Start Time	09:18,000
+
+560
+09:19,000 --> 09:20,000
+Cue 	560	Start Time	09:19,000
+
+561
+09:20,000 --> 09:21,000
+Cue 	561	Start Time	09:20,000
+
+562
+09:21,000 --> 09:22,000
+Cue 	562	Start Time	09:21,000
+
+563
+09:22,000 --> 09:23,000
+Cue 	563	Start Time	09:22,000
+
+564
+09:23,000 --> 09:24,000
+Cue 	564	Start Time	09:23,000
+
+565
+09:24,000 --> 09:25,000
+Cue 	565	Start Time	09:24,000
+
+566
+09:25,000 --> 09:26,000
+Cue 	566	Start Time	09:25,000
+
+567
+09:26,000 --> 09:27,000
+Cue 	567	Start Time	09:26,000
+
+568
+09:27,000 --> 09:28,000
+Cue 	568	Start Time	09:27,000
+
+569
+09:28,000 --> 09:29,000
+Cue 	569	Start Time	09:28,000
+
+570
+09:29,000 --> 09:30,000
+Cue 	570	Start Time	09:29,000
+
+571
+09:30,000 --> 09:31,000
+Cue 	571	Start Time	09:30,000
+
+572
+09:31,000 --> 09:32,000
+Cue 	572	Start Time	09:31,000
+
+573
+09:32,000 --> 09:33,000
+Cue 	573	Start Time	09:32,000
+
+574
+09:33,000 --> 09:34,000
+Cue 	574	Start Time	09:33,000
+
+575
+09:34,000 --> 09:35,000
+Cue 	575	Start Time	09:34,000
+
+576
+09:35,000 --> 09:36,000
+Cue 	576	Start Time	09:35,000
+
+577
+09:36,000 --> 09:37,000
+Cue 	577	Start Time	09:36,000
+
+578
+09:37,000 --> 09:38,000
+Cue 	578	Start Time	09:37,000
+
+579
+09:38,000 --> 09:39,000
+Cue 	579	Start Time	09:38,000
+
+580
+09:39,000 --> 09:40,000
+Cue 	580	Start Time	09:39,000
+
+581
+09:40,000 --> 09:41,000
+Cue 	581	Start Time	09:40,000
+
+582
+09:41,000 --> 09:42,000
+Cue 	582	Start Time	09:41,000
+
+583
+09:42,000 --> 09:43,000
+Cue 	583	Start Time	09:42,000
+
+584
+09:43,000 --> 09:44,000
+Cue 	584	Start Time	09:43,000
+
+585
+09:44,000 --> 09:45,000
+Cue 	585	Start Time	09:44,000
+
+586
+09:45,000 --> 09:46,000
+Cue 	586	Start Time	09:45,000
+
+587
+09:46,000 --> 09:47,000
+Cue 	587	Start Time	09:46,000
+
+588
+09:47,000 --> 09:48,000
+Cue 	588	Start Time	09:47,000
+
+589
+09:48,000 --> 09:49,000
+Cue 	589	Start Time	09:48,000
+
+590
+09:49,000 --> 09:50,000
+Cue 	590	Start Time	09:49,000
+
+591
+09:50,000 --> 09:51,000
+Cue 	591	Start Time	09:50,000
+
+592
+09:51,000 --> 09:52,000
+Cue 	592	Start Time	09:51,000
+
+593
+09:52,000 --> 09:53,000
+Cue 	593	Start Time	09:52,000
+
+594
+09:53,000 --> 09:54,000
+Cue 	594	Start Time	09:53,000
+
+595
+09:54,000 --> 09:55,000
+Cue 	595	Start Time	09:54,000
+
+596
+09:55,000 --> 09:56,000
+Cue 	596	Start Time	09:55,000
+
+597
+09:56,000 --> 09:57,000
+Cue 	597	Start Time	09:56,000
+
+598
+09:57,000 --> 09:58,000
+Cue 	598	Start Time	09:57,000
+
+599
+09:58,000 --> 09:59,000
+Cue 	599	Start Time	09:58,000
+
+600
+09:59,000 --> 10:00,000
+Cue 	600	Start Time	09:59,000
+

gpac-0.5.0.svn5178.tar.bz2/regression_tests/webvtt/counter.vtt Added

@@ -0,0 +1,4502 @@
+WEBVTT
+
+00:00.000	--> 	00:00.040	
+0	-	00:00.000	
+
+00:00.040	--> 	00:00.080	
+1	-	00:00.040	
+
+00:00.080	--> 	00:00.120	
+2	-	00:00.080	
+
+00:00.120	--> 	00:00.160	
+3	-	00:00.120	
+
+00:00.160	--> 	00:00.200	
+4	-	00:00.160	
+
+00:00.200	--> 	00:00.240	
+5	-	00:00.200	
+
+00:00.240	--> 	00:00.280	
+6	-	00:00.240	
+
+00:00.280	--> 	00:00.320	
+7	-	00:00.280	
+
+00:00.320	--> 	00:00.360	
+8	-	00:00.320	
+
+00:00.360	--> 	00:00.400	
+9	-	00:00.360	
+
+00:00.400	--> 	00:00.440	
+10	-	00:00.400	
+
+00:00.440	--> 	00:00.480	
+11	-	00:00.440	
+
+00:00.480	--> 	00:00.520	
+12	-	00:00.480	
+
+00:00.520	--> 	00:00.560	
+13	-	00:00.520	
+
+00:00.560	--> 	00:00.600	
+14	-	00:00.560	
+
+00:00.600	--> 	00:00.640	
+15	-	00:00.600	
+
+00:00.640	--> 	00:00.680	
+16	-	00:00.640	
+
+00:00.680	--> 	00:00.720	
+17	-	00:00.680	
+
+00:00.720	--> 	00:00.760	
+18	-	00:00.720	
+
+00:00.760	--> 	00:00.800	
+19	-	00:00.760	
+
+00:00.800	--> 	00:00.840	
+20	-	00:00.800	
+
+00:00.840	--> 	00:00.880	
+21	-	00:00.840	
+
+00:00.880	--> 	00:00.920	
+22	-	00:00.880	
+
+00:00.920	--> 	00:00.960	
+23	-	00:00.920	
+
+00:00.960	--> 	00:01.000	
+24	-	00:00.960	
+
+00:01.000	--> 	00:01.040	
+25	-	00:01.000	
+
+00:01.040	--> 	00:01.080	
+26	-	00:01.040	
+
+00:01.080	--> 	00:01.120	
+27	-	00:01.080	
+
+00:01.120	--> 	00:01.160	
+28	-	00:01.120	
+
+00:01.160	--> 	00:01.200	
+29	-	00:01.160	
+
+00:01.200	--> 	00:01.240	
+30	-	00:01.200	
+
+00:01.240	--> 	00:01.280	
+31	-	00:01.240	
+
+00:01.280	--> 	00:01.320	
+32	-	00:01.280	
+
+00:01.320	--> 	00:01.360	
+33	-	00:01.320	
+
+00:01.360	--> 	00:01.400	
+34	-	00:01.360	
+
+00:01.400	--> 	00:01.440	
+35	-	00:01.400	
+
+00:01.440	--> 	00:01.480	
+36	-	00:01.440	
+
+00:01.480	--> 	00:01.520	
+37	-	00:01.480	
+
+00:01.520	--> 	00:01.560	
+38	-	00:01.520	
+
+00:01.560	--> 	00:01.600	
+39	-	00:01.560	
+
+00:01.600	--> 	00:01.640	
+40	-	00:01.600	
+
+00:01.640	--> 	00:01.680	
+41	-	00:01.640	
+
+00:01.680	--> 	00:01.720	
+42	-	00:01.680	
+
+00:01.720	--> 	00:01.760	
+43	-	00:01.720	
+
+00:01.760	--> 	00:01.800	
+44	-	00:01.760	
+
+00:01.800	--> 	00:01.840	
+45	-	00:01.800	
+
+00:01.840	--> 	00:01.880	
+46	-	00:01.840	
+
+00:01.880	--> 	00:01.920	
+47	-	00:01.880	
+
+00:01.920	--> 	00:01.960	
+48	-	00:01.920	
+
+00:01.960	--> 	00:02.000	
+49	-	00:01.960	
+
+00:02.000	--> 	00:02.040	
+50	-	00:02.000	
+
+00:02.040	--> 	00:02.080	
+51	-	00:02.040	
+
+00:02.080	--> 	00:02.120	
+52	-	00:02.080	
+
+00:02.120	--> 	00:02.160	
+53	-	00:02.120	
+
+00:02.160	--> 	00:02.200	
+54	-	00:02.160	
+
+00:02.200	--> 	00:02.240	
+55	-	00:02.200	
+
+00:02.240	--> 	00:02.280	
+56	-	00:02.240	
+
+00:02.280	--> 	00:02.320	
+57	-	00:02.280	
+
+00:02.320	--> 	00:02.360	
+58	-	00:02.320	
+
+00:02.360	--> 	00:02.400	
+59	-	00:02.360	
+
+00:02.400	--> 	00:02.440	
+60	-	00:02.400	
+
+00:02.440	--> 	00:02.480	
+61	-	00:02.440	
+
+00:02.480	--> 	00:02.520	
+62	-	00:02.480	
+
+00:02.520	--> 	00:02.560	
+63	-	00:02.520	
+
+00:02.560	--> 	00:02.600	
+64	-	00:02.560	
+
+00:02.600	--> 	00:02.640	
+65	-	00:02.600	
+
+00:02.640	--> 	00:02.680	
+66	-	00:02.640	
+
+00:02.680	--> 	00:02.720	
+67	-	00:02.680	
+
+00:02.720	--> 	00:02.760	
+68	-	00:02.720	
+
+00:02.760	--> 	00:02.800	
+69	-	00:02.760	
+
+00:02.800	--> 	00:02.840	
+70	-	00:02.800	
+
+00:02.840	--> 	00:02.880	
+71	-	00:02.840	
+
+00:02.880	--> 	00:02.920	
+72	-	00:02.880	
+
+00:02.920	--> 	00:02.960	
+73	-	00:02.920	
+
+00:02.960	--> 	00:03.000	
+74	-	00:02.960	
+
+00:03.000	--> 	00:03.040	
+75	-	00:03.000	
+
+00:03.040	--> 	00:03.080	
+76	-	00:03.040	
+
+00:03.080	--> 	00:03.120	
+77	-	00:03.080	
+
+00:03.120	--> 	00:03.160	
+78	-	00:03.120	
+
+00:03.160	--> 	00:03.200	
+79	-	00:03.160	
+
+00:03.200	--> 	00:03.240	
+80	-	00:03.200	
+
+00:03.240	--> 	00:03.280	
+81	-	00:03.240	
+
+00:03.280	--> 	00:03.320	
+82	-	00:03.280	
+
+00:03.320	--> 	00:03.360	
+83	-	00:03.320	
+
+00:03.360	--> 	00:03.400	
+84	-	00:03.360	
+
+00:03.400	--> 	00:03.440	
+85	-	00:03.400	
+
+00:03.440	--> 	00:03.480	
+86	-	00:03.440	
+
+00:03.480	--> 	00:03.520	
+87	-	00:03.480	
+
+00:03.520	--> 	00:03.560	
+88	-	00:03.520	
+
+00:03.560	--> 	00:03.600	
+89	-	00:03.560	
+
+00:03.600	--> 	00:03.640	
+90	-	00:03.600	
+
+00:03.640	--> 	00:03.680	
+91	-	00:03.640	
+
+00:03.680	--> 	00:03.720	
+92	-	00:03.680	
+
+00:03.720	--> 	00:03.760	
+93	-	00:03.720	
+
+00:03.760	--> 	00:03.800	
+94	-	00:03.760	
+
+00:03.800	--> 	00:03.840	
+95	-	00:03.800	
+
+00:03.840	--> 	00:03.880	
+96	-	00:03.840	
+
+00:03.880	--> 	00:03.920	
+97	-	00:03.880	
+
+00:03.920	--> 	00:03.960	
+98	-	00:03.920	
+
+00:03.960	--> 	00:04.000	
+99	-	00:03.960	
+
+00:04.000	--> 	00:04.040	
+100	-	00:04.000	
+
+00:04.040	--> 	00:04.080	
+101	-	00:04.040	
+
+00:04.080	--> 	00:04.120	
+102	-	00:04.080	
+
+00:04.120	--> 	00:04.160	
+103	-	00:04.120	
+
+00:04.160	--> 	00:04.200	
+104	-	00:04.160	
+
+00:04.200	--> 	00:04.240	
+105	-	00:04.200	
+
+00:04.240	--> 	00:04.280	
+106	-	00:04.240	
+
+00:04.280	--> 	00:04.320	
+107	-	00:04.280	
+
+00:04.320	--> 	00:04.360	
+108	-	00:04.320	
+
+00:04.360	--> 	00:04.400	
+109	-	00:04.360	
+
+00:04.400	--> 	00:04.440	
+110	-	00:04.400	
+
+00:04.440	--> 	00:04.480	
+111	-	00:04.440	
+
+00:04.480	--> 	00:04.520	
+112	-	00:04.480	
+
+00:04.520	--> 	00:04.560	
+113	-	00:04.520	
+
+00:04.560	--> 	00:04.600	
+114	-	00:04.560	
+
+00:04.600	--> 	00:04.640	
+115	-	00:04.600	
+
+00:04.640	--> 	00:04.680	
+116	-	00:04.640	
+
+00:04.680	--> 	00:04.720	
+117	-	00:04.680	
+
+00:04.720	--> 	00:04.760	
+118	-	00:04.720	
+
+00:04.760	--> 	00:04.800	
+119	-	00:04.760	
+
+00:04.800	--> 	00:04.840	
+120	-	00:04.800	
+
+00:04.840	--> 	00:04.880	
+121	-	00:04.840	
+
+00:04.880	--> 	00:04.920	
+122	-	00:04.880	
+
+00:04.920	--> 	00:04.960	
+123	-	00:04.920	
+
+00:04.960	--> 	00:05.000	
+124	-	00:04.960	
+
+00:05.000	--> 	00:05.040	
+125	-	00:05.000	
+
+00:05.040	--> 	00:05.080	
+126	-	00:05.040	
+
+00:05.080	--> 	00:05.120	
+127	-	00:05.080	
+
+00:05.120	--> 	00:05.160	
+128	-	00:05.120	
+
+00:05.160	--> 	00:05.200	
+129	-	00:05.160	
+
+00:05.200	--> 	00:05.240	
+130	-	00:05.200	
+
+00:05.240	--> 	00:05.280	
+131	-	00:05.240	
+
+00:05.280	--> 	00:05.320	
+132	-	00:05.280	
+
+00:05.320	--> 	00:05.360	
+133	-	00:05.320	
+
+00:05.360	--> 	00:05.400	
+134	-	00:05.360	
+
+00:05.400	--> 	00:05.440	
+135	-	00:05.400	
+
+00:05.440	--> 	00:05.480	
+136	-	00:05.440	
+
+00:05.480	--> 	00:05.520	
+137	-	00:05.480	
+
+00:05.520	--> 	00:05.560	
+138	-	00:05.520	
+
+00:05.560	--> 	00:05.600	
+139	-	00:05.560	
+
+00:05.600	--> 	00:05.640	
+140	-	00:05.600	
+
+00:05.640	--> 	00:05.680	
+141	-	00:05.640	
+
+00:05.680	--> 	00:05.720	
+142	-	00:05.680	
+
+00:05.720	--> 	00:05.760	
+143	-	00:05.720	
+
+00:05.760	--> 	00:05.800	
+144	-	00:05.760	
+
+00:05.800	--> 	00:05.840	
+145	-	00:05.800	
+
+00:05.840	--> 	00:05.880	
+146	-	00:05.840	
+
+00:05.880	--> 	00:05.920	
+147	-	00:05.880	
+
+00:05.920	--> 	00:05.960	
+148	-	00:05.920	
+
+00:05.960	--> 	00:06.000	
+149	-	00:05.960	
+
+00:06.000	--> 	00:06.040	
+150	-	00:06.000	
+
+00:06.040	--> 	00:06.080	
+151	-	00:06.040	
+
+00:06.080	--> 	00:06.120	
+152	-	00:06.080	
+
+00:06.120	--> 	00:06.160	
+153	-	00:06.120	
+
+00:06.160	--> 	00:06.200	
+154	-	00:06.160	
+
+00:06.200	--> 	00:06.240	
+155	-	00:06.200	
+
+00:06.240	--> 	00:06.280	
+156	-	00:06.240	
+
+00:06.280	--> 	00:06.320	
+157	-	00:06.280	
+
+00:06.320	--> 	00:06.360	
+158	-	00:06.320	
+
+00:06.360	--> 	00:06.400	
+159	-	00:06.360	
+
+00:06.400	--> 	00:06.440	
+160	-	00:06.400	
+
+00:06.440	--> 	00:06.480	
+161	-	00:06.440	
+
+00:06.480	--> 	00:06.520	
+162	-	00:06.480	
+
+00:06.520	--> 	00:06.560	
+163	-	00:06.520	
+
+00:06.560	--> 	00:06.600	
+164	-	00:06.560	
+
+00:06.600	--> 	00:06.640	
+165	-	00:06.600	
+
+00:06.640	--> 	00:06.680	
+166	-	00:06.640	
+
+00:06.680	--> 	00:06.720	
+167	-	00:06.680	
+
+00:06.720	--> 	00:06.760	
+168	-	00:06.720	
+
+00:06.760	--> 	00:06.800	
+169	-	00:06.760	
+
+00:06.800	--> 	00:06.840	
+170	-	00:06.800	
+
+00:06.840	--> 	00:06.880	
+171	-	00:06.840	
+
+00:06.880	--> 	00:06.920	
+172	-	00:06.880	
+
+00:06.920	--> 	00:06.960	
+173	-	00:06.920	
+
+00:06.960	--> 	00:07.000	
+174	-	00:06.960	
+
+00:07.000	--> 	00:07.040	
+175	-	00:07.000	
+
+00:07.040	--> 	00:07.080	
+176	-	00:07.040	
+
+00:07.080	--> 	00:07.120	
+177	-	00:07.080	
+
+00:07.120	--> 	00:07.160	
+178	-	00:07.120	
+
+00:07.160	--> 	00:07.200	
+179	-	00:07.160	
+
+00:07.200	--> 	00:07.240	
+180	-	00:07.200	
+
+00:07.240	--> 	00:07.280	
+181	-	00:07.240	
+
+00:07.280	--> 	00:07.320	
+182	-	00:07.280	
+
+00:07.320	--> 	00:07.360	
+183	-	00:07.320	
+
+00:07.360	--> 	00:07.400	
+184	-	00:07.360	
+
+00:07.400	--> 	00:07.440	
+185	-	00:07.400	
+
+00:07.440	--> 	00:07.480	
+186	-	00:07.440	
+
+00:07.480	--> 	00:07.520	
+187	-	00:07.480	
+
+00:07.520	--> 	00:07.560	
+188	-	00:07.520	
+
+00:07.560	--> 	00:07.600	
+189	-	00:07.560	
+
+00:07.600	--> 	00:07.640	
+190	-	00:07.600	
+
+00:07.640	--> 	00:07.680	
+191	-	00:07.640	
+
+00:07.680	--> 	00:07.720	
+192	-	00:07.680	
+
+00:07.720	--> 	00:07.760	
+193	-	00:07.720	
+
+00:07.760	--> 	00:07.800	
+194	-	00:07.760	
+
+00:07.800	--> 	00:07.840	
+195	-	00:07.800	
+
+00:07.840	--> 	00:07.880	
+196	-	00:07.840	
+
+00:07.880	--> 	00:07.920	
+197	-	00:07.880	
+
+00:07.920	--> 	00:07.960	
+198	-	00:07.920	
+
+00:07.960	--> 	00:08.000	
+199	-	00:07.960	
+
+00:08.000	--> 	00:08.040	
+200	-	00:08.000	
+
+00:08.040	--> 	00:08.080	
+201	-	00:08.040	
+
+00:08.080	--> 	00:08.120	
+202	-	00:08.080	
+
+00:08.120	--> 	00:08.160	
+203	-	00:08.120	
+
+00:08.160	--> 	00:08.200	
+204	-	00:08.160	
+
+00:08.200	--> 	00:08.240	
+205	-	00:08.200	
+
+00:08.240	--> 	00:08.280	
+206	-	00:08.240	
+
+00:08.280	--> 	00:08.320	
+207	-	00:08.280	
+
+00:08.320	--> 	00:08.360	
+208	-	00:08.320	
+
+00:08.360	--> 	00:08.400	
+209	-	00:08.360	
+
+00:08.400	--> 	00:08.440	
+210	-	00:08.400	
+
+00:08.440	--> 	00:08.480	
+211	-	00:08.440	
+
+00:08.480	--> 	00:08.520	
+212	-	00:08.480	
+
+00:08.520	--> 	00:08.560	
+213	-	00:08.520	
+
+00:08.560	--> 	00:08.600	
+214	-	00:08.560	
+
+00:08.600	--> 	00:08.640	
+215	-	00:08.600	
+
+00:08.640	--> 	00:08.680	
+216	-	00:08.640	
+
+00:08.680	--> 	00:08.720	
+217	-	00:08.680	
+
+00:08.720	--> 	00:08.760	
+218	-	00:08.720	
+
+00:08.760	--> 	00:08.800	
+219	-	00:08.760	
+
+00:08.800	--> 	00:08.840	
+220	-	00:08.800	
+
+00:08.840	--> 	00:08.880	
+221	-	00:08.840	
+
+00:08.880	--> 	00:08.920	
+222	-	00:08.880	
+
+00:08.920	--> 	00:08.960	
+223	-	00:08.920	
+
+00:08.960	--> 	00:09.000	
+224	-	00:08.960	
+
+00:09.000	--> 	00:09.040	
+225	-	00:09.000	
+
+00:09.040	--> 	00:09.080	
+226	-	00:09.040	
+
+00:09.080	--> 	00:09.120	
+227	-	00:09.080	
+
+00:09.120	--> 	00:09.160	
+228	-	00:09.120	
+
+00:09.160	--> 	00:09.200	
+229	-	00:09.160	
+
+00:09.200	--> 	00:09.240	
+230	-	00:09.200	
+
+00:09.240	--> 	00:09.280	
+231	-	00:09.240	
+
+00:09.280	--> 	00:09.320	
+232	-	00:09.280	
+
+00:09.320	--> 	00:09.360	
+233	-	00:09.320	
+
+00:09.360	--> 	00:09.400	
+234	-	00:09.360	
+
+00:09.400	--> 	00:09.440	
+235	-	00:09.400	
+
+00:09.440	--> 	00:09.480	
+236	-	00:09.440	
+
+00:09.480	--> 	00:09.520	
+237	-	00:09.480	
+
+00:09.520	--> 	00:09.560	
+238	-	00:09.520	
+
+00:09.560	--> 	00:09.600	
+239	-	00:09.560	
+
+00:09.600	--> 	00:09.640	
+240	-	00:09.600	
+
+00:09.640	--> 	00:09.680	
+241	-	00:09.640	
+
+00:09.680	--> 	00:09.720	
+242	-	00:09.680	
+
+00:09.720	--> 	00:09.760	
+243	-	00:09.720	
+
+00:09.760	--> 	00:09.800	
+244	-	00:09.760	
+
+00:09.800	--> 	00:09.840	
+245	-	00:09.800	
+
+00:09.840	--> 	00:09.880	
+246	-	00:09.840	
+
+00:09.880	--> 	00:09.920	
+247	-	00:09.880	
+
+00:09.920	--> 	00:09.960	
+248	-	00:09.920	
+
+00:09.960	--> 	00:10.000	
+249	-	00:09.960	
+
+00:10.000	--> 	00:10.040	
+250	-	00:10.000	
+
+00:10.040	--> 	00:10.080	
+251	-	00:10.040	
+
+00:10.080	--> 	00:10.120	
+252	-	00:10.080	
+
+00:10.120	--> 	00:10.160	
+253	-	00:10.120	
+
+00:10.160	--> 	00:10.200	
+254	-	00:10.160	
+
+00:10.200	--> 	00:10.240	
+255	-	00:10.200	
+
+00:10.240	--> 	00:10.280	
+256	-	00:10.240	
+
+00:10.280	--> 	00:10.320	
+257	-	00:10.280	
+
+00:10.320	--> 	00:10.360	
+258	-	00:10.320	
+
+00:10.360	--> 	00:10.400	
+259	-	00:10.360	
+
+00:10.400	--> 	00:10.440	
+260	-	00:10.400	
+
+00:10.440	--> 	00:10.480	
+261	-	00:10.440	
+
+00:10.480	--> 	00:10.520	
+262	-	00:10.480	
+
+00:10.520	--> 	00:10.560	
+263	-	00:10.520	
+
+00:10.560	--> 	00:10.600	
+264	-	00:10.560	
+
+00:10.600	--> 	00:10.640	
+265	-	00:10.600	
+
+00:10.640	--> 	00:10.680	
+266	-	00:10.640	
+
+00:10.680	--> 	00:10.720	
+267	-	00:10.680	
+
+00:10.720	--> 	00:10.760	
+268	-	00:10.720	
+
+00:10.760	--> 	00:10.800	
+269	-	00:10.760	
+
+00:10.800	--> 	00:10.840	
+270	-	00:10.800	
+
+00:10.840	--> 	00:10.880	
+271	-	00:10.840	
+
+00:10.880	--> 	00:10.920	
+272	-	00:10.880	
+
+00:10.920	--> 	00:10.960	
+273	-	00:10.920	
+
+00:10.960	--> 	00:11.000	
+274	-	00:10.960	
+
+00:11.000	--> 	00:11.040	
+275	-	00:11.000	
+
+00:11.040	--> 	00:11.080	
+276	-	00:11.040	
+
+00:11.080	--> 	00:11.120	
+277	-	00:11.080	
+
+00:11.120	--> 	00:11.160	
+278	-	00:11.120	
+
+00:11.160	--> 	00:11.200	
+279	-	00:11.160	
+
+00:11.200	--> 	00:11.240	
+280	-	00:11.200	
+
+00:11.240	--> 	00:11.280	
+281	-	00:11.240	
+
+00:11.280	--> 	00:11.320	
+282	-	00:11.280	
+
+00:11.320	--> 	00:11.360	
+283	-	00:11.320	
+
+00:11.360	--> 	00:11.400	
+284	-	00:11.360	
+
+00:11.400	--> 	00:11.440	
+285	-	00:11.400	
+
+00:11.440	--> 	00:11.480	
+286	-	00:11.440	
+
+00:11.480	--> 	00:11.520	
+287	-	00:11.480	
+
+00:11.520	--> 	00:11.560	
+288	-	00:11.520	
+
+00:11.560	--> 	00:11.600	
+289	-	00:11.560	
+
+00:11.600	--> 	00:11.640	
+290	-	00:11.600	
+
+00:11.640	--> 	00:11.680	
+291	-	00:11.640	
+
+00:11.680	--> 	00:11.720	
+292	-	00:11.680	
+
+00:11.720	--> 	00:11.760	
+293	-	00:11.720	
+
+00:11.760	--> 	00:11.800	
+294	-	00:11.760	
+
+00:11.800	--> 	00:11.840	
+295	-	00:11.800	
+
+00:11.840	--> 	00:11.880	
+296	-	00:11.840	
+
+00:11.880	--> 	00:11.920	
+297	-	00:11.880	
+
+00:11.920	--> 	00:11.960	
+298	-	00:11.920	
+
+00:11.960	--> 	00:12.000	
+299	-	00:11.960	
+
+00:12.000	--> 	00:12.040	
+300	-	00:12.000	
+
+00:12.040	--> 	00:12.080	
+301	-	00:12.040	
+
+00:12.080	--> 	00:12.120	
+302	-	00:12.080	
+
+00:12.120	--> 	00:12.160	
+303	-	00:12.120	
+
+00:12.160	--> 	00:12.200	
+304	-	00:12.160	
+
+00:12.200	--> 	00:12.240	
+305	-	00:12.200	
+
+00:12.240	--> 	00:12.280	
+306	-	00:12.240	
+
+00:12.280	--> 	00:12.320	
+307	-	00:12.280	
+
+00:12.320	--> 	00:12.360	
+308	-	00:12.320	
+
+00:12.360	--> 	00:12.400	
+309	-	00:12.360	
+
+00:12.400	--> 	00:12.440	
+310	-	00:12.400	
+
+00:12.440	--> 	00:12.480	
+311	-	00:12.440	
+
+00:12.480	--> 	00:12.520	
+312	-	00:12.480	
+
+00:12.520	--> 	00:12.560	
+313	-	00:12.520	
+
+00:12.560	--> 	00:12.600	
+314	-	00:12.560	
+
+00:12.600	--> 	00:12.640	
+315	-	00:12.600	
+
+00:12.640	--> 	00:12.680	
+316	-	00:12.640	
+
+00:12.680	--> 	00:12.720	
+317	-	00:12.680	
+
+00:12.720	--> 	00:12.760	
+318	-	00:12.720	
+
+00:12.760	--> 	00:12.800	
+319	-	00:12.760	
+
+00:12.800	--> 	00:12.840	
+320	-	00:12.800	
+
+00:12.840	--> 	00:12.880	
+321	-	00:12.840	
+
+00:12.880	--> 	00:12.920	
+322	-	00:12.880	
+
+00:12.920	--> 	00:12.960	
+323	-	00:12.920	
+
+00:12.960	--> 	00:13.000	
+324	-	00:12.960	
+
+00:13.000	--> 	00:13.040	
+325	-	00:13.000	
+
+00:13.040	--> 	00:13.080	
+326	-	00:13.040	
+
+00:13.080	--> 	00:13.120	
+327	-	00:13.080	
+
+00:13.120	--> 	00:13.160	
+328	-	00:13.120	
+
+00:13.160	--> 	00:13.200	
+329	-	00:13.160	
+
+00:13.200	--> 	00:13.240	
+330	-	00:13.200	
+
+00:13.240	--> 	00:13.280	
+331	-	00:13.240	
+
+00:13.280	--> 	00:13.320	
+332	-	00:13.280	
+
+00:13.320	--> 	00:13.360	
+333	-	00:13.320	
+
+00:13.360	--> 	00:13.400	
+334	-	00:13.360	
+
+00:13.400	--> 	00:13.440	
+335	-	00:13.400	
+
+00:13.440	--> 	00:13.480	
+336	-	00:13.440	
+
+00:13.480	--> 	00:13.520	
+337	-	00:13.480	
+
+00:13.520	--> 	00:13.560	
+338	-	00:13.520	
+
+00:13.560	--> 	00:13.600	
+339	-	00:13.560	
+
+00:13.600	--> 	00:13.640	
+340	-	00:13.600	
+
+00:13.640	--> 	00:13.680	
+341	-	00:13.640	
+
+00:13.680	--> 	00:13.720	
+342	-	00:13.680	
+
+00:13.720	--> 	00:13.760	
+343	-	00:13.720	
+
+00:13.760	--> 	00:13.800	
+344	-	00:13.760	
+
+00:13.800	--> 	00:13.840	
+345	-	00:13.800	
+
+00:13.840	--> 	00:13.880	
+346	-	00:13.840	
+
+00:13.880	--> 	00:13.920	
+347	-	00:13.880	
+
+00:13.920	--> 	00:13.960	
+348	-	00:13.920	
+
+00:13.960	--> 	00:14.000	
+349	-	00:13.960	
+
+00:14.000	--> 	00:14.040	
+350	-	00:14.000	
+
+00:14.040	--> 	00:14.080	
+351	-	00:14.040	
+
+00:14.080	--> 	00:14.120	
+352	-	00:14.080	
+
+00:14.120	--> 	00:14.160	
+353	-	00:14.120	
+
+00:14.160	--> 	00:14.200	
+354	-	00:14.160	
+
+00:14.200	--> 	00:14.240	
+355	-	00:14.200	
+
+00:14.240	--> 	00:14.280	
+356	-	00:14.240	
+
+00:14.280	--> 	00:14.320	
+357	-	00:14.280	
+
+00:14.320	--> 	00:14.360	
+358	-	00:14.320	
+
+00:14.360	--> 	00:14.400	
+359	-	00:14.360	
+
+00:14.400	--> 	00:14.440	
+360	-	00:14.400	
+
+00:14.440	--> 	00:14.480	
+361	-	00:14.440	
+
+00:14.480	--> 	00:14.520	
+362	-	00:14.480	
+
+00:14.520	--> 	00:14.560	
+363	-	00:14.520	
+
+00:14.560	--> 	00:14.600	
+364	-	00:14.560	
+
+00:14.600	--> 	00:14.640	
+365	-	00:14.600	
+
+00:14.640	--> 	00:14.680	
+366	-	00:14.640	
+
+00:14.680	--> 	00:14.720	
+367	-	00:14.680	
+
+00:14.720	--> 	00:14.760	
+368	-	00:14.720	
+
+00:14.760	--> 	00:14.800	
+369	-	00:14.760	
+
+00:14.800	--> 	00:14.840	
+370	-	00:14.800	
+
+00:14.840	--> 	00:14.880	
+371	-	00:14.840	
+
+00:14.880	--> 	00:14.920	
+372	-	00:14.880	
+
+00:14.920	--> 	00:14.960	
+373	-	00:14.920	
+
+00:14.960	--> 	00:15.000	
+374	-	00:14.960	
+
+00:15.000	--> 	00:15.040	
+375	-	00:15.000	
+
+00:15.040	--> 	00:15.080	
+376	-	00:15.040	
+
+00:15.080	--> 	00:15.120	
+377	-	00:15.080	
+
+00:15.120	--> 	00:15.160	
+378	-	00:15.120	
+
+00:15.160	--> 	00:15.200	
+379	-	00:15.160	
+
+00:15.200	--> 	00:15.240	
+380	-	00:15.200	
+
+00:15.240	--> 	00:15.280	
+381	-	00:15.240	
+
+00:15.280	--> 	00:15.320	
+382	-	00:15.280	
+
+00:15.320	--> 	00:15.360	
+383	-	00:15.320	
+
+00:15.360	--> 	00:15.400	
+384	-	00:15.360	
+
+00:15.400	--> 	00:15.440	
+385	-	00:15.400	
+
+00:15.440	--> 	00:15.480	
+386	-	00:15.440	
+
+00:15.480	--> 	00:15.520	
+387	-	00:15.480	
+
+00:15.520	--> 	00:15.560	
+388	-	00:15.520	
+
+00:15.560	--> 	00:15.600	
+389	-	00:15.560	
+
+00:15.600	--> 	00:15.640	
+390	-	00:15.600	
+
+00:15.640	--> 	00:15.680	
+391	-	00:15.640	
+
+00:15.680	--> 	00:15.720	
+392	-	00:15.680	
+
+00:15.720	--> 	00:15.760	
+393	-	00:15.720	
+
+00:15.760	--> 	00:15.800	
+394	-	00:15.760	
+
+00:15.800	--> 	00:15.840	
+395	-	00:15.800	
+
+00:15.840	--> 	00:15.880	
+396	-	00:15.840	
+
+00:15.880	--> 	00:15.920	
+397	-	00:15.880	
+
+00:15.920	--> 	00:15.960	
+398	-	00:15.920	
+
+00:15.960	--> 	00:16.000	
+399	-	00:15.960	
+
+00:16.000	--> 	00:16.040	
+400	-	00:16.000	
+
+00:16.040	--> 	00:16.080	
+401	-	00:16.040	
+
+00:16.080	--> 	00:16.120	
+402	-	00:16.080	
+
+00:16.120	--> 	00:16.160	
+403	-	00:16.120	
+
+00:16.160	--> 	00:16.200	
+404	-	00:16.160	
+
+00:16.200	--> 	00:16.240	
+405	-	00:16.200	
+
+00:16.240	--> 	00:16.280	
+406	-	00:16.240	
+
+00:16.280	--> 	00:16.320	
+407	-	00:16.280	
+
+00:16.320	--> 	00:16.360	
+408	-	00:16.320	
+
+00:16.360	--> 	00:16.400	
+409	-	00:16.360	
+
+00:16.400	--> 	00:16.440	
+410	-	00:16.400	
+
+00:16.440	--> 	00:16.480	
+411	-	00:16.440	
+
+00:16.480	--> 	00:16.520	
+412	-	00:16.480	
+
+00:16.520	--> 	00:16.560	
+413	-	00:16.520	
+
+00:16.560	--> 	00:16.600	
+414	-	00:16.560	
+
+00:16.600	--> 	00:16.640	
+415	-	00:16.600	
+
+00:16.640	--> 	00:16.680	
+416	-	00:16.640	
+
+00:16.680	--> 	00:16.720	
+417	-	00:16.680	
+
+00:16.720	--> 	00:16.760	
+418	-	00:16.720	
+
+00:16.760	--> 	00:16.800	
+419	-	00:16.760	
+
+00:16.800	--> 	00:16.840	
+420	-	00:16.800	
+
+00:16.840	--> 	00:16.880	
+421	-	00:16.840	
+
+00:16.880	--> 	00:16.920	
+422	-	00:16.880	
+
+00:16.920	--> 	00:16.960	
+423	-	00:16.920	
+
+00:16.960	--> 	00:17.000	
+424	-	00:16.960	
+
+00:17.000	--> 	00:17.040	
+425	-	00:17.000	
+
+00:17.040	--> 	00:17.080	
+426	-	00:17.040	
+
+00:17.080	--> 	00:17.120	
+427	-	00:17.080	
+
+00:17.120	--> 	00:17.160	
+428	-	00:17.120	
+
+00:17.160	--> 	00:17.200	
+429	-	00:17.160	
+
+00:17.200	--> 	00:17.240	
+430	-	00:17.200	
+
+00:17.240	--> 	00:17.280	
+431	-	00:17.240	
+
+00:17.280	--> 	00:17.320	
+432	-	00:17.280	
+
+00:17.320	--> 	00:17.360	
+433	-	00:17.320	
+
+00:17.360	--> 	00:17.400	
+434	-	00:17.360	
+
+00:17.400	--> 	00:17.440	
+435	-	00:17.400	
+
+00:17.440	--> 	00:17.480	
+436	-	00:17.440	
+
+00:17.480	--> 	00:17.520	
+437	-	00:17.480	
+
+00:17.520	--> 	00:17.560	
+438	-	00:17.520	
+
+00:17.560	--> 	00:17.600	
+439	-	00:17.560	
+
+00:17.600	--> 	00:17.640	
+440	-	00:17.600	
+
+00:17.640	--> 	00:17.680	
+441	-	00:17.640	
+
+00:17.680	--> 	00:17.720	
+442	-	00:17.680	
+
+00:17.720	--> 	00:17.760	
+443	-	00:17.720	
+
+00:17.760	--> 	00:17.800	
+444	-	00:17.760	
+
+00:17.800	--> 	00:17.840	
+445	-	00:17.800	
+
+00:17.840	--> 	00:17.880	
+446	-	00:17.840	
+
+00:17.880	--> 	00:17.920	
+447	-	00:17.880	
+
+00:17.920	--> 	00:17.960	
+448	-	00:17.920	
+
+00:17.960	--> 	00:18.000	
+449	-	00:17.960	
+
+00:18.000	--> 	00:18.040	
+450	-	00:18.000	
+
+00:18.040	--> 	00:18.080	
+451	-	00:18.040	
+
+00:18.080	--> 	00:18.120	
+452	-	00:18.080	
+
+00:18.120	--> 	00:18.160	
+453	-	00:18.120	
+
+00:18.160	--> 	00:18.200	
+454	-	00:18.160	
+
+00:18.200	--> 	00:18.240	
+455	-	00:18.200	
+
+00:18.240	--> 	00:18.280	
+456	-	00:18.240	
+
+00:18.280	--> 	00:18.320	
+457	-	00:18.280	
+
+00:18.320	--> 	00:18.360	
+458	-	00:18.320	
+
+00:18.360	--> 	00:18.400	
+459	-	00:18.360	
+
+00:18.400	--> 	00:18.440	
+460	-	00:18.400	
+
+00:18.440	--> 	00:18.480	
+461	-	00:18.440	
+
+00:18.480	--> 	00:18.520	
+462	-	00:18.480	
+
+00:18.520	--> 	00:18.560	
+463	-	00:18.520	
+
+00:18.560	--> 	00:18.600	
+464	-	00:18.560	
+
+00:18.600	--> 	00:18.640	
+465	-	00:18.600	
+
+00:18.640	--> 	00:18.680	
+466	-	00:18.640	
+
+00:18.680	--> 	00:18.720	
+467	-	00:18.680	
+
+00:18.720	--> 	00:18.760	
+468	-	00:18.720	
+
+00:18.760	--> 	00:18.800	
+469	-	00:18.760	
+
+00:18.800	--> 	00:18.840	
+470	-	00:18.800	
+
+00:18.840	--> 	00:18.880	
+471	-	00:18.840	
+
+00:18.880	--> 	00:18.920	
+472	-	00:18.880	
+
+00:18.920	--> 	00:18.960	
+473	-	00:18.920	
+
+00:18.960	--> 	00:19.000	
+474	-	00:18.960	
+
+00:19.000	--> 	00:19.040	
+475	-	00:19.000	
+
+00:19.040	--> 	00:19.080	
+476	-	00:19.040	
+
+00:19.080	--> 	00:19.120	
+477	-	00:19.080	
+
+00:19.120	--> 	00:19.160	
+478	-	00:19.120	
+
+00:19.160	--> 	00:19.200	
+479	-	00:19.160	
+
+00:19.200	--> 	00:19.240	
+480	-	00:19.200	
+
+00:19.240	--> 	00:19.280	
+481	-	00:19.240	
+
+00:19.280	--> 	00:19.320	
+482	-	00:19.280	
+
+00:19.320	--> 	00:19.360	
+483	-	00:19.320	
+
+00:19.360	--> 	00:19.400	
+484	-	00:19.360	
+
+00:19.400	--> 	00:19.440	
+485	-	00:19.400	
+
+00:19.440	--> 	00:19.480	
+486	-	00:19.440	
+
+00:19.480	--> 	00:19.520	
+487	-	00:19.480	
+
+00:19.520	--> 	00:19.560	
+488	-	00:19.520	
+
+00:19.560	--> 	00:19.600	
+489	-	00:19.560	
+
+00:19.600	--> 	00:19.640	
+490	-	00:19.600	
+
+00:19.640	--> 	00:19.680	
+491	-	00:19.640	
+
+00:19.680	--> 	00:19.720	
+492	-	00:19.680	
+
+00:19.720	--> 	00:19.760	
+493	-	00:19.720	
+
+00:19.760	--> 	00:19.800	
+494	-	00:19.760	
+
+00:19.800	--> 	00:19.840	
+495	-	00:19.800	
+
+00:19.840	--> 	00:19.880	
+496	-	00:19.840	
+
+00:19.880	--> 	00:19.920	
+497	-	00:19.880	
+
+00:19.920	--> 	00:19.960	
+498	-	00:19.920	
+
+00:19.960	--> 	00:20.000	
+499	-	00:19.960	
+
+00:20.000	--> 	00:20.040	
+500	-	00:20.000	
+
+00:20.040	--> 	00:20.080	
+501	-	00:20.040	
+
+00:20.080	--> 	00:20.120	
+502	-	00:20.080	
+
+00:20.120	--> 	00:20.160	
+503	-	00:20.120	
+
+00:20.160	--> 	00:20.200	
+504	-	00:20.160	
+
+00:20.200	--> 	00:20.240	
+505	-	00:20.200	
+
+00:20.240	--> 	00:20.280	
+506	-	00:20.240	
+
+00:20.280	--> 	00:20.320	
+507	-	00:20.280	
+
+00:20.320	--> 	00:20.360	
+508	-	00:20.320	
+
+00:20.360	--> 	00:20.400	
+509	-	00:20.360	
+
+00:20.400	--> 	00:20.440	
+510	-	00:20.400	
+
+00:20.440	--> 	00:20.480	
+511	-	00:20.440	
+
+00:20.480	--> 	00:20.520	
+512	-	00:20.480	
+
+00:20.520	--> 	00:20.560	
+513	-	00:20.520	
+
+00:20.560	--> 	00:20.600	
+514	-	00:20.560	
+
+00:20.600	--> 	00:20.640	
+515	-	00:20.600	
+
+00:20.640	--> 	00:20.680	
+516	-	00:20.640	
+
+00:20.680	--> 	00:20.720	
+517	-	00:20.680	
+
+00:20.720	--> 	00:20.760	
+518	-	00:20.720	
+
+00:20.760	--> 	00:20.800	
+519	-	00:20.760	
+
+00:20.800	--> 	00:20.840	
+520	-	00:20.800	
+
+00:20.840	--> 	00:20.880	
+521	-	00:20.840	
+
+00:20.880	--> 	00:20.920	
+522	-	00:20.880	
+
+00:20.920	--> 	00:20.960	
+523	-	00:20.920	
+
+00:20.960	--> 	00:21.000	
+524	-	00:20.960	
+
+00:21.000	--> 	00:21.040	
+525	-	00:21.000	
+
+00:21.040	--> 	00:21.080	
+526	-	00:21.040	
+
+00:21.080	--> 	00:21.120	
+527	-	00:21.080	
+
+00:21.120	--> 	00:21.160	
+528	-	00:21.120	
+
+00:21.160	--> 	00:21.200	
+529	-	00:21.160	
+
+00:21.200	--> 	00:21.240	
+530	-	00:21.200	
+
+00:21.240	--> 	00:21.280	
+531	-	00:21.240	
+
+00:21.280	--> 	00:21.320	
+532	-	00:21.280	
+
+00:21.320	--> 	00:21.360	
+533	-	00:21.320	
+
+00:21.360	--> 	00:21.400	
+534	-	00:21.360	
+
+00:21.400	--> 	00:21.440	
+535	-	00:21.400	
+
+00:21.440	--> 	00:21.480	
+536	-	00:21.440	
+
+00:21.480	--> 	00:21.520	
+537	-	00:21.480	
+
+00:21.520	--> 	00:21.560	
+538	-	00:21.520	
+
+00:21.560	--> 	00:21.600	
+539	-	00:21.560	
+
+00:21.600	--> 	00:21.640	
+540	-	00:21.600	
+
+00:21.640	--> 	00:21.680	
+541	-	00:21.640	
+
+00:21.680	--> 	00:21.720	
+542	-	00:21.680	
+
+00:21.720	--> 	00:21.760	
+543	-	00:21.720	
+
+00:21.760	--> 	00:21.800	
+544	-	00:21.760	
+
+00:21.800	--> 	00:21.840	
+545	-	00:21.800	
+
+00:21.840	--> 	00:21.880	
+546	-	00:21.840	
+
+00:21.880	--> 	00:21.920	
+547	-	00:21.880	
+
+00:21.920	--> 	00:21.960	
+548	-	00:21.920	
+
+00:21.960	--> 	00:22.000	
+549	-	00:21.960	
+
+00:22.000	--> 	00:22.040	
+550	-	00:22.000	
+
+00:22.040	--> 	00:22.080	
+551	-	00:22.040	
+
+00:22.080	--> 	00:22.120	
+552	-	00:22.080	
+
+00:22.120	--> 	00:22.160	
+553	-	00:22.120	
+
+00:22.160	--> 	00:22.200	
+554	-	00:22.160	
+
+00:22.200	--> 	00:22.240	
+555	-	00:22.200	
+
+00:22.240	--> 	00:22.280	
+556	-	00:22.240	
+
+00:22.280	--> 	00:22.320	
+557	-	00:22.280	
+
+00:22.320	--> 	00:22.360	
+558	-	00:22.320	
+
+00:22.360	--> 	00:22.400	
+559	-	00:22.360	
+
+00:22.400	--> 	00:22.440	
+560	-	00:22.400	
+
+00:22.440	--> 	00:22.480	
+561	-	00:22.440	
+
+00:22.480	--> 	00:22.520	
+562	-	00:22.480	
+
+00:22.520	--> 	00:22.560	
+563	-	00:22.520	
+
+00:22.560	--> 	00:22.600	
+564	-	00:22.560	
+
+00:22.600	--> 	00:22.640	
+565	-	00:22.600	
+
+00:22.640	--> 	00:22.680	
+566	-	00:22.640	
+
+00:22.680	--> 	00:22.720	
+567	-	00:22.680	
+
+00:22.720	--> 	00:22.760	
+568	-	00:22.720	
+
+00:22.760	--> 	00:22.800	
+569	-	00:22.760	
+
+00:22.800	--> 	00:22.840	
+570	-	00:22.800	
+
+00:22.840	--> 	00:22.880	
+571	-	00:22.840	
+
+00:22.880	--> 	00:22.920	
+572	-	00:22.880	
+
+00:22.920	--> 	00:22.960	
+573	-	00:22.920	
+
+00:22.960	--> 	00:23.000	
+574	-	00:22.960	
+
+00:23.000	--> 	00:23.040	
+575	-	00:23.000	
+
+00:23.040	--> 	00:23.080	
+576	-	00:23.040	
+
+00:23.080	--> 	00:23.120	
+577	-	00:23.080	
+
+00:23.120	--> 	00:23.160	
+578	-	00:23.120	
+
+00:23.160	--> 	00:23.200	
+579	-	00:23.160	
+
+00:23.200	--> 	00:23.240	
+580	-	00:23.200	
+
+00:23.240	--> 	00:23.280	
+581	-	00:23.240	
+
+00:23.280	--> 	00:23.320	
+582	-	00:23.280	
+
+00:23.320	--> 	00:23.360	
+583	-	00:23.320	
+
+00:23.360	--> 	00:23.400	
+584	-	00:23.360	
+
+00:23.400	--> 	00:23.440	
+585	-	00:23.400	
+
+00:23.440	--> 	00:23.480	
+586	-	00:23.440	
+
+00:23.480	--> 	00:23.520	
+587	-	00:23.480	
+
+00:23.520	--> 	00:23.560	
+588	-	00:23.520	
+
+00:23.560	--> 	00:23.600	
+589	-	00:23.560	
+
+00:23.600	--> 	00:23.640	
+590	-	00:23.600	
+
+00:23.640	--> 	00:23.680	
+591	-	00:23.640	
+
+00:23.680	--> 	00:23.720	
+592	-	00:23.680	
+
+00:23.720	--> 	00:23.760	
+593	-	00:23.720	
+
+00:23.760	--> 	00:23.800	
+594	-	00:23.760	
+
+00:23.800	--> 	00:23.840	
+595	-	00:23.800	
+
+00:23.840	--> 	00:23.880	
+596	-	00:23.840	
+
+00:23.880	--> 	00:23.920	
+597	-	00:23.880	
+
+00:23.920	--> 	00:23.960	
+598	-	00:23.920	
+
+00:23.960	--> 	00:24.000	
+599	-	00:23.960	
+
+00:24.000	--> 	00:24.040	
+600	-	00:24.000	
+
+00:24.040	--> 	00:24.080	
+601	-	00:24.040	
+
+00:24.080	--> 	00:24.120	
+602	-	00:24.080	
+
+00:24.120	--> 	00:24.160	
+603	-	00:24.120	
+
+00:24.160	--> 	00:24.200	
+604	-	00:24.160	
+
+00:24.200	--> 	00:24.240	
+605	-	00:24.200	
+
+00:24.240	--> 	00:24.280	
+606	-	00:24.240	
+
+00:24.280	--> 	00:24.320	
+607	-	00:24.280	
+
+00:24.320	--> 	00:24.360	
+608	-	00:24.320	
+
+00:24.360	--> 	00:24.400	
+609	-	00:24.360	
+
+00:24.400	--> 	00:24.440	
+610	-	00:24.400	
+
+00:24.440	--> 	00:24.480	
+611	-	00:24.440	
+
+00:24.480	--> 	00:24.520	
+612	-	00:24.480	
+
+00:24.520	--> 	00:24.560	
+613	-	00:24.520	
+
+00:24.560	--> 	00:24.600	
+614	-	00:24.560	
+
+00:24.600	--> 	00:24.640	
+615	-	00:24.600	
+
+00:24.640	--> 	00:24.680	
+616	-	00:24.640	
+
+00:24.680	--> 	00:24.720	
+617	-	00:24.680	
+
+00:24.720	--> 	00:24.760	
+618	-	00:24.720	
+
+00:24.760	--> 	00:24.800	
+619	-	00:24.760	
+
+00:24.800	--> 	00:24.840	
+620	-	00:24.800	
+
+00:24.840	--> 	00:24.880	
+621	-	00:24.840	
+
+00:24.880	--> 	00:24.920	
+622	-	00:24.880	
+
+00:24.920	--> 	00:24.960	
+623	-	00:24.920	
+
+00:24.960	--> 	00:25.000	
+624	-	00:24.960	
+
+00:25.000	--> 	00:25.040	
+625	-	00:25.000	
+
+00:25.040	--> 	00:25.080	
+626	-	00:25.040	
+
+00:25.080	--> 	00:25.120	
+627	-	00:25.080	
+
+00:25.120	--> 	00:25.160	
+628	-	00:25.120	
+
+00:25.160	--> 	00:25.200	
+629	-	00:25.160	
+
+00:25.200	--> 	00:25.240	
+630	-	00:25.200	
+
+00:25.240	--> 	00:25.280	
+631	-	00:25.240	
+
+00:25.280	--> 	00:25.320	
+632	-	00:25.280	
+
+00:25.320	--> 	00:25.360	
+633	-	00:25.320	
+
+00:25.360	--> 	00:25.400	
+634	-	00:25.360	
+
+00:25.400	--> 	00:25.440	
+635	-	00:25.400	
+
+00:25.440	--> 	00:25.480	
+636	-	00:25.440	
+
+00:25.480	--> 	00:25.520	
+637	-	00:25.480	
+
+00:25.520	--> 	00:25.560	
+638	-	00:25.520	
+
+00:25.560	--> 	00:25.600	
+639	-	00:25.560	
+
+00:25.600	--> 	00:25.640	
+640	-	00:25.600	
+
+00:25.640	--> 	00:25.680	
+641	-	00:25.640	
+
+00:25.680	--> 	00:25.720	
+642	-	00:25.680	
+
+00:25.720	--> 	00:25.760	
+643	-	00:25.720	
+
+00:25.760	--> 	00:25.800	
+644	-	00:25.760	
+
+00:25.800	--> 	00:25.840	
+645	-	00:25.800	
+
+00:25.840	--> 	00:25.880	
+646	-	00:25.840	
+
+00:25.880	--> 	00:25.920	
+647	-	00:25.880	
+
+00:25.920	--> 	00:25.960	
+648	-	00:25.920	
+
+00:25.960	--> 	00:26.000	
+649	-	00:25.960	
+
+00:26.000	--> 	00:26.040	
+650	-	00:26.000	
+
+00:26.040	--> 	00:26.080	
+651	-	00:26.040	
+
+00:26.080	--> 	00:26.120	
+652	-	00:26.080	
+
+00:26.120	--> 	00:26.160	
+653	-	00:26.120	
+
+00:26.160	--> 	00:26.200	
+654	-	00:26.160	
+
+00:26.200	--> 	00:26.240	
+655	-	00:26.200	
+
+00:26.240	--> 	00:26.280	
+656	-	00:26.240	
+
+00:26.280	--> 	00:26.320	
+657	-	00:26.280	
+
+00:26.320	--> 	00:26.360	
+658	-	00:26.320	
+
+00:26.360	--> 	00:26.400	
+659	-	00:26.360	
+
+00:26.400	--> 	00:26.440	
+660	-	00:26.400	
+
+00:26.440	--> 	00:26.480	
+661	-	00:26.440	
+
+00:26.480	--> 	00:26.520	
+662	-	00:26.480	
+
+00:26.520	--> 	00:26.560	
+663	-	00:26.520	
+
+00:26.560	--> 	00:26.600	
+664	-	00:26.560	
+
+00:26.600	--> 	00:26.640	
+665	-	00:26.600	
+
+00:26.640	--> 	00:26.680	
+666	-	00:26.640	
+
+00:26.680	--> 	00:26.720	
+667	-	00:26.680	
+
+00:26.720	--> 	00:26.760	
+668	-	00:26.720	
+
+00:26.760	--> 	00:26.800	
+669	-	00:26.760	
+
+00:26.800	--> 	00:26.840	
+670	-	00:26.800	
+
+00:26.840	--> 	00:26.880	
+671	-	00:26.840	
+
+00:26.880	--> 	00:26.920	
+672	-	00:26.880	
+
+00:26.920	--> 	00:26.960	
+673	-	00:26.920	
+
+00:26.960	--> 	00:27.000	
+674	-	00:26.960	
+
+00:27.000	--> 	00:27.040	
+675	-	00:27.000	
+
+00:27.040	--> 	00:27.080	
+676	-	00:27.040	
+
+00:27.080	--> 	00:27.120	
+677	-	00:27.080	
+
+00:27.120	--> 	00:27.160	
+678	-	00:27.120	
+
+00:27.160	--> 	00:27.200	
+679	-	00:27.160	
+
+00:27.200	--> 	00:27.240	
+680	-	00:27.200	
+
+00:27.240	--> 	00:27.280	
+681	-	00:27.240	
+
+00:27.280	--> 	00:27.320	
+682	-	00:27.280	
+
+00:27.320	--> 	00:27.360	
+683	-	00:27.320	
+
+00:27.360	--> 	00:27.400	
+684	-	00:27.360	
+
+00:27.400	--> 	00:27.440	
+685	-	00:27.400	
+
+00:27.440	--> 	00:27.480	
+686	-	00:27.440	
+
+00:27.480	--> 	00:27.520	
+687	-	00:27.480	
+
+00:27.520	--> 	00:27.560	
+688	-	00:27.520	
+
+00:27.560	--> 	00:27.600	
+689	-	00:27.560	
+
+00:27.600	--> 	00:27.640	
+690	-	00:27.600	
+
+00:27.640	--> 	00:27.680	
+691	-	00:27.640	
+
+00:27.680	--> 	00:27.720	
+692	-	00:27.680	
+
+00:27.720	--> 	00:27.760	
+693	-	00:27.720	
+
+00:27.760	--> 	00:27.800	
+694	-	00:27.760	
+
+00:27.800	--> 	00:27.840	
+695	-	00:27.800	
+
+00:27.840	--> 	00:27.880	
+696	-	00:27.840	
+
+00:27.880	--> 	00:27.920	
+697	-	00:27.880	
+
+00:27.920	--> 	00:27.960	
+698	-	00:27.920	
+
+00:27.960	--> 	00:28.000	
+699	-	00:27.960	
+
+00:28.000	--> 	00:28.040	
+700	-	00:28.000	
+
+00:28.040	--> 	00:28.080	
+701	-	00:28.040	
+
+00:28.080	--> 	00:28.120	
+702	-	00:28.080	
+
+00:28.120	--> 	00:28.160	
+703	-	00:28.120	
+
+00:28.160	--> 	00:28.200	
+704	-	00:28.160	
+
+00:28.200	--> 	00:28.240	
+705	-	00:28.200	
+
+00:28.240	--> 	00:28.280	
+706	-	00:28.240	
+
+00:28.280	--> 	00:28.320	
+707	-	00:28.280	
+
+00:28.320	--> 	00:28.360	
+708	-	00:28.320	
+
+00:28.360	--> 	00:28.400	
+709	-	00:28.360	
+
+00:28.400	--> 	00:28.440	
+710	-	00:28.400	
+
+00:28.440	--> 	00:28.480	
+711	-	00:28.440	
+
+00:28.480	--> 	00:28.520	
+712	-	00:28.480	
+
+00:28.520	--> 	00:28.560	
+713	-	00:28.520	
+
+00:28.560	--> 	00:28.600	
+714	-	00:28.560	
+
+00:28.600	--> 	00:28.640	
+715	-	00:28.600	
+
+00:28.640	--> 	00:28.680	
+716	-	00:28.640	
+
+00:28.680	--> 	00:28.720	
+717	-	00:28.680	
+
+00:28.720	--> 	00:28.760	
+718	-	00:28.720	
+
+00:28.760	--> 	00:28.800	
+719	-	00:28.760	
+
+00:28.800	--> 	00:28.840	
+720	-	00:28.800	
+
+00:28.840	--> 	00:28.880	
+721	-	00:28.840	
+
+00:28.880	--> 	00:28.920	
+722	-	00:28.880	
+
+00:28.920	--> 	00:28.960	
+723	-	00:28.920	
+
+00:28.960	--> 	00:29.000	
+724	-	00:28.960	
+
+00:29.000	--> 	00:29.040	
+725	-	00:29.000	
+
+00:29.040	--> 	00:29.080	
+726	-	00:29.040	
+
+00:29.080	--> 	00:29.120	
+727	-	00:29.080	
+
+00:29.120	--> 	00:29.160	
+728	-	00:29.120	
+
+00:29.160	--> 	00:29.200	
+729	-	00:29.160	
+
+00:29.200	--> 	00:29.240	
+730	-	00:29.200	
+
+00:29.240	--> 	00:29.280	
+731	-	00:29.240	
+
+00:29.280	--> 	00:29.320	
+732	-	00:29.280	
+
+00:29.320	--> 	00:29.360	
+733	-	00:29.320	
+
+00:29.360	--> 	00:29.400	
+734	-	00:29.360	
+
+00:29.400	--> 	00:29.440	
+735	-	00:29.400	
+
+00:29.440	--> 	00:29.480	
+736	-	00:29.440	
+
+00:29.480	--> 	00:29.520	
+737	-	00:29.480	
+
+00:29.520	--> 	00:29.560	
+738	-	00:29.520	
+
+00:29.560	--> 	00:29.600	
+739	-	00:29.560	
+
+00:29.600	--> 	00:29.640	
+740	-	00:29.600	
+
+00:29.640	--> 	00:29.680	
+741	-	00:29.640	
+
+00:29.680	--> 	00:29.720	
+742	-	00:29.680	
+
+00:29.720	--> 	00:29.760	
+743	-	00:29.720	
+
+00:29.760	--> 	00:29.800	
+744	-	00:29.760	
+
+00:29.800	--> 	00:29.840	
+745	-	00:29.800	
+
+00:29.840	--> 	00:29.880	
+746	-	00:29.840	
+
+00:29.880	--> 	00:29.920	
+747	-	00:29.880	
+
+00:29.920	--> 	00:29.960	
+748	-	00:29.920	
+
+00:29.960	--> 	00:30.000	
+749	-	00:29.960	
+
+00:30.000	--> 	00:30.040	
+750	-	00:30.000	
+
+00:30.040	--> 	00:30.080	
+751	-	00:30.040	
+
+00:30.080	--> 	00:30.120	
+752	-	00:30.080	
+
+00:30.120	--> 	00:30.160	
+753	-	00:30.120	
+
+00:30.160	--> 	00:30.200	
+754	-	00:30.160	
+
+00:30.200	--> 	00:30.240	
+755	-	00:30.200	
+
+00:30.240	--> 	00:30.280	
+756	-	00:30.240	
+
+00:30.280	--> 	00:30.320	
+757	-	00:30.280	
+
+00:30.320	--> 	00:30.360	
+758	-	00:30.320	
+
+00:30.360	--> 	00:30.400	
+759	-	00:30.360	
+
+00:30.400	--> 	00:30.440	
+760	-	00:30.400	
+
+00:30.440	--> 	00:30.480	
+761	-	00:30.440	
+
+00:30.480	--> 	00:30.520	
+762	-	00:30.480	
+
+00:30.520	--> 	00:30.560	
+763	-	00:30.520	
+
+00:30.560	--> 	00:30.600	
+764	-	00:30.560	
+
+00:30.600	--> 	00:30.640	
+765	-	00:30.600	
+
+00:30.640	--> 	00:30.680	
+766	-	00:30.640	
+
+00:30.680	--> 	00:30.720	
+767	-	00:30.680	
+
+00:30.720	--> 	00:30.760	
+768	-	00:30.720	
+
+00:30.760	--> 	00:30.800	
+769	-	00:30.760	
+
+00:30.800	--> 	00:30.840	
+770	-	00:30.800	
+
+00:30.840	--> 	00:30.880	
+771	-	00:30.840	
+
+00:30.880	--> 	00:30.920	
+772	-	00:30.880	
+
+00:30.920	--> 	00:30.960	
+773	-	00:30.920	
+
+00:30.960	--> 	00:31.000	
+774	-	00:30.960	
+
+00:31.000	--> 	00:31.040	
+775	-	00:31.000	
+
+00:31.040	--> 	00:31.080	
+776	-	00:31.040	
+
+00:31.080	--> 	00:31.120	
+777	-	00:31.080	
+
+00:31.120	--> 	00:31.160	
+778	-	00:31.120	
+
+00:31.160	--> 	00:31.200	
+779	-	00:31.160	
+
+00:31.200	--> 	00:31.240	
+780	-	00:31.200	
+
+00:31.240	--> 	00:31.280	
+781	-	00:31.240	
+
+00:31.280	--> 	00:31.320	
+782	-	00:31.280	
+
+00:31.320	--> 	00:31.360	
+783	-	00:31.320	
+
+00:31.360	--> 	00:31.400	
+784	-	00:31.360	
+
+00:31.400	--> 	00:31.440	
+785	-	00:31.400	
+
+00:31.440	--> 	00:31.480	
+786	-	00:31.440	
+
+00:31.480	--> 	00:31.520	
+787	-	00:31.480	
+
+00:31.520	--> 	00:31.560	
+788	-	00:31.520	
+
+00:31.560	--> 	00:31.600	
+789	-	00:31.560	
+
+00:31.600	--> 	00:31.640	
+790	-	00:31.600	
+
+00:31.640	--> 	00:31.680	
+791	-	00:31.640	
+
+00:31.680	--> 	00:31.720	
+792	-	00:31.680	
+
+00:31.720	--> 	00:31.760	
+793	-	00:31.720	
+
+00:31.760	--> 	00:31.800	
+794	-	00:31.760	
+
+00:31.800	--> 	00:31.840	
+795	-	00:31.800	
+
+00:31.840	--> 	00:31.880	
+796	-	00:31.840	
+
+00:31.880	--> 	00:31.920	
+797	-	00:31.880	
+
+00:31.920	--> 	00:31.960	
+798	-	00:31.920	
+
+00:31.960	--> 	00:32.000	
+799	-	00:31.960	
+
+00:32.000	--> 	00:32.040	
+800	-	00:32.000	
+
+00:32.040	--> 	00:32.080	
+801	-	00:32.040	
+
+00:32.080	--> 	00:32.120	
+802	-	00:32.080	
+
+00:32.120	--> 	00:32.160	
+803	-	00:32.120	
+
+00:32.160	--> 	00:32.200	
+804	-	00:32.160	
+
+00:32.200	--> 	00:32.240	
+805	-	00:32.200	
+
+00:32.240	--> 	00:32.280	
+806	-	00:32.240	
+
+00:32.280	--> 	00:32.320	
+807	-	00:32.280	
+
+00:32.320	--> 	00:32.360	
+808	-	00:32.320	
+
+00:32.360	--> 	00:32.400	
+809	-	00:32.360	
+
+00:32.400	--> 	00:32.440	
+810	-	00:32.400	
+
+00:32.440	--> 	00:32.480	
+811	-	00:32.440	
+
+00:32.480	--> 	00:32.520	
+812	-	00:32.480	
+
+00:32.520	--> 	00:32.560	
+813	-	00:32.520	
+
+00:32.560	--> 	00:32.600	
+814	-	00:32.560	
+
+00:32.600	--> 	00:32.640	
+815	-	00:32.600	
+
+00:32.640	--> 	00:32.680	
+816	-	00:32.640	
+
+00:32.680	--> 	00:32.720	
+817	-	00:32.680	
+
+00:32.720	--> 	00:32.760	
+818	-	00:32.720	
+
+00:32.760	--> 	00:32.800	
+819	-	00:32.760	
+
+00:32.800	--> 	00:32.840	
+820	-	00:32.800	
+
+00:32.840	--> 	00:32.880	
+821	-	00:32.840	
+
+00:32.880	--> 	00:32.920	
+822	-	00:32.880	
+
+00:32.920	--> 	00:32.960	
+823	-	00:32.920	
+
+00:32.960	--> 	00:33.000	
+824	-	00:32.960	
+
+00:33.000	--> 	00:33.040	
+825	-	00:33.000	
+
+00:33.040	--> 	00:33.080	
+826	-	00:33.040	
+
+00:33.080	--> 	00:33.120	
+827	-	00:33.080	
+
+00:33.120	--> 	00:33.160	
+828	-	00:33.120	
+
+00:33.160	--> 	00:33.200	
+829	-	00:33.160	
+
+00:33.200	--> 	00:33.240	
+830	-	00:33.200	
+
+00:33.240	--> 	00:33.280	
+831	-	00:33.240	
+
+00:33.280	--> 	00:33.320	
+832	-	00:33.280	
+
+00:33.320	--> 	00:33.360	
+833	-	00:33.320	
+
+00:33.360	--> 	00:33.400	
+834	-	00:33.360	
+
+00:33.400	--> 	00:33.440	
+835	-	00:33.400	
+
+00:33.440	--> 	00:33.480	
+836	-	00:33.440	
+
+00:33.480	--> 	00:33.520	
+837	-	00:33.480	
+
+00:33.520	--> 	00:33.560	
+838	-	00:33.520	
+
+00:33.560	--> 	00:33.600	
+839	-	00:33.560	
+
+00:33.600	--> 	00:33.640	
+840	-	00:33.600	
+
+00:33.640	--> 	00:33.680	
+841	-	00:33.640	
+
+00:33.680	--> 	00:33.720	
+842	-	00:33.680	
+
+00:33.720	--> 	00:33.760	
+843	-	00:33.720	
+
+00:33.760	--> 	00:33.800	
+844	-	00:33.760	
+
+00:33.800	--> 	00:33.840	
+845	-	00:33.800	
+
+00:33.840	--> 	00:33.880	
+846	-	00:33.840	
+
+00:33.880	--> 	00:33.920	
+847	-	00:33.880	
+
+00:33.920	--> 	00:33.960	
+848	-	00:33.920	
+
+00:33.960	--> 	00:34.000	
+849	-	00:33.960	
+
+00:34.000	--> 	00:34.040	
+850	-	00:34.000	
+
+00:34.040	--> 	00:34.080	
+851	-	00:34.040	
+
+00:34.080	--> 	00:34.120	
+852	-	00:34.080	
+
+00:34.120	--> 	00:34.160	
+853	-	00:34.120	
+
+00:34.160	--> 	00:34.200	
+854	-	00:34.160	
+
+00:34.200	--> 	00:34.240	
+855	-	00:34.200	
+
+00:34.240	--> 	00:34.280	
+856	-	00:34.240	
+
+00:34.280	--> 	00:34.320	
+857	-	00:34.280	
+
+00:34.320	--> 	00:34.360	
+858	-	00:34.320	
+
+00:34.360	--> 	00:34.400	
+859	-	00:34.360	
+
+00:34.400	--> 	00:34.440	
+860	-	00:34.400	
+
+00:34.440	--> 	00:34.480	
+861	-	00:34.440	
+
+00:34.480	--> 	00:34.520	
+862	-	00:34.480	
+
+00:34.520	--> 	00:34.560	
+863	-	00:34.520	
+
+00:34.560	--> 	00:34.600	
+864	-	00:34.560	
+
+00:34.600	--> 	00:34.640	
+865	-	00:34.600	
+
+00:34.640	--> 	00:34.680	
+866	-	00:34.640	
+
+00:34.680	--> 	00:34.720	
+867	-	00:34.680	
+
+00:34.720	--> 	00:34.760	
+868	-	00:34.720	
+
+00:34.760	--> 	00:34.800	
+869	-	00:34.760	
+
+00:34.800	--> 	00:34.840	
+870	-	00:34.800	
+
+00:34.840	--> 	00:34.880	
+871	-	00:34.840	
+
+00:34.880	--> 	00:34.920	
+872	-	00:34.880	
+
+00:34.920	--> 	00:34.960	
+873	-	00:34.920	
+
+00:34.960	--> 	00:35.000	
+874	-	00:34.960	
+
+00:35.000	--> 	00:35.040	
+875	-	00:35.000	
+
+00:35.040	--> 	00:35.080	
+876	-	00:35.040	
+
+00:35.080	--> 	00:35.120	
+877	-	00:35.080	
+
+00:35.120	--> 	00:35.160	
+878	-	00:35.120	
+
+00:35.160	--> 	00:35.200	
+879	-	00:35.160	
+
+00:35.200	--> 	00:35.240	
+880	-	00:35.200	
+
+00:35.240	--> 	00:35.280	
+881	-	00:35.240	
+
+00:35.280	--> 	00:35.320	
+882	-	00:35.280	
+
+00:35.320	--> 	00:35.360	
+883	-	00:35.320	
+
+00:35.360	--> 	00:35.400	
+884	-	00:35.360	
+
+00:35.400	--> 	00:35.440	
+885	-	00:35.400	
+
+00:35.440	--> 	00:35.480	
+886	-	00:35.440	
+
+00:35.480	--> 	00:35.520	
+887	-	00:35.480	
+
+00:35.520	--> 	00:35.560	
+888	-	00:35.520	
+
+00:35.560	--> 	00:35.600	
+889	-	00:35.560	
+
+00:35.600	--> 	00:35.640	
+890	-	00:35.600	
+
+00:35.640	--> 	00:35.680	
+891	-	00:35.640	
+
+00:35.680	--> 	00:35.720	
+892	-	00:35.680	
+
+00:35.720	--> 	00:35.760	
+893	-	00:35.720	
+
+00:35.760	--> 	00:35.800	
+894	-	00:35.760	
+
+00:35.800	--> 	00:35.840	
+895	-	00:35.800	
+
+00:35.840	--> 	00:35.880	
+896	-	00:35.840	
+
+00:35.880	--> 	00:35.920	
+897	-	00:35.880	
+
+00:35.920	--> 	00:35.960	
+898	-	00:35.920	
+
+00:35.960	--> 	00:36.000	
+899	-	00:35.960	
+
+00:36.000	--> 	00:36.040	
+900	-	00:36.000	
+
+00:36.040	--> 	00:36.080	
+901	-	00:36.040	
+
+00:36.080	--> 	00:36.120	
+902	-	00:36.080	
+
+00:36.120	--> 	00:36.160	
+903	-	00:36.120	
+
+00:36.160	--> 	00:36.200	
+904	-	00:36.160	
+
+00:36.200	--> 	00:36.240	
+905	-	00:36.200	
+
+00:36.240	--> 	00:36.280	
+906	-	00:36.240	
+
+00:36.280	--> 	00:36.320	
+907	-	00:36.280	
+
+00:36.320	--> 	00:36.360	
+908	-	00:36.320	
+
+00:36.360	--> 	00:36.400	
+909	-	00:36.360	
+
+00:36.400	--> 	00:36.440	
+910	-	00:36.400	
+
+00:36.440	--> 	00:36.480	
+911	-	00:36.440	
+
+00:36.480	--> 	00:36.520	
+912	-	00:36.480	
+
+00:36.520	--> 	00:36.560	
+913	-	00:36.520	
+
+00:36.560	--> 	00:36.600	
+914	-	00:36.560	
+
+00:36.600	--> 	00:36.640	
+915	-	00:36.600	
+
+00:36.640	--> 	00:36.680	
+916	-	00:36.640	
+
+00:36.680	--> 	00:36.720	
+917	-	00:36.680	
+
+00:36.720	--> 	00:36.760	
+918	-	00:36.720	
+
+00:36.760	--> 	00:36.800	
+919	-	00:36.760	
+
+00:36.800	--> 	00:36.840	
+920	-	00:36.800	
+
+00:36.840	--> 	00:36.880	
+921	-	00:36.840	
+
+00:36.880	--> 	00:36.920	
+922	-	00:36.880	
+
+00:36.920	--> 	00:36.960	
+923	-	00:36.920	
+
+00:36.960	--> 	00:37.000	
+924	-	00:36.960	
+
+00:37.000	--> 	00:37.040	
+925	-	00:37.000	
+
+00:37.040	--> 	00:37.080	
+926	-	00:37.040	
+
+00:37.080	--> 	00:37.120	
+927	-	00:37.080	
+
+00:37.120	--> 	00:37.160	
+928	-	00:37.120	
+
+00:37.160	--> 	00:37.200	
+929	-	00:37.160	
+
+00:37.200	--> 	00:37.240	
+930	-	00:37.200	
+
+00:37.240	--> 	00:37.280	
+931	-	00:37.240	
+
+00:37.280	--> 	00:37.320	
+932	-	00:37.280	
+
+00:37.320	--> 	00:37.360	
+933	-	00:37.320	
+
+00:37.360	--> 	00:37.400	
+934	-	00:37.360	
+
+00:37.400	--> 	00:37.440	
+935	-	00:37.400	
+
+00:37.440	--> 	00:37.480	
+936	-	00:37.440	
+
+00:37.480	--> 	00:37.520	
+937	-	00:37.480	
+
+00:37.520	--> 	00:37.560	
+938	-	00:37.520	
+
+00:37.560	--> 	00:37.600	
+939	-	00:37.560	
+
+00:37.600	--> 	00:37.640	
+940	-	00:37.600	
+
+00:37.640	--> 	00:37.680	
+941	-	00:37.640	
+
+00:37.680	--> 	00:37.720	
+942	-	00:37.680	
+
+00:37.720	--> 	00:37.760	
+943	-	00:37.720	
+
+00:37.760	--> 	00:37.800	
+944	-	00:37.760	
+
+00:37.800	--> 	00:37.840	
+945	-	00:37.800	
+
+00:37.840	--> 	00:37.880	
+946	-	00:37.840	
+
+00:37.880	--> 	00:37.920	
+947	-	00:37.880	
+
+00:37.920	--> 	00:37.960	
+948	-	00:37.920	
+
+00:37.960	--> 	00:38.000	
+949	-	00:37.960	
+
+00:38.000	--> 	00:38.040	
+950	-	00:38.000	
+
+00:38.040	--> 	00:38.080	
+951	-	00:38.040	
+
+00:38.080	--> 	00:38.120	
+952	-	00:38.080	
+
+00:38.120	--> 	00:38.160	
+953	-	00:38.120	
+
+00:38.160	--> 	00:38.200	
+954	-	00:38.160	
+
+00:38.200	--> 	00:38.240	
+955	-	00:38.200	
+
+00:38.240	--> 	00:38.280	
+956	-	00:38.240	
+
+00:38.280	--> 	00:38.320	
+957	-	00:38.280	
+
+00:38.320	--> 	00:38.360	
+958	-	00:38.320	
+
+00:38.360	--> 	00:38.400	
+959	-	00:38.360	
+
+00:38.400	--> 	00:38.440	
+960	-	00:38.400	
+
+00:38.440	--> 	00:38.480	
+961	-	00:38.440	
+
+00:38.480	--> 	00:38.520	
+962	-	00:38.480	
+
+00:38.520	--> 	00:38.560	
+963	-	00:38.520	
+
+00:38.560	--> 	00:38.600	
+964	-	00:38.560	
+
+00:38.600	--> 	00:38.640	
+965	-	00:38.600	
+
+00:38.640	--> 	00:38.680	
+966	-	00:38.640	
+
+00:38.680	--> 	00:38.720	
+967	-	00:38.680	
+
+00:38.720	--> 	00:38.760	
+968	-	00:38.720	
+
+00:38.760	--> 	00:38.800	
+969	-	00:38.760	
+
+00:38.800	--> 	00:38.840	
+970	-	00:38.800	
+
+00:38.840	--> 	00:38.880	
+971	-	00:38.840	
+
+00:38.880	--> 	00:38.920	
+972	-	00:38.880	
+
+00:38.920	--> 	00:38.960	
+973	-	00:38.920	
+
+00:38.960	--> 	00:39.000	
+974	-	00:38.960	
+
+00:39.000	--> 	00:39.040	
+975	-	00:39.000	
+
+00:39.040	--> 	00:39.080	
+976	-	00:39.040	
+
+00:39.080	--> 	00:39.120	
+977	-	00:39.080	
+
+00:39.120	--> 	00:39.160	
+978	-	00:39.120	
+
+00:39.160	--> 	00:39.200	
+979	-	00:39.160	
+
+00:39.200	--> 	00:39.240	
+980	-	00:39.200	
+
+00:39.240	--> 	00:39.280	
+981	-	00:39.240	
+
+00:39.280	--> 	00:39.320	
+982	-	00:39.280	
+
+00:39.320	--> 	00:39.360	
+983	-	00:39.320	
+
+00:39.360	--> 	00:39.400	
+984	-	00:39.360	
+
+00:39.400	--> 	00:39.440	
+985	-	00:39.400	
+
+00:39.440	--> 	00:39.480	
+986	-	00:39.440	
+
+00:39.480	--> 	00:39.520	
+987	-	00:39.480	
+
+00:39.520	--> 	00:39.560	
+988	-	00:39.520	
+
+00:39.560	--> 	00:39.600	
+989	-	00:39.560	
+
+00:39.600	--> 	00:39.640	
+990	-	00:39.600	
+
+00:39.640	--> 	00:39.680	
+991	-	00:39.640	
+
+00:39.680	--> 	00:39.720	
+992	-	00:39.680	
+
+00:39.720	--> 	00:39.760	
+993	-	00:39.720	
+
+00:39.760	--> 	00:39.800	
+994	-	00:39.760	
+
+00:39.800	--> 	00:39.840	
+995	-	00:39.800	
+
+00:39.840	--> 	00:39.880	
+996	-	00:39.840	
+
+00:39.880	--> 	00:39.920	
+997	-	00:39.880	
+
+00:39.920	--> 	00:39.960	
+998	-	00:39.920	
+
+00:39.960	--> 	00:40.000	
+999	-	00:39.960	
+
+00:40.000	--> 	00:40.040	
+1000	-	00:40.000	
+
+00:40.040	--> 	00:40.080	
+1001	-	00:40.040	
+
+00:40.080	--> 	00:40.120	
+1002	-	00:40.080	
+
+00:40.120	--> 	00:40.160	
+1003	-	00:40.120	
+
+00:40.160	--> 	00:40.200	
+1004	-	00:40.160	
+
+00:40.200	--> 	00:40.240	
+1005	-	00:40.200	
+
+00:40.240	--> 	00:40.280	
+1006	-	00:40.240	
+
+00:40.280	--> 	00:40.320	
+1007	-	00:40.280	
+
+00:40.320	--> 	00:40.360	
+1008	-	00:40.320	
+
+00:40.360	--> 	00:40.400	
+1009	-	00:40.360	
+
+00:40.400	--> 	00:40.440	
+1010	-	00:40.400	
+
+00:40.440	--> 	00:40.480	
+1011	-	00:40.440	
+
+00:40.480	--> 	00:40.520	
+1012	-	00:40.480	
+
+00:40.520	--> 	00:40.560	
+1013	-	00:40.520	
+
+00:40.560	--> 	00:40.600	
+1014	-	00:40.560	
+
+00:40.600	--> 	00:40.640	
+1015	-	00:40.600	
+
+00:40.640	--> 	00:40.680	
+1016	-	00:40.640	
+
+00:40.680	--> 	00:40.720	
+1017	-	00:40.680	
+
+00:40.720	--> 	00:40.760	
+1018	-	00:40.720	
+
+00:40.760	--> 	00:40.800	
+1019	-	00:40.760	
+
+00:40.800	--> 	00:40.840	
+1020	-	00:40.800	
+
+00:40.840	--> 	00:40.880	
+1021	-	00:40.840	
+
+00:40.880	--> 	00:40.920	
+1022	-	00:40.880	
+
+00:40.920	--> 	00:40.960	
+1023	-	00:40.920	
+
+00:40.960	--> 	00:41.000	
+1024	-	00:40.960	
+
+00:41.000	--> 	00:41.040	
+1025	-	00:41.000	
+
+00:41.040	--> 	00:41.080	
+1026	-	00:41.040	
+
+00:41.080	--> 	00:41.120	
+1027	-	00:41.080	
+
+00:41.120	--> 	00:41.160	
+1028	-	00:41.120	
+
+00:41.160	--> 	00:41.200	
+1029	-	00:41.160	
+
+00:41.200	--> 	00:41.240	
+1030	-	00:41.200	
+
+00:41.240	--> 	00:41.280	
+1031	-	00:41.240	
+
+00:41.280	--> 	00:41.320	
+1032	-	00:41.280	
+
+00:41.320	--> 	00:41.360	
+1033	-	00:41.320	
+
+00:41.360	--> 	00:41.400	
+1034	-	00:41.360	
+
+00:41.400	--> 	00:41.440	
+1035	-	00:41.400	
+
+00:41.440	--> 	00:41.480	
+1036	-	00:41.440	
+
+00:41.480	--> 	00:41.520	
+1037	-	00:41.480	
+
+00:41.520	--> 	00:41.560	
+1038	-	00:41.520	
+
+00:41.560	--> 	00:41.600	
+1039	-	00:41.560	
+
+00:41.600	--> 	00:41.640	
+1040	-	00:41.600	
+
+00:41.640	--> 	00:41.680	
+1041	-	00:41.640	
+
+00:41.680	--> 	00:41.720	
+1042	-	00:41.680	
+
+00:41.720	--> 	00:41.760	
+1043	-	00:41.720	
+
+00:41.760	--> 	00:41.800	
+1044	-	00:41.760	
+
+00:41.800	--> 	00:41.840	
+1045	-	00:41.800	
+
+00:41.840	--> 	00:41.880	
+1046	-	00:41.840	
+
+00:41.880	--> 	00:41.920	
+1047	-	00:41.880	
+
+00:41.920	--> 	00:41.960	
+1048	-	00:41.920	
+
+00:41.960	--> 	00:42.000	
+1049	-	00:41.960	
+
+00:42.000	--> 	00:42.040	
+1050	-	00:42.000	
+
+00:42.040	--> 	00:42.080	
+1051	-	00:42.040	
+
+00:42.080	--> 	00:42.120	
+1052	-	00:42.080	
+
+00:42.120	--> 	00:42.160	
+1053	-	00:42.120	
+
+00:42.160	--> 	00:42.200	
+1054	-	00:42.160	
+
+00:42.200	--> 	00:42.240	
+1055	-	00:42.200	
+
+00:42.240	--> 	00:42.280	
+1056	-	00:42.240	
+
+00:42.280	--> 	00:42.320	
+1057	-	00:42.280	
+
+00:42.320	--> 	00:42.360	
+1058	-	00:42.320	
+
+00:42.360	--> 	00:42.400	
+1059	-	00:42.360	
+
+00:42.400	--> 	00:42.440	
+1060	-	00:42.400	
+
+00:42.440	--> 	00:42.480	
+1061	-	00:42.440	
+
+00:42.480	--> 	00:42.520	
+1062	-	00:42.480	
+
+00:42.520	--> 	00:42.560	
+1063	-	00:42.520	
+
+00:42.560	--> 	00:42.600	
+1064	-	00:42.560	
+
+00:42.600	--> 	00:42.640	
+1065	-	00:42.600	
+
+00:42.640	--> 	00:42.680	
+1066	-	00:42.640	
+
+00:42.680	--> 	00:42.720	
+1067	-	00:42.680	
+
+00:42.720	--> 	00:42.760	
+1068	-	00:42.720	
+
+00:42.760	--> 	00:42.800	
+1069	-	00:42.760	
+
+00:42.800	--> 	00:42.840	
+1070	-	00:42.800	
+
+00:42.840	--> 	00:42.880	
+1071	-	00:42.840	
+
+00:42.880	--> 	00:42.920	
+1072	-	00:42.880	
+
+00:42.920	--> 	00:42.960	
+1073	-	00:42.920	
+
+00:42.960	--> 	00:43.000	
+1074	-	00:42.960	
+
+00:43.000	--> 	00:43.040	
+1075	-	00:43.000	
+
+00:43.040	--> 	00:43.080	
+1076	-	00:43.040	
+
+00:43.080	--> 	00:43.120	
+1077	-	00:43.080	
+
+00:43.120	--> 	00:43.160	
+1078	-	00:43.120	
+
+00:43.160	--> 	00:43.200	
+1079	-	00:43.160	
+
+00:43.200	--> 	00:43.240	
+1080	-	00:43.200	
+
+00:43.240	--> 	00:43.280	
+1081	-	00:43.240	
+
+00:43.280	--> 	00:43.320	
+1082	-	00:43.280	
+
+00:43.320	--> 	00:43.360	
+1083	-	00:43.320	
+
+00:43.360	--> 	00:43.400	
+1084	-	00:43.360	
+
+00:43.400	--> 	00:43.440	
+1085	-	00:43.400	
+
+00:43.440	--> 	00:43.480	
+1086	-	00:43.440	
+
+00:43.480	--> 	00:43.520	
+1087	-	00:43.480	
+
+00:43.520	--> 	00:43.560	
+1088	-	00:43.520	
+
+00:43.560	--> 	00:43.600	
+1089	-	00:43.560	
+
+00:43.600	--> 	00:43.640	
+1090	-	00:43.600	
+
+00:43.640	--> 	00:43.680	
+1091	-	00:43.640	
+
+00:43.680	--> 	00:43.720	
+1092	-	00:43.680	
+
+00:43.720	--> 	00:43.760	
+1093	-	00:43.720	
+
+00:43.760	--> 	00:43.800	
+1094	-	00:43.760	
+
+00:43.800	--> 	00:43.840	
+1095	-	00:43.800	
+
+00:43.840	--> 	00:43.880	
+1096	-	00:43.840	
+
+00:43.880	--> 	00:43.920	
+1097	-	00:43.880	
+
+00:43.920	--> 	00:43.960	
+1098	-	00:43.920	
+
+00:43.960	--> 	00:44.000	
+1099	-	00:43.960	
+
+00:44.000	--> 	00:44.040	
+1100	-	00:44.000	
+
+00:44.040	--> 	00:44.080	
+1101	-	00:44.040	
+
+00:44.080	--> 	00:44.120	
+1102	-	00:44.080	
+
+00:44.120	--> 	00:44.160	
+1103	-	00:44.120	
+
+00:44.160	--> 	00:44.200	
+1104	-	00:44.160	
+
+00:44.200	--> 	00:44.240	
+1105	-	00:44.200	
+
+00:44.240	--> 	00:44.280	
+1106	-	00:44.240	
+
+00:44.280	--> 	00:44.320	
+1107	-	00:44.280	
+
+00:44.320	--> 	00:44.360	
+1108	-	00:44.320	
+
+00:44.360	--> 	00:44.400	
+1109	-	00:44.360	
+
+00:44.400	--> 	00:44.440	
+1110	-	00:44.400	
+
+00:44.440	--> 	00:44.480	
+1111	-	00:44.440	
+
+00:44.480	--> 	00:44.520	
+1112	-	00:44.480	
+
+00:44.520	--> 	00:44.560	
+1113	-	00:44.520	
+
+00:44.560	--> 	00:44.600	
+1114	-	00:44.560	
+
+00:44.600	--> 	00:44.640	
+1115	-	00:44.600	
+
+00:44.640	--> 	00:44.680	
+1116	-	00:44.640	
+
+00:44.680	--> 	00:44.720	
+1117	-	00:44.680	
+
+00:44.720	--> 	00:44.760	
+1118	-	00:44.720	
+
+00:44.760	--> 	00:44.800	
+1119	-	00:44.760	
+
+00:44.800	--> 	00:44.840	
+1120	-	00:44.800	
+
+00:44.840	--> 	00:44.880	
+1121	-	00:44.840	
+
+00:44.880	--> 	00:44.920	
+1122	-	00:44.880	
+
+00:44.920	--> 	00:44.960	
+1123	-	00:44.920	
+
+00:44.960	--> 	00:45.000	
+1124	-	00:44.960	
+
+00:45.000	--> 	00:45.040	
+1125	-	00:45.000	
+
+00:45.040	--> 	00:45.080	
+1126	-	00:45.040	
+
+00:45.080	--> 	00:45.120	
+1127	-	00:45.080	
+
+00:45.120	--> 	00:45.160	
+1128	-	00:45.120	
+
+00:45.160	--> 	00:45.200	
+1129	-	00:45.160	
+
+00:45.200	--> 	00:45.240	
+1130	-	00:45.200	
+
+00:45.240	--> 	00:45.280	
+1131	-	00:45.240	
+
+00:45.280	--> 	00:45.320	
+1132	-	00:45.280	
+
+00:45.320	--> 	00:45.360	
+1133	-	00:45.320	
+
+00:45.360	--> 	00:45.400	
+1134	-	00:45.360	
+
+00:45.400	--> 	00:45.440	
+1135	-	00:45.400	
+
+00:45.440	--> 	00:45.480	
+1136	-	00:45.440	
+
+00:45.480	--> 	00:45.520	
+1137	-	00:45.480	
+
+00:45.520	--> 	00:45.560	
+1138	-	00:45.520	
+
+00:45.560	--> 	00:45.600	
+1139	-	00:45.560	
+
+00:45.600	--> 	00:45.640	
+1140	-	00:45.600	
+
+00:45.640	--> 	00:45.680	
+1141	-	00:45.640	
+
+00:45.680	--> 	00:45.720	
+1142	-	00:45.680	
+
+00:45.720	--> 	00:45.760	
+1143	-	00:45.720	
+
+00:45.760	--> 	00:45.800	
+1144	-	00:45.760	
+
+00:45.800	--> 	00:45.840	
+1145	-	00:45.800	
+
+00:45.840	--> 	00:45.880	
+1146	-	00:45.840	
+
+00:45.880	--> 	00:45.920	
+1147	-	00:45.880	
+
+00:45.920	--> 	00:45.960	
+1148	-	00:45.920	
+
+00:45.960	--> 	00:46.000	
+1149	-	00:45.960	
+
+00:46.000	--> 	00:46.040	
+1150	-	00:46.000	
+
+00:46.040	--> 	00:46.080	
+1151	-	00:46.040	
+
+00:46.080	--> 	00:46.120	
+1152	-	00:46.080	
+
+00:46.120	--> 	00:46.160	
+1153	-	00:46.120	
+
+00:46.160	--> 	00:46.200	
+1154	-	00:46.160	
+
+00:46.200	--> 	00:46.240	
+1155	-	00:46.200	
+
+00:46.240	--> 	00:46.280	
+1156	-	00:46.240	
+
+00:46.280	--> 	00:46.320	
+1157	-	00:46.280	
+
+00:46.320	--> 	00:46.360	
+1158	-	00:46.320	
+
+00:46.360	--> 	00:46.400	
+1159	-	00:46.360	
+
+00:46.400	--> 	00:46.440	
+1160	-	00:46.400	
+
+00:46.440	--> 	00:46.480	
+1161	-	00:46.440	
+
+00:46.480	--> 	00:46.520	
+1162	-	00:46.480	
+
+00:46.520	--> 	00:46.560	
+1163	-	00:46.520	
+
+00:46.560	--> 	00:46.600	
+1164	-	00:46.560	
+
+00:46.600	--> 	00:46.640	
+1165	-	00:46.600	
+
+00:46.640	--> 	00:46.680	
+1166	-	00:46.640	
+
+00:46.680	--> 	00:46.720	
+1167	-	00:46.680	
+
+00:46.720	--> 	00:46.760	
+1168	-	00:46.720	
+
+00:46.760	--> 	00:46.800	
+1169	-	00:46.760	
+
+00:46.800	--> 	00:46.840	
+1170	-	00:46.800	
+
+00:46.840	--> 	00:46.880	
+1171	-	00:46.840	
+
+00:46.880	--> 	00:46.920	
+1172	-	00:46.880	
+
+00:46.920	--> 	00:46.960	
+1173	-	00:46.920	
+
+00:46.960	--> 	00:47.000	
+1174	-	00:46.960	
+
+00:47.000	--> 	00:47.040	
+1175	-	00:47.000	
+
+00:47.040	--> 	00:47.080	
+1176	-	00:47.040	
+
+00:47.080	--> 	00:47.120	
+1177	-	00:47.080	
+
+00:47.120	--> 	00:47.160	
+1178	-	00:47.120	
+
+00:47.160	--> 	00:47.200	
+1179	-	00:47.160	
+
+00:47.200	--> 	00:47.240	
+1180	-	00:47.200	
+
+00:47.240	--> 	00:47.280	
+1181	-	00:47.240	
+
+00:47.280	--> 	00:47.320	
+1182	-	00:47.280	
+
+00:47.320	--> 	00:47.360	
+1183	-	00:47.320	
+
+00:47.360	--> 	00:47.400	
+1184	-	00:47.360	
+
+00:47.400	--> 	00:47.440	
+1185	-	00:47.400	
+
+00:47.440	--> 	00:47.480	
+1186	-	00:47.440	
+
+00:47.480	--> 	00:47.520	
+1187	-	00:47.480	
+
+00:47.520	--> 	00:47.560	
+1188	-	00:47.520	
+
+00:47.560	--> 	00:47.600	
+1189	-	00:47.560	
+
+00:47.600	--> 	00:47.640	
+1190	-	00:47.600	
+
+00:47.640	--> 	00:47.680	
+1191	-	00:47.640	
+
+00:47.680	--> 	00:47.720	
+1192	-	00:47.680	
+
+00:47.720	--> 	00:47.760	
+1193	-	00:47.720	
+
+00:47.760	--> 	00:47.800	
+1194	-	00:47.760	
+
+00:47.800	--> 	00:47.840	
+1195	-	00:47.800	
+
+00:47.840	--> 	00:47.880	
+1196	-	00:47.840	
+
+00:47.880	--> 	00:47.920	
+1197	-	00:47.880	
+
+00:47.920	--> 	00:47.960	
+1198	-	00:47.920	
+
+00:47.960	--> 	00:48.000	
+1199	-	00:47.960	
+
+00:48.000	--> 	00:48.040	
+1200	-	00:48.000	
+
+00:48.040	--> 	00:48.080	
+1201	-	00:48.040	
+
+00:48.080	--> 	00:48.120	
+1202	-	00:48.080	
+
+00:48.120	--> 	00:48.160	
+1203	-	00:48.120	
+
+00:48.160	--> 	00:48.200	
+1204	-	00:48.160	
+
+00:48.200	--> 	00:48.240	
+1205	-	00:48.200	
+
+00:48.240	--> 	00:48.280	
+1206	-	00:48.240	
+
+00:48.280	--> 	00:48.320	
+1207	-	00:48.280	
+
+00:48.320	--> 	00:48.360	
+1208	-	00:48.320	
+
+00:48.360	--> 	00:48.400	
+1209	-	00:48.360	
+
+00:48.400	--> 	00:48.440	
+1210	-	00:48.400	
+
+00:48.440	--> 	00:48.480	
+1211	-	00:48.440	
+
+00:48.480	--> 	00:48.520	
+1212	-	00:48.480	
+
+00:48.520	--> 	00:48.560	
+1213	-	00:48.520	
+
+00:48.560	--> 	00:48.600	
+1214	-	00:48.560	
+
+00:48.600	--> 	00:48.640	
+1215	-	00:48.600	
+
+00:48.640	--> 	00:48.680	
+1216	-	00:48.640	
+
+00:48.680	--> 	00:48.720	
+1217	-	00:48.680	
+
+00:48.720	--> 	00:48.760	
+1218	-	00:48.720	
+
+00:48.760	--> 	00:48.800	
+1219	-	00:48.760	
+
+00:48.800	--> 	00:48.840	
+1220	-	00:48.800	
+
+00:48.840	--> 	00:48.880	
+1221	-	00:48.840	
+
+00:48.880	--> 	00:48.920	
+1222	-	00:48.880	
+
+00:48.920	--> 	00:48.960	
+1223	-	00:48.920	
+
+00:48.960	--> 	00:49.000	
+1224	-	00:48.960	
+
+00:49.000	--> 	00:49.040	
+1225	-	00:49.000	
+
+00:49.040	--> 	00:49.080	
+1226	-	00:49.040	
+
+00:49.080	--> 	00:49.120	
+1227	-	00:49.080	
+
+00:49.120	--> 	00:49.160	
+1228	-	00:49.120	
+
+00:49.160	--> 	00:49.200	
+1229	-	00:49.160	
+
+00:49.200	--> 	00:49.240	
+1230	-	00:49.200	
+
+00:49.240	--> 	00:49.280	
+1231	-	00:49.240	
+
+00:49.280	--> 	00:49.320	
+1232	-	00:49.280	
+
+00:49.320	--> 	00:49.360	
+1233	-	00:49.320	
+
+00:49.360	--> 	00:49.400	
+1234	-	00:49.360	
+
+00:49.400	--> 	00:49.440	
+1235	-	00:49.400	
+
+00:49.440	--> 	00:49.480	
+1236	-	00:49.440	
+
+00:49.480	--> 	00:49.520	
+1237	-	00:49.480	
+
+00:49.520	--> 	00:49.560	
+1238	-	00:49.520	
+
+00:49.560	--> 	00:49.600	
+1239	-	00:49.560	
+
+00:49.600	--> 	00:49.640	
+1240	-	00:49.600	
+
+00:49.640	--> 	00:49.680	
+1241	-	00:49.640	
+
+00:49.680	--> 	00:49.720	
+1242	-	00:49.680	
+
+00:49.720	--> 	00:49.760	
+1243	-	00:49.720	
+
+00:49.760	--> 	00:49.800	
+1244	-	00:49.760	
+
+00:49.800	--> 	00:49.840	
+1245	-	00:49.800	
+
+00:49.840	--> 	00:49.880	
+1246	-	00:49.840	
+
+00:49.880	--> 	00:49.920	
+1247	-	00:49.880	
+
+00:49.920	--> 	00:49.960	
+1248	-	00:49.920	
+
+00:49.960	--> 	00:50.000	
+1249	-	00:49.960	
+
+00:50.000	--> 	00:50.040	
+1250	-	00:50.000	
+
+00:50.040	--> 	00:50.080	
+1251	-	00:50.040	
+
+00:50.080	--> 	00:50.120	
+1252	-	00:50.080	
+
+00:50.120	--> 	00:50.160	
+1253	-	00:50.120	
+
+00:50.160	--> 	00:50.200	
+1254	-	00:50.160	
+
+00:50.200	--> 	00:50.240	
+1255	-	00:50.200	
+
+00:50.240	--> 	00:50.280	
+1256	-	00:50.240	
+
+00:50.280	--> 	00:50.320	
+1257	-	00:50.280	
+
+00:50.320	--> 	00:50.360	
+1258	-	00:50.320	
+
+00:50.360	--> 	00:50.400	
+1259	-	00:50.360	
+
+00:50.400	--> 	00:50.440	
+1260	-	00:50.400	
+
+00:50.440	--> 	00:50.480	
+1261	-	00:50.440	
+
+00:50.480	--> 	00:50.520	
+1262	-	00:50.480	
+
+00:50.520	--> 	00:50.560	
+1263	-	00:50.520	
+
+00:50.560	--> 	00:50.600	
+1264	-	00:50.560	
+
+00:50.600	--> 	00:50.640	
+1265	-	00:50.600	
+
+00:50.640	--> 	00:50.680	
+1266	-	00:50.640	
+
+00:50.680	--> 	00:50.720	
+1267	-	00:50.680	
+
+00:50.720	--> 	00:50.760	
+1268	-	00:50.720	
+
+00:50.760	--> 	00:50.800	
+1269	-	00:50.760	
+
+00:50.800	--> 	00:50.840	
+1270	-	00:50.800	
+
+00:50.840	--> 	00:50.880	
+1271	-	00:50.840	
+
+00:50.880	--> 	00:50.920	
+1272	-	00:50.880	
+
+00:50.920	--> 	00:50.960	
+1273	-	00:50.920	
+
+00:50.960	--> 	00:51.000	
+1274	-	00:50.960	
+
+00:51.000	--> 	00:51.040	
+1275	-	00:51.000	
+
+00:51.040	--> 	00:51.080	
+1276	-	00:51.040	
+
+00:51.080	--> 	00:51.120	
+1277	-	00:51.080	
+
+00:51.120	--> 	00:51.160	
+1278	-	00:51.120	
+
+00:51.160	--> 	00:51.200	
+1279	-	00:51.160	
+
+00:51.200	--> 	00:51.240	
+1280	-	00:51.200	
+
+00:51.240	--> 	00:51.280	
+1281	-	00:51.240	
+
+00:51.280	--> 	00:51.320	
+1282	-	00:51.280	
+
+00:51.320	--> 	00:51.360	
+1283	-	00:51.320	
+
+00:51.360	--> 	00:51.400	
+1284	-	00:51.360	
+
+00:51.400	--> 	00:51.440	
+1285	-	00:51.400	
+
+00:51.440	--> 	00:51.480	
+1286	-	00:51.440	
+
+00:51.480	--> 	00:51.520	
+1287	-	00:51.480	
+
+00:51.520	--> 	00:51.560	
+1288	-	00:51.520	
+
+00:51.560	--> 	00:51.600	
+1289	-	00:51.560	
+
+00:51.600	--> 	00:51.640	
+1290	-	00:51.600	
+
+00:51.640	--> 	00:51.680	
+1291	-	00:51.640	
+
+00:51.680	--> 	00:51.720	
+1292	-	00:51.680	
+
+00:51.720	--> 	00:51.760	
+1293	-	00:51.720	
+
+00:51.760	--> 	00:51.800	
+1294	-	00:51.760	
+
+00:51.800	--> 	00:51.840	
+1295	-	00:51.800	
+
+00:51.840	--> 	00:51.880	
+1296	-	00:51.840	
+
+00:51.880	--> 	00:51.920	
+1297	-	00:51.880	
+
+00:51.920	--> 	00:51.960	
+1298	-	00:51.920	
+
+00:51.960	--> 	00:52.000	
+1299	-	00:51.960	
+
+00:52.000	--> 	00:52.040	
+1300	-	00:52.000	
+
+00:52.040	--> 	00:52.080	
+1301	-	00:52.040	
+
+00:52.080	--> 	00:52.120	
+1302	-	00:52.080	
+
+00:52.120	--> 	00:52.160	
+1303	-	00:52.120	
+
+00:52.160	--> 	00:52.200	
+1304	-	00:52.160	
+
+00:52.200	--> 	00:52.240	
+1305	-	00:52.200	
+
+00:52.240	--> 	00:52.280	
+1306	-	00:52.240	
+
+00:52.280	--> 	00:52.320	
+1307	-	00:52.280	
+
+00:52.320	--> 	00:52.360	
+1308	-	00:52.320	
+
+00:52.360	--> 	00:52.400	
+1309	-	00:52.360	
+
+00:52.400	--> 	00:52.440	
+1310	-	00:52.400	
+
+00:52.440	--> 	00:52.480	
+1311	-	00:52.440	
+
+00:52.480	--> 	00:52.520	
+1312	-	00:52.480	
+
+00:52.520	--> 	00:52.560	
+1313	-	00:52.520	
+
+00:52.560	--> 	00:52.600	
+1314	-	00:52.560	
+
+00:52.600	--> 	00:52.640	
+1315	-	00:52.600	
+
+00:52.640	--> 	00:52.680	
+1316	-	00:52.640	
+
+00:52.680	--> 	00:52.720	
+1317	-	00:52.680	
+
+00:52.720	--> 	00:52.760	
+1318	-	00:52.720	
+
+00:52.760	--> 	00:52.800	
+1319	-	00:52.760	
+
+00:52.800	--> 	00:52.840	
+1320	-	00:52.800	
+
+00:52.840	--> 	00:52.880	
+1321	-	00:52.840	
+
+00:52.880	--> 	00:52.920	
+1322	-	00:52.880	
+
+00:52.920	--> 	00:52.960	
+1323	-	00:52.920	
+
+00:52.960	--> 	00:53.000	
+1324	-	00:52.960	
+
+00:53.000	--> 	00:53.040	
+1325	-	00:53.000	
+
+00:53.040	--> 	00:53.080	
+1326	-	00:53.040	
+
+00:53.080	--> 	00:53.120	
+1327	-	00:53.080	
+
+00:53.120	--> 	00:53.160	
+1328	-	00:53.120	
+
+00:53.160	--> 	00:53.200	
+1329	-	00:53.160	
+
+00:53.200	--> 	00:53.240	
+1330	-	00:53.200	
+
+00:53.240	--> 	00:53.280	
+1331	-	00:53.240	
+
+00:53.280	--> 	00:53.320	
+1332	-	00:53.280	
+
+00:53.320	--> 	00:53.360	
+1333	-	00:53.320	
+
+00:53.360	--> 	00:53.400	
+1334	-	00:53.360	
+
+00:53.400	--> 	00:53.440	
+1335	-	00:53.400	
+
+00:53.440	--> 	00:53.480	
+1336	-	00:53.440	
+
+00:53.480	--> 	00:53.520	
+1337	-	00:53.480	
+
+00:53.520	--> 	00:53.560	
+1338	-	00:53.520	
+
+00:53.560	--> 	00:53.600	
+1339	-	00:53.560	
+
+00:53.600	--> 	00:53.640	
+1340	-	00:53.600	
+
+00:53.640	--> 	00:53.680	
+1341	-	00:53.640	
+
+00:53.680	--> 	00:53.720	
+1342	-	00:53.680	
+
+00:53.720	--> 	00:53.760	
+1343	-	00:53.720	
+
+00:53.760	--> 	00:53.800	
+1344	-	00:53.760	
+
+00:53.800	--> 	00:53.840	
+1345	-	00:53.800	
+
+00:53.840	--> 	00:53.880	
+1346	-	00:53.840	
+
+00:53.880	--> 	00:53.920	
+1347	-	00:53.880	
+
+00:53.920	--> 	00:53.960	
+1348	-	00:53.920	
+
+00:53.960	--> 	00:54.000	
+1349	-	00:53.960	
+
+00:54.000	--> 	00:54.040	
+1350	-	00:54.000	
+
+00:54.040	--> 	00:54.080	
+1351	-	00:54.040	
+
+00:54.080	--> 	00:54.120	
+1352	-	00:54.080	
+
+00:54.120	--> 	00:54.160	
+1353	-	00:54.120	
+
+00:54.160	--> 	00:54.200	
+1354	-	00:54.160	
+
+00:54.200	--> 	00:54.240	
+1355	-	00:54.200	
+
+00:54.240	--> 	00:54.280	
+1356	-	00:54.240	
+
+00:54.280	--> 	00:54.320	
+1357	-	00:54.280	
+
+00:54.320	--> 	00:54.360	
+1358	-	00:54.320	
+
+00:54.360	--> 	00:54.400	
+1359	-	00:54.360	
+
+00:54.400	--> 	00:54.440	
+1360	-	00:54.400	
+
+00:54.440	--> 	00:54.480	
+1361	-	00:54.440	
+
+00:54.480	--> 	00:54.520	
+1362	-	00:54.480	
+
+00:54.520	--> 	00:54.560	
+1363	-	00:54.520	
+
+00:54.560	--> 	00:54.600	
+1364	-	00:54.560	
+
+00:54.600	--> 	00:54.640	
+1365	-	00:54.600	
+
+00:54.640	--> 	00:54.680	
+1366	-	00:54.640	
+
+00:54.680	--> 	00:54.720	
+1367	-	00:54.680	
+
+00:54.720	--> 	00:54.760	
+1368	-	00:54.720	
+
+00:54.760	--> 	00:54.800	
+1369	-	00:54.760	
+
+00:54.800	--> 	00:54.840	
+1370	-	00:54.800	
+
+00:54.840	--> 	00:54.880	
+1371	-	00:54.840	
+
+00:54.880	--> 	00:54.920	
+1372	-	00:54.880	
+
+00:54.920	--> 	00:54.960	
+1373	-	00:54.920	
+
+00:54.960	--> 	00:55.000	
+1374	-	00:54.960	
+
+00:55.000	--> 	00:55.040	
+1375	-	00:55.000	
+
+00:55.040	--> 	00:55.080	
+1376	-	00:55.040	
+
+00:55.080	--> 	00:55.120	
+1377	-	00:55.080	
+
+00:55.120	--> 	00:55.160	
+1378	-	00:55.120	
+
+00:55.160	--> 	00:55.200	
+1379	-	00:55.160	
+
+00:55.200	--> 	00:55.240	
+1380	-	00:55.200	
+
+00:55.240	--> 	00:55.280	
+1381	-	00:55.240	
+
+00:55.280	--> 	00:55.320	
+1382	-	00:55.280	
+
+00:55.320	--> 	00:55.360	
+1383	-	00:55.320	
+
+00:55.360	--> 	00:55.400	
+1384	-	00:55.360	
+
+00:55.400	--> 	00:55.440	
+1385	-	00:55.400	
+
+00:55.440	--> 	00:55.480	
+1386	-	00:55.440	
+
+00:55.480	--> 	00:55.520	
+1387	-	00:55.480	
+
+00:55.520	--> 	00:55.560	
+1388	-	00:55.520	
+
+00:55.560	--> 	00:55.600	
+1389	-	00:55.560	
+
+00:55.600	--> 	00:55.640	
+1390	-	00:55.600	
+
+00:55.640	--> 	00:55.680	
+1391	-	00:55.640	
+
+00:55.680	--> 	00:55.720	
+1392	-	00:55.680	
+
+00:55.720	--> 	00:55.760	
+1393	-	00:55.720	
+
+00:55.760	--> 	00:55.800	
+1394	-	00:55.760	
+
+00:55.800	--> 	00:55.840	
+1395	-	00:55.800	
+
+00:55.840	--> 	00:55.880	
+1396	-	00:55.840	
+
+00:55.880	--> 	00:55.920	
+1397	-	00:55.880	
+
+00:55.920	--> 	00:55.960	
+1398	-	00:55.920	
+
+00:55.960	--> 	00:56.000	
+1399	-	00:55.960	
+
+00:56.000	--> 	00:56.040	
+1400	-	00:56.000	
+
+00:56.040	--> 	00:56.080	
+1401	-	00:56.040	
+
+00:56.080	--> 	00:56.120	
+1402	-	00:56.080	
+
+00:56.120	--> 	00:56.160	
+1403	-	00:56.120	
+
+00:56.160	--> 	00:56.200	
+1404	-	00:56.160	
+
+00:56.200	--> 	00:56.240	
+1405	-	00:56.200	
+
+00:56.240	--> 	00:56.280	
+1406	-	00:56.240	
+
+00:56.280	--> 	00:56.320	
+1407	-	00:56.280	
+
+00:56.320	--> 	00:56.360	
+1408	-	00:56.320	
+
+00:56.360	--> 	00:56.400	
+1409	-	00:56.360	
+
+00:56.400	--> 	00:56.440	
+1410	-	00:56.400	
+
+00:56.440	--> 	00:56.480	
+1411	-	00:56.440	
+
+00:56.480	--> 	00:56.520	
+1412	-	00:56.480	
+
+00:56.520	--> 	00:56.560	
+1413	-	00:56.520	
+
+00:56.560	--> 	00:56.600	
+1414	-	00:56.560	
+
+00:56.600	--> 	00:56.640	
+1415	-	00:56.600	
+
+00:56.640	--> 	00:56.680	
+1416	-	00:56.640	
+
+00:56.680	--> 	00:56.720	
+1417	-	00:56.680	
+
+00:56.720	--> 	00:56.760	
+1418	-	00:56.720	
+
+00:56.760	--> 	00:56.800	
+1419	-	00:56.760	
+
+00:56.800	--> 	00:56.840	
+1420	-	00:56.800	
+
+00:56.840	--> 	00:56.880	
+1421	-	00:56.840	
+
+00:56.880	--> 	00:56.920	
+1422	-	00:56.880	
+
+00:56.920	--> 	00:56.960	
+1423	-	00:56.920	
+
+00:56.960	--> 	00:57.000	
+1424	-	00:56.960	
+
+00:57.000	--> 	00:57.040	
+1425	-	00:57.000	
+
+00:57.040	--> 	00:57.080	
+1426	-	00:57.040	
+
+00:57.080	--> 	00:57.120	
+1427	-	00:57.080	
+
+00:57.120	--> 	00:57.160	
+1428	-	00:57.120	
+
+00:57.160	--> 	00:57.200	
+1429	-	00:57.160	
+
+00:57.200	--> 	00:57.240	
+1430	-	00:57.200	
+
+00:57.240	--> 	00:57.280	
+1431	-	00:57.240	
+
+00:57.280	--> 	00:57.320	
+1432	-	00:57.280	
+
+00:57.320	--> 	00:57.360	
+1433	-	00:57.320	
+
+00:57.360	--> 	00:57.400	
+1434	-	00:57.360	
+
+00:57.400	--> 	00:57.440	
+1435	-	00:57.400	
+
+00:57.440	--> 	00:57.480	
+1436	-	00:57.440	
+
+00:57.480	--> 	00:57.520	
+1437	-	00:57.480	
+
+00:57.520	--> 	00:57.560	
+1438	-	00:57.520	
+
+00:57.560	--> 	00:57.600	
+1439	-	00:57.560	
+
+00:57.600	--> 	00:57.640	
+1440	-	00:57.600	
+
+00:57.640	--> 	00:57.680	
+1441	-	00:57.640	
+
+00:57.680	--> 	00:57.720	
+1442	-	00:57.680	
+
+00:57.720	--> 	00:57.760	
+1443	-	00:57.720	
+
+00:57.760	--> 	00:57.800	
+1444	-	00:57.760	
+
+00:57.800	--> 	00:57.840	
+1445	-	00:57.800	
+
+00:57.840	--> 	00:57.880	
+1446	-	00:57.840	
+
+00:57.880	--> 	00:57.920	
+1447	-	00:57.880	
+
+00:57.920	--> 	00:57.960	
+1448	-	00:57.920	
+
+00:57.960	--> 	00:58.000	
+1449	-	00:57.960	
+
+00:58.000	--> 	00:58.040	
+1450	-	00:58.000	
+
+00:58.040	--> 	00:58.080	
+1451	-	00:58.040	
+
+00:58.080	--> 	00:58.120	
+1452	-	00:58.080	
+
+00:58.120	--> 	00:58.160	
+1453	-	00:58.120	
+
+00:58.160	--> 	00:58.200	
+1454	-	00:58.160	
+
+00:58.200	--> 	00:58.240	
+1455	-	00:58.200	
+
+00:58.240	--> 	00:58.280	
+1456	-	00:58.240	
+
+00:58.280	--> 	00:58.320	
+1457	-	00:58.280	
+
+00:58.320	--> 	00:58.360	
+1458	-	00:58.320	
+
+00:58.360	--> 	00:58.400	
+1459	-	00:58.360	
+
+00:58.400	--> 	00:58.440	
+1460	-	00:58.400	
+
+00:58.440	--> 	00:58.480	
+1461	-	00:58.440	
+
+00:58.480	--> 	00:58.520	
+1462	-	00:58.480	
+
+00:58.520	--> 	00:58.560	
+1463	-	00:58.520	
+
+00:58.560	--> 	00:58.600	
+1464	-	00:58.560	
+
+00:58.600	--> 	00:58.640	
+1465	-	00:58.600	
+
+00:58.640	--> 	00:58.680	
+1466	-	00:58.640	
+
+00:58.680	--> 	00:58.720	
+1467	-	00:58.680	
+
+00:58.720	--> 	00:58.760	
+1468	-	00:58.720	
+
+00:58.760	--> 	00:58.800	
+1469	-	00:58.760	
+
+00:58.800	--> 	00:58.840	
+1470	-	00:58.800	
+
+00:58.840	--> 	00:58.880	
+1471	-	00:58.840	
+
+00:58.880	--> 	00:58.920	
+1472	-	00:58.880	
+
+00:58.920	--> 	00:58.960	
+1473	-	00:58.920	
+
+00:58.960	--> 	00:59.000	
+1474	-	00:58.960	
+
+00:59.000	--> 	00:59.040	
+1475	-	00:59.000	
+
+00:59.040	--> 	00:59.080	
+1476	-	00:59.040	
+
+00:59.080	--> 	00:59.120	
+1477	-	00:59.080	
+
+00:59.120	--> 	00:59.160	
+1478	-	00:59.120	
+
+00:59.160	--> 	00:59.200	
+1479	-	00:59.160	
+
+00:59.200	--> 	00:59.240	
+1480	-	00:59.200	
+
+00:59.240	--> 	00:59.280	
+1481	-	00:59.240	
+
+00:59.280	--> 	00:59.320	
+1482	-	00:59.280	
+
+00:59.320	--> 	00:59.360	
+1483	-	00:59.320	
+
+00:59.360	--> 	00:59.400	
+1484	-	00:59.360	
+
+00:59.400	--> 	00:59.440	
+1485	-	00:59.400	
+
+00:59.440	--> 	00:59.480	
+1486	-	00:59.440	
+
+00:59.480	--> 	00:59.520	
+1487	-	00:59.480	
+
+00:59.520	--> 	00:59.560	
+1488	-	00:59.520	
+
+00:59.560	--> 	00:59.600	
+1489	-	00:59.560	
+
+00:59.600	--> 	00:59.640	
+1490	-	00:59.600	
+
+00:59.640	--> 	00:59.680	
+1491	-	00:59.640	
+
+00:59.680	--> 	00:59.720	
+1492	-	00:59.680	
+
+00:59.720	--> 	00:59.760	
+1493	-	00:59.720	
+
+00:59.760	--> 	00:59.800	
+1494	-	00:59.760	
+
+00:59.800	--> 	00:59.840	
+1495	-	00:59.800	
+
+00:59.840	--> 	00:59.880	
+1496	-	00:59.840	
+
+00:59.880	--> 	00:59.920	
+1497	-	00:59.880	
+
+00:59.920	--> 	00:59.960	
+1498	-	00:59.920	
+
+00:59.960	--> 	01:00.000	
+1499	-	00:59.960	
+

gpac-0.5.0.svn5178.tar.bz2/regression_tests/webvtt/simple.vtt Added

gpac-0.5.0.svn4668.tar.bz2/src/Makefile -> gpac-0.5.0.svn5178.tar.bz2/src/Makefile Changed

@@ -37,7 +37,7 @@
 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/generic_subtitle.o 
+LIBGPAC_ISOM=isomedia/avc_ext.o isomedia/box_code_3gpp.o isomedia/box_code_apple.o isomedia/box_code_base.o isomedia/box_code_drm.o isomedia/box_code_meta.o isomedia/box_dump.o isomedia/box_funcs.o isomedia/data_map.o isomedia/drm_sample.o isomedia/isom_intern.o isomedia/isom_read.o isomedia/isom_store.o isomedia/isom_write.o isomedia/media.o isomedia/media_odf.o isomedia/meta.o isomedia/movie_fragments.o isomedia/sample_descs.o isomedia/stbl_read.o isomedia/stbl_write.o isomedia/track.o isomedia/tx3g.o isomedia/ttml.o 
 ifeq ($(DISABLE_ISOFF_HINT), no)
 LIBGPAC_ISOM+=isomedia/hint_track.o isomedia/hinting.o
 endif
@@ -68,7 +68,7 @@
 endif
 
 ## libgpac objects gathering: src/scenegraph
-LIBGPAC_SCENE=scenegraph/base_scenegraph.o scenegraph/mpeg4_animators.o scenegraph/commands.o scenegraph/mpeg4_nodes.o scenegraph/mpeg4_valuator.o scenegraph/vrml_interpolators.o scenegraph/vrml_proto.o scenegraph/vrml_route.o scenegraph/vrml_script.o scenegraph/vrml_smjs.o scenegraph/vrml_tools.o scenegraph/x3d_nodes.o scenegraph/svg_attributes.o scenegraph/svg_types.o scenegraph/svg_smjs.o scenegraph/smil_anim.o scenegraph/smil_timing.o scenegraph/svg_properties.o scenegraph/dom_events.o  scenegraph/dom_smjs.o scenegraph/xbl_process.o scenegraph/xml_ns.o scenegraph/html5_media_smjs.o scenegraph/html5_mse_smjs.o
+LIBGPAC_SCENE=scenegraph/base_scenegraph.o scenegraph/mpeg4_animators.o scenegraph/commands.o scenegraph/mpeg4_nodes.o scenegraph/mpeg4_valuator.o scenegraph/vrml_interpolators.o scenegraph/vrml_proto.o scenegraph/vrml_route.o scenegraph/vrml_script.o scenegraph/vrml_smjs.o scenegraph/vrml_tools.o scenegraph/x3d_nodes.o scenegraph/svg_attributes.o scenegraph/svg_types.o scenegraph/svg_smjs.o scenegraph/smil_anim.o scenegraph/smil_timing.o scenegraph/svg_properties.o scenegraph/dom_events.o  scenegraph/dom_smjs.o scenegraph/xbl_process.o scenegraph/xml_ns.o scenegraph/html5_media_smjs.o scenegraph/html5_mse_smjs.o scenegraph/webvtt_smjs.o
 
 ## libgpac objects gathering: src/mcrypt
 LIBGPAC_MCRYPT=
@@ -461,7 +461,9 @@
 CFLAGS+= -I"$(LOCAL_INC_PATH)/zlib"
 NEED_LOCAL_LIB="yes"
 endif
+ifneq ($(CONFIG_ZLIB), no)
 LINKLIBS+=-lz
+endif
 
 #2 - ssl support
 ifeq ($(HAS_OPENSSL), yes)
@@ -575,7 +577,7 @@
 
 all: lib
 
-lib: $(LIB)
+lib: ../bin/gcc/$(LIB)
 
 #there's a bunch of warnings in there, get rid of them
 mcrypt: CFLAGS= $(OPTFLAGS) -w -I"$(SRC_PATH)/include"
@@ -583,38 +585,50 @@
 
 scenegraph: CFLAGS += $(SCENEGRAPH_CFLAGS)
 scenegraph: $(LIBGPAC_SCENE)
+.deps/scenegraph/%: CFLAGS += $(SCENEGRAPH_CFLAGS)
+.deps/scenegraph/%: CFLAGS += $(SCENEGRAPH_CFLAGS)
 
-mediatools: CFLAGS += $(MEDIATOOLS_CFLAGS)
-mediatools: $(LIBGPAC_MEDIATOOLS)
+media_tools: CFLAGS += $(MEDIATOOLS_CFLAGS)
+media_tools: $(LIBGPAC_MEDIATOOLS)
+.deps/media_tools/%: CFLAGS += $(MEDIATOOLS_CFLAGS)
+.deps/media_tools/%: CFLAGS += $(MEDIATOOLS_CFLAGS)
 
 compositor: CFLAGS+=$(COMPOSITOR_CFLAGS)
 compositor: $(LIBGPAC_COMPOSITOR)
+.deps/compositor/%: CFLAGS += $(COMPOSITOR_CFLAGS)
+.deps/compositor/%: CFLAGS += $(COMPOSITOR_CFLAGS)
 
 
-$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph mediatools mcrypt $(OBJS)
-	@echo "Linking libgpac"
+../bin/gcc/$(LIB): $(LIBGPAC_UTILS) $(LIBGPAC_IETF) $(LIBGPAC_BIFS) $(LIBGPAC_ODF) $(LIBGPAC_LASER) $(LIBGPAC_ISOM) $(LIBGPAC_SCENEMANAGER) $(LIBGPAC_TERMINAL) compositor scenegraph media_tools mcrypt $(OBJS)
 	@echo "OBJS $(OBJS)"
 	@echo "LIBS $(EXTRALIBS)"
 ifeq ($(CONFIG_DARWIN),yes)
 	$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
 	$(RANLIB) ../bin/gcc/libgpac_static.a
-	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS) 
+	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS) 
 else
 	$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
 	$(RANLIB) ../bin/gcc/libgpac_static.a
-	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o ../bin/gcc/$@ $(OBJS) $(EXTRALIBS)
+	$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
 ifeq (,$(findstring yes, $(CONFIG_WIN32)))
-	mv ../bin/gcc/$@ ../bin/gcc/$@.$(VERSION_SONAME)
-	ln -sf $@.$(VERSION_SONAME) ../bin/gcc/$@.$(VERSION_MAJOR)
-	ln -sf $@.$(VERSION_SONAME) ../bin/gcc/$@
+	mv $@ $@.$(VERSION_SONAME)
+	ln -sf $(notdir $@).$(VERSION_SONAME) $@.$(VERSION_MAJOR)
+	ln -sf $(notdir $@).$(VERSION_SONAME) $@
 endif
 endif
 
-dep: depend
+dep:
+
+DEPS := $(SRCS:%.c=.deps/%.dep)
+
+-include .depend
+
+.depend: $(DEPS)
+	cat $^ > "$@"
 
-depend:
-	rm -f .depend
-	$(CC) -MM $(CFLAGS) $(SRCS) 1>.depend
+.deps/%.dep: %.c
+	@mkdir -p $(dir $@)
+	$(CC) -MM $(CFLAGS) "$<" -MT "$*.o" -MF "$@"
 
 clean: 
 	rm -f $(OBJS) ../bin/gcc/$(LIB)
@@ -623,11 +637,4 @@
 		../bin/gcc/libgpac.so.$(VERSION_SONAME)
 
 distclean: clean
-	rm -f Makefile.bak .depend
-
-
-# include dependency files if they exist
-#
-ifneq ($(wildcard .depend),)
-include .depend
-endif
+	rm -f Makefile.bak .depend $(DEPS)

gpac-0.5.0.svn4668.tar.bz2/src/bifs/com_dec.c -> gpac-0.5.0.svn5178.tar.bz2/src/bifs/com_dec.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/bifs/field_encode.c -> gpac-0.5.0.svn5178.tar.bz2/src/bifs/field_encode.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/bifs/script_enc.c -> gpac-0.5.0.svn5178.tar.bz2/src/bifs/script_enc.c Changed

@@ -620,11 +620,11 @@
 	u32 nbBits, val = 0;
 	if (sc_enc->emul) return;
 	if ((str[0]=='0') && (str[1]=='x' || str[1]=='X')) {
-		val = strtoul(sc_enc->token, (char **) NULL, 16);
+		val = (u32) strtoul(sc_enc->token, (char **) NULL, 16);
 	} else if (str[0]=='0' && isdigit(str[1])) {
-		val = strtoul(str, (char **) NULL, 8);
+		val = (u32) strtoul(str, (char **) NULL, 8);
 	} else if (isdigit(str[0])) {
-		val = strtoul(str, (char **) NULL, 10);
+		val = (u32) strtoul(str, (char **) NULL, 10);
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: %s is not an integer\n", str));
 		sc_enc->err = GF_BAD_PARAM;
@@ -872,11 +872,11 @@
 {
 	u32 val = 0;
 	if ((str[0]=='0') && (str[1]=='x' || str[1]=='X')) {
-		val = strtoul(sc_enc->token, (char **) NULL, 16);
+		val = (u32) strtoul(sc_enc->token, (char **) NULL, 16);
 	} else if (str[0]=='0' && isdigit(str[1])) {
-		val = strtoul(str, (char **) NULL, 8);
+		val = (u32) strtoul(str, (char **) NULL, 8);
 	} else if (isdigit(str[0])) {
-		val = strtoul(str, (char **) NULL, 10);
+		val = (u32) strtoul(str, (char **) NULL, 10);
 	} else {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[bifs] Script encoding: %s is not an integer\n", str));
 		sc_enc->err = GF_BAD_PARAM;

gpac-0.5.0.svn4668.tar.bz2/src/compositor/audio_input.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/audio_input.c Changed

@@ -59,7 +59,7 @@
 	/*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);
+	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);
 
@@ -67,6 +67,7 @@
 	if (!frame) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] No data in audio object (eos %d)\n", ai->stream_finished));
 		gf_mo_adjust_clock(ai->stream, 0);
+		*size = 0;
 		return NULL;
 	}
 	ai->need_release = 1;
@@ -75,15 +76,20 @@
 
 	gf_mo_get_object_time(ai->stream, &obj_time);
 	obj_time += audio_delay_ms;
-	drift = (s32)obj_time;
-	drift -= (s32)ts;
-
+	if (ai->compositor->bench_mode) {
+		drift = 0;
+	} else {
+		drift = (s32)obj_time;
+		drift -= (s32)ts;
+	}
+	
 #ifdef ENABLE_EARLY_FRAME_DETECTION
 	/*too early (silence insertions), skip*/
 	if (drift < 0) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_AUDIO, ("[Audio Input] audio too early of %d (CTS %u at OTB %u with audio delay %d ms)\n", drift + audio_delay_ms, ts, obj_time, audio_delay_ms));
 		ai->need_release = 0;
-		gf_mo_release_data(ai->stream, 0, 0);
+		gf_mo_release_data(ai->stream, 0, -1);
+		*size = 0;
 		return NULL;
 	}
 #endif

gpac-0.5.0.svn4668.tar.bz2/src/compositor/audio_mixer.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/audio_mixer.c Changed

@@ -78,6 +78,7 @@
 	u32 output_size;
 };
 
+GF_EXPORT
 GF_AudioMixer *gf_mixer_new(struct _audio_render *ar)
 {
 	GF_AudioMixer *am;
@@ -150,6 +151,7 @@
 	return am->nb_channels*am->bits_per_sample/8;
 }
 
+GF_EXPORT
 void gf_mixer_lock(GF_AudioMixer *am, Bool lockIt)
 {
 	//GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[AudioMixer] Thread ID %d is %s the audio mixer\n", gf_th_id(), lockIt ? "locking" : "unlocking" ));
@@ -160,11 +162,13 @@
 	}
 }
 
+GF_EXPORT
 Bool gf_mixer_empty(GF_AudioMixer *am)
 {
 	return am->isEmpty;
 }
 
+GF_EXPORT
 void gf_mixer_add_input(GF_AudioMixer *am, GF_AudioInterface *src)
 {
 	MixerInput *in;
@@ -207,6 +211,7 @@
 	return am->ar->audio_out->QueryOutputSampleRate(am->ar->audio_out, out_sr, out_ch, out_bps);
 }
 
+GF_EXPORT
 void gf_mixer_get_config(GF_AudioMixer *am, u32 *outSR, u32 *outCH, u32 *outBPS, u32 *outChCfg)
 {
 	(*outBPS) = am->bits_per_sample;
@@ -215,6 +220,7 @@
 	(*outChCfg) = am->channel_cfg;
 }
 
+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) 
@@ -234,6 +240,7 @@
 	gf_mixer_lock(am, 0);
 }
 
+GF_EXPORT
 Bool gf_mixer_reconfig(GF_AudioMixer *am)
 {
 	u32 i, count, numInit, max_sample_rate, max_channels, max_bps, cfg_changed, ch_cfg;
@@ -505,7 +512,7 @@
 		}
 
 		gf_mixer_map_channels(inChan, in_ch, in->src->ch_cfg, out_ch, am->channel_cfg);
-
+		//Fixe me - we nee to uderstand how to map pan from N channels to K channels ...
 		for (j=0; j<out_ch ; j++) {
 			*(in->ch_buf[j] + in->out_samples_written) = (s32) (inChan[j] * FIX2INT(100*in->pan[j]) / 100 );
 		}
@@ -546,12 +553,12 @@
 	in->in_bytes_used += 1;
 }
 
-
+GF_EXPORT
 u32 gf_mixer_get_output(GF_AudioMixer *am, void *buffer, u32 buffer_size, u32 delay)
 {
 	MixerInput *in, *single_source;
 	Fixed pan[6];
-	Bool is_muted;
+	Bool is_muted, force_mix;
 	u32 i, j, count, size, in_size, nb_samples, nb_written;
 	s32 *out_mix, nb_act_src;
 	char *data, *ptr;
@@ -571,13 +578,15 @@
 	if (count!=1) goto do_mix;
 	if (am->force_channel_out) goto do_mix;
 	single_source = (MixerInput *) gf_list_get(am->sources, 0);
-	/*if cfg changed or unknown return*/
+	/*if cfg changed or unknown, reconfigure the mixer if the audio renderer is attached. Otherwise,  the mixer config never changes internally*/
 	if (!single_source->src->GetConfig(single_source->src, 0)) {
-		am->must_reconfig = 1;
-		gf_mixer_reconfig(am);
-		memset(buffer, 0, buffer_size);
-		gf_mixer_lock(am, 0);
-		return 0;
+		if (am->ar) {
+			am->must_reconfig = 1;
+			gf_mixer_reconfig(am);
+			memset(buffer, 0, buffer_size);
+			gf_mixer_lock(am, 0);
+			return 0;
+		}
 	}
 
 	single_source->muted = single_source->src->IsMuted(single_source->src->callback);
@@ -596,6 +605,7 @@
 	is_muted = single_source->muted;
 
 	while (buffer_size) {
+		size = 0;
 		data = single_source->src->FetchFrame(single_source->src->callback, &size, delay);
 		if (!data || !size) break;
 		/*don't copy more than possible*/
@@ -612,14 +622,20 @@
 	}
 
 	/*not completely filled*/
-	if (buffer_size) {
-		if (!data) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioMixer] not enough input data (%d still to fill)\n", buffer_size));
+	if (!size || !buffer_size) {
+		if (buffer_size) {
+			if (!data) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioMixer] not enough input data (%d still to fill)\n", buffer_size));
+			}
+			memset(ptr, 0, buffer_size);
 		}
-		memset(ptr, 0, buffer_size);
+		gf_mixer_lock(am, 0);
+		return (in_size - buffer_size);
 	}
-	gf_mixer_lock(am, 0);
-	return (in_size - buffer_size);
+
+	//otherwise, we do have some data but we had a change in config while writing the sample - fallthrough to full mix mode
+	buffer = ptr;
+
 
 do_mix:
 	nb_act_src = 0;
@@ -632,6 +648,7 @@
 	}
 
 	single_source = NULL;
+	force_mix = GF_FALSE;
 	for (i=0; i<count; i++) {
 		in = (MixerInput *)gf_list_get(am->sources, i);
 		in->muted = in->src->IsMuted(in->src->callback);
@@ -652,17 +669,20 @@
 
 		/*if cfg unknown or changed (AudioBuffer child...) invalidate cfg settings*/
 		if (!in->src->GetConfig(in->src, 0)) {
-			if (!am->must_reconfig) {
-				am->must_reconfig = 1;
-				/*if main mixer reconfig asap*/
-				if (am->ar) gf_mixer_reconfig(am);
-			}
-			//however keep the current mixer config and output some audio ...
-//			nb_act_src = 0;
-//			break;
-			in->muted = 1;
-			continue;
-		} else if (in->speed==0) {
+			if (am->ar) {
+				if (!am->must_reconfig) {
+					am->must_reconfig = 1;
+					/*if main mixer reconfig asap*/
+					gf_mixer_reconfig(am);
+				}
+				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 {
 			assert(in->src->samplerate);
@@ -670,7 +690,7 @@
 			if (in->src->IsMuted(in->src->callback)) {
 				memset(in->pan, 0, sizeof(Fixed)*6);
 			} else {
-				if (!in->src->GetChannelVolume(in->src->callback, in->pan)) {
+				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) 
@@ -742,12 +762,13 @@
 		return 0;
 	}
 
+	//we do not re-normalize based on the numbner of input, this is the author's responsability
 	out_mix = am->output;
 	if (am->bits_per_sample==16) {
 		s16 *out_s16 = (s16 *) buffer;
 		for (i=0; i<nb_written; i++) {
 			for (j=0; j<am->nb_channels; j++) {
-				s32 samp = (*out_mix / nb_act_src);
+				s32 samp = (*out_mix );
 				if (samp > GF_SHORT_MAX) samp = GF_SHORT_MAX;
 				else if (samp < GF_SHORT_MIN) samp = GF_SHORT_MIN;
 				(*out_s16) = samp;
@@ -759,7 +780,7 @@
 		s8 *out_s8 = (s8 *) buffer;
 		for (i=0; i<nb_written; i++) {
 			for (j=0; j<am->nb_channels; j++) {
-				s32 samp = (*out_mix / nb_act_src);
+				s32 samp = (*out_mix ) / 255;
 				if (samp > 127) samp = 127;
 				else if (samp < -128) samp = -128;
 				(*out_s8) = samp;

gpac-0.5.0.svn4668.tar.bz2/src/compositor/audio_render.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/audio_render.c Changed

@@ -424,25 +424,36 @@
 			}
 		}
 		if (!ar->audio_out) {
+			GF_AudioOutput *raw_out = NULL;
 			count = gf_modules_get_count(ar->user->modules);
 			for (i=0; i<count; i++) {
 				ar->audio_out = (GF_AudioOutput *) gf_modules_load_interface(ar->user->modules, i, GF_AUDIO_OUTPUT_INTERFACE);
 				if (!ar->audio_out) continue;
+
+				//in enum mode, only use raw out if everything else failed ...
+				if (!stricmp(ar->audio_out->module_name, "Raw Audio Output")) {
+					raw_out = ar->audio_out;
+					ar->audio_out = NULL;
+					continue;
+				}
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_AUDIO, ("[AudioRender] Audio output module %s loaded\n", ar->audio_out->module_name));
 				/*check that's a valid audio compositor*/
-				if (ar->audio_out->SelfThreaded) {
-					if (ar->audio_out->SetPriority) break;
-				} else {
-					if (ar->audio_out->WriteAudio) break;
+				if ((ar->audio_out->SelfThreaded && ar->audio_out->SetPriority) || ar->audio_out->WriteAudio) {
+					/*remember the module we use*/
+					gf_cfg_set_key(user->config, "Audio", "DriverName", ar->audio_out->module_name);
+					break;
 				}
 				gf_modules_close_interface((GF_BaseInterface *)ar->audio_out);
 				ar->audio_out = NULL;
 			}
+			if (raw_out) {
+				if (ar->audio_out) gf_modules_close_interface((GF_BaseInterface *)raw_out);
+				else ar->audio_out = raw_out;
+			}
 		}
 
 		/*if not init we run with a NULL audio compositor*/
 		if (ar->audio_out) {
-
 			ar->audio_out->FillBuffer = gf_ar_fill_output;
 			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));
@@ -458,8 +469,6 @@
 				gf_modules_close_interface((GF_BaseInterface *)ar->audio_out);
 				ar->audio_out = NULL;
 			} else {
-				/*remember the module we use*/
-				gf_cfg_set_key(user->config, "Audio", "DriverName", ar->audio_out->module_name);
 				if (!ar->audio_out->SelfThreaded) {
 					ar->th = gf_th_new("AudioRenderer");
 					gf_th_run(ar->th, gf_ar_proc, ar);

gpac-0.5.0.svn4668.tar.bz2/src/compositor/compositor.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/compositor.c Changed

@@ -59,6 +59,9 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Switching fullscreen %s\n", compositor->fullscreen ? "off" : "on"));
 	/*move to FS*/
 	compositor->fullscreen = !compositor->fullscreen;
+
+	gf_sc_ar_control(compositor->audio_renderer, 0);
+
 	if (compositor->fullscreen && (compositor->scene_width>=compositor->scene_height)
 #ifndef GPAC_DISABLE_3D
 			&& !compositor->visual->type_3d 
@@ -69,10 +72,12 @@
 		e = compositor->video_out->SetFullScreen(compositor->video_out, compositor->fullscreen, &compositor->display_width, &compositor->display_height);
 	}
 
+	gf_sc_ar_control(compositor->audio_renderer, 1);
+
 	if (e) {
 		GF_Event evt;
+		memset(&evt, 0, sizeof(GF_Event));
 		evt.type = GF_EVENT_MESSAGE;
-		evt.message.service = "";
 		evt.message.message = "Cannot switch to fullscreen";
 		evt.message.error = e;
 		gf_term_send_event(compositor->term, &evt);
@@ -82,7 +87,7 @@
 	GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] recomputing aspect ratio\n"));
 	compositor->recompute_ar = 1;
 	/*force signaling graphics reset*/
-	if (!compositor->reset_graphics) compositor->reset_graphics = 1;
+	if (!compositor->reset_graphics) gf_sc_reset_graphics(compositor);
 }
 
 
@@ -156,7 +161,6 @@
 				compositor->recompute_ar = 1;
 				gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 			}
-			if (!compositor->reset_graphics) compositor->reset_graphics = 1;
 			notif_size=1;
 			
 		}
@@ -168,9 +172,14 @@
 		/*fullscreen on/off request*/
 		if (compositor->msg_type & GF_SR_CFG_FULLSCREEN) {
 			compositor->msg_type &= ~GF_SR_CFG_FULLSCREEN;
-			gf_sc_set_fullscreen(compositor);
-			gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
-			notif_size=1;
+			//video is about to resetup, wait for the setup 
+			if (compositor->recompute_ar) {
+				compositor->fullscreen_postponed = 1;
+			} else {
+				gf_sc_set_fullscreen(compositor);
+				gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
+				notif_size=1;
+			}
 		}
 		compositor->msg_type &= ~GF_SR_IN_RECONFIG;
 	}
@@ -202,16 +211,22 @@
 	}
 }
 
-Bool gf_sc_draw_frame(GF_Compositor *compositor)
+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)	
+			*ms_till_next = compositor->frame_duration;
+		else
+			*ms_till_next = MIN(compositor->next_frame_delay, compositor->frame_duration);
+	}
 	if (compositor->frame_draw_type) return 1;
 	if (compositor->fonts_pending) return 1;
 	return GF_FALSE;
 }
 
 
-
 /*forces graphics redraw*/
 GF_EXPORT
 void gf_sc_reset_graphics(GF_Compositor *compositor)
@@ -296,6 +311,7 @@
 	mesh_new_unit_bbox(compositor->unit_bbox);
 #endif
 
+	compositor->was_system_memory=1;
 	return GF_OK;
 }
 
@@ -317,21 +333,25 @@
 				gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
 				compositor->video_out = NULL;
 			}
-		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("Failed to load module %s, no video driver.\n", sOpt));
-			sOpt = NULL;
 		}
 	}
 
 	if (!compositor->video_out) {
-		u32 i, count;
-		count = gf_modules_get_count(compositor->user->modules);
+		GF_VideoOutput *raw_out = NULL;
+		u32 i, count = gf_modules_get_count(compositor->user->modules);
 		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("Trying to find a suitable video driver amongst %d modules...\n", count));
 		for (i=0; i<count; i++) {
 			compositor->video_out = (GF_VideoOutput *) gf_modules_load_interface(compositor->user->modules, i, GF_VIDEO_OUTPUT_INTERFACE);
 			if (!compositor->video_out) continue;
 			compositor->video_out->evt_cbk_hdl = compositor;
 			compositor->video_out->on_event = gf_sc_on_event;
+			//in enum mode, only use raw out if everything else failed ...
+			if (!stricmp(compositor->video_out->module_name, "Raw Video Output")) {
+				raw_out = compositor->video_out;
+				compositor->video_out = NULL;
+				continue;
+			}
+
 			/*init hw*/
 			if (compositor->video_out->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags)==GF_OK) {
 				gf_cfg_set_key(compositor->user->config, "Video", "DriverName", compositor->video_out->module_name);
@@ -340,6 +360,13 @@
 			gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
 			compositor->video_out = NULL;
 		}
+		if (raw_out) {
+			if (compositor->video_out) gf_modules_close_interface((GF_BaseInterface *)raw_out);
+			else {
+				compositor->video_out = raw_out;
+				compositor->video_out ->Setup(compositor->video_out, compositor->user->os_window_handler, compositor->user->os_display, compositor->user->init_flags);
+			}
+		}
 	}
 	if (!compositor->video_out ) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Failed to create compositor->video_out, did not find any suitable driver."));
@@ -393,13 +420,13 @@
 	}
 
 	compositor->textures = gf_list_new();
+	compositor->textures_gc = gf_list_new();
 	compositor->frame_rate = 30.0;	
 	compositor->frame_duration = 33;
 	compositor->time_nodes = gf_list_new();
-#ifdef GF_SR_EVENT_QUEUE
-	compositor->events = gf_list_new();
-	compositor->ev_mx = gf_mx_new("EventQueue");
-#endif
+	compositor->event_queue = gf_list_new();
+	compositor->event_queue_back = gf_list_new();
+	compositor->evq_mx = gf_mx_new("EventQueue");
 
 #ifdef GF_SR_USE_VIDEO_CACHE
 	compositor->cached_groups = gf_list_new();
@@ -416,6 +443,8 @@
 	compositor->extra_scenes = gf_list_new();
 	compositor->interaction_level = GF_INTERACT_NORMAL | GF_INTERACT_INPUT_SENSOR | GF_INTERACT_NAVIGATION;
 
+	compositor->scene_sampled_clock = 0;
+	compositor->video_th_id = gf_th_id();
 	return GF_OK;
 }
 
@@ -445,11 +474,22 @@
 
 	compositor->video_th_state = GF_COMPOSITOR_THREAD_RUN;	
 	while (compositor->video_th_state == GF_COMPOSITOR_THREAD_RUN) {
-		if (compositor->is_hidden==1) 
+		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);
 	}
+
+#ifndef GPAC_DISABLE_3D
+	visual_3d_reset_graphics(compositor->visual);
+	compositor_2d_reset_gl_auto(compositor);
+#endif
+	gf_sc_texture_cleanup_hw(compositor);
+
+
 	/*destroy video out here if we're using openGL, to avoid threading issues*/
 	compositor->video_out->Shutdown(compositor->video_out);
 	gf_modules_close_interface((GF_BaseInterface *)compositor->video_out);
@@ -541,7 +581,13 @@
 			}
 		}
 		gf_th_del(compositor->VisualThread);
+	} else {
+#ifndef GPAC_DISABLE_3D
+		compositor_2d_reset_gl_auto(compositor);
+#endif
+		gf_sc_texture_cleanup_hw(compositor);
 	}
+
 	if (compositor->video_out) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Closing video output\n"));
 		compositor->video_out->Shutdown(compositor->video_out);
@@ -572,6 +618,7 @@
 		gf_list_del(compositor->traverse_state->use_stack);
 		gf_free(compositor->traverse_state);
 	}
+
 #ifndef GPAC_DISABLE_3D
 	if (compositor->unit_bbox) mesh_free(compositor->unit_bbox);
 #endif
@@ -590,17 +637,21 @@
 		}
 		gf_list_del(compositor->proto_modules);
 	}
-#ifdef GF_SR_EVENT_QUEUE
-	gf_mx_p(compositor->ev_mx);
-	while (gf_list_count(compositor->events)) {
-		GF_Event *ev = (GF_Event *)gf_list_get(compositor->events, 0);
-		gf_list_rem(compositor->events, 0);
-		gf_free(ev);
-	}
-	gf_mx_v(compositor->ev_mx);
-	gf_mx_del(compositor->ev_mx);
-	gf_list_del(compositor->events);
-#endif
+	gf_mx_p(compositor->evq_mx);
+	while (gf_list_count(compositor->event_queue)) {
+		GF_QueuedEvent *qev = (GF_QueuedEvent *)gf_list_get(compositor->event_queue, 0);
+		gf_list_rem(compositor->event_queue, 0);
+		gf_free(qev);
+	}
+	while (gf_list_count(compositor->event_queue_back)) {
+		GF_QueuedEvent *qev = (GF_QueuedEvent *)gf_list_get(compositor->event_queue_back, 0);
+		gf_list_rem(compositor->event_queue, 0);
+		gf_free(qev);
+	}
+	gf_mx_v(compositor->evq_mx);
+	gf_mx_del(compositor->evq_mx);
+	gf_list_del(compositor->event_queue);
+	gf_list_del(compositor->event_queue_back);
 
 	if (compositor->font_manager) gf_font_manager_del(compositor->font_manager);
 
@@ -610,6 +661,7 @@
 #endif
 
 	if (compositor->textures) gf_list_del(compositor->textures);
+	if (compositor->textures_gc) gf_list_del(compositor->textures_gc);
 	if (compositor->time_nodes) gf_list_del(compositor->time_nodes);
 	if (compositor->extra_scenes) gf_list_del(compositor->extra_scenes);
 	if (compositor->video_listeners) gf_list_del(compositor->video_listeners);
@@ -658,7 +710,7 @@
 
 u32 gf_sc_get_clock(GF_Compositor *compositor)
 {
-	return gf_sc_ar_get_clock(compositor->audio_renderer);
+	return compositor->scene_sampled_clock;
 }
 
 GF_Err gf_sc_set_scene_size(GF_Compositor *compositor, u32 Width, u32 Height, Bool force_size)
@@ -738,7 +790,7 @@
 	compositor_2d_set_user_transform(compositor, compositor->zoom, compositor->trans_x, compositor->trans_y, 1);
 }
 
-static void gf_sc_reset(GF_Compositor *compositor)
+static void gf_sc_reset(GF_Compositor *compositor, Bool has_scene)
 {
 	Bool draw_mode;
 	
@@ -780,6 +832,13 @@
 	compositor->traverse_state->depth_offset = 0;
 #endif
 
+#ifndef GPAC_DISABLE_3D
+	//force a recompute of the canvas
+	if (has_scene && compositor->hybgl_txh) {
+		compositor->hybgl_txh->width = compositor->hybgl_txh->height = 0;
+	}
+#endif
+
 	assert(!compositor->visual->overlays);
 
 	compositor->reset_graphics = 0;
@@ -822,19 +881,18 @@
 		gf_sc_ar_reset(compositor->audio_renderer);
 	}
 
-#ifdef GF_SR_EVENT_QUEUE
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Reseting event queue\n"));
-	gf_mx_p(compositor->ev_mx);
-	while (gf_list_count(compositor->events)) {
-		GF_Event *ev = (GF_Event*)gf_list_get(compositor->events, 0);
-		gf_list_rem(compositor->events, 0);
-		gf_free(ev);
+	gf_mx_p(compositor->evq_mx);
+	while (gf_list_count(compositor->event_queue)) {
+		GF_QueuedEvent *qev = (GF_QueuedEvent*)gf_list_get(compositor->event_queue, 0);
+		gf_list_rem(compositor->event_queue, 0);
+		gf_free(qev);
 	}
-#endif
+	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);
+	gf_sc_reset(compositor, scene_graph ? 1 : 0);
 
 	/*set current graph*/
 	compositor->scene = scene_graph;
@@ -854,6 +912,8 @@
 		compositor->has_size_info = (width && height) ? 1 : 0;
 		if (compositor->has_size_info != had_size_info) compositor->scene_width = compositor->scene_height = 0;
 
+		compositor->video_memory = gf_scene_is_dynamic_scene(scene_graph);
+
 #ifndef GPAC_DISABLE_3D
 		compositor->visual->camera.world_bbox.is_set = 0;
 #endif
@@ -950,9 +1010,6 @@
 	}
 
 	gf_sc_reset_framerate(compositor);	
-#ifdef GF_SR_EVENT_QUEUE
-	gf_mx_v(compositor->ev_mx);
-#endif
 	
 	gf_sc_lock(compositor, 0);
 	if (scene_graph)
@@ -1137,22 +1194,35 @@
 	compositor->cache_tolerance = sOpt ? atoi(sOpt) : 30;
 #endif
 
-#ifndef GPAC_DISABLE_3D
+	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "TextureFromDecoderMemory");
+	compositor->texture_from_decoder_memory = (sOpt && !strcmp(sOpt, "yes")) ? GF_TRUE : GF_FALSE;
+	if (!sOpt) 
+		gf_cfg_set_key(compositor->user->config, "Compositor", "TextureFromDecoderMemory", "no");
 
-	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "ForceOpenGL");
-	compositor->force_opengl_2d = (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0;
+#ifndef GPAC_DISABLE_3D
 
+	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "OpenGLMode");
+	compositor->force_opengl_2d = (sOpt && !strcmp(sOpt, "always")) ? 1 : 0;
+	if (!sOpt) {
+		compositor->recompute_ar = 1;
+		compositor->autoconfig_opengl = 1;
+	} else {
+		compositor->hybrid_opengl = !strcmp(sOpt, "hybrid") ? 1 : 0;
 #ifdef OPENGL_RASTER
-	compositor->opengl_raster = (sOpt && !strcmp(sOpt, "raster")) ? 1 : 0;
-	if (compositor->opengl_raster) compositor->traverse_state->immediate_draw = GF_TRUE;
+		compositor->opengl_raster = !strcmp(sOpt, "raster") ? 1 : 0;
+		if (compositor->opengl_raster) compositor->traverse_state->immediate_draw = GF_TRUE;
 #endif
+	}
+
+	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "EnablePBO");
+	if (!sOpt) gf_cfg_set_key(compositor->user->config, "Compositor", "EnablePBO", "no");
+	compositor->enable_pbo = (sOpt && !strcmp(sOpt, "yes")) ? 1 : 0;
 
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "DefaultNavigationMode");
 	if (sOpt && !strcmp(sOpt, "Walk")) compositor->default_navigation_mode = GF_NAVIGATE_WALK;
 	else if (sOpt && !strcmp(sOpt, "Examine")) compositor->default_navigation_mode = GF_NAVIGATE_EXAMINE;
 	else if (sOpt && !strcmp(sOpt, "Fly")) compositor->default_navigation_mode = GF_NAVIGATE_FLY;
 	
-
 #ifdef GPAC_HAS_GLU
 	sOpt = gf_cfg_get_key(compositor->user->config, "Compositor", "RasterOutlines");
 	compositor->raster_outlines = (sOpt && !stricmp(sOpt, "yes") ) ? 1 : 0;
@@ -1313,7 +1383,7 @@
 #endif
 
 
-	compositor->reset_graphics = 1;
+	gf_sc_reset_graphics(compositor);
 	gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 
 	gf_sc_lock(compositor, 0);
@@ -1371,7 +1441,7 @@
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
 	case GF_OPT_REFRESH: 
-		compositor->reset_graphics = value; 
+		gf_sc_reset_graphics(compositor); 
 		compositor->traverse_state->invalidate_all = 1; 
 		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		break;
@@ -1420,11 +1490,15 @@
 			/*force resetup*/
 			compositor->root_visual_setup = 0;
 			/*force texture setup when switching to OpenGL*/
-			if (value) compositor->reset_graphics = 1;
+			if (value) gf_sc_reset_graphics(compositor);
 			/*force redraw*/
 			gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		}
 		break;
+	case GF_OPT_VIDEO_BENCH:
+		compositor->bench_mode = value ? GF_TRUE : GF_FALSE;
+		break;
+
 	case GF_OPT_YUV_HARDWARE:
 		compositor->enable_yuv_hw = value;
 		break;
@@ -1508,7 +1582,7 @@
 		if (value != compositor->disable_rect_ext) {
 			compositor->disable_rect_ext = value;
 			/*RECT texture support - we must reload HW*/
-			compositor->reset_graphics = 1;
+			gf_sc_reset_graphics(compositor);
 		}
 		break;
 	case GF_OPT_BITMAP_COPY: compositor->bitmap_use_pixels = value; break;
@@ -1540,51 +1614,58 @@
 	return e;
 }
 
-u32 gf_sc_get_option(GF_Compositor *compositor, u32 type)
+Bool gf_sc_is_over(GF_Compositor *compositor, GF_SceneGraph *scene_graph)
 {
-	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_IS_FINISHED:
-		if (compositor->interaction_sensors) return 0;
-	case GF_OPT_IS_OVER:
-	{
-		u32 i, count;
-		count = gf_list_count(compositor->time_nodes);
-		for (i=0; i<count; i++) {
-			GF_TimeNode *tn = (GF_TimeNode *)gf_list_get(compositor->time_nodes, i);
-			if (tn->needs_unregister) continue;
-			switch (gf_node_get_tag((GF_Node *)tn->udta)) {
+	u32 i, count;
+	count = gf_list_count(compositor->time_nodes);
+	for (i=0; i<count; i++) {
+		GF_TimeNode *tn = (GF_TimeNode *)gf_list_get(compositor->time_nodes, i);
+		if (tn->needs_unregister) continue;
+
+		if (scene_graph && (gf_node_get_graph((GF_Node *)tn->udta) != scene_graph))
+			continue;
+
+		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;
+			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: 
+			if (((M_MovieTexture *)tn->udta)->loop) return 0;
+			break;
+		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: 
-				if (((M_AnimationStream*)tn->udta)->loop) return 0;
-				break;
+			if (((M_AudioClip*)tn->udta)->loop) return 0;
+			break;
+		case TAG_MPEG4_AnimationStream: 
+			if (((M_AnimationStream*)tn->udta)->loop) return 0;
+			break;
 #endif
-			}
 		}
 	}
-		/*FIXME - this does not work with SVG/SMIL*/
-		return 1;
+	/*FIXME - this does not work with SVG/SMIL*/
+	return 1;
+}
+
+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_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;
@@ -1718,38 +1799,35 @@
 Double gf_sc_get_fps(GF_Compositor *compositor, Bool absoluteFPS)
 {
 	Double fps;
-	u32 ind, num, frames, run_time;
+	u32 fidx, num, frames, run_time;
 
 	gf_mx_p(compositor->mx);
-#if 1
-	/*start from last frame and get first frame time*/
-	ind = compositor->current_frame;
-	frames = 0;
-	run_time = compositor->frame_dur[ind];
-	for (num=0; num<GF_SR_FPS_COMPUTE_SIZE; num++) {
-		if (absoluteFPS) {
-			run_time += compositor->frame_dur[ind];
-		} else {
-			run_time += MAX(compositor->frame_dur[ind], compositor->frame_duration);
-		}
-		frames++;
-		if (frames==GF_SR_FPS_COMPUTE_SIZE) break;
-		if (!ind) {
-			ind = GF_SR_FPS_COMPUTE_SIZE;
-		} else {
-			ind--;
+
+	if (absoluteFPS) {
+		/*start from last frame and get first frame time*/
+		fidx = compositor->current_frame;
+		frames = 0;
+		run_time = compositor->frame_dur[fidx];
+		for (num=0; num<GF_SR_FPS_COMPUTE_SIZE; num++) {
+			run_time += compositor->frame_dur[fidx];
+			frames++;
+			if (frames==GF_SR_FPS_COMPUTE_SIZE) break;
+			if (!fidx) {
+				fidx = GF_SR_FPS_COMPUTE_SIZE-1;
+			} else {
+				fidx--;
+			}
 		}
+	} else {
+		/*start from last frame and get first frame time*/
+		fidx = compositor->current_frame;
+		frames = 0;
+		run_time = compositor->frame_time[fidx];
+		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;
 	}
-#else
-	/*start from last frame and get first frame time*/
-	ind = compositor->current_frame;
-	frames = 0;
-	run_time = compositor->frame_time[ind];
-	if (ind == GF_SR_FPS_COMPUTE_SIZE) ind = 0;
-	assert(run_time >= compositor->frame_time[ind+1]);
-	run_time -= compositor->frame_time[ind+1];
-	frames = GF_SR_FPS_COMPUTE_SIZE;
-#endif
 
 
 	gf_mx_v(compositor->mx);
@@ -1888,12 +1966,11 @@
 
 		GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Main scene setup - pixel metrics %d - center coords %d\n", compositor->traverse_state->pixel_metrics, compositor->visual->center_coords));
 
+		compositor->recompute_ar = 1;
 #ifndef GPAC_DISABLE_3D
 		/*change in 2D/3D config, force AR recompute/video restup*/
 		if (was_3d != compositor->visual->type_3d) compositor->recompute_ar = was_3d ? 1 : 2;
 #endif
-
-		compositor->recompute_ar = 1;
 	}
 }
 
@@ -1912,17 +1989,52 @@
 		}
 #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;
+				}
+			}
+
 		}
-		else
+		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
@@ -1932,6 +2044,13 @@
 #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;
+		}
+
 	} 
 }
 
@@ -1954,8 +2073,10 @@
 #endif
 
 	flags = compositor->traverse_state->immediate_draw;
-
-	if (! visual_draw_frame(compositor->visual, top_node, compositor->traverse_state, 1)) {
+	if (compositor->video_setup_failed) {
+		compositor->skip_flush = 1;
+	}
+	else if (! visual_draw_frame(compositor->visual, top_node, compositor->traverse_state, 1)) {
 		/*android backend uses opengl without telling it to us, we need an ugly hack here ...*/
 #ifdef GPAC_ANDROID
 		compositor->skip_flush = 0;
@@ -1988,87 +2109,168 @@
 extern u32 time_spent_in_anim;
 #endif
 
+static void compositor_release_textures(GF_Compositor *compositor, Bool frame_drawn)
+{
+	u32 i, count;
+	/*release all textures - we must release them to handle a same OD being used by several textures*/
+	count = gf_list_count(compositor->textures);
+	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)) 
+			gf_sc_texture_reset(txh);
+		/*remove the use flag*/
+		txh->flags &= ~GF_SR_TEXTURE_USED;
+	}
+}
+
+
 void gf_sc_simulation_tick(GF_Compositor *compositor)
 {	
 	GF_SceneGraph *sg;
-	u32 in_time, end_time, i, count, sim_time;
-	Bool frame_drawn;
+	GF_List *temp_queue;
+	u32 in_time, end_time, i, count;
+	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;
+	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);
 
+	gf_sc_texture_cleanup_hw(compositor);
+
 	/*first thing to do, let the video output handle user event if it is not threaded*/
 	compositor->video_out->ProcessEvent(compositor->video_out, NULL);
 
 	if (compositor->freeze_display) {
 		gf_sc_lock(compositor, 0);
+		if (!compositor->bench_mode) {
+			compositor->scene_sampled_clock = gf_sc_ar_get_clock(compositor->audio_renderer);
+		}
 		if (!compositor->no_regulation) gf_sleep(compositor->frame_duration);
 		return;
 	}
 
 	gf_sc_reconfig_task(compositor);
 
-	/* if there is no scene, we draw a black screen to flush the screen */
+	/* if there is no scene*/
 	if (!compositor->scene && !gf_list_count(compositor->extra_scenes) ) {
 		gf_sc_draw_scene(compositor);
+        //increase clock in bench mode before releasing mutex
+		if (compositor->bench_mode && (compositor->force_bench_frame==1)) {
+			compositor->scene_sampled_clock += compositor->frame_duration;
+		}
 		gf_sc_lock(compositor, 0);
-		if (!compositor->no_regulation) gf_sleep(compositor->frame_duration);
+		if (!compositor->no_regulation) {
+			gf_sleep(compositor->bench_mode ? 2 : compositor->frame_duration);
+		}
+		compositor->force_bench_frame=0;
 		return;
 	}
 
 	if (compositor->reset_graphics) {
-		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);		
+		gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
 		visual_reset_graphics(compositor->visual);
 	}
 
-#ifdef GF_SR_EVENT_QUEUE
 	/*process pending user events*/
 #ifndef GPAC_DISABLE_LOG
 	event_time = gf_sys_clock();
 #endif
-	gf_mx_p(compositor->ev_mx);
-	while (gf_list_count(compositor->events)) {
-		Bool ret;
-		GF_Event *ev = (GF_Event*)gf_list_get(compositor->events, 0);
-		gf_list_rem(compositor->events, 0);
-		ret = gf_sc_exec_event(compositor, ev);
-		gf_free(ev);
+	//swap event queus
+	gf_mx_p(compositor->evq_mx);
+	temp_queue = compositor->event_queue;
+	compositor->event_queue = compositor->event_queue_back;
+	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);
+		gf_list_rem(compositor->event_queue_back, 0);
+
+		if (qev->target) {
+#ifndef GPAC_DISABLE_SVG
+			gf_sg_fire_dom_event(qev->target, &qev->dom_evt, qev->sg, NULL);
+#endif
+		} else if (qev->node) {
+#ifndef GPAC_DISABLE_SVG
+			gf_dom_event_fire(qev->node, &qev->dom_evt);
+#endif
+		} else {
+			gf_sc_exec_event(compositor, &qev->evt);
+		}
+		gf_free(qev);
 	}
-	gf_mx_v(compositor->ev_mx);
 #ifndef GPAC_DISABLE_LOG
 	event_time = gf_sys_clock() - event_time;
 #endif
-#elif !defined(GPAC_DISABLE_LOG)
-	event_time = 0;
-#endif
-	
-	sim_time = gf_term_sample_clocks(compositor->term);
 
-#ifndef GPAC_DISABLE_VRML
-	/*execute all routes before updating textures, otherwise nodes inside composite texture may never see their dirty flag set*/
+
+	if (!compositor->bench_mode) {
+		compositor->scene_sampled_clock = gf_sc_ar_get_clock(compositor->audio_renderer);
+	} else {
+		if (compositor->force_bench_frame==1) {
+			//a system frame is pending on a future frame - we must increase our time
+			compositor->scene_sampled_clock += compositor->frame_duration;
+		}
+		compositor->force_bench_frame = 0;
+	}
+
+
+	//first update all natural textures to figure out timing
+	compositor->frame_delay = (u32) -1;
+	compositor->next_frame_delay = (u32) -1;
+
 #ifndef GPAC_DISABLE_LOG
-	route_time = gf_sys_clock();
+	texture_time = gf_sys_clock();
 #endif
+	/*update all video textures*/
+	count = gf_list_count(compositor->textures);
+	for (i=0; i<count; i++) {
+		GF_TextureHandler *txh = (GF_TextureHandler *)gf_list_get(compositor->textures, i);
+		if (!txh) break;
+		//this is not a natural (video) texture
+		if (! txh->stream) continue;
 
-	gf_sg_activate_routes(compositor->scene);
-	i = 0;
-	while ((sg = (GF_SceneGraph*)gf_list_enum(compositor->extra_scenes, &i))) {
-		gf_sg_activate_routes(sg);
+		/*signal graphics reset before updating*/
+		if (compositor->reset_graphics && txh->tx_io) gf_sc_texture_reset(txh);
+		txh->update_texture_fcnt(txh);
+
+		if (!txh->stream_finished) all_tx_done=0;
 	}
 
+	//it may happen that we have a reconfigure request at this stage, especially if updating one of the textures 
+	//forced a relayout - do it right away
+	if (compositor->msg_type) {
+		gf_sc_lock(compositor, 0);
+		return;
+	}
+
+
 #ifndef GPAC_DISABLE_LOG
-	route_time = gf_sys_clock() - route_time;
+	texture_time = gf_sys_clock() - texture_time;
 #endif
 
-#else
-#ifndef GPAC_DISABLE_LOG
-	route_time = 0;
+	//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
-#endif /*GPAC_DISABLE_VRML*/
 
 
 
@@ -2136,6 +2338,7 @@
 			count--;
 			continue;
 		}
+		has_timed_nodes = GF_TRUE;
 	}
 #ifndef GPAC_DISABLE_LOG
 	time_node_time = gf_sys_clock() - time_node_time;
@@ -2154,36 +2357,65 @@
 		}
 	}
 
-	/*setup root visual BEFORE updating the texture, because of potential composite texture */
+
+#ifndef GPAC_DISABLE_VRML
+	/*execute all routes:
+		before updating composite textures, otherwise nodes inside composite texture may never see their dirty flag set
+		after updating timed nodes to trigger all events based on time
+	*/
+#ifndef GPAC_DISABLE_LOG
+	route_time = gf_sys_clock();
+#endif
+
+	gf_sg_activate_routes(compositor->scene);
+	i = 0;
+	while ((sg = (GF_SceneGraph*)gf_list_enum(compositor->extra_scenes, &i))) {
+		gf_sg_activate_routes(sg);
+	}
+
+#ifndef GPAC_DISABLE_LOG
+	route_time = gf_sys_clock() - route_time;
+#endif
+
+#else
+#ifndef GPAC_DISABLE_LOG
+	route_time = 0;
+#endif
+#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));
 
-	compositor->video_regulation = compositor->no_regulation;
 #ifndef GPAC_DISABLE_LOG
-	texture_time = gf_sys_clock();
+	txtime = gf_sys_clock();
 #endif
-	/*update all textures*/
+	/*update all composite textures*/
 	count = gf_list_count(compositor->textures);
 	for (i=0; i<count; i++) {
 		GF_TextureHandler *txh = (GF_TextureHandler *)gf_list_get(compositor->textures, i);
 		if (!txh) break;
+		//this is not a composite texture
+		if (txh->stream) continue;
 		/*signal graphics reset before updating*/
 		if (compositor->reset_graphics && txh->tx_io) gf_sc_texture_reset(txh);
 		txh->update_texture_fcnt(txh);
 	}
 
-	//it may happen that we have a reconfigure request at this stage, especiall if updating one of the textures update
+	//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) {
 		gf_sc_lock(compositor, 0);
 		return;
 	}
-	compositor->text_edit_changed = 0;
-	compositor->rebuild_offscreen_textures = 0;
-
 #ifndef GPAC_DISABLE_LOG
-	texture_time = gf_sys_clock() - texture_time;
+	texture_time += gf_sys_clock() - txtime;
 #endif
 
+	compositor->text_edit_changed = 0;
+	compositor->rebuild_offscreen_textures = 0;
+
 	if (compositor->force_next_frame_redraw) {
 		compositor->force_next_frame_redraw=0;
 		compositor->frame_draw_type=GF_SC_DRAW_FRAME;
@@ -2205,6 +2437,8 @@
 	/*if invalidated, draw*/
 	if (compositor->frame_draw_type) {
 		GF_Window rc;
+		Bool textures_released = 0;
+
 #ifndef GPAC_DISABLE_LOG
 		traverse_time = gf_sys_clock();
 		time_spent_in_anim = 0;
@@ -2213,9 +2447,13 @@
 		/*video flush only*/
 		if (compositor->frame_draw_type==GF_SC_DRAW_FLUSH) {
 			compositor->frame_draw_type = 0;
-		} else {
+		}
+		/*full render*/
+		else {
 			compositor->frame_draw_type = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Redrawing scene - OTB %d\n", sim_time));
+
+
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Redrawing scene - STB %d\n", compositor->scene_sampled_clock));
 			gf_sc_draw_scene(compositor);
 #ifndef GPAC_DISABLE_LOG
 			traverse_time = gf_sys_clock() - traverse_time;
@@ -2238,27 +2476,49 @@
 		if(compositor->user->init_flags & GF_TERM_INIT_HIDE)
 			compositor->skip_flush = 1;
 
+		//if no overlays, release textures before flushing, otherwise we might loose time waiting for vsync
+		if (!compositor->visual->has_overlays) {
+			compositor_release_textures(compositor, frame_drawn);
+			textures_released = 1;
+		}
+
 		if (compositor->skip_flush!=1) {
+
+			//release compositor in case we have vsync
+			gf_sc_lock(compositor, 0);
 			rc.x = rc.y = 0; 
 			rc.w = compositor->display_width;	
 			rc.h = compositor->display_height;		
 			compositor->video_out->Flush(compositor->video_out, &rc);
+			gf_sc_lock(compositor, 1);
 		} else {
 			compositor->skip_flush = 0;
 		}
+
 #ifndef GPAC_DISABLE_LOG
 		flush_time = gf_sys_clock() - flush_time;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Compositor] done flushing frame in %d ms\n", flush_time));
 #endif
 
 		visual_2d_draw_overlays(compositor->visual);
 		compositor->last_had_overlays = compositor->visual->has_overlays;
 
+		if (!textures_released) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[Compositor] Releasing textures after flush\n" ));
+			compositor_release_textures(compositor, frame_drawn);
+		}
+
 		if (compositor->stress_mode) {
 			gf_sc_next_frame_state(compositor, GF_SC_DRAW_FRAME);
-			compositor->reset_graphics = 1;
+			gf_sc_reset_graphics(compositor);
 		}
 		compositor->reset_fonts = 0;
+
 	} else {
+
+		//frame not drawn, release textures
+		compositor_release_textures(compositor, frame_drawn);
+
 #ifndef GPAC_DISABLE_LOG
 		traverse_time = 0;
 		time_spent_in_anim = 0;
@@ -2270,17 +2530,6 @@
 	}
 	compositor->reset_graphics = 0;
 
-	/*release all textures - we must release them to handle a same OD being used by several textures*/
-	count = gf_list_count(compositor->textures);
-	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)) 
-			gf_sc_texture_reset(txh);
-		/*remove the use flag*/
-		txh->flags &= ~GF_SR_TEXTURE_USED;
-	}
-
 	compositor->last_frame_time = gf_sys_clock();
 	end_time = compositor->last_frame_time - in_time;
 
@@ -2310,7 +2559,11 @@
 		compositor->frame_time[compositor->current_frame] = compositor->last_frame_time;
 		compositor->frame_number++;
 	}
-
+	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->video_frame_pending=0;
 	gf_sc_lock(compositor, 0);
 
 #if 0
@@ -2324,22 +2577,46 @@
 	if (frame_drawn) compositor->step_mode = 0;
 #endif
 
-	/*not threaded, let the owner decide*/
-	if (compositor->video_regulation) {
-		/*fixme - we need to know exactly how long to sleep / yield until next frame is due*/
-		if (!compositor->no_regulation) gf_sleep(1);
+	/*let the owner decide*/
+	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*/
+	if (compositor->bench_mode) {
+		gf_sleep(0);
+		return;
+	}
+
+	//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);
+		if (compositor->next_frame_delay>2) {
+			u32 diff=0;
+			while (! compositor->msg_type && ! compositor->video_frame_pending) {
+				gf_sleep(1);
+				diff = gf_sys_clock() - in_time;
+				if (diff >= (u32) compositor->next_frame_delay)
+					break;
+			}
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Compositor slept %d ms until next frame due in %d ms\n", diff, compositor->next_frame_delay));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Compositor] Next frame due in %d ms - not going to sleep\n", compositor->next_frame_delay));
+		}
 		return;
 	}
 
-	/*TO CHECK - THERE WAS A BUG HERE WITH TRISCOPE@SHIX*/
 	if (end_time > compositor->frame_duration) {
-		gf_sleep(1);
+		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));
 }
 
 Bool gf_sc_visual_is_registered(GF_Compositor *compositor, GF_VisualManager *visual)
@@ -2531,12 +2808,7 @@
 
 static Bool gf_sc_handle_event_intern(GF_Compositor *compositor, GF_Event *event, Bool from_user)
 {
-#ifdef GF_SR_EVENT_QUEUE
-	GF_Event *ev;
-#else
 	Bool ret;
-	u32 retry;
-#endif
 
 	if (compositor->term && (compositor->interaction_level & GF_INTERACT_INPUT_SENSOR) && (event->type<=GF_EVENT_MOUSEWHEEL)) {
 		GF_Event evt = *event;
@@ -2550,58 +2822,12 @@
 		return 0;
 	}
 */
-#ifdef GF_SR_EVENT_QUEUE
-	switch (event->type) {
-	case GF_EVENT_MOUSEMOVE:
-	{
-		u32 i, count;
-		gf_mx_p(compositor->ev_mx);
-		count = gf_list_count(compositor->events);
-		for (i=0; i<count; i++) {
-			ev = (GF_Event *)gf_list_get(compositor->events, i);
-			if (ev->type == GF_EVENT_MOUSEMOVE) {
-				ev->mouse =  event->mouse;
-				gf_mx_v(compositor->ev_mx);
-				return 1;
-			}
-		}
-		gf_mx_v(compositor->ev_mx);
-	}
-	default:
-		ev = (GF_Event *)gf_malloc(sizeof(GF_Event));
-		ev->type = event->type;
-		if (event->type<=GF_EVENT_MOUSEWHEEL) {
-			ev->mouse = event->mouse;
-		} else if (event->type==GF_EVENT_TEXTINPUT) {
-			ev->character = event->character;
-		} else {
-			ev->key = event->key;
-		}
-		gf_mx_p(compositor->ev_mx);
-		gf_list_add(compositor->events, ev);
-		gf_mx_v(compositor->ev_mx);
-		break;
-	}
-	return 0;
-#else
-
-	retry = 100;
-	while (retry) {
-		if (gf_mx_try_lock(compositor->mx)) 
-			break;
-		retry--;
-		gf_sleep(1);
-		if (!retry) {
-			return GF_FALSE;
-		}
-	}
+	gf_mx_p(compositor->mx);
 	ret = gf_sc_exec_event(compositor, event);
 	gf_sc_lock(compositor, GF_FALSE);
 
-	if (!from_user) {
-	}
+//	if (!from_user) { }
 	return ret;
-#endif
 }
 
 void gf_sc_traverse_subscene(GF_Compositor *compositor, GF_Node *inline_parent, GF_SceneGraph *subscene, void *rs)
@@ -2623,7 +2849,7 @@
 	/*we're reconfiguring the video output, cancel all messages except GL reconfig (context lost)*/
 	if (compositor->msg_type & GF_SR_IN_RECONFIG) {
 		if (event->type==GF_EVENT_VIDEO_SETUP) {
-			compositor->reset_graphics = 2;
+			gf_sc_reset_graphics(compositor);
 			if (event->setup.back_buffer) 
 				compositor->recompute_ar = 1;
 		}
@@ -2649,7 +2875,9 @@
 	case GF_EVENT_VIDEO_SETUP:
 		{
 			Bool locked = gf_mx_try_lock(compositor->mx);
-			compositor->reset_graphics = 2;
+			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);
@@ -2673,7 +2901,8 @@
 				if (from_user) compositor->msg_type &= ~GF_SR_CFG_WINDOWSIZE_NOTIF;
 			} else {
 				/*remove pending resize notif*/
-				compositor->msg_type = 0;
+				if (!compositor->new_width)
+					compositor->msg_type = 0;
 			}
 			if (lock_ok) gf_sc_lock(compositor, GF_FALSE);
 		}
@@ -3034,3 +3263,121 @@
 	gf_sc_lock(sc, GF_FALSE);
 	return GF_OK;
 }
+
+Bool gf_sc_use_raw_texture(GF_Compositor *compositor)
+{
+	if (!compositor) return 0;
+//	if (!compositor->visual->type_3d && !compositor->force_opengl_2d) return 0;
+	return compositor->texture_from_decoder_memory;
+}
+
+void gf_sc_get_av_caps(GF_Compositor *compositor, u32 *width, u32 *height, u32 *display_bit_depth, u32 *audio_bpp, u32 *channels, u32 *sample_rate)
+{
+	if (width) *width = compositor->video_out->max_screen_width;
+	if (height) *height = compositor->video_out->max_screen_height;
+	if (display_bit_depth) *display_bit_depth = compositor->video_out->max_screen_bpp ? compositor->video_out->max_screen_bpp : 8;
+	//to do
+	if (audio_bpp) *audio_bpp = 8;
+	if (channels) *channels = 0;
+	if (sample_rate) *sample_rate = 48000;
+}
+
+void gf_sc_set_system_pending_frame(GF_Compositor *compositor, Bool frame_pending)
+{
+	if (frame_pending) {
+		if (!compositor->force_bench_frame)
+			compositor->force_bench_frame = 1;
+	} else {
+		//do not increase clock
+		compositor->force_bench_frame = 2;
+	}
+}
+
+void gf_sc_set_video_pending_frame(GF_Compositor *compositor)
+{
+	compositor->video_frame_pending = GF_TRUE;
+}
+
+void gf_sc_queue_dom_event(GF_Compositor *compositor, GF_Node *node, GF_DOM_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==node) && (qev->dom_evt.type==evt->type)) {
+			qev->dom_evt = *evt;
+			gf_mx_v(compositor->evq_mx);
+			return;
+		}
+	}
+	GF_SAFEALLOC(qev, GF_QueuedEvent);
+	qev->node = node;
+	qev->dom_evt = *evt;
+	gf_list_add(compositor->event_queue, qev);
+	gf_mx_v(compositor->evq_mx);
+}
+
+void gf_sc_queue_dom_event_on_target(GF_Compositor *compositor, GF_DOM_Event *evt, GF_DOMEventTarget *target, GF_SceneGraph *sg)
+{
+	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->target==target) && (qev->dom_evt.type==evt->type) && (qev->sg==sg) ) {
+			qev->dom_evt = *evt;
+			gf_mx_v(compositor->evq_mx);
+			return;
+		}
+	}
+
+	GF_SAFEALLOC(qev, GF_QueuedEvent);
+	qev->sg = sg;
+	qev->target = target;
+	qev->dom_evt = *evt;
+	gf_list_add(compositor->event_queue, qev);
+	gf_mx_v(compositor->evq_mx);
+}
+
+static void sc_cleanup_event_queue(GF_List *evq, GF_Node *node, GF_SceneGraph *sg)
+{
+	u32 i, count = gf_list_count(evq);
+	for (i=0; i<count; i++) {
+		Bool del = 0;
+		GF_QueuedEvent *qev = gf_list_get(evq, i);
+		if (qev->node) {
+			if (node && qev->node)
+				del = 1;
+			if (sg && (gf_node_get_graph(qev->node)==sg)) 
+				del = 1;
+		}
+		if (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)) 
+				del = 1;
+			if (sg && (gf_node_get_graph((GF_Node *)qev->target->ptr)==sg)) 
+				del = 1;
+		}
+
+		if (del) {
+			gf_list_rem(evq, i);
+			i--;
+			count--;
+			gf_free(qev);
+		}
+	}
+}
+
+void gf_sc_node_destroy(GF_Compositor *compositor, GF_Node *node, GF_SceneGraph *sg)
+{
+	gf_mx_p(compositor->evq_mx);
+	sc_cleanup_event_queue(compositor->event_queue, node, sg);
+	sc_cleanup_event_queue(compositor->event_queue_back, node, sg);
+	gf_mx_v(compositor->evq_mx);
+}

gpac-0.5.0.svn4668.tar.bz2/src/compositor/compositor_2d.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/compositor_2d.c Changed

@@ -28,6 +28,7 @@
 #include "visual_manager.h"
 #include "nodes_stacks.h"
 #include <gpac/options.h>
+#include <gpac/internal/terminal_dev.h>
 
 #ifdef OPENGL_RASTER
 #include "gl_inc.h"
@@ -35,6 +36,7 @@
 
 static void c2d_gl_fill_no_alpha(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color)
 {
+    return;
 #if defined(GPAC_USE_OGL_ES)
 	GLfloat line[4];
 
@@ -59,8 +61,10 @@
 #endif
 }
 
+
 static void c2d_gl_fill_alpha(void *cbk, u32 x, u32 y, u32 run_h_len, GF_Color color, u8 alpha)
 {
+    return;
 #if defined(GPAC_USE_OGL_ES)
 	GLfloat line[4];
 
@@ -91,6 +95,7 @@
 
 static void c2d_gl_fill_rect(void *cbk, u32 x, u32 y, u32 width, u32 height, GF_Color color)
 {
+    return;
 #if defined(GPAC_USE_OGL_ES)
 	GLfloat line[8];
 
@@ -129,6 +134,119 @@
 #endif
 }
 
+#endif
+
+
+#ifndef GPAC_DISABLE_3D
+void compositor_2d_hybgl_clear_surface(GF_VisualManager *visual, GF_IRect *rc, u32 BackColor)
+{
+	SFColor rgb;
+	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) {
+		visual->compositor->rasterizer->surface_clear(visual->raster_surface, rc, BackColor);
+	} 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));
+	}
+}
+
+void compositor_2d_hybgl_flush_video(GF_Compositor *compositor, GF_IRect *area)
+{
+	GF_TraverseState a_tr_state;
+
+	//check if texture data has changed - if so, mark texture to be updated
+	if (compositor->traverse_state->immediate_draw) {
+		//nothing drawn, nothing to do
+		if (!compositor->visual->hybgl_drawn.count) {
+			return;
+		}
+		//nodes where drawn on canvas, push texture
+		gf_sc_texture_set_data(compositor->hybgl_txh);
+	} else {
+		//nodes where drawn on canvas, push texture
+		if (compositor->visual->hybgl_drawn.count) {
+			//we could actually use texSubImage here, but we would need either to copy the data before pushing it or use current stride which will result in pushing too much data ...
+			gf_sc_texture_set_data(compositor->hybgl_txh);
+		}
+	}
+	//if no object drawn since the last flush, no need to draw the texture
+	if (!compositor->visual->nb_objects_on_canvas_since_last_ogl_flush)
+		goto exit;
+
+	a_tr_state.visual = compositor->visual;
+
+	visual_3d_set_state(compositor->visual, V3D_STATE_LIGHT, 0);
+	visual_3d_enable_antialias(compositor->visual, 0);
+	gf_sc_texture_set_blend_mode(compositor->hybgl_txh, TX_MODULATE);
+	visual_3d_set_material_2d_argb(compositor->visual, 0xFFFFFFFF);
+	a_tr_state.mesh_num_textures = gf_sc_texture_enable(compositor->hybgl_txh, NULL);
+	if (a_tr_state.mesh_num_textures ) {
+		if (area) {
+			u32 i;
+			Fixed umin, umax, vmin, vmax;
+			SFVec2f size, orig;
+			size.x = INT2FIX(area->width);
+			size.y = INT2FIX(area->height);
+
+			orig.x = INT2FIX(area->x);
+			orig.y = INT2FIX(area->y);
+			mesh_new_rectangle(compositor->hybgl_mesh, size, &orig, 1);
+
+			orig.x = INT2FIX(area->x) + INT2FIX(compositor->vp_width)/2;
+			orig.y = INT2FIX(compositor->vp_height)/2 - INT2FIX(area->y) + INT2FIX(area->height);
+			//set our coor texture so that we update only the right part of the canvas
+			umin = gf_divfix(orig.x, INT2FIX(compositor->vp_width));
+			umax = gf_divfix(orig.x+size.x, INT2FIX(compositor->vp_width));
+			vmin = gf_divfix(orig.y-size.y, INT2FIX(compositor->vp_height));
+			vmax = gf_divfix(orig.y, INT2FIX(compositor->vp_height));
+
+			for (i=0; i<compositor->hybgl_mesh->v_count; i++) {
+				if (compositor->hybgl_mesh->vertices[i].texcoords.x == FIX_ONE) {
+					compositor->hybgl_mesh->vertices[i].texcoords.x = umax;
+				} else {
+					compositor->hybgl_mesh->vertices[i].texcoords.x = umin;
+				}
+				if (compositor->hybgl_mesh->vertices[i].texcoords.y == FIX_ONE) {
+					compositor->hybgl_mesh->vertices[i].texcoords.y = vmax;
+				} else {
+					compositor->hybgl_mesh->vertices[i].texcoords.y = vmin;
+				}
+			}
+		}
+
+		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);
+			size.y = INT2FIX(compositor->vp_height);
+			mesh_new_rectangle(compositor->hybgl_mesh, size, NULL, 1);
+		}
+	}
+
+exit:
+	//in immediate mode always clear the canvas
+	if (compositor->traverse_state->immediate_draw) {
+		compositor->visual->hybgl_drawn.count = 0;
+		//partial flush, reset
+		if (area)
+			memset(compositor->hybgl_txh->data, 0, compositor->hybgl_txh->stride*compositor->hybgl_txh->height);
+	}
+	//complete flush (end of frame)
+	else if (!area) {
+		compositor->visual->hybgl_drawn.count = 0;
+	}
+	compositor->visual->nb_objects_on_canvas_since_last_ogl_flush = 0;
+}
 
 Bool c2d_gl_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx, GF_ColorKey *col_key)
 {
@@ -153,9 +271,10 @@
 		GF_Mesh *mesh;
 		size.x = ctx->bi->unclip.width;
 		size.y = ctx->bi->unclip.height;
-		orig.x = ctx->bi->unclip.x + INT2FIX(visual->compositor->vp_width)/2;
-		orig.y = INT2FIX(visual->compositor->vp_height)/2 - ctx->bi->unclip.y + ctx->bi->unclip.height;
-
+		if (visual->compositor->opengl_raster) {
+			orig.x = ctx->bi->unclip.x + INT2FIX(visual->compositor->vp_width)/2;
+			orig.y = INT2FIX(visual->compositor->vp_height)/2 - ctx->bi->unclip.y + ctx->bi->unclip.height;
+		}
 		mesh = new_mesh();
 		mesh_new_rectangle(mesh, size, &orig, 1);
 		visual_3d_mesh_paint(tr_state, mesh);
@@ -166,6 +285,107 @@
 	}
 	return 0;
 }
+
+Bool compositor_2d_hybgl_draw_bitmap(GF_VisualManager *visual, GF_TraverseState *tr_state, DrawableContext *ctx, GF_ColorKey *col_key)
+{
+	//for anything but background use regular routines
+	if (!(ctx->flags & CTX_IS_BACKGROUND)) return 0;
+
+	/*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) {
+		SFVec2f size, orig;
+		size.x = ctx->bi->unclip.width;
+		size.y = ctx->bi->unclip.height;
+		orig.x = ctx->bi->unclip.x ;
+		orig.y = ctx->bi->unclip.y;
+		mesh_new_rectangle(visual->compositor->hybgl_mesh_background, size, &orig, 0);
+
+		visual_3d_mesh_paint(tr_state, visual->compositor->hybgl_mesh_background);
+		gf_sc_texture_disable(ctx->aspect.fill_texture);
+		tr_state->mesh_num_textures = 0;
+	}
+	return 1;
+}
+#endif
+
+#ifndef GPAC_DISABLE_3D
+void compositor_2d_reset_gl_auto(GF_Compositor *compositor)
+{
+	if (compositor->hybgl_txh) {
+		if (compositor->hybgl_txh->data) {
+			gf_free(compositor->hybgl_txh->data);
+			compositor->hybgl_txh->data = NULL;
+		}
+		if (compositor->hybgl_txh->tx_io) 
+			gf_sc_texture_release(compositor->hybgl_txh);
+
+		gf_free(compositor->hybgl_txh);
+		compositor->hybgl_txh = NULL;
+	}
+	if (compositor->hybgl_mesh) {
+		mesh_free(compositor->hybgl_mesh);
+		compositor->hybgl_mesh = NULL;
+	}
+	if (compositor->hybgl_mesh_background) {
+		mesh_free(compositor->hybgl_mesh_background);
+		compositor->hybgl_mesh_background = NULL;
+	}
+}
+
+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);
+	glClear(GL_DEPTH_BUFFER_BIT);
+	glViewport(0, 0, compositor->vp_width, compositor->vp_height);
+
+	glClear(GL_COLOR_BUFFER_BIT);
+
+	glLineWidth(1.0f);
+
+#ifndef GPAC_USE_OGL_ES
+	glDisable(GL_POLYGON_SMOOTH);
+#endif
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+	glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
+
+	glDisable(GL_NORMALIZE);
+	glDisable(GL_DEPTH_TEST);
+	//glDepthFunc(GL_LEQUAL);
+	
+	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+	if (compositor->opengl_raster) {
+		glDisable(GL_LINE_SMOOTH);
+	} else {
+		glEnable(GL_LINE_SMOOTH);
+	}
+
+	hw = INT2FIX(compositor->vp_width)/2;
+	hh = INT2FIX(compositor->vp_height)/2;
+	gf_mx_ortho(&mx, -hw, hw, -hh, hh, 50, -50);
+
+	visual_3d_set_matrix_mode(visual, V3D_MATRIX_PROJECTION);
+	visual_3d_matrix_load(visual, mx.m);
+
+	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);
+	}
+#endif
+
+	visual_3d_matrix_load(visual, mx.m);
+
+	return GF_OK;
+}
 #endif
 
 GF_Err compositor_2d_get_video_access(GF_VisualManager *visual)
@@ -173,7 +393,6 @@
 	GF_Err e;
 	GF_Compositor *compositor = visual->compositor;
 
-
 	if (!visual->raster_surface) return GF_BAD_PARAM;
 
 #ifdef OPENGL_RASTER
@@ -184,53 +403,73 @@
 		callbacks.fill_run_no_alpha = c2d_gl_fill_no_alpha;
 		callbacks.fill_rect = c2d_gl_fill_rect;
 
-		visual->DrawBitmap = c2d_gl_draw_bitmap;
+		visual->DrawBitmap = compositor_2d_hybgl_draw_bitmap;
 
 		e = compositor->rasterizer->surface_attach_to_callbacks(visual->raster_surface, &callbacks, compositor->vp_width, compositor->vp_height);
-		if (e==GF_OK) {
-			GF_Matrix mx;
-			Fixed hh, hw;
-			visual->is_attached = 2;
-
-			visual_3d_setup(visual);
-			glClear(GL_DEPTH_BUFFER_BIT);
-			glViewport(0, 0, compositor->vp_width, compositor->vp_height);
-
-			glClear(GL_COLOR_BUFFER_BIT);
-
-			glLineWidth(1.0f);
-
-#ifndef GPAC_USE_OGL_ES
-			glDisable(GL_POLYGON_SMOOTH);
+		if (e) return e;
+		
+		return compositor_2d_setup_opengl(visual);
+	}
 #endif
-			glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
-			glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST);
 
-			glDisable(GL_NORMALIZE);
-			glDisable(GL_LINE_SMOOTH);
-			glDisable(GL_DEPTH_TEST);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			glDepthFunc(GL_LEQUAL);
+#ifndef GPAC_DISABLE_3D
+	if (compositor->hybrid_opengl) {
 
-			hw = INT2FIX(compositor->vp_width)/2;
-			hh = INT2FIX(compositor->vp_height)/2;
-			gf_mx_ortho(&mx, -hw, hw, -hh, hh, 50, -50);
+		if (!compositor->hybgl_txh) {
+			GF_SAFEALLOC(compositor->hybgl_txh, GF_TextureHandler);
+			if (!compositor->hybgl_txh) return GF_IO_ERR;
+			compositor->hybgl_txh->compositor = compositor;
+		}
 
-			visual_3d_set_matrix_mode(visual, V3D_MATRIX_PROJECTION);
-			visual_3d_matrix_load(visual, mx.m);
+		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);		
+
+			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;
+			compositor->hybgl_txh->pixelformat = GF_PIXEL_RGBA;
+			compositor->hybgl_txh->transparent = 1;
+			compositor->hybgl_txh->flags = GF_SR_TEXTURE_PRIVATE_MEDIA | GF_SR_TEXTURE_NO_GL_FLIP;
+
+			memset(compositor->hybgl_txh->data, 0, 4*compositor->hybgl_txh->width*compositor->hybgl_txh->height);
+			gf_sc_texture_allocate(compositor->hybgl_txh);
+			gf_sc_texture_set_data(compositor->hybgl_txh);
+
+			if (!compositor->hybgl_mesh)
+				compositor->hybgl_mesh = new_mesh();
+
+			if (!compositor->hybgl_mesh_background)
+				compositor->hybgl_mesh_background = new_mesh();
+
+			size.x = INT2FIX(compositor->vp_width);
+			size.y = INT2FIX(compositor->vp_height);
+			mesh_new_rectangle(compositor->hybgl_mesh, size, NULL, 1);
+			mesh_new_rectangle(compositor->hybgl_mesh_background, size, NULL, 0);
+		}
+		if (!compositor->hybgl_txh->data) return GF_IO_ERR;
 
-			visual_3d_set_matrix_mode(visual, V3D_MATRIX_MODELVIEW);
-			gf_mx_init(mx);
-			gf_mx_add_scale(&mx, 1, -1, 1);
-			gf_mx_add_translation(&mx, -hw, -hh, 0);
-			visual_3d_matrix_load(visual, mx.m);
+		if (visual->compositor->traverse_state->immediate_draw)
+			memset(compositor->hybgl_txh->data, 0, 4*compositor->hybgl_txh->width*compositor->hybgl_txh->height);
 
-			return GF_OK;
-		}
+		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);
+		if (e) return e;
+		e = compositor_2d_setup_opengl(visual);
+		if (e) return e;
+		visual->ClearSurface = compositor_2d_hybgl_clear_surface;
+		visual->DrawBitmap = compositor_2d_hybgl_draw_bitmap;
+		return GF_OK;
 	}
 #endif
 
-
 	compositor->hw_locked = 0;
 	e = GF_IO_ERR;
 
@@ -264,7 +503,8 @@
 
 	e = GF_NOT_SUPPORTED;
 
-	if (compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, 1)==GF_OK) {
+	e = compositor->video_out->LockBackBuffer(compositor->video_out, &compositor->hw_surface, 1);
+	if (e==GF_OK) {
 		compositor->hw_locked = 1;
 
 		e = compositor->rasterizer->surface_attach_to_buffer(visual->raster_surface, compositor->hw_surface.video_buffer,
@@ -295,6 +535,14 @@
 		compositor->rasterizer->surface_detach(visual->raster_surface);
 		visual->is_attached = 0;
 	}
+
+#ifndef GPAC_DISABLE_3D
+	if (compositor->hybrid_opengl) {
+		compositor_2d_hybgl_flush_video(compositor, NULL);
+		return;
+	}
+#endif //GPAC_DISABLE_3D
+
 	if (compositor->hw_context) {
 		compositor->video_out->LockOSContext(compositor->video_out, 0);
 		compositor->hw_context = NULL;
@@ -304,6 +552,27 @@
 	}
 }
 
+#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));
+}
+#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)
 {
 	Fixed w_scale, h_scale, tmp;
@@ -501,6 +770,7 @@
 		case GF_PIXEL_YVYU:
 		case GF_PIXEL_YUY2:
 		case GF_PIXEL_YUVD:
+		case GF_PIXEL_YV12_10:
 			if (hw_caps & GF_VIDEO_HW_HAS_YUV) use_soft_stretch = GF_FALSE;
 			else if (hw_caps & GF_VIDEO_HW_HAS_YUV_OVERLAY) overlay_type = 1;
 			break;
@@ -551,6 +821,7 @@
 		force_soft_blt = use_soft_stretch = GF_TRUE;
 	}
 
+	memset(&video_src, 0, sizeof(GF_VideoSurface));
 	video_src.height = txh->height;
 	video_src.width = txh->width;
 	video_src.pitch_x = 0;
@@ -560,46 +831,58 @@
 	if (txh->pixelformat==GF_PIXEL_YUVD) video_src.pixel_format = GF_PIXEL_YV12;
 #endif
 	video_src.video_buffer = txh->data;
-	if (overlay_type) {
+	if (txh->raw_memory) {
+		video_src.u_ptr = (char *) txh->pU;
+		video_src.v_ptr = (char *) txh->pV;
+	}
 
-		if (overlay_type==2) {
-			GF_IRect o_rc;
-			GF_OverlayStack *ol, *first;
-
-			/*queue overlay in order*/
-			GF_SAFEALLOC(ol, GF_OverlayStack);
-			ol->ctx = ctx;
-			ol->dst = dst_wnd;
-			ol->src = src_wnd;
-			first = visual->overlays;
-			if (first) {
-				while (first->next) first = first->next;
-				first->next = ol;
-			} else {
-				visual->overlays = ol;
-			}
+	//overlay queing
+	if (overlay_type==2) {
+		GF_IRect o_rc;
+		GF_OverlayStack *ol, *first;
+
+		/*queue overlay in order*/
+		GF_SAFEALLOC(ol, GF_OverlayStack);
+		ol->ctx = ctx;
+		ol->dst = dst_wnd;
+		ol->src = src_wnd;
+		first = visual->overlays;
+		if (first) {
+			while (first->next) first = first->next;
+			first->next = ol;
+		} else {
+			visual->overlays = ol;
+		}
 
-			if (visual->center_coords) {
-				o_rc.x = dst_wnd.x - output_width/2;
-				o_rc.y = output_height/2- dst_wnd.y;
-			} else {
-				o_rc.x = dst_wnd.x;
-				o_rc.y = dst_wnd.y + dst_wnd.h;
-			}
+		if (visual->center_coords) {
+			o_rc.x = dst_wnd.x - output_width/2;
+			o_rc.y = output_height/2- dst_wnd.y;
+		} else {
+			o_rc.x = dst_wnd.x;
+			o_rc.y = dst_wnd.y + dst_wnd.h;
+		}
 
-			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->has_overlays = GF_TRUE;
-			/*mark drawable as overlay*/
-			ctx->drawable->flags |= DRAWABLE_IS_OVERLAY;
+		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->has_overlays = GF_TRUE;
+		/*mark drawable as overlay*/
+		ctx->drawable->flags |= DRAWABLE_IS_OVERLAY;
+
+		/*prevents this context from being removed in direct draw mode by requesting a new one
+		but not allocating it*/
+		if (tr_state->immediate_draw)
+			visual_2d_get_drawable_context(visual);
+
+		return GF_TRUE;
+	}
+
+	//will pause clock if first HW load
+	gf_sc_texture_check_pause_on_first_load(txh);
+
+	if (overlay_type) {
+		u32 push_time;
 
-			/*prevents this context from being removed in direct draw mode by requesting a new one
-			but not allocating it*/
-			if (tr_state->immediate_draw)
-				visual_2d_get_drawable_context(visual);
-			return GF_TRUE;
-		}
 		/*top level overlay*/
 		if (flush_video) {
 			GF_Window rc;
@@ -613,11 +896,19 @@
 		}
 		visual->compositor->skip_flush = 1;
 
+		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            
 			/*mark drawable as overlay*/
 			ctx->drawable->flags |= DRAWABLE_IS_OVERLAY;
 			visual->has_overlays = GF_TRUE;
+
+			//will resume clock if first HW load
+			gf_sc_texture_check_pause_on_first_load(txh);
 			return GF_TRUE;
 		}
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor2D] Error during overlay blit - trying with soft one\n"));
@@ -629,7 +920,9 @@
 	if (is_attached) visual_2d_release_raster(visual);
 
 	if (!use_soft_stretch) {
+		u32 push_time = gf_sys_clock();
 		e = visual->compositor->video_out->Blit(visual->compositor->video_out, &video_src, &src_wnd, &dst_wnd, 0);
+
 		/*HW pb, try soft*/
 		if (e) {
 			use_soft_stretch = GF_TRUE;
@@ -645,16 +938,30 @@
 				gf_sc_next_frame_state(visual->compositor, GF_SC_DRAW_FRAME);
 			}
 		}
+#ifndef GPAC_DISABLE_LOG
+		else {
+            log_blit_times(txh, push_time);
+		}
+#endif
 	}
+
+	//will resume clock if first HW load
+	gf_sc_texture_check_pause_on_first_load(txh);
+
 	if (use_soft_stretch) {
 		GF_VideoSurface backbuffer;
 		e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, GF_TRUE);
 		if (!e) {
+            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);
+#endif
 			e = visual->compositor->video_out->LockBackBuffer(visual->compositor->video_out, &backbuffer, GF_FALSE);
 		} else {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor2D] Cannot lock back buffer - Error %s\n", gf_error_to_string(e) ));
 			if (is_attached) visual_2d_init_raster(visual);
+
 			return GF_FALSE;
 		}
 		if (!visual->compositor->video_memory) {
@@ -665,7 +972,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;
 }
 
@@ -716,6 +1023,7 @@
 	case GF_PIXEL_YUVA:
 	case GF_PIXEL_RGBS:
 	case GF_PIXEL_RGBAS:		
+	case GF_PIXEL_YV12_10:		
 		break;
 	case GF_PIXEL_YUVD:
 	case GF_PIXEL_RGBD:
@@ -756,10 +1064,10 @@
 		for (i=0; i<tr_state->visual->to_redraw.count; i++) {
 			/*there's an opaque region above, don't draw*/
 #ifdef TRACK_OPAQUE_REGIONS
-			if (tr_state->visual->draw_node_index < tr_state->visual->to_redraw.opaque_node_index[i]) continue;
+			if (tr_state->visual->draw_node_index < tr_state->visual->to_redraw.list[i].opaque_node_index) continue;
 #endif
 			clip = ctx->bi->clip;
-			gf_irect_intersect(&clip, &tr_state->visual->to_redraw.list[i]);
+			gf_irect_intersect(&clip, &tr_state->visual->to_redraw.list[i].rect);
 			if (clip.width && clip.height) {
 				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
@@ -880,6 +1188,7 @@
 	}
 
 	/*resize hardware surface*/
+	memset(&evt, 0, sizeof(GF_Event));
 	evt.type = GF_EVENT_VIDEO_SETUP;
 	evt.setup.width = compositor->vp_width;
 	evt.setup.height = compositor->vp_height;
@@ -897,10 +1206,18 @@
 	}
 #endif
 
+#ifndef GPAC_DISABLE_3D
+	if (compositor->hybrid_opengl) {
+		evt.setup.opengl_mode = 1;
+		evt.setup.system_memory = 0;
+		evt.setup.back_buffer = 1;
+	}
+#endif
+
 	if (compositor->was_system_memory != evt.setup.system_memory) changed = 1;
 	else if (old_vp_width != compositor->vp_width) changed=1;
 	else if (old_vp_height != compositor->vp_height) changed=1;
-	else if (compositor->was_opengl != evt.setup.opengl_mode) changed=1;
+	else if (compositor->is_opengl != evt.setup.opengl_mode) changed=1;
 	
 
 	if (changed) {
@@ -909,9 +1226,24 @@
 			));
 
 		e = compositor->video_out->ProcessEvent(compositor->video_out, &evt);
-		if (e) return e;
+		if (e) {
+#ifndef GPAC_DISABLE_3D
+			if (!compositor->hybrid_opengl) {
+				compositor->hybrid_opengl=1;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor2D] Failed to configure 2D output (%s) - retrying in OpenGL mode\n", gf_error_to_string(e) ));
+				return compositor_2d_set_aspect_ratio(compositor);
+			}
+#endif
+			compositor->video_setup_failed = GF_TRUE;
+			memset(&evt, 0, sizeof(GF_Event));
+			evt.type = GF_EVENT_QUIT;
+			evt.message.error = e;
+			evt.message.message = "Cannot setup video output";
+			gf_term_send_event(compositor->term, &evt);
+			return e;
+		}
 
-		compositor->was_opengl = evt.setup.opengl_mode;
+		compositor->is_opengl = evt.setup.opengl_mode;
 		compositor->was_system_memory = evt.setup.system_memory;		
 	}
 	if (compositor->has_size_info) {
@@ -1068,6 +1400,7 @@
 			gf_mx_copy(mx, tr_state->model_matrix);
 			gf_mx_inverse(&mx);
 			gf_mx_apply_rect(&mx, &orig);
+			gf_mx_apply_rect(&tr_state->layer_matrix, &orig);
 		} else
 #endif
 		{
@@ -1076,7 +1409,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;
@@ -1095,6 +1428,11 @@
 	if (for_layer) {
 		tr_state->layer_clipper = clip;
 		tr_state->has_layer_clip = 1;
+#ifndef GPAC_DISABLE_3D
+		if (tr_state->visual->type_3d) {
+			gf_mx_copy(tr_state->layer_matrix, tr_state->model_matrix);
+		}
+#endif
 	} else {
 		tr_state->clipper = clip;
 #ifndef GPAC_DISABLE_3D
@@ -1139,7 +1477,7 @@
 		/*check previsously drawn areas*/
 		for (i=0; i<ol->ra.count; i++) {
 			/*we have drawn something here, don't draw*/
-			if (gf_irect_inside(&ol->ra.list[i], &clip))
+			if (gf_irect_inside(&ol->ra.list[i].rect, &clip))
 				break;
 		}
 		res++;
@@ -1175,7 +1513,7 @@
 		ra_refresh(&ol->ra);
 
 		for (i=0; i<ol->ra.count; i++) {
-			the_clip = ol->ra.list[i];
+			the_clip = ol->ra.list[i].rect;
 
 			/*draw all objects above this overlay*/
 			ctx = ol->ctx->next;
@@ -1186,7 +1524,7 @@
 					if (needs_draw) {
 						/*if first object above is not transparent and completely covers the overlay skip video redraw*/
 						if ((ctx->flags & CTX_IS_TRANSPARENT) || !gf_irect_inside(&prev_clip, &the_clip)) {
-							vid_clip = ol->ra.list[i];
+							vid_clip = ol->ra.list[i].rect;
 							gf_irect_intersect(&vid_clip, &ol->ctx->bi->clip);
 							compositor_2d_draw_bitmap_ex(visual, ol->ctx->aspect.fill_texture, ol->ctx, &vid_clip, &ol->ctx->bi->unclip, 0xFF, NULL, tr_state, 1);
 						}
@@ -1221,6 +1559,7 @@
 		visual->overlays = ol->next;
 
 		txh = ol->ctx->aspect.fill_texture;
+		memset(&video_src, 0, sizeof(GF_VideoSurface));
 		video_src.height = txh->height;
 		video_src.width = txh->width;
 		video_src.pitch_x = 0;

gpac-0.5.0.svn4668.tar.bz2/src/compositor/compositor_3d.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/compositor_3d.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/compositor_node_init.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/compositor_node_init.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/drawable.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/drawable.c Changed

@@ -643,6 +643,7 @@
 
 
 #ifndef GPAC_DISABLE_VRML
+
 DrawableContext *drawable_init_context_mpeg4(Drawable *drawable, GF_TraverseState *tr_state)
 {
 	DrawableContext *ctx;
@@ -695,8 +696,43 @@
 	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 && ctx->aspect.fill_texture->needs_refresh) ctx->flags |= CTX_TEXTURE_DIRTY;
-	else if (ctx->aspect.line_texture && ctx->aspect.line_texture->needs_refresh) ctx->flags |= CTX_TEXTURE_DIRTY;
+	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)
+				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;
+
+#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 
 	completely break layout of children. We consider the node should be drawn*/

gpac-0.5.0.svn4668.tar.bz2/src/compositor/drawable.h -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/drawable.h Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/events.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/events.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/font_engine.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/font_engine.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/gl_inc.h -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/gl_inc.h Changed

@@ -85,7 +85,7 @@
 #endif
 
 
-#define GL_CHECK_ERR  {s32 res = glGetError(); if (res) GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, "GL Error %d file %s line %d\n", res, __FILE__, __LINE__)); }
+#define GL_CHECK_ERR  {s32 res = glGetError(); if (res) GF_LOG(GF_LOG_ERROR, GF_LOG_MMIO, ("GL Error %d file %s line %d\n", res, __FILE__, __LINE__)); }
 
 /*macros for GL proto and fun declaration*/
 #ifdef _WIN32_WCE
@@ -328,6 +328,8 @@
 GLDECL(void, glBindBuffer, (GLenum, GLuint ) )
 GLDECL(void, glBufferData, (GLenum, int, void *, GLenum) )
 GLDECL(void, glBufferSubData, (GLenum, int, int, void *) )
+GLDECL(void *, glMapBuffer, (GLenum, GLenum) )
+GLDECL(void *, glUnmapBuffer, (GLenum) )
 
 #endif	//GL_VERSION_1_5
 
@@ -421,6 +423,10 @@
 #define GL_STENCIL_BACK_REF 0x8CA3
 #define GL_STENCIL_BACK_VALUE_MASK 0x8CA4
 #define GL_STENCIL_BACK_WRITEMASK 0x8CA5
+#define GL_PIXEL_UNPACK_BUFFER_ARB   0x88EC
+#define GL_STREAM_DRAW_ARB   0x88E0
+#define GL_WRITE_ONLY_ARB   0x88B9
+#define GL_DYNAMIC_DRAW_ARB   0x88E8
 
 
 GLDECL(GLuint, glCreateProgram, (void) )

gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_background2d.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_background2d.c Changed

@@ -102,6 +102,8 @@
 
 static void DrawBackground2D_2D(DrawableContext *ctx, GF_TraverseState *tr_state)
 {
+	Bool clear_all = GF_TRUE;	
+	u32 color;
 	Background2DStack *stack;
 	if (!ctx || !ctx->drawable || !ctx->drawable->node) return;
 	stack = (Background2DStack *) gf_node_get_private(ctx->drawable->node);
@@ -109,6 +111,7 @@
 	if (!ctx->bi->clip.width || !ctx->bi->clip.height) return;
 
 	stack->flags &= ~CTX_PATH_FILLED;
+	color = ctx->aspect.fill_color;
 
 	if (back_use_texture((M_Background2D *)ctx->drawable->node)) {
 
@@ -124,29 +127,49 @@
 			visual_2d_texture_path(tr_state->visual, stack->drawable->path, ctx, tr_state);
 		}
 		stack->flags &= ~(CTX_APP_DIRTY | CTX_TEXTURE_DIRTY);
+		tr_state->visual->has_modif = 1;
+#ifndef GPAC_DISABLE_3D
+		//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;
+			color &= 0x00FFFFFF;
+		} else
+#endif
+			return;
+	}
+
+
+#ifndef GPAC_DISABLE_3D
+	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;
+		}
+	}
+#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);
 	} else {
-		
-		/*direct drawing, draw without clippers */
-		if (tr_state->immediate_draw) {
-			/*directly clear with specified color*/
-			tr_state->visual->ClearSurface(tr_state->visual, &ctx->bi->clip, ctx->aspect.fill_color);
-		} else {
-			u32 i;
-			GF_IRect clip;
-			for (i=0; i<tr_state->visual->to_redraw.count; i++) {
-				/*there's an opaque region above, don't draw*/
+		u32 i;
+		GF_IRect clip;
+		for (i=0; i<tr_state->visual->to_redraw.count; i++) {
+			/*there's an opaque region above, don't draw*/
 #ifdef TRACK_OPAQUE_REGIONS
-				if (tr_state->visual->draw_node_index<tr_state->visual->to_redraw.opaque_node_index[i]) continue;
+			if (tr_state->visual->draw_node_index < tr_state->visual->to_redraw.list[i].opaque_node_index) continue;
 #endif
-				clip = ctx->bi->clip;
-				gf_irect_intersect(&clip, &tr_state->visual->to_redraw.list[i]);
-				if (clip.width && clip.height) {
-					tr_state->visual->ClearSurface(tr_state->visual, &clip, ctx->aspect.fill_color);
-				}
+			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);
 			}
 		}
-		stack->flags &= ~(CTX_APP_DIRTY | CTX_TEXTURE_DIRTY);
 	}
+	stack->flags &= ~(CTX_APP_DIRTY | CTX_TEXTURE_DIRTY);
 	tr_state->visual->has_modif = 1;
 }
 
@@ -325,8 +348,14 @@
 	} 
 
 	if (back_use_texture(bck) ) {
-		if (stack->txh.tx_io && !(status->ctx.flags & CTX_APP_DIRTY) && stack->txh.needs_refresh) 
+		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) {
+			stack->flags |= CTX_HYBOGL_NO_CLEAR;
+		}
+#endif
 	}
 	status->ctx.flags = stack->flags;

gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_composite.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_composite.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_geometry_2d.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_geometry_2d.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_layer_2d.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_layer_2d.c Changed

@@ -103,7 +103,7 @@
 	SFVec2f prev_vp;
 
 #ifndef GPAC_DISABLE_3D
-	GF_Matrix mx3d;
+	GF_Matrix mx3d, prev_layer_mx;
 	GF_List *oldf, *oldn;
 	GF_List *node_list_backup;
 	GF_Rect prev_clipper;
@@ -164,6 +164,7 @@
 	case TRAVERSE_SORT:
 #ifndef GPAC_DISABLE_3D
 		if (tr_state->visual->type_3d) {
+			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);
@@ -211,6 +212,7 @@
 			tr_state->has_layer_clip = had_clip;
 			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);
 			}
 		} else 
@@ -236,6 +238,8 @@
 #endif
 			}
 
+			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;

gpac-0.5.0.svn4668.tar.bz2/src/compositor/mpeg4_textures.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/mpeg4_textures.c Changed

@@ -73,6 +73,8 @@
 	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);
+	} else if (stack->first_frame_fetched) {
+		gf_mo_resume(stack->txh.stream);
 	}
 	gf_mo_set_speed(stack->txh.stream, mt->speed);
 }
@@ -96,7 +98,7 @@
 	if (!txnode->isActive && st->first_frame_fetched) return;
 
 	/*when fetching the first frame disable resync*/
-	gf_sc_texture_update_frame(txh, !txnode->isActive);
+	gf_sc_texture_update_frame(txh, 0);
 
 	if (txh->stream_finished) {
 		if (movietexture_get_loop(st, txnode)) {
@@ -114,15 +116,15 @@
 		gf_node_event_out_str(txh->owner, "duration_changed");
 		/*stop stream if needed*/
 		if (!txnode->isActive && txh->is_open) {
-			gf_sc_texture_stop(txh);
+			gf_mo_pause(txh->stream);
 			/*make sure the refresh flag is not cleared*/
 			txh->needs_refresh = 1;
+			gf_sc_invalidate(txh->compositor, NULL);
 		}
 	}
 	if (txh->needs_refresh) {
 		/*mark all subtrees using this image as dirty*/
 		gf_node_dirty_parents(txh->owner);
-		gf_sc_invalidate(txh->compositor, NULL);
 	}
 }
 
@@ -148,6 +150,8 @@
 			stack->fetch_first_frame = 0;
 			if (!stack->txh.is_open)
 				gf_sc_texture_play(&stack->txh, &mt->url);
+			else
+				gf_mo_resume(stack->txh.stream);
 		}
 		return;
 	}

gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_font.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_font.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_geometry.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_geometry.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_grouping.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_grouping.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_media.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_media.c Changed

@@ -213,6 +213,10 @@
 	gf_node_dirty_clear(stack->graph->node, GF_SG_SVG_GEOMETRY_DIRTY);
 }
 
+static void svg_open_texture(SVG_video_stack *stack)
+{
+	gf_sc_texture_open(&stack->txh, &stack->txurl, GF_FALSE);
+}
 
 static void svg_play_texture(SVG_video_stack *stack, SVGAllAttributes *atts)
 {
@@ -246,7 +250,6 @@
 	DrawableContext *ctx;
 	SVGAllAttributes all_atts;
 
-
 	if (is_destroy) {
 		gf_sc_texture_destroy(&stack->txh);
 		gf_sg_mfurl_del(stack->txurl);
@@ -259,7 +262,6 @@
 		return;
 	} 
 
-
 	/*TRAVERSE_DRAW is NEVER called in 3D mode*/
 	if (tr_state->traversing_mode==TRAVERSE_DRAW_2D) {
 		SVG_Draw_bitmap(tr_state);
@@ -436,20 +438,24 @@
 	GF_FieldInfo init_vis_info;
 	SVG_video_stack *stack = (SVG_video_stack *) gf_node_get_private(txh->owner);
 	
-	if (!txh->is_open) {
-		SVG_InitialVisibility init_vis;
-		if (stack->first_frame_fetched) return;
+	if (!txh->stream) {
+		svg_open_texture(stack);
 
-		init_vis = SVG_INITIALVISIBILTY_WHENSTARTED;
+		if (!txh->is_open) {
+			SVG_InitialVisibility init_vis;
+			if (stack->first_frame_fetched) return;
 
-		if (gf_node_get_attribute_by_tag(txh->owner, TAG_SVG_ATT_initialVisibility, GF_FALSE, GF_FALSE, &init_vis_info) == GF_OK) {
-			init_vis = *(SVG_InitialVisibility *)init_vis_info.far_ptr;
-		}
+			init_vis = SVG_INITIALVISIBILTY_WHENSTARTED;
+
+			if (gf_node_get_attribute_by_tag(txh->owner, TAG_SVG_ATT_initialVisibility, GF_FALSE, GF_FALSE, &init_vis_info) == GF_OK) {
+				init_vis = *(SVG_InitialVisibility *)init_vis_info.far_ptr;
+			}
 
-		/*opens stream only at first access to fetch first frame if needed*/
-		if (init_vis == SVG_INITIALVISIBILTY_ALWAYS) {
-			svg_play_texture((SVG_video_stack*)stack, NULL);
-			gf_sc_invalidate(txh->compositor, NULL);
+			/*opens stream only at first access to fetch first frame if needed*/
+			if (init_vis == SVG_INITIALVISIBILTY_ALWAYS) {
+				svg_play_texture((SVG_video_stack*)stack, NULL);
+				gf_sc_invalidate(txh->compositor, NULL);
+			} 
 		}
 		return;
 	}

gpac-0.5.0.svn4668.tar.bz2/src/compositor/svg_text.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/svg_text.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/texturing.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/texturing.c Changed

@@ -67,7 +67,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_sc_texture_play_from_to(GF_TextureHandler *txh, MFURL *url, Double start_offset, Double end_offset, Bool can_loop, Bool lock_scene_timeline)
+GF_Err gf_sc_texture_open(GF_TextureHandler *txh, MFURL *url, Bool lock_scene_timeline)
 {
 	if (txh->is_open) return GF_BAD_PARAM;
 
@@ -78,12 +78,28 @@
 	txh->stream = gf_mo_register(txh->owner, url, lock_scene_timeline, 0);
 	/*bad/Empty URL*/
 	if (!txh->stream) return GF_NOT_SUPPORTED;
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_sc_texture_play_from_to(GF_TextureHandler *txh, MFURL *url, Double start_offset, Double end_offset, Bool can_loop, Bool lock_scene_timeline)
+{
+	if (!txh->stream) {
+		GF_Err e;
+		e = gf_sc_texture_open(txh, url, lock_scene_timeline);
+		if (e != GF_OK) return e;
+	}
+
 	/*request play*/
 	gf_mo_play(txh->stream, start_offset, end_offset, can_loop);
 
 	txh->last_frame_time = (u32) (-1);
 	//gf_sc_invalidate(txh->compositor, NULL);
 	txh->is_open = 1;
+
+	/*request play*/
+	txh->raw_memory = gf_mo_is_raw_memory(txh->stream);
 	return GF_OK;
 }
 
@@ -164,6 +180,7 @@
 {
 	Bool needs_reload = 0;
 	u32 size, ts;
+	s32 ms_until_pres, ms_until_next;
 
 	/*already refreshed*/
 	if (txh->needs_refresh) return;
@@ -184,7 +201,7 @@
 			gf_sc_texture_release(txh);
 		}
 	}
-	txh->data = gf_mo_fetch_data(txh->stream, !disable_resync, &txh->stream_finished, &ts, &size);
+	txh->data = gf_mo_fetch_data(txh->stream, !disable_resync, &txh->stream_finished, &ts, &size, &ms_until_pres, &ms_until_next);
 
 	if (!(gf_mo_get_flags(txh->stream) & GF_MO_IS_INIT)) {
 		needs_reload = 1;
@@ -205,7 +222,7 @@
 
 	/*if no frame or muted don't draw*/
 	if (!txh->data || !size) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("No output frame available\n"));
+		GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("|Visual Texture] No output frame available \n"));
 		/*TODO - check if this is needed */
 		if (txh->flags & GF_SR_TEXTURE_PRIVATE_MEDIA) {
 			//txh->needs_refresh = 1;
@@ -218,15 +235,31 @@
 	if (txh->tx_io && (txh->stream_finished || (txh->last_frame_time==ts)) ) {
 		gf_mo_release_data(txh->stream, 0xFFFFFFFF, 0);
 		txh->needs_release = 0;
-		if (!txh->stream_finished)
-			txh->compositor->video_regulation = 1;
+		if (!txh->stream_finished) {
+			if (ms_until_next>0 && (txh->compositor->next_frame_delay > (u32) ms_until_next))
+				txh->compositor->next_frame_delay = ms_until_next;
+		}
 		return;
 	}
-	txh->compositor->video_regulation = 1;
 	txh->needs_release = 1; 
 	txh->last_frame_time = ts;
+	if (txh->raw_memory) {
+		gf_mo_get_raw_image_planes(txh->stream, (u8 **) &txh->data, (u8 **) &txh->pU, (u8 **) &txh->pV);
+	}
 	if (gf_mo_is_muted(txh->stream)) return;
 
+
+	if (txh->nb_frames) {
+		s32 push_delay = txh->upload_time / txh->nb_frames;
+		if (push_delay > ms_until_pres) ms_until_pres = 0;
+		else ms_until_pres -= push_delay;
+	}
+
+	if (txh->compositor->frame_delay < ms_until_pres)
+		txh->compositor->frame_delay = ms_until_pres;
+
+	txh->compositor->next_frame_delay = 1;
+
 	if (!txh->tx_io) {
 		setup_texture_object(txh, 0);
 	}

gpac-0.5.0.svn4668.tar.bz2/src/compositor/texturing.h -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/texturing.h Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/texturing_gl.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/texturing_gl.c Changed

@@ -52,16 +52,17 @@
 	TX_NEEDS_RASTER_LOAD = (1<<1),
 	/*signal video data must be sent to 3D hw*/
 	TX_NEEDS_HW_LOAD = (1<<2),
+
 	/*OpenGL texturing flags*/
 
 	/*these 4 are exclusives*/
-	TX_MUST_SCALE = (1<<3),
-	TX_IS_POW2 = (1<<4),
-	TX_IS_RECT = (1<<5),
-	TX_EMULE_POW2 = (1<<6),
-	TX_EMULE_FIRST_LOAD = (1<<7),
+	TX_MUST_SCALE = (1<<10),
+	TX_IS_POW2 = (1<<11),
+	TX_IS_RECT = (1<<12),
+	TX_EMULE_POW2 = (1<<13),
+	TX_EMULE_FIRST_LOAD = (1<<14),
 
-	TX_IS_FLIPPED = (1<<8),
+	TX_IS_FLIPPED = (1<<15),
 };
 
 
@@ -71,6 +72,8 @@
 
 	/*2D texturing*/
 	GF_STENCIL tx_raster;
+	//0: not paused, 1: paused, 2: initial pause has been done
+	u32 init_pause_status;
 
 	/*3D texturing*/
 #ifndef GPAC_DISABLE_3D
@@ -85,6 +88,10 @@
 
 	/*gl textures vars (gl_type: 2D texture or rectangle (NV ext) )*/
 	u32 nb_comp, gl_format, gl_type, gl_dtype;
+	Bool yuv_shader;
+	u32 v_id, u_id;
+	u32 pbo_id, u_pbo_id, v_pbo_id;
+	Bool pbo_pushed;
 #endif
 #ifdef GF_SR_USE_DEPTH
 	char *depth_data;
@@ -100,6 +107,29 @@
 	return GF_OK;
 }
 
+static void release_txio(struct __texture_wrapper *tx_io)
+{
+
+#ifndef GPAC_DISABLE_3D
+	if (tx_io->id) glDeleteTextures(1, &tx_io->id);
+	if (tx_io->u_id) glDeleteTextures(1, &tx_io->u_id);
+	if (tx_io->v_id) glDeleteTextures(1, &tx_io->v_id);
+
+	if (tx_io->pbo_id) glDeleteBuffers(1, &tx_io->pbo_id);
+	if (tx_io->u_pbo_id) glDeleteBuffers(1, &tx_io->u_pbo_id);
+	if (tx_io->v_pbo_id) glDeleteBuffers(1, &tx_io->v_pbo_id);
+
+	if (tx_io->scale_data) gf_free(tx_io->scale_data);
+	if (tx_io->conv_data) gf_free(tx_io->conv_data);
+#endif
+
+#ifdef GF_SR_USE_DEPTH
+	if (tx_io->depth_data) gf_free(tx_io->depth_data);
+#endif
+
+	gf_free(tx_io);
+}
+
 void gf_sc_texture_release(GF_TextureHandler *txh)
 {
 	if (txh->vout_udta && txh->compositor->video_out->ReleaseTexture) {
@@ -107,30 +137,76 @@
 		txh->vout_udta = NULL;
 	}
 
-	if (!txh->tx_io) return;
-	if (txh->tx_io->tx_raster) {
-		txh->compositor->rasterizer->stencil_delete(txh->tx_io->tx_raster);
-		txh->tx_io->tx_raster = NULL;
-	}
+	if (txh->tx_io) {
+		if (txh->tx_io->tx_raster) {
+			txh->compositor->rasterizer->stencil_delete(txh->tx_io->tx_raster);
+			txh->tx_io->tx_raster = NULL;
+		}
 
-#ifndef GPAC_DISABLE_3D
-	if (txh->tx_io->id) glDeleteTextures(1, &txh->tx_io->id);
-	if (txh->tx_io->scale_data) gf_free(txh->tx_io->scale_data);
-	if (txh->tx_io->conv_data) gf_free(txh->tx_io->conv_data);
-#endif
+		if (gf_th_id()==txh->compositor->video_th_id) {
+			release_txio(txh->tx_io);
+		} else {
+			gf_list_add(txh->compositor->textures_gc, txh->tx_io);
+		}
+		txh->tx_io=NULL;
+	}
+}
 
-#ifdef GF_SR_USE_DEPTH
-	if (txh->tx_io->depth_data) gf_free(txh->tx_io->depth_data);
-#endif
+void gf_sc_texture_cleanup_hw(GF_Compositor *compositor)
+{
+	while (gf_list_count(compositor->textures_gc)) {
+		struct __texture_wrapper *tx_io = (struct __texture_wrapper *) gf_list_last(compositor->textures_gc);
+		gf_list_rem_last(compositor->textures_gc);
 
-	gf_free(txh->tx_io);
-	txh->tx_io = NULL;
+		release_txio(tx_io);
+	}
 }
 
 
+
 GF_Err gf_sc_texture_set_data(GF_TextureHandler *txh)
 {
 	txh->tx_io->flags |= TX_NEEDS_RASTER_LOAD | TX_NEEDS_HW_LOAD;
+
+#if !defined(GPAC_DISABLE_3D) && !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+	//PBO mode: start pushing the texture
+	if (txh->tx_io->pbo_id) {
+		u8 *ptr;
+		u32 size = txh->stride*txh->height;
+
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, txh->tx_io->pbo_id);
+		ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+		if (ptr) memcpy(ptr, txh->data, size);
+		glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+
+		if (txh->tx_io->u_pbo_id) {
+			u8 *pU = txh->pU;
+			u8 *pV = txh->pV;
+			if (!pU) pU = (u8 *) txh->data + size;
+			if (!pV) pV = (u8 *) txh->data + 5*size/4;
+
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, txh->tx_io->u_pbo_id);
+			ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+			if (ptr) memcpy(ptr, pU, size/4);
+			glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, txh->tx_io->v_pbo_id);
+			ptr =(u8 *)glMapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, GL_WRITE_ONLY_ARB);
+			if (ptr) memcpy(ptr, pV, size/4);
+			glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER_ARB);
+			glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+		}
+
+		txh->tx_io->pbo_pushed = 1;
+
+		//we just pushed our texture to the GPU, release
+		if (txh->raw_memory) {
+			gf_sc_texture_release_stream(txh);
+		}
+	}
+#endif
 	return GF_OK;
 }
 
@@ -139,8 +215,18 @@
 #ifndef GPAC_DISABLE_3D
 	if (txh->tx_io->id) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Texturing] Releasing OpenGL texture %d\n", txh->tx_io->id));
+
 		glDeleteTextures(1, &txh->tx_io->id);
 		txh->tx_io->id = 0;
+		if (txh->tx_io->u_id) {
+			glDeleteTextures(1, &txh->tx_io->u_id);
+			glDeleteTextures(1, &txh->tx_io->v_id);
+			txh->tx_io->u_id = txh->tx_io->v_id = 0;
+		}
+		if (txh->tx_io->pbo_id) glDeleteBuffers(1, &txh->tx_io->pbo_id);
+		if (txh->tx_io->u_pbo_id) glDeleteBuffers(1, &txh->tx_io->u_pbo_id);
+		if (txh->tx_io->v_pbo_id) glDeleteBuffers(1, &txh->tx_io->v_pbo_id);
+		txh->tx_io->pbo_id = txh->tx_io->u_pbo_id = txh->tx_io->v_pbo_id = 0;
 	}
 	txh->tx_io->flags |= TX_NEEDS_HW_LOAD;
 #endif
@@ -165,10 +251,12 @@
 	if (txh->tx_io) txh->tx_io->blend_mode = mode;
 }
 
-void tx_bind_with_mode(GF_TextureHandler *txh, Bool transparent, u32 blend_mode)
+void tx_bind_with_mode(GF_TextureHandler *txh, Bool transparent, u32 blend_mode, Bool no_bind)
 {
 	if (!txh->tx_io || !txh->tx_io->id || !txh->tx_io->gl_type) return;
-	glEnable(txh->tx_io->gl_type);
+
+	if (!no_bind)
+		glEnable(txh->tx_io->gl_type);
 
 	switch (blend_mode) {
 	case TX_BLEND:
@@ -189,27 +277,42 @@
 		break;
 	case TX_DECAL:
 	default:
-		if ((txh->tx_io->gl_format==GL_LUMINANCE) || (txh->tx_io->gl_format==GL_LUMINANCE_ALPHA)) {
+		if (((txh->tx_io->gl_format==GL_LUMINANCE)) || (txh->tx_io->gl_format==GL_LUMINANCE_ALPHA)) {
 			GLTEXENV(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_BLEND/*GL_MODULATE*/);
 		} else {
 			GLTEXENV(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
 		}
 		break;
 	}
-	glBindTexture(txh->tx_io->gl_type, txh->tx_io->id);
+	if (!no_bind)
+		glBindTexture(txh->tx_io->gl_type, txh->tx_io->id);
 }
 
 void tx_bind(GF_TextureHandler *txh)
 {
 	if (txh->tx_io )
-		tx_bind_with_mode(txh, txh->transparent, txh->tx_io->blend_mode);
+		tx_bind_with_mode(txh, txh->transparent, txh->tx_io->blend_mode, 0);
 }
 
 void gf_sc_texture_disable(GF_TextureHandler *txh)
 {
 	if (txh && txh->tx_io) {
+
+#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));
+
+		}
+#endif
 		glDisable(txh->tx_io->gl_type);
 		if (txh->transparent) glDisable(GL_BLEND);
+
+		gf_sc_texture_check_pause_on_first_load(txh);
 	}
 }
 
@@ -249,15 +352,11 @@
 
 static Bool tx_setup_format(GF_TextureHandler *txh)
 {
-	Bool is_pow2, use_rect, flip;
+	GLint tx_id[3];
+	u32 i, nb_tx = 1;
+	Bool is_pow2, use_rect, flip, use_yuv_shaders;
 	GF_Compositor *compositor = (GF_Compositor *)txh->compositor;
 
-	/*in case the ID has been lost, resetup*/
-	if (!txh->tx_io->id) {
-		glGenTextures(1, &txh->tx_io->id);
-		txh->tx_io->flags |= TX_EMULE_FIRST_LOAD;
-	}
-
 	/*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)) 
@@ -279,6 +378,7 @@
 	}
 	if (!use_rect && !compositor->gl_caps.npot_texture && !is_pow2) txh->tx_io->flags = TX_MUST_SCALE;
 
+	use_yuv_shaders = 0;
 	txh->tx_io->nb_comp = txh->tx_io->gl_format = 0;
 	txh->tx_io->gl_dtype = GL_UNSIGNED_BYTE;
 	switch (txh->pixelformat) {
@@ -319,31 +419,31 @@
 		break;
 #endif
 	case GF_PIXEL_YV12:
+	case GF_PIXEL_YV12_10:
 	case GF_PIXEL_NV21:
 #ifndef GPAC_USE_OGL_ES 
-		if (!compositor->disable_yuvgl && compositor->gl_caps.yuv_texture && !(txh->tx_io->flags & TX_MUST_SCALE) ) {
+        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;
-		} else 
+			break;
+		}
 #endif
-		{
+		//fallthrough
+	case GF_PIXEL_YUY2:
+	case GF_PIXEL_YUVD:
+		if (compositor->gl_caps.has_shaders && (is_pow2 || compositor->visual->yuv_rect_glsl_program) ) {
+			use_yuv_shaders = 1;
+		} else {
 			if (!use_rect && compositor->emul_pow2) txh->tx_io->flags = TX_EMULE_POW2;
 			txh->tx_io->gl_format = GL_RGB;
 			txh->tx_io->nb_comp = 3;
 		}
 		break;
-	case GF_PIXEL_YUY2:
-		if (!use_rect && compositor->emul_pow2) txh->tx_io->flags = TX_EMULE_POW2;
-		txh->tx_io->gl_format = GL_RGB;
-		txh->tx_io->nb_comp = 3;
-		break;
 
-	case GF_PIXEL_YUVD:
-		if (!use_rect && compositor->emul_pow2) txh->tx_io->flags = TX_EMULE_POW2;
-		txh->tx_io->gl_format = GL_RGB;
-		txh->tx_io->nb_comp = 3;
-		break;
 	case GF_PIXEL_RGBD:
 	case GF_PIXEL_RGB_24_DEPTH:
 		if (!use_rect && compositor->emul_pow2) txh->tx_io->flags = TX_EMULE_POW2;
@@ -356,48 +456,144 @@
 
 	if (flip) txh->tx_io->flags |= TX_IS_FLIPPED;
 
+	/*in case the ID has been lost, resetup*/
+	if (!txh->tx_io->id) {
+		glGenTextures(1, &txh->tx_io->id);
+		txh->tx_io->flags |= TX_EMULE_FIRST_LOAD;
+		txh->tx_io->u_id = 0;
+		txh->tx_io->v_id = 0;
+	}
+	tx_id[0] = txh->tx_io->id;
+
+#ifndef GPAC_USE_OGL_ES
+	if (use_yuv_shaders && !txh->tx_io->u_id) {
+		glGenTextures(1, &txh->tx_io->u_id);
+		glGenTextures(1, &txh->tx_io->v_id);
+		tx_id[1] = txh->tx_io->u_id;
+		tx_id[2] = txh->tx_io->v_id;
+		nb_tx = 3;
+
+		if (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");
+			if (loc == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate uniform \"width\" in YUV shader\n"));
+			} else {
+				GLfloat w = (GLfloat) txh->width;
+				glUniform1f(loc, w);
+			}
+			loc = glGetUniformLocation(compositor->visual->yuv_rect_glsl_program, "height");
+			if (loc == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate uniform \"width\" in YUV shader\n"));
+			} else {
+				GLfloat h = (GLfloat) txh->height;
+				glUniform1f(loc, h);
+			}
+			glUseProgram(0);
+		}
+	}
+#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;
+
+		if (!txh->tx_io->pbo_id && txh->tx_io->id) {
+			glGenBuffers(1, &txh->tx_io->pbo_id);
+			if (txh->tx_io->pbo_id) {
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, txh->tx_io->pbo_id);
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size, NULL, GL_DYNAMIC_DRAW_ARB);
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+			}
+		}
+		if (!txh->tx_io->u_pbo_id && txh->tx_io->u_id) {
+			glGenBuffers(1, &txh->tx_io->u_pbo_id);
+			if (txh->tx_io->u_pbo_id) {
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, txh->tx_io->u_pbo_id);
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size/4, NULL, GL_DYNAMIC_DRAW_ARB);
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+			}
+		}
+		if (!txh->tx_io->v_pbo_id && txh->tx_io->v_id) {
+			glGenBuffers(1, &txh->tx_io->v_pbo_id);
+			if (txh->tx_io->v_pbo_id) {
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, txh->tx_io->v_pbo_id);
+				glBufferData(GL_PIXEL_UNPACK_BUFFER_ARB, size/4, NULL, GL_DYNAMIC_DRAW_ARB);
+				glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
+			}
+		}
+	}
+#endif
+
+	if (use_yuv_shaders) {
+		//we use LUMINANCE because GL_RED is not defined on android ...
+		txh->tx_io->gl_format = GL_LUMINANCE;
+		txh->tx_io->nb_comp = 1;
+		txh->tx_io->yuv_shader = 1;
+		if (txh->pixelformat==GF_PIXEL_YV12_10) {
+			txh->tx_io->gl_dtype = GL_UNSIGNED_SHORT;
+		}
+	}
+
 	/*note we don't free the data if existing, since this only happen when re-setting up after context loss (same size)*/
 	if ((txh->tx_io->flags == TX_MUST_SCALE) & !txh->tx_io->scale_data) {
 		txh->tx_io->scale_data = (char*)gf_malloc(sizeof(char) * txh->tx_io->nb_comp*txh->tx_io->rescale_width*txh->tx_io->rescale_height);
 		memset(txh->tx_io->scale_data , 0, sizeof(char) * txh->tx_io->nb_comp*txh->tx_io->rescale_width*txh->tx_io->rescale_height);
 	}
 
-	glEnable(txh->tx_io->gl_type);
-	glBindTexture(txh->tx_io->gl_type, txh->tx_io->id);
+	//setup all textures
+	for (i=0; i<nb_tx; i++) {
+		glEnable(txh->tx_io->gl_type);
+		glBindTexture(txh->tx_io->gl_type, tx_id[i] );
 
 #ifdef GPAC_USE_OGL_ES
-	GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, (txh->flags & GF_SR_TEXTURE_REPEAT_S) ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-	GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, (txh->flags & GF_SR_TEXTURE_REPEAT_T) ? GL_REPEAT : GL_CLAMP_TO_EDGE);
-	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 {
-		GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	}
+		GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, (txh->flags & GF_SR_TEXTURE_REPEAT_S) ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+		GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, (txh->flags & GF_SR_TEXTURE_REPEAT_T) ? GL_REPEAT : GL_CLAMP_TO_EDGE);
+		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 {
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		}
 #else
 
 #ifndef GPAC_USE_TINYGL
-	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
+		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);
-	}
+		{ 
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_S, GL_CLAMP);
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_WRAP_T, GL_CLAMP);
+		}
 
-	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 {
-		GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	}
+		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 {
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+			GLTEXPARAM(txh->tx_io->gl_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		}
 #endif
-	glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-	glDisable(txh->tx_io->gl_type);
+
+		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);
+			//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 
+			glPixelTransferi(GL_RED_SCALE, 1);
+#endif
+		    glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+		}
+		glDisable(txh->tx_io->gl_type);
+	}
 	return 1;
 }
 
@@ -486,6 +682,7 @@
 
 		if (!(txh->tx_io->flags & TX_IS_RECT)) return 1;
 		if (txh->flags & GF_SR_TEXTURE_NO_GL_FLIP) return 1;
+		//FIXME - we really want to go for shaders on RGB as well to avoid this copy on rect ext ...
 
 		if (!txh->tx_io->conv_data) {
 			txh->tx_io->conv_data = gf_malloc(sizeof(char)*txh->stride*txh->height);
@@ -502,6 +699,7 @@
 		txh->tx_io->flags |= TX_IS_FLIPPED;
 		return 1;
 	case GF_PIXEL_YV12:
+	case GF_PIXEL_YV12_10:
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_I420:
 		if (txh->tx_io->gl_format == compositor->gl_caps.yuv_texture) {
@@ -510,8 +708,10 @@
 			txh_unpack_yuv(txh);
 			return 1;
 		}
-		bpp = 3;
-		break;
+		if (txh->tx_io->yuv_shader) {
+			txh->tx_io->flags |= TX_NEEDS_HW_LOAD;
+			return 1;
+		}
 	case GF_PIXEL_YUY2:
 		bpp = 3;
 		break;
@@ -523,7 +723,7 @@
 		return 0;
 	}
 	if (!txh->tx_io->conv_data) {
-		if (txh->tx_io->flags == TX_EMULE_POW2) {
+		if (txh->tx_io->flags & TX_EMULE_POW2) {
 			/*convert video to a po of 2 WITHOUT SCALING VIDEO*/
 			txh->tx_io->conv_w = gf_get_next_pow2(txh->width);
 			txh->tx_io->conv_h = gf_get_next_pow2(txh->height);
@@ -538,6 +738,8 @@
 	}
 	out_stride = bpp * ((txh->tx_io->flags & TX_EMULE_POW2) ? txh->tx_io->conv_w : txh->width);
 
+	memset(&src, 0, sizeof(GF_VideoSurface));
+	memset(&dst, 0, sizeof(GF_VideoSurface));
 	dst.width = src.width = txh->width;
 	dst.height = src.height = txh->height;
 	dst.is_hardware_memory = src.is_hardware_memory = 0;
@@ -554,6 +756,7 @@
 	switch (txh->pixelformat) {
 	case GF_PIXEL_YUY2:
 	case GF_PIXEL_YV12:
+	case GF_PIXEL_YV12_10:
 	case GF_PIXEL_NV21:
 	case GF_PIXEL_I420:
 	case GF_PIXEL_BGR_24:
@@ -611,6 +814,62 @@
 #endif
 
 
+#ifndef GPAC_DISABLE_3D
+static void do_tex_image_2d(GF_TextureHandler *txh, GLint tx_mode, Bool first_load, u8 *data, u32 stride, u32 w, u32 h, u32 pbo_id)
+{
+	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; 
+		if (needs_stride) stride /= 2;
+	} else {
+		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);
+#else
+    u32 i;
+    if (needs_stride) {
+#endif
+
+#if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
+	if (txh->tx_io->pbo_pushed) {
+		glBindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, pbo_id);
+		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 
+#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 !defined(GPAC_USE_OGL_ES)
+    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);
+    }
+#endif
+}
+
+#endif
+    
 Bool gf_sc_texture_push_image(GF_TextureHandler *txh, Bool generate_mipmaps, Bool for2d)
 {
 #ifndef GPAC_DISABLE_3D
@@ -649,19 +908,13 @@
 		/*force setup of image*/
 		txh->needs_refresh = 1;
 		tx_setup_format(txh);
-		first_load = 1;
+		txh->tx_io->flags |= TX_EMULE_FIRST_LOAD;
 		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) {
-
-		if (txh->tx_io->flags & TX_EMULE_FIRST_LOAD) {
-			txh->tx_io->flags &= ~TX_EMULE_FIRST_LOAD;
-			first_load = 1;
-		}
-
 		/*convert image*/
 		gf_sc_texture_convert(txh);
 	}
@@ -671,6 +924,12 @@
 	txh->tx_io->flags &= ~TX_NEEDS_HW_LOAD;
 	data = gf_sc_texture_get_data(txh, &pixel_format);
 	if (!data) return 0;
+
+	if (txh->tx_io->flags & TX_EMULE_FIRST_LOAD) {
+		txh->tx_io->flags &= ~TX_EMULE_FIRST_LOAD;
+		first_load = 1;
+	}
+
 	if (txh->tx_io->flags & TX_EMULE_POW2) {
 		w = txh->tx_io->conv_w;
 		h = txh->tx_io->conv_h;
@@ -692,14 +951,69 @@
 
 #else
 
+	gf_sc_texture_check_pause_on_first_load(txh);
+
 	/*pow2 texture or hardware support*/
 	if (! (txh->tx_io->flags & TX_MUST_SCALE) ) {
-		first_load=1;
-		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, (unsigned char *) data);
+		if (txh->tx_io->yuv_shader) {
+			u32 push_time;
+			u8 *pY, *pU, *pV;
+			u32 ck;
+			pY = (u8 *) data;
+			if (txh->raw_memory) {
+				assert(txh->pU && txh->pV);
+				pU = (u8 *) txh->pU;
+				pV = (u8 *) txh->pV;
+			} else {
+				pU = (u8 *) pY + txh->height*txh->stride;
+				pV = (u8 *) pU + txh->height*txh->stride/4;
+			}
 
+#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
+				glPixelTransferi(GL_RED_SCALE, 64);
+			}
+#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
+
+			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
+            
+			push_time = gf_sys_clock() - push_time;
+
+			if (txh->nb_frames==100) {
+				txh->nb_frames = 0;
+				txh->upload_time = 0;
+			}
+			txh->nb_frames ++;
+			txh->upload_time += push_time;
+
+#ifndef GPAC_USE_OGL_ES 
+			if (txh->pixelformat==GF_PIXEL_YV12_10) {
+				glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+				glPixelTransferi(GL_RED_SCALE, 1);
+			}
+#endif
+
+#ifndef GPAC_DISABLE_LOGS
+		    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 {
-			glTexSubImage2D(txh->tx_io->gl_type, 0, 0, 0, w, h, txh->tx_io->gl_format, txh->tx_io->gl_dtype, (unsigned char *) data);
+            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 {
 
@@ -711,6 +1025,7 @@
 		{
 			/*it appears gluScaleImage is quite slow - use ourt own resampler which is not as nice but a but faster*/
 			GF_VideoSurface src, dst;
+			memset(&src, 0, sizeof(GF_VideoSurface));
 			src.width = txh->width;
 			src.height = txh->height;
 			src.pitch_x = 0;
@@ -718,6 +1033,7 @@
 			src.pixel_format = txh->pixelformat;
 			src.video_buffer = txh->data;
 
+			memset(&dst, 0, sizeof(GF_VideoSurface));
 			dst.width = txh->tx_io->rescale_width;
 			dst.height = txh->tx_io->rescale_height;
 			dst.pitch_x = 0;
@@ -735,6 +1051,7 @@
 		}
 	}
 #endif
+
 	return 1;
 
 #endif
@@ -744,6 +1061,17 @@
 
 #ifndef GPAC_DISABLE_3D
 
+void gf_sc_texture_refresh_area(GF_TextureHandler *txh, GF_IRect *rc, void *mem)
+{
+	if (!txh->tx_io) return;
+
+	if (txh->tx_io->flags & TX_NEEDS_HW_LOAD) {
+		gf_sc_texture_push_image(txh, 0, 0);
+	}
+
+	glTexSubImage2D(txh->tx_io->gl_type, 0, rc->x, rc->y, rc->width, rc->height, txh->tx_io->gl_format, txh->tx_io->gl_dtype, mem);
+}
+
 static Bool tx_set_image(GF_TextureHandler *txh, Bool generate_mipmaps)
 {
 	return gf_sc_texture_push_image(txh, generate_mipmaps, 0);
@@ -1299,7 +1627,8 @@
 		return ret;
 	}
 #endif
-	if (!txh || !txh->tx_io) return 0;
+	if (!txh || !txh->tx_io) 
+		return 0;
 
 	if (txh->compute_gradient_matrix && gf_sc_texture_needs_reload(txh) ) {
 		compositor_gradient_update(txh);
@@ -1322,8 +1651,36 @@
 	visual_3d_set_matrix_mode(compositor->visual, V3D_MATRIX_MODELVIEW);
 
 	txh->flags |= GF_SR_TEXTURE_USED;
-	tx_bind(txh);
+
+#ifndef GPAC_USE_OGL_ES
+	if (txh->tx_io->yuv_shader) {
+		/*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
+		glUseProgram(compositor->visual->current_texture_glsl_program);
+	GL_CHECK_ERR
+
+		glEnable(txh->tx_io->gl_type);
+		
+		glActiveTexture(GL_TEXTURE2);
+		glBindTexture(txh->tx_io->gl_type, txh->tx_io->v_id);
+
+		glActiveTexture(GL_TEXTURE1);
+		glBindTexture(txh->tx_io->gl_type, txh->tx_io->u_id);
+
+		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 
+#endif
+    {
+		tx_bind(txh);
+	}
 	return 1;
+
 }
 
 u32 gf_sc_texture_enable(GF_TextureHandler *txh, GF_Node *tx_transform)
@@ -1351,3 +1708,21 @@
 	txh->tx_io->flags |= TX_NEEDS_HW_LOAD;
 }
 
+void gf_sc_texture_check_pause_on_first_load(GF_TextureHandler *txh)
+{
+	if (txh->stream && txh->tx_io) {
+		switch (txh->tx_io->init_pause_status) {
+		case 0:
+			gf_sc_ar_control(txh->compositor->audio_renderer, 0);
+			txh->tx_io->init_pause_status = 1;
+			break;
+		case 1:
+			gf_sc_ar_control(txh->compositor->audio_renderer, 1);
+			txh->tx_io->init_pause_status = 2;
+			break;
+		default:
+			break;
+		}
+	}
+}
+

gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager.h -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager.h Changed

@@ -77,7 +77,6 @@
 	u32 type_3d;
 #endif
 
-
 #ifndef GPAC_DISABLE_VRML
 	/*background stack*/
 	GF_List *back_stack;
@@ -95,9 +94,7 @@
 
 	/*the one and only dirty rect collector for this visual manager*/
 	GF_RectArray to_redraw;
-#ifdef TRACK_OPAQUE_REGIONS
 	u32 draw_node_index;
-#endif
 
 	/*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*/
@@ -111,7 +108,7 @@
 	/*top clipper (may be different than surf_rect when a viewport is active)*/
 	GF_IRect top_clipper;
 
-	Bool last_had_back;
+	u32 last_had_back;
 
 	/*signals that the hardware surface is attached to buffer/device/stencil*/
 	Bool is_attached;
@@ -155,7 +152,7 @@
 	 *	Visual Manager part for 3D drawing 
 	 */
 
-#if defined( _LP64 ) && defined(CONFIG_DARWIN_GL)
+#if defined( _LP64 ) && 0 && defined(CONFIG_DARWIN_GL)
 #define GF_SHADERID u64
 #else
 #define GF_SHADERID u32
@@ -181,16 +178,28 @@
 	u32 num_clips;
 	u32 max_clips;
 
+	//when using 2D layering in opengl, we store the bounding rect of drawn objects betwwen GL calls, so we
+	//can flush only the minimum part of the texture
+	GF_RectArray hybgl_drawn;
+	u32 nb_objects_on_canvas_since_last_ogl_flush;
 
 	u32 nb_views, current_view, autostereo_type, camera_layout;
 	Bool reverse_views;
 
+	GF_SHADERID base_glsl_vertex;
+
 	u32 *gl_textures;
 	u32 auto_stereo_width, auto_stereo_height;
 	GF_Mesh *autostereo_mesh;
-	GF_SHADERID glsl_program;
-	GF_SHADERID glsl_vertex;
-	GF_SHADERID glsl_fragment;
+	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;
 #endif
 
 #ifdef GF_SR_USE_DEPTH

gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_2d.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_2d.c Changed

@@ -315,8 +315,10 @@
 			}
 			ctx->bi->unclip = gf_rect_ft(&ctx->bi->clip);
 			tr_state->traversing_mode = TRAVERSE_BINDABLE;
+			ctx->flags |= CTX_BACKROUND_NOT_LAYER;
 			gf_node_traverse((GF_Node *) bck, tr_state);
 			tr_state->traversing_mode = TRAVERSE_SORT;
+			ctx->flags &= ~CTX_BACKROUND_NOT_LAYER;
 		} else {
 			visual->ClearSurface(visual, NULL, 0);
 		}
@@ -372,8 +374,8 @@
 	assert(rc->width && rc->height);
 
 	for (i=0; i<ra->count; i++) { 
-		if (gf_irect_overlaps(&ra->list[i], rc)) { 
-			gf_irect_union(&ra->list[i], rc); 
+		if (gf_irect_overlaps(&ra->list[i].rect, rc)) { 
+			gf_irect_union(&ra->list[i].rect, rc); 
 			return; 
 		} 
 	}
@@ -406,14 +408,14 @@
 	u32 i, j, k;
 	for (i=0; i<ra->count; i++) {
 		for (j=i+1; j<ra->count; j++) {
-			switch (gf_irect_relation(&ra->list[j], &ra->list[i])) {
+			switch (gf_irect_relation(&ra->list[j].rect, &ra->list[i].rect)) {
 
 			/*both rectangles overlap, merge them and remove opaque node info*/
 			case 1:
-				gf_irect_union(&ra->list[i], &ra->list[j]);
+				gf_irect_union(&ra->list[i].rect, &ra->list[j].rect);
 #ifdef TRACK_OPAQUE_REGIONS
 				/*current dirty rect is no longer opaque*/
-				ra->opaque_node_index[i] = 0;
+				ra->list[i].opaque_node_index = 0;
 #endif
 				/*FALLTHROUGH*/
 			/*first rectangle covers second, just remove*/
@@ -422,9 +424,6 @@
 				k = ra->count - j - 1;
 				if (k) {
 					memmove(&ra->list[j], & ra->list[j+1], sizeof(GF_IRect)*k);
-#ifdef TRACK_OPAQUE_REGIONS
-					memmove(&ra->opaque_node_index[j], & ra->opaque_node_index[j+1], sizeof(u32)*k);
-#endif
 				}
 				ra->count--; 
 				if (ra->count>=2)
@@ -437,7 +436,7 @@
 	}
 }
 
-static Bool register_context_rect(GF_RectArray *ra, DrawableContext *ctx, u32 ctx_idx, DrawableContext **first_opaque)
+static u32 register_context_rect(GF_RectArray *ra, DrawableContext *ctx, u32 ctx_idx, DrawableContext **first_opaque)
 {
 	u32 i;
 	Bool needs_redraw;
@@ -450,7 +449,13 @@
 	/*node is modified*/
 	needs_redraw = (ctx->flags & CTX_REDRAW_MASK) ? 1 : 0;
 
-	/*node is transparent*/
+#ifndef GPAC_DISABLE_3D
+	if (ctx->flags & CTX_HYBOGL_NO_CLEAR) {
+		return 2;
+	}
+#endif
+
+	/*node is not transparent*/
 	if ((ctx->flags & CTX_NO_ANTIALIAS) && !(ctx->flags & CTX_IS_TRANSPARENT) ) {
 #ifdef TRACK_OPAQUE_REGIONS
 		is_transparent = 0;
@@ -460,31 +465,30 @@
 
 	for (i=0; i<ra->count; i++) { 
 		if (needs_redraw) {
-			switch (gf_irect_relation(&ra->list[i], 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], rc); 
+				gf_irect_union(&ra->list[i].rect, rc); 
 #ifdef TRACK_OPAQUE_REGIONS
-				ra->opaque_node_index[i]= 0; 
+				ra->list[i].opaque_node_index = 0; 
 #endif
-				return needs_redraw; 
+				return 1; 
 			/*context covers an existing rectangle, replace rect and add opaque idx info*/
 			case 2:
-				ra->list[i]= *rc; 
+				ra->list[i].rect= *rc; 
 #ifdef TRACK_OPAQUE_REGIONS
-				ra->opaque_node_index[i]= is_transparent ? 0 : ctx_idx; 
+				ra->list[i].opaque_node_index = is_transparent ? 0 : ctx_idx; 
 #endif
-				return needs_redraw; 
+				return 1; 
 			}
 		}
 #ifdef TRACK_OPAQUE_REGIONS
 		/*context unchanged coverring an entire area*/
-		else if (!is_transparent && gf_irect_inside(rc, &ra->list[i])) {
+		else if (!is_transparent && gf_irect_inside(rc, &ra->list[i].rect)) {
 			/*remove rect*/
 			u32 k = ra->count - i - 1;
 			if (k) {
-				memmove(&ra->list[i], & ra->list[i+1], sizeof(GF_IRect)*k);
-				memmove(&ra->opaque_node_index[i], & ra->opaque_node_index[i+1], sizeof(u32)*k);
+				memmove(&ra->list[i], & ra->list[i+1], sizeof(GF_RectArrayEntry)*k);
 			}
 			ra->count--; 
 			i--;
@@ -495,13 +499,10 @@
 	if (needs_redraw) {
 		ra_add(ra, rc); 
 #ifdef TRACK_OPAQUE_REGIONS
-		if (!ra->opaque_node_index)
-			ra->opaque_node_index = gf_malloc(sizeof(u32)*ra->alloc);
-
-		ra->opaque_node_index[ra->count-1] = is_transparent ? 0 : ctx_idx; 
+		ra->list[ra->count-1].opaque_node_index = is_transparent ? 0 : ctx_idx; 
 #endif
 	}
-	return needs_redraw;
+	return 1;
 }
 
 
@@ -513,11 +514,11 @@
 #ifdef TRACK_OPAQUE_REGIONS
 	u32 i;
 	for (i=0; i<ra->count; i++) { 
-		switch (gf_irect_relation(rc, &ra->list[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], rc); 
-			ra->opaque_node_index[i]= 0; 
+			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:
@@ -528,10 +529,7 @@
 	/*not found, add rect*/
 	ra_add(ra, rc); 
 #ifdef TRACK_OPAQUE_REGIONS
-	if (!ra->opaque_node_index)
-		ra->opaque_node_index = gf_malloc(sizeof(u32)*ra->alloc);
-
-	ra->opaque_node_index[ra->count-1] = 0; 
+	ra->list[ra->count-1].opaque_node_index = 0; 
 #endif
 
 #else
@@ -539,10 +537,7 @@
 	ra_add(ra, rc); 
 
 #ifdef TRACK_OPAQUE_REGIONS
-	if (!ra->opaque_node_index)
-		ra->opaque_node_index = gf_malloc(sizeof(u32)*ra->alloc);
-
-	ra->opaque_node_index[ra->count-1] = 0; 
+	ra->list[ra->count-1].opaque_node_index = 0; 
 #endif
 
 #endif
@@ -554,6 +549,7 @@
 	u32 k, i, count, num_nodes, num_changed;
 	GF_IRect refreshRect;
 	Bool redraw_all;
+	Bool hyb_force_redraw=GF_FALSE;
 #ifndef GPAC_DISABLE_VRML
 	M_Background2D *bck = NULL;
 	DrawableContext *bck_ctx = NULL;
@@ -563,6 +559,7 @@
 	DrawableContext *first_opaque = NULL;
 	Bool has_clear = 0;
 	Bool has_changed = 0;
+	Bool redraw_all_on_background_change = GF_TRUE;
 
 	/*in direct mode the visual is always redrawn*/
 	if (tr_state->immediate_draw) {
@@ -576,28 +573,37 @@
 	}
 
 	num_changed = 0;
-	
+
 	/*if the aspect ratio has changed redraw everything*/
 	redraw_all = tr_state->invalidate_all;
 
+#ifndef GPAC_DISABLE_3D
+	if (visual->compositor->hybrid_opengl && !visual->offscreen) redraw_all_on_background_change = GF_FALSE;
+#endif
 	/*check for background changes for transparent nodes*/
 #ifndef GPAC_DISABLE_VRML
 	bck = (M_Background2D*)gf_list_get(visual->back_stack, 0);
 	if (bck) {
 		if (!bck->isBound) {
-			if (visual->last_had_back) redraw_all = 1;
+			if (visual->last_had_back) {
+				if (redraw_all_on_background_change) redraw_all = 1;
+				else hyb_force_redraw = 1;
+			}
 			visual->last_had_back = 0;
 		} else {
-			if (!visual->last_had_back) redraw_all = 1;
 			bck_ctx = b2d_get_context(bck, visual->back_stack);
-			if (bck_ctx->flags & CTX_REDRAW_MASK) redraw_all = 1;
+			if (!visual->last_had_back || (bck_ctx->flags & CTX_REDRAW_MASK) ) {
+				if (redraw_all_on_background_change) redraw_all = 1;
+				else hyb_force_redraw = 1;
+			}
 			visual->last_had_back = (bck_ctx->aspect.fill_texture && !bck_ctx->aspect.fill_texture->transparent) ? 2 : 1;
 		}
 	} else 
 #endif
 	if (visual->last_had_back) {
 		visual->last_had_back = 0;
-		redraw_all = 1;
+		if (redraw_all_on_background_change) redraw_all = 1;
+		else hyb_force_redraw = 1;
 	}
 	
 	num_nodes = 0;
@@ -607,9 +613,13 @@
 
 		drawctx_update_info(ctx, visual);
 		if (!redraw_all) {
+			u32 res;
 			assert( gf_irect_inside(&visual->top_clipper, &ctx->bi->clip) );
-			if (register_context_rect(&visual->to_redraw, ctx, num_nodes, &first_opaque)) {
+			res = register_context_rect(&visual->to_redraw, ctx, num_nodes, &first_opaque);
+			if (res) {
 				num_changed ++;
+				if (res==2)
+					hyb_force_redraw=GF_TRUE;
 			}
 
 		}
@@ -658,8 +668,7 @@
 		ra_clear(&visual->to_redraw);
 		ra_add(&visual->to_redraw, &visual->surf_rect);
 #ifdef TRACK_OPAQUE_REGIONS
-		if (!visual->to_redraw.opaque_node_index) visual->to_redraw.opaque_node_index = gf_malloc(sizeof(u32)*visual->to_redraw.alloc);
-		visual->to_redraw.opaque_node_index[0]=0;
+		visual->to_redraw.list[0].opaque_node_index=0;
 #endif
 	} else {
 		ra_refresh(&visual->to_redraw);
@@ -668,19 +677,20 @@
 			visual->ClearSurface(visual, &visual->top_clipper, 0);
 		}
 	}
-#ifdef TRACK_OPAQUE_REGIONS
-	assert(!visual->to_redraw.count || (visual->to_redraw.opaque_node_index != NULL));
-#endif
-	
+
 	/*nothing to redraw*/
-	if (ra_is_empty(&visual->to_redraw) ) {
+	if (!hyb_force_redraw && ra_is_empty(&visual->to_redraw) ) {
+#ifndef GPAC_DISABLE_3D
+		//force canvas draw
+		visual->nb_objects_on_canvas_since_last_ogl_flush = 1;
+#endif
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] No changes found since last frame - skipping redraw\n"));
 		goto exit;
 	}
 	has_changed = 1;
 	tr_state->traversing_mode = TRAVERSE_DRAW_2D;
 
-	if (first_opaque && (visual->to_redraw.count==1) && gf_rect_equal(first_opaque->bi->clip, visual->to_redraw.list[0])) {
+	if (first_opaque && (visual->to_redraw.count==1) && gf_rect_equal(first_opaque->bi->clip, visual->to_redraw.list[0].rect)) {
 		visual->has_modif=0;
 		goto skip_background;
 	}
@@ -690,9 +700,8 @@
 	if (bck_ctx) {
 		drawable_check_bounds(bck_ctx, visual);
 		tr_state->ctx = bck_ctx;
-#ifdef TRACK_OPAQUE_REGIONS
 		visual->draw_node_index = 0;
-#endif
+
 		/*force clearing entire zone, not just viewport, when using color. If texture, we MUST
 		use the VP clipper in order to compute offsets when blitting bitmaps*/
 		if (bck_ctx->aspect.fill_texture && bck_ctx->aspect.fill_texture->stream) {
@@ -702,7 +711,9 @@
 		}
 		bck_ctx->bi->unclip = gf_rect_ft(&bck_ctx->bi->clip);
 		bck_ctx->next = visual->context;
+		bck_ctx->flags |= CTX_BACKROUND_NOT_LAYER;
 		gf_node_traverse(bck_ctx->drawable->node, tr_state);
+		bck_ctx->flags &= ~CTX_BACKROUND_NOT_LAYER;
 	} else 
 #endif /*GPAC_DISABLE_VRML*/
 	{
@@ -711,11 +722,14 @@
 			GF_IRect rc;
 			/*opaque area, skip*/
 #ifdef TRACK_OPAQUE_REGIONS
-			if (visual->to_redraw.opaque_node_index[k] > 0) continue;
+			if (visual->to_redraw.list[k].opaque_node_index > 0) continue;
 #endif
-			rc = visual->to_redraw.list[k];
+			rc = visual->to_redraw.list[k].rect;
 			visual->ClearSurface(visual, &rc, 0);
 		}
+		if (!count && hyb_force_redraw) {
+			visual->ClearSurface(visual, NULL, 0);
+		}
 	}
 	if (!redraw_all && !has_clear) visual->has_modif=0;
 
@@ -727,22 +741,18 @@
 		if (visual->to_redraw.count>1) GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("\n"));
 
 		for (i=0; i<visual->to_redraw.count; i++) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("\tDirtyRect #%d: %d:%d@%dx%d\n", i+1, visual->to_redraw.list[i].x, visual->to_redraw.list[i].y, visual->to_redraw.list[i].width, visual->to_redraw.list[i].height));
-			assert(visual->to_redraw.list[i].width);
+			GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("\tDirtyRect #%d: %d:%d@%dx%d\n", i+1, visual->to_redraw.list[i].rect.x, visual->to_redraw.list[i].rect.y, visual->to_redraw.list[i].rect.width, visual->to_redraw.list[i].rect.height));
+			assert(visual->to_redraw.list[i].rect.width);
 		}
 	}
 #endif
 	
-#ifdef TRACK_OPAQUE_REGIONS
 	visual->draw_node_index = 0;
-#endif
 
 	ctx = visual->context;
 	while (ctx && ctx->drawable) {
 
-#ifdef TRACK_OPAQUE_REGIONS
 		visual->draw_node_index ++;
-#endif
 		tr_state->ctx = ctx;
 
 		/*if overlay we cannot remove the context and cannot draw directly*/
@@ -764,10 +774,15 @@
 
 	if (visual->direct_flush) {
 		GF_DirtyRectangles dr;
+		u32 i;
 		dr.count = visual->to_redraw.count;
-		dr.list = visual->to_redraw.list;
+		dr.list = gf_malloc(sizeof(GF_IRect)*dr.count);
+		for (i=0; i<dr.count; i++) {
+			dr.list[i] = visual->to_redraw.list[i].rect;
+		}
 		visual->compositor->video_out->FlushRectangles(visual->compositor->video_out, &dr);
 		visual->compositor->skip_flush=1;
+		gf_free(dr.list);
 	}
 
 exit:
@@ -784,6 +799,7 @@
 	GF_SceneGraph *sg;
 	GF_Matrix2D backup;
 	u32 i;
+	Bool res;
 	GF_Err e;
 #ifndef GPAC_DISABLE_LOG
 	u32 itime, time = gf_sys_clock();
@@ -825,7 +841,7 @@
 #endif
 
 	gf_mx2d_copy(tr_state->transform, backup);
-	e = visual_2d_terminate_draw(visual, tr_state);
+	res = visual_2d_terminate_draw(visual, tr_state);
 	
 #ifndef GPAC_DISABLE_LOG
 	if (!tr_state->immediate_draw) {
@@ -833,7 +849,7 @@
 	}
 #endif
 
-	return e;
+	return res;
 }

gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_2d.h -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_2d.h Changed

@@ -36,7 +36,6 @@
 /*@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 TRACK_OPAQUE_REGIONS
 
 /*ra_: rectangle array macros to speed dirty rects*/
@@ -44,44 +43,31 @@
 
 typedef struct
 {	
-	GF_IRect *list;
-	u32 count, alloc;
+	GF_IRect rect;
 #ifdef TRACK_OPAQUE_REGIONS
 	/*list of nodes covering (no transparency) each rect, or 0 otherwise.*/
-	u32 *opaque_node_index;
+	u32 opaque_node_index;
 #endif
-} GF_RectArray;
+} GF_RectArrayEntry;
 
-#ifdef TRACK_OPAQUE_REGIONS
-/*inits structure - called as a constructor*/
-#define ra_init(ra) { (ra)->count = 0; (ra)->alloc = RA_DEFAULT_STEP; (ra)->list = (GF_IRect*)gf_malloc(sizeof(GF_IRect)*(ra)->alloc); (ra)->opaque_node_index = NULL;}
-/*deletes structure - called as a destructor*/
-#define ra_del(ra) { gf_free((ra)->list); if ((ra)->opaque_node_index) { gf_free((ra)->opaque_node_index); (ra)->opaque_node_index = NULL; } }
-
-
-/*adds rect to list - expand if needed*/
-#define ra_add(ra, rc) {	\
-	if ((ra)->count==(ra)->alloc) { \
-		(ra)->alloc += RA_DEFAULT_STEP; \
-		(ra)->list = (GF_IRect*)gf_realloc((ra)->list, sizeof(GF_IRect) * (ra)->alloc); \
-		if ( (ra)->opaque_node_index) (ra)->opaque_node_index = (u32*)gf_realloc((ra)->opaque_node_index, sizeof(u32) * (ra)->alloc); \
-	}	\
-	(ra)->list[(ra)->count] = *rc; (ra)->count++;	}
+typedef struct
+{	
+	GF_RectArrayEntry *list;
+	u32 count, alloc;
+} GF_RectArray;
 
-#else
-#define ra_init(ra) { (ra)->count = 0; (ra)->alloc = RA_DEFAULT_STEP; (ra)->list = (GF_IRect*)gf_malloc(sizeof(GF_IRect)*(ra)->alloc);}
+#define ra_init(ra) { (ra)->count = 0; (ra)->alloc = RA_DEFAULT_STEP; (ra)->list = (GF_RectArrayEntry*)gf_malloc(sizeof(GF_RectArrayEntry)*(ra)->alloc); }
 /*deletes structure - called as a destructor*/
-#define ra_del(ra) { gf_free((ra)->list); }
+#define ra_del(ra) { if ((ra)->list) { gf_free((ra)->list); (ra)->list = NULL; } }
 
 
 /*adds rect to list - expand if needed*/
 #define ra_add(ra, rc) {	\
 	if ((ra)->count==(ra)->alloc) { \
 		(ra)->alloc += RA_DEFAULT_STEP; \
-		(ra)->list = (GF_IRect*)gf_realloc((ra)->list, sizeof(GF_IRect) * (ra)->alloc); \
+		(ra)->list = (GF_RectArrayEntry*)gf_realloc((ra)->list, sizeof(GF_RectArrayEntry) * (ra)->alloc); \
 	}	\
-	(ra)->list[(ra)->count] = *rc; (ra)->count++;	}
-#endif
+	(ra)->list[(ra)->count].rect = *rc; (ra)->count++;	}
 
 
 /*adds rectangle to the list performing union test*/
@@ -136,7 +122,7 @@
 
 /*extended version of above function to override texture transforms - needed for proper texturing of glyphs*/
 void visual_2d_texture_path_extended(GF_VisualManager *visual, GF_Path *path, GF_TextureHandler *txh, struct _drawable_context *ctx, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, GF_TraverseState *tr_state);
-void visual_2d_draw_path_extended(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx);
+void visual_2d_draw_path_extended(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, Bool is_erase);
 
 
 /*video overlay context*/

gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_2d_draw.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_2d_draw.c Changed

@@ -91,8 +91,9 @@
 	gf_path_del(cliper);
 }
 
-static void visual_2d_fill_path(GF_VisualManager *visual, DrawableContext *ctx, GF_STENCIL stencil, GF_TraverseState *tr_state)
+static void visual_2d_fill_path(GF_VisualManager *visual, DrawableContext *ctx, GF_STENCIL stencil, GF_TraverseState *tr_state, Bool is_erase)
 {
+	Bool has_modif = GF_FALSE;
 	GF_IRect clip;
 	GF_Raster2D *raster = visual->compositor->rasterizer;
 
@@ -108,7 +109,7 @@
 				raster->surface_clear(visual->raster_surface, &ctx->bi->clip, 0);
 			}
 
-			visual->has_modif = 1;
+			has_modif = GF_TRUE;
 		}
 	} 
 	/*indirect drawing, draw path in all dirty areas*/
@@ -117,10 +118,10 @@
 		for (i=0; i<visual->to_redraw.count; i++) {
 			/*there's an opaque region above, don't draw*/
 #ifdef TRACK_OPAQUE_REGIONS
-			if (visual->draw_node_index<visual->to_redraw.opaque_node_index[i]) continue;
+			if (!is_erase && (visual->draw_node_index<visual->to_redraw.list[i].opaque_node_index)) continue;
 #endif
 			clip = ctx->bi->clip;
-			gf_irect_intersect(&clip, &visual->to_redraw.list[i]);
+			gf_irect_intersect(&clip, &visual->to_redraw.list[i].rect);
 			if (clip.width && clip.height) {
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual2D] Redrawing node %s[%s] (indirect draw @ dirty rect idx %d)\n", gf_node_get_log_name(ctx->drawable->node), gf_node_get_class_name(ctx->drawable->node), i));
 				if (stencil) {
@@ -129,10 +130,21 @@
 				} else {
 					raster->surface_clear(visual->raster_surface, &clip, 0);
 				}
-				visual->has_modif = 1;
+				has_modif = 1;
 			}
 		}
 	}
+#ifndef GPAC_DISABLE_3D
+	if (!is_erase)
+		visual->nb_objects_on_canvas_since_last_ogl_flush++;
+#endif
+	if (has_modif) {
+		visual->has_modif = 1;
+#ifndef GPAC_DISABLE_3D
+		if (!visual->offscreen && visual->compositor->hybrid_opengl && !is_erase) 
+			ra_union_rect(&visual->hybgl_drawn, &ctx->bi->clip);
+#endif
+	}
 }
 
 static void visual_2d_set_options(GF_Compositor *compositor, GF_SURFACE rend, Bool forText, Bool no_antialias)
@@ -260,7 +272,7 @@
 	txh->flags |= GF_SR_TEXTURE_USED;
 
 	raster->surface_set_path(visual->raster_surface, path);
-	visual_2d_fill_path(visual, ctx, stencil, tr_state);
+	visual_2d_fill_path(visual, ctx, stencil, tr_state, 0);
 	raster->surface_set_path(visual->raster_surface, NULL);
 
 	ctx->flags |= CTX_PATH_FILLED;
@@ -330,11 +342,105 @@
 	/*push path*/
 	raster->surface_set_path(visual->raster_surface, path);
 
-	visual_2d_fill_path(visual, txt_ctx, stencil, tr_state);
+	visual_2d_fill_path(visual, txt_ctx, stencil, tr_state, 0);
 	raster->surface_set_path(visual->raster_surface, NULL);
 	txt_ctx->flags |= CTX_PATH_FILLED;
 }
 
+
+#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;
+	u32 prev_mode = tr_state->traversing_mode;
+	u32 prev_type_3d = tr_state->visual->type_3d;
+
+	//we have drawn things on the canvas before this object
+	if (visual->hybgl_drawn.count) {
+		Bool line_texture = GF_FALSE;
+		u32 i;
+		u32 prev_color;
+		Bool transparent, had_flush = 0;
+		u32 nb_obj_left_on_canvas = visual->nb_objects_on_canvas_since_last_ogl_flush;
+		u8 alpha;
+
+		if (txh==ctx->aspect.line_texture) {
+			line_texture = GF_TRUE;
+			alpha = GF_COL_A(ctx->aspect.line_color);
+			prev_color = ctx->aspect.line_color;
+			ctx->aspect.line_texture = NULL;
+			ctx->aspect.line_color = 0;
+		} else {
+			alpha = GF_COL_A(ctx->aspect.fill_color);
+			if (!alpha) alpha = GF_COL_A(ctx->aspect.line_color);
+			prev_color = ctx->aspect.fill_color;
+			ctx->aspect.fill_texture = NULL;
+			ctx->aspect.fill_color = 0;
+		}
+		transparent = txh->transparent || (alpha!=0xFF);
+
+		//clear wherever we have overlap
+		for (i=0; i<visual->hybgl_drawn.count; i++) {
+			GF_IRect rc = ctx->bi->clip;
+			gf_irect_intersect(&ctx->bi->clip, &visual->hybgl_drawn.list[i].rect);
+			if (ctx->bi->clip.width && ctx->bi->clip.height) {
+				//if something behind this, flush canvas to gpu
+				if (transparent) {
+					if (!had_flush) {
+						//flush the complete area below this object, regardless of intersections
+						compositor_2d_hybgl_flush_video(visual->compositor, tr_state->immediate_draw ? NULL : &rc);
+						had_flush = 1;
+					}
+					//if object was not completely in the flush region we will need to flush the canvas
+					if (gf_irect_inside(&rc, &visual->hybgl_drawn.list[i].rect)) {
+						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) {
+					}
+				}
+			}
+			ctx->bi->clip = rc;
+		}
+		if (line_texture) {
+			ctx->aspect.line_color = prev_color;
+			ctx->aspect.line_texture = txh;
+		} else {
+			ctx->aspect.fill_color = prev_color;
+			ctx->aspect.fill_texture = txh;
+		}
+
+		if (had_flush) {
+			visual->nb_objects_on_canvas_since_last_ogl_flush = nb_obj_left_on_canvas;
+		}
+	}
+
+	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);
+
+	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_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;
+}
+#endif
+
+
 void visual_2d_texture_path_extended(GF_VisualManager *visual, GF_Path *path, GF_TextureHandler *txh, struct _drawable_context *ctx, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, GF_TraverseState *tr_state)
 {
 	Fixed sS, sT;
@@ -362,9 +468,17 @@
 		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);
+		return;
+	}
+#endif
+
 	if (txh->flags & GF_SR_TEXTURE_PRIVATE_MEDIA) {
 		GF_Window src, dst;
-		visual_2d_fill_path(visual, ctx, NULL, tr_state);
+		visual_2d_fill_path(visual, ctx, NULL, tr_state, 0);
 
 		/*if texture not ready, update the size before computing output rectangles */
 		if (!txh->width || !txh->height) {
@@ -450,7 +564,7 @@
 
 	/*push path & draw*/
 	raster->surface_set_path(visual->raster_surface, path);
-	visual_2d_fill_path(visual, ctx, tx_raster, tr_state);
+	visual_2d_fill_path(visual, ctx, tx_raster, tr_state, 0);
 	raster->surface_set_path(visual->raster_surface, NULL);
 
 
@@ -480,7 +594,7 @@
 #define ADAPTATION_SIZE		0
 
 
-void visual_2d_draw_path_extended(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx)
+void visual_2d_draw_path_extended(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state, GF_Rect *orig_bounds, GF_Matrix2D *ext_mx, Bool is_erase)
 {
 	Bool dofill, dostrike;
 	GF_Raster2D *raster = visual->compositor->rasterizer;
@@ -498,7 +612,7 @@
 		visual_2d_set_options(visual->compositor, visual->raster_surface, ctx->flags & CTX_IS_TEXT, ctx->flags & CTX_NO_ANTIALIAS);
 
 	dofill = dostrike = 0;
-	if (!(ctx->flags & CTX_PATH_FILLED) && GF_COL_A(ctx->aspect.fill_color) ) {
+	if (!(ctx->flags & CTX_PATH_FILLED) && (is_erase || GF_COL_A(ctx->aspect.fill_color)) ) {
 		dofill = 1;
 		if (!brush) {
 			brush = visual->raster_brush;
@@ -527,7 +641,7 @@
 		{
 			/*push path*/
 			raster->surface_set_path(visual->raster_surface, path);
-			visual_2d_fill_path(visual, ctx, brush, tr_state);
+			visual_2d_fill_path(visual, ctx, brush, tr_state, is_erase);
 			raster->surface_set_path(visual->raster_surface, NULL);
 		}
 	}
@@ -551,7 +665,7 @@
 					visual_2d_texture_path_extended(visual, si->outline, ctx->aspect.line_texture, ctx, orig_bounds, ext_mx, tr_state);
 				} else {
 					raster->surface_set_path(visual->raster_surface, si->outline);
-					visual_2d_fill_path(visual, ctx, pen, tr_state);
+					visual_2d_fill_path(visual, ctx, pen, tr_state, 0);
 				}
 				/*that's ugly, but we cannot cache path outline for IFS2D/ILS2D*/
 				if (path && !(ctx->flags & CTX_IS_TEXT) && (path!=ctx->drawable->path) ) {
@@ -568,7 +682,7 @@
 
 void visual_2d_draw_path(GF_VisualManager *visual, GF_Path *path, DrawableContext *ctx, GF_STENCIL brush, GF_STENCIL pen, GF_TraverseState *tr_state)
 {
-	visual_2d_draw_path_extended(visual, path, ctx, brush, pen, tr_state, NULL, NULL);
+	visual_2d_draw_path_extended(visual, path, ctx, brush, pen, tr_state, NULL, NULL, GF_FALSE);
 }
 
 void visual_2d_fill_rect(GF_VisualManager *visual, DrawableContext *ctx, GF_Rect *_rc, u32 color, u32 strike_color, GF_TraverseState *tr_state)
@@ -611,7 +725,7 @@
 		/*push path*/
 		raster->surface_set_path(visual->raster_surface, path);
 		raster->stencil_set_brush_color(visual->raster_brush, color);
-		visual_2d_fill_path(visual, ctx, visual->raster_brush, tr_state);
+		visual_2d_fill_path(visual, ctx, visual->raster_brush, tr_state, 0);
 		raster->surface_set_path(visual->raster_surface, NULL);
 	}
 	if (strike_color) {
@@ -625,7 +739,7 @@
 		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);
+		visual_2d_fill_path(visual, ctx, visual->raster_brush, tr_state, 0);
 		raster->surface_set_path(visual->raster_surface, NULL);
 		gf_path_del(outline);
 	}
@@ -688,6 +802,9 @@
 		raster->surface_set_path(visual->raster_surface, NULL);
 		gf_path_del(outline);
 	}
-
 	gf_path_del(path);
+#ifndef GPAC_DISABLE_3D
+	if (!visual->offscreen && visual->compositor->hybrid_opengl)
+		ra_union_rect(&visual->hybgl_drawn, rc);
+#endif
 }

gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_3d.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_3d.c Changed

@@ -314,7 +314,7 @@
 	} else 
 #endif
 	if (tr_state->camera->had_viewpoint) {
-		Bool had_vp = 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;
@@ -865,6 +865,10 @@
 			visual_3d_init_autostereo(visual);
 			auto_stereo = 1;
 		}
+
+#ifndef GPAC_USE_OGL_ES
+		visual_3d_init_yuv_shader(visual);
+#endif
 		
 		for (visual->current_view=0; visual->current_view < visual->nb_views; visual->current_view++) {
 			GF_SceneGraph *sg;
@@ -1488,6 +1492,14 @@
 void visual_3d_set_2d_strike(GF_TraverseState *tr_state, DrawAspect2D *asp)
 {
 	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) 
+		) {
+			txtrans = ((M_XLineProperties *) ((M_Material2D *) ((M_Appearance *)tr_state->appear)->material)->lineProps)->textureTransform;
+		}
+
 		/*We forgot to specify this in the spec ...*/
 		gf_sc_texture_set_blend_mode(asp->line_texture, TX_REPLACE);
 #if 0
@@ -1499,7 +1511,7 @@
 			gf_sc_texture_set_blend_mode(asp->txh, TX_REPLACE);
 		}
 #endif
-		tr_state->mesh_num_textures = gf_sc_texture_enable(asp->line_texture, NULL/*asp->tx_trans*/);
+		tr_state->mesh_num_textures = gf_sc_texture_enable(asp->line_texture, txtrans);
 		if (tr_state->mesh_num_textures) return;
 	}
 	/*no texture or not ready, use color*/
@@ -1530,6 +1542,8 @@
 		}
 	}
 
+	if ((tr_state->visual->type_3d == 4) && !asp->line_texture) return;
+
 	/*strike path*/
 	if (!asp->pen_props.width || !GF_COL_A(asp->line_color)) return;
 
@@ -1537,7 +1551,7 @@
 	if (!si) return;
 
 	if (!si->mesh_outline) {
-		si->is_vectorial = !tr_state->visual->compositor->raster_outlines;
+		si->is_vectorial = asp->line_texture ? GF_TRUE : !tr_state->visual->compositor->raster_outlines;
 		si->mesh_outline = new_mesh();
 #ifdef GPAC_HAS_GLU
 		if (si->is_vectorial) {

gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_3d.h -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_3d.h Changed

gpac-0.5.0.svn4668.tar.bz2/src/compositor/visual_manager_3d_gl.c -> gpac-0.5.0.svn5178.tar.bz2/src/compositor/visual_manager_3d_gl.c Changed

@@ -92,6 +92,8 @@
 GLDECL_STATIC(glBindBuffer);
 GLDECL_STATIC(glBufferData);
 GLDECL_STATIC(glBufferSubData);
+GLDECL_STATIC(glMapBuffer);
+GLDECL_STATIC(glUnmapBuffer);
 #endif //LOAD_GL_1_5
 
 #ifdef LOAD_GL_2_0
@@ -140,16 +142,14 @@
 
 void gf_sc_load_opengl_extensions(GF_Compositor *compositor, Bool has_gl_context)
 {
-	Bool has_shaders = 0;
 #ifdef GPAC_USE_TINYGL
 	/*let TGL handle texturing*/
 	compositor->gl_caps.rect_texture = 1;
 	compositor->gl_caps.npot_texture = 1;
 #else
-
 	const char *ext = NULL;
 
-	if (compositor->visual->type_3d) 
+	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");
@@ -190,7 +190,8 @@
 
 	if (!has_gl_context) return;
 
-	/*we have a GL context, get proc addresses*/
+	/*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")) {
@@ -199,7 +200,7 @@
 	}
 	GET_GLFUN(glBlendEquation);
 #endif
-
+	
 #ifdef LOAD_GL_1_4
 	if (compositor->gl_caps.point_sprite) {
 		GET_GLFUN(glPointParameterf);
@@ -215,10 +216,17 @@
 		GET_GLFUN(glBufferData);
 		GET_GLFUN(glBufferSubData);
 	}
+	if (CHECK_GL_EXT("GL_ARB_pixel_buffer_object")) {
+		GET_GLFUN(glMapBuffer);
+		GET_GLFUN(glUnmapBuffer);
+		
+		compositor->gl_caps.pbo=1;
+	}
 #endif
 
 
 
+
 #ifdef LOAD_GL_2_0
 	GET_GLFUN(glCreateProgram);
 	
@@ -261,7 +269,7 @@
 		GET_GLFUN(glUniformMatrix3x4fv);
 		GET_GLFUN(glUniformMatrix4x3fv);
 
-		has_shaders = 1;
+		compositor->gl_caps.has_shaders = 1;
 	} else {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] OpenGL shaders not supported\n"));
 	}
@@ -270,10 +278,10 @@
 #endif //GPAC_USE_TINYGL
 
 #ifdef GL_VERSION_2_0
-	has_shaders = 1;
+	compositor->gl_caps.has_shaders = 1;
 #endif
 
-	if (!has_shaders && (compositor->visual->autostereo_type > GF_3D_STEREO_SIDE)) {
+	if (!compositor->gl_caps.has_shaders && (compositor->visual->autostereo_type > GF_3D_STEREO_SIDE)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] OpenGL shaders not supported - disabling auto-stereo output\n"));
 		compositor->visual->nb_views=1;
 		compositor->visual->autostereo_type = GF_3D_STEREO_NONE;
@@ -285,21 +293,24 @@
 #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_Position = gl_ModelViewProjectionMatrix * gl_Vertex;\
-		gl_TexCoord[0] = gl_MultiTexCoord0;\
+		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);\
@@ -317,10 +328,11 @@
 static char *glsl_view_anaglyph = "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
+	varying vec2 TexCoord;\
 	void main(void)  \
 	{\
-		vec4 col1 = texture2D(gfView1, gl_TexCoord[0].st); \
-		vec4 col2 = texture2D(gfView2, gl_TexCoord[0].st); \
+		vec4 col1 = texture2D(gfView1, TexCoord.st); \
+		vec4 col2 = texture2D(gfView2, TexCoord.st); \
 		gl_FragColor.r = col1.r;\
 		gl_FragColor.g = col2.g;\
 		gl_FragColor.b = col2.b;\
@@ -330,10 +342,11 @@
 static char *glsl_view_anaglyph_optimize = "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
+	varying vec2 TexCoord;\
 	void main(void)  \
 	{\
-		vec4 col1 = texture2D(gfView1, gl_TexCoord[0].st); \
-		vec4 col2 = texture2D(gfView2, gl_TexCoord[0].st); \
+		vec4 col1 = texture2D(gfView1, TexCoord.st); \
+		vec4 col2 = texture2D(gfView2, TexCoord.st); \
 		gl_FragColor.r = 0.7*col1.g + 0.3*col1.b;\
 		gl_FragColor.r = pow(gl_FragColor.r, 1.5);\
 		gl_FragColor.g = col2.g;\
@@ -344,23 +357,25 @@
 static char *glsl_view_columns = "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
+	varying vec2 TexCoord;\
 	void main(void)  \
 	{\
 		if ( int( mod(gl_FragCoord.x, 2.0) ) == 0) \
-			gl_FragColor = texture2D(gfView1, gl_TexCoord[0].st); \
+			gl_FragColor = texture2D(gfView1, TexCoord.st); \
 		else \
-			gl_FragColor = texture2D(gfView2, gl_TexCoord[0].st); \
+			gl_FragColor = texture2D(gfView2, TexCoord.st); \
 	}";
 
 static char *glsl_view_rows = "\
 	uniform sampler2D gfView1;\
 	uniform sampler2D gfView2;\
+	varying vec2 TexCoord;\
 	void main(void)  \
 	{\
 		if ( int( mod(gl_FragCoord.y, 2.0) ) == 0) \
-			gl_FragColor = texture2D(gfView1, gl_TexCoord[0].st); \
+			gl_FragColor = texture2D(gfView1, TexCoord.st); \
 		else \
-			gl_FragColor = texture2D(gfView2, gl_TexCoord[0].st); \
+			gl_FragColor = texture2D(gfView2, TexCoord.st); \
 	}";
 
 static char *glsl_view_5VSP19 = "\
@@ -369,13 +384,14 @@
 	uniform sampler2D gfView3;\
 	uniform sampler2D gfView4;\
 	uniform sampler2D gfView5;\
+	varying vec2 TexCoord;\
 	void main(void) {\
 	vec4 color[5];\
-	color[0] = texture2D(gfView5, gl_TexCoord[0].st);\
-	color[1] = texture2D(gfView4, gl_TexCoord[0].st);\
-	color[2] = texture2D(gfView3, gl_TexCoord[0].st);\
-	color[3] = texture2D(gfView2, gl_TexCoord[0].st);\
-	color[4] = texture2D(gfView1, gl_TexCoord[0].st);\
+	color[0] = texture2D(gfView5, TexCoord.st);\
+	color[1] = texture2D(gfView4, TexCoord.st);\
+	color[2] = texture2D(gfView3, TexCoord.st);\
+	color[3] = texture2D(gfView2, TexCoord.st);\
+	color[4] = texture2D(gfView1, TexCoord.st);\
 	float pitch = 5.0 + 1.0  - mod(gl_FragCoord.y , 5.0);\
 	int col = int( mod(pitch + 3.0 * (gl_FragCoord.x), 5.0 ) );\
 	int Vr = int(col);\
@@ -388,12 +404,106 @@
 	gl_FragColor.b = color[Vb].b;\
 	}";
 
+static char *glsl_yuv_shader = "\
+	uniform sampler2D y_plane;\n\
+	uniform sampler2D u_plane;\n\
+	uniform sampler2D v_plane;\n\
+	uniform float alpha;\n\
+	varying vec2 TexCoord;\n\
+	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
+	const vec3 R_mul = vec3(1.164,  0.000,  1.596);\n\
+	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
+	const vec3 B_mul = vec3(1.164,  2.018,  0.000);\n\
+	void main(void)  \n\
+	{\n\
+		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\
+		yuv += offset;\n\
+	    rgb.r = dot(yuv, R_mul);\n\
+	    rgb.g = dot(yuv, G_mul);\n\
+	    rgb.b = dot(yuv, B_mul);\n\
+		gl_FragColor = vec4(rgb, alpha);\n\
+	}\n";
+
+
+static char *glsl_yuv_rect_shader_strict = "\
+	#version 140\n\
+	#extension GL_ARB_texture_rectangle : enable\n\
+	uniform sampler2DRect y_plane;\n\
+	uniform sampler2DRect u_plane;\n\
+	uniform sampler2DRect v_plane;\n\
+	uniform float width;\n\
+	uniform float height;\n\
+	uniform float alpha;\n\
+	in vec2 TexCoord;\n\
+	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
+	const vec3 R_mul = vec3(1.164,  0.000,  1.596);\n\
+	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
+	const vec3 B_mul = vec3(1.164,  2.018,  0.000);\n\
+	out vec4 FragColor;\n\
+	void main(void)  \n\
+	{\n\
+		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\
+		texc.x /= 2.0;\n\
+		texc.y /= 2.0;\n\
+		yuv.y = texture2DRect(u_plane, texc).r;\n\
+		yuv.z = texture2DRect(v_plane, texc).r;\n\
+		yuv += offset;\n\
+	    rgb.r = dot(yuv, R_mul);\n\
+	    rgb.g = dot(yuv, G_mul);\n\
+	    rgb.b = dot(yuv, B_mul);\n\
+		FragColor = vec4(rgb, alpha);\n\
+	}\n";
+
+static char *glsl_yuv_rect_shader_relaxed= "\
+	uniform sampler2DRect y_plane;\n\
+	uniform sampler2DRect u_plane;\n\
+	uniform sampler2DRect v_plane;\n\
+	uniform float width;\n\
+	uniform float height;\n\
+	uniform float alpha;\n\
+    varying vec2 TexCoord;\n\
+	const vec3 offset = vec3(-0.0625, -0.5, -0.5);\n\
+	const vec3 R_mul = vec3(1.164,  0.000,  1.596);\n\
+	const vec3 G_mul = vec3(1.164, -0.391, -0.813);\n\
+	const vec3 B_mul = vec3(1.164,  2.018,  0.000);\n\
+	void main(void)  \n\
+	{\n\
+		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\
+		texc.x /= 2.0;\n\
+		texc.y /= 2.0;\n\
+		yuv.y = texture2DRect(u_plane, texc).r;\n\
+		yuv.z = texture2DRect(v_plane, texc).r;\n\
+		yuv += offset;\n\
+	    rgb.r = dot(yuv, R_mul);\n\
+	    rgb.g = dot(yuv, G_mul);\n\
+	    rgb.b = dot(yuv, B_mul);\n\
+		gl_FragColor = vec4(rgb, alpha);\n\
+	}\n";
+
 
 Bool visual_3d_compile_shader(GF_SHADERID shader_id, const char *name, const char *source)
 {
 	GLint blen = 0;	
 	GLsizei slen = 0;
-	u32 len;
+	s32 len;
 	if (!source || !shader_id) return 0;
 	len = (u32) strlen(source);
 	glShaderSource(shader_id, 1, &source, &len);
@@ -408,75 +518,186 @@
 		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_free (compiler_log);
 		return 0;
 	}
 	return 1;
 }
-
-void visual_3d_init_shaders(GF_VisualManager *visual)
+static GF_SHADERID visual_3d_shader_from_source_file(const char *src_path, u32 shader_type)
 {
-/* This test creates a compilation warning under MacOS since always defined, should now compile with -Wall -Werror */
-#if (defined(GL_VERSION_2_0) && defined(GL_GLEXT_PROTOTYPES)) || defined(CONFIG_DARWIN_GL)
-#else
-	if (!glCreateProgram) return;
-#endif /* for Linux w/ OpenGL 2 + CONFIG_DARWIN_GL ... */
+	FILE *src = gf_f64_open(src_path, "rt");
+	GF_SHADERID shader = 0;
+	if (src) {
+		size_t size;
+		char *shader_src;
+		gf_f64_seek(src, 0, SEEK_END);
+		size = (size_t) gf_f64_tell(src);
+		gf_f64_seek(src, 0, SEEK_SET);
+		shader_src = gf_malloc(sizeof(char)*(size+1));
+		size = fread(shader_src, 1, size, src);
+		fclose(src);
+		if (size != (size_t) -1) {
+			shader_src[size]=0;
+			shader = glCreateShader(shader_type);
+			if (visual_3d_compile_shader(shader, (shader_type == GL_FRAGMENT_SHADER) ? "fragment" : "vertex", shader_src)==GF_FALSE) {
+				glDeleteShader(shader);
+				shader = 0;
+			}
+		}
+		gf_free(shader_src);
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to open shader file %s\n", src_path));
+	}
+	return shader;
+}
 
-	if (visual->glsl_program) return;
+void visual_3d_init_stereo_shaders(GF_VisualManager *visual)
+{
+    if (!visual->compositor->gl_caps.has_shaders) return;
+    
+	if (visual->autostereo_glsl_program) return;
 	
-	visual->glsl_program = glCreateProgram();
+	visual->autostereo_glsl_program = glCreateProgram();
 
-	visual->glsl_vertex = glCreateShader(GL_VERTEX_SHADER);
-	visual_3d_compile_shader(visual->glsl_vertex, "vertex", default_glsl_vertex);
+	if (!visual->base_glsl_vertex) {
+		visual->base_glsl_vertex = glCreateShader(GL_VERTEX_SHADER);
+		visual_3d_compile_shader(visual->base_glsl_vertex, "vertex", default_glsl_vertex);
+	}
 
 	switch (visual->autostereo_type) {
 	case GF_3D_STEREO_COLUMNS:
-		visual->glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		visual_3d_compile_shader(visual->glsl_fragment, "fragment", glsl_view_columns);
+		visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+		visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_columns);
 		break;
 	case GF_3D_STEREO_ROWS:
-		visual->glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		visual_3d_compile_shader(visual->glsl_fragment, "fragment", glsl_view_rows);
+		visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+		visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_rows);
 		break;
 	case GF_3D_STEREO_ANAGLYPH:
-		visual->glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		visual_3d_compile_shader(visual->glsl_fragment, "fragment", glsl_view_anaglyph);
+		visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+		visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_anaglyph);
 		break;
 	case GF_3D_STEREO_5VSP19:
-		visual->glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-		visual_3d_compile_shader(visual->glsl_fragment, "fragment", glsl_view_5VSP19);
+		visual->autostereo_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+		visual_3d_compile_shader(visual->autostereo_glsl_fragment, "fragment", glsl_view_5VSP19);
 		break;
 	case GF_3D_STEREO_CUSTOM:
 	{
 		const char *sOpt = gf_cfg_get_key(visual->compositor->user->config, "Compositor", "InterleaverShader");
 		if (sOpt) {
-			FILE *src = gf_f64_open(sOpt, "rt");
-			if (src) {
-				size_t size;
-				char *shader_src;
-				gf_f64_seek(src, 0, SEEK_END);
-				size = (size_t) gf_f64_tell(src);
-				gf_f64_seek(src, 0, SEEK_SET);
-				shader_src = gf_malloc(sizeof(char)*(size+1));
-				size = fread(shader_src, 1, size, src);
-				fclose(src);
-				if (size != (size_t) -1) {
-					shader_src[size]=0;
-					visual->glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
-					visual_3d_compile_shader(visual->glsl_fragment, "fragment", shader_src);
-				}
-				gf_free(shader_src);
-			}
+			visual->autostereo_glsl_fragment = visual_3d_shader_from_source_file(sOpt, GL_FRAGMENT_SHADER);
 		}
 	}
 		break;
 	}
 
-	glAttachShader(visual->glsl_program, visual->glsl_vertex);
-	glAttachShader(visual->glsl_program, visual->glsl_fragment);
-	glLinkProgram(visual->glsl_program);  
+	glAttachShader(visual->autostereo_glsl_program, visual->base_glsl_vertex);
+	glAttachShader(visual->autostereo_glsl_program, visual->autostereo_glsl_fragment);
+	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)
+{
+	u32 i;
+	GLint loc;
+    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) {
+		visual->base_glsl_vertex = glCreateShader(GL_VERTEX_SHADER);
+		visual_3d_compile_shader(visual->base_glsl_vertex, "vertex", default_glsl_vertex);
+	}
+
+	visual->yuv_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+	visual_3d_compile_shader(visual->yuv_glsl_fragment, "YUV fragment", glsl_yuv_shader);
+
+	glAttachShader(visual->yuv_glsl_program, visual->base_glsl_vertex);
+	glAttachShader(visual->yuv_glsl_program, visual->yuv_glsl_fragment);
+	glLinkProgram(visual->yuv_glsl_program);  
+
+	//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
+	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);
+		if (loc == -1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
+			continue;
+		}
+		glUniform1i(loc, i);
+	}
+	glUseProgram(0);  
+
+	if (visual->compositor->gl_caps.rect_texture) {
+		Bool res;
+		const char *opt;
+		visual->yuv_rect_glsl_program = glCreateProgram();
+
+		opt = gf_cfg_get_key(visual->compositor->user->config, "Compositor", "YUVRectShader");
+		visual->yuv_rect_glsl_fragment = glCreateShader(GL_FRAGMENT_SHADER);
+		if (opt && !strcmp(opt, "Relaxed")) {
+			res = visual_3d_compile_shader(visual->yuv_rect_glsl_fragment, "YUV Rect fragment (relaxed syntax)", glsl_yuv_rect_shader_relaxed);
+		} else {
+			if (opt) {
+				visual->yuv_rect_glsl_fragment = visual_3d_shader_from_source_file(opt, GL_FRAGMENT_SHADER);
+				if (!visual->yuv_rect_glsl_fragment) res  = GF_FALSE;
+			}
+			res = visual_3d_compile_shader(visual->yuv_rect_glsl_fragment, "YUV Rect fragment (strict syntax)", glsl_yuv_rect_shader_strict);
+			if (!res) {
+				res = visual_3d_compile_shader(visual->yuv_rect_glsl_fragment, "YUV Rect fragment (relaxed syntax)", glsl_yuv_rect_shader_relaxed);
+				if (res) {
+					if (!opt) gf_cfg_set_key(visual->compositor->user->config, "Compositor", "YUVRectShader", "Relaxed");
+					GF_LOG(GF_LOG_WARNING, GF_LOG_COMPOSE, ("[Compositor] Using relaxed syntax version of YUV shader\n"));
+				}
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_COMPOSE, ("[Compositor] Using strict syntax version of YUV shader\n"));
+			}
+		}
+		if (!res) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Unable to compile fragment shader for rectangular extensions\n"));
+			DEL_SHADER(visual->yuv_rect_glsl_fragment);
+			DEL_PROGRAM(visual->yuv_rect_glsl_program);
+		}
+
+		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);  
+
+			//sets uniforms: y, u, v textures point to texture slots 0, 1 and 2
+			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);
+				if (loc == -1) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate texture %s in YUV shader\n", txname));
+					continue;
+				}
+				glUniform1i(loc, i);
+			}
+
+			loc = glGetUniformLocation(visual->yuv_rect_glsl_program, "width");
+			if (loc == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate width in YUV shader\n"));
+			}
+
+			loc = glGetUniformLocation(visual->yuv_rect_glsl_program, "height");
+			if (loc == -1) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_COMPOSE, ("[Compositor] Failed to locate width in YUV shader\n"));
+			}
+
+			glUseProgram(0);  
+		}
+	}
+}
 #endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
 
 
@@ -484,15 +705,12 @@
 {
 #if !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
 
-#define DEL_SHADER(_a) if (_a) { glDeleteShader(_a); _a = 0; }
-
-	DEL_SHADER(visual->glsl_vertex);
-	DEL_SHADER(visual->glsl_fragment);
+	DEL_SHADER(visual->base_glsl_vertex);
+	DEL_SHADER(visual->autostereo_glsl_fragment);
+	DEL_SHADER(visual->yuv_glsl_fragment);
 
-	if (visual->glsl_program ) {
-		glDeleteProgram(visual->glsl_program);
-		visual->glsl_program = 0;
-	}
+	DEL_PROGRAM(visual->autostereo_glsl_program );
+	DEL_PROGRAM(visual->yuv_glsl_program );
 
 	if (visual->gl_textures) {
 		glDeleteTextures(visual->nb_views, visual->gl_textures);
@@ -504,7 +722,6 @@
 		visual->autostereo_mesh = NULL;
 	}
 #endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
-
 }
 
 
@@ -544,7 +761,7 @@
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_COMPOSE, ("[Visual3D] AutoStereo initialized - width %d height %d\n", visual->auto_stereo_width, visual->auto_stereo_height) );
 
-	visual_3d_init_shaders(visual);
+	visual_3d_init_stereo_shaders(visual);
 #endif // !defined(GPAC_USE_TINYGL) && !defined(GPAC_USE_OGL_ES)
 
 	return GF_OK;
@@ -609,10 +826,10 @@
 	glMatrixMode(GL_MODELVIEW);
 
 	/*use our program*/
-	glUseProgram(visual->glsl_program);
+	glUseProgram(visual->autostereo_glsl_program);
 
 	/*push number of views if shader uses it*/
-	loc = glGetUniformLocation(visual->glsl_program, "gfViewCount");
+	loc = glGetUniformLocation(visual->autostereo_glsl_program, "gfViewCount");
 	if (loc != -1) glUniform1i(loc, visual->nb_views);
 
 	glClientActiveTexture(GL_TEXTURE0);
@@ -622,7 +839,7 @@
 	/*bind all our textures*/
 	for (i=0; i<visual->nb_views; i++) {
 		sprintf(szTex, "gfView%d", i+1);
-		loc = glGetUniformLocation(visual->glsl_program, szTex);
+		loc = glGetUniformLocation(visual->autostereo_glsl_program, szTex);
 		if (loc == -1) continue;
 
 		glActiveTexture(GL_TEXTURE0 + i);
@@ -1555,9 +1772,20 @@
 
 void visual_3d_set_material_2d_argb(GF_VisualManager *visual, u32 col)
 {
-	u32 a;
-	a = GF_COL_A(col);
+	u32 a = GF_COL_A(col);
 
+#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 {
+			GLfloat alpha = (GLfloat) a / 255.0f;
+			glUniform1f(loc, alpha);
+		}
+		return;
+	}
+#endif
 	glDisable(GL_LIGHTING);
 	if (a != 0xFF) {
 		glEnable(GL_BLEND);
@@ -2326,7 +2554,7 @@
 		Float z;
 		static GLfloat none[3] = { 1.0f, 0, 0 };
 
-		data = gf_sc_texture_get_data(txh, &pixel_format);
+		data = (u8 *) gf_sc_texture_get_data(txh, &pixel_format);
 		if (!data) return;
 		if (pixel_format!=GF_PIXEL_RGBD) return;
 		stride = txh->stride;
@@ -2375,7 +2603,7 @@
 		if (!delta) first_pass = 2;
 		else first_pass = 1;
 
-		data = gf_sc_texture_get_data(txh, &pixel_format);
+		data = (u8 *) gf_sc_texture_get_data(txh, &pixel_format);
 		if (!data) return;
 		if (pixel_format!=GF_PIXEL_RGBD) return;
 		stride = txh->stride;
@@ -2399,7 +2627,7 @@
 
 		in_strip = 0;
 		for (h=0; h<txh->height - 1; h++) {
-			char *src = data + h*stride;
+			u8 *src = data + h*stride;
 			x = -1; x = gf_mulfix(x, INT2FIX(txh->width/2));
 			if (!tr_state->pixel_metrics) x  = gf_divfix(x, tr_state->min_hsize);
 
@@ -2511,13 +2739,13 @@
 		Fixed f_scale = FLT2FIX(visual->compositor->depth_gl_scale);
 		txh->needs_refresh = 0;
 
-		data = gf_sc_texture_get_data(txh, &pixel_format);
+		data = (u8 *) gf_sc_texture_get_data(txh, &pixel_format);
 		if (!data) return;
 		if (pixel_format!=GF_PIXEL_RGB_24_DEPTH) return;
 		data += txh->height*txh->width*3;
 
 		for (h=0; h<txh->height; h++) {
-			char *src = data + h * txh->width;
+			u8 *src = data + h * txh->width;
 			for (w=0; w<txh->width; w++) {
 				u8 d = src[w];
 				Fixed z = INT2FIX(d);

gpac-0.5.0.svn4668.tar.bz2/src/export.cpp -> gpac-0.5.0.svn5178.tar.bz2/src/export.cpp Changed

@@ -47,6 +47,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_rmdir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cleanup_dir) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_clock) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sys_clock_high_res) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_rti) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sys_get_battery_state) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_get_default_cache_directory) )
@@ -118,6 +119,21 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_ringbuffer_del) )
 #endif
 
+
+/* Sound */
+#ifndef GPAC_DISABLE_PLAYER
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_set_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_get_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_reconfig) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_new) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_empty) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_lock) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_add_input) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mixer_get_output) )
+#endif
+
+
 /* List */
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_del) )
@@ -133,6 +149,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_last) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_rem_last) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_swap) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_list_transfer) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_reverse) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_clone) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_list_rev_enum) )
@@ -150,8 +167,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_map_rem) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_map_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_map_has_key) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_set) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_has_next) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_map_iter_reset) )
 #endif
@@ -194,6 +210,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_get_refreshed_size) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_set_output_buffering) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_bs_transfer) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_bs_flush) )
+
 
 /* Thread */
 #pragma comment (linker, EXPORT_SYMBOL(gf_th_new) )
@@ -215,11 +233,6 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_sema_notify) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sema_wait) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sema_wait_for) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cond_new) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cond_del) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cond_wait) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cond_signal) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_cond_broadcast) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_global_resource_lock) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_global_resource_unlock) )
 
@@ -256,6 +269,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_utc_time_since_1970) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_get_ntp) )
 #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) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_has_ipv6) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_is_ipv6) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_net_mobileip_set_callback) )
@@ -265,6 +280,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_base16_encode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_base16_decode) )
 
+#pragma comment (linker, EXPORT_SYMBOL(gf_bin128_parse) )
+
 #pragma comment (linker, EXPORT_SYMBOL(gf_token_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_token_get_line) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_token_find) )
@@ -286,6 +303,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_del_section) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_get_filename) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cfg_set_filename) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_cfg_discard_changes) )
 
 #ifndef GPAC_DISABLE_PLAYER
 #pragma comment (linker, EXPORT_SYMBOL(gf_modules_new) )
@@ -319,11 +337,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_process_headers) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_cache_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_stats) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_utc_start) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_fetch_data) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_last_error) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_resource_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_reset) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_mime_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dm_sess_get_header) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dm_set_data_rate) )
@@ -383,7 +403,8 @@
 #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_parse_bit_sequence) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_xml_dom_detach_root) )
 
 #ifndef GPAC_DISABLE_SVG
 #pragma comment (linker, EXPORT_SYMBOL(gf_dom_get_key_name) )
@@ -491,6 +512,7 @@
 
 /*color.h exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_stretch_bits) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_color_write_yv12_10_to_yuv) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_set) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_cmx_set_all) )
@@ -618,6 +640,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_timed_meta_data_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_parse_box) )
 #ifndef GPAC_DISABLE_ISOM_WRITE
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_write) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_box_size) )
@@ -627,9 +650,14 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_fragmented) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_fragmented_duration) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_fragments_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_fragmented_samples_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_track_fragmented) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_tables) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_reset_data_offset) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_single_moof_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_release_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_open_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_highest_track_in_scalable_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_refresh_fragmented) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_track_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_timescale) )
@@ -709,11 +737,22 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_ismacryp_media) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_ismacryp_delete_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_ismacryp_sample) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_cenc_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_original_format_type) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_pssh_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_pssh_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_cenc_media) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_sample_cenc_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_get_sample_aux_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_samp_aux_info_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_cenc_get_default_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_avc_svc_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_avc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_svc_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_get) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_shvc_config_get) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_hevc_shvc_type) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_count) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_by_id) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_meta_item_info) )
@@ -723,8 +762,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_extract_meta_item) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_movie) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_segment_get_fragment_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_segment_get_track_fragment_count) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_segment_get_track_fragment_decode_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_is_single_av) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_guess_specification) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_keep_utc_times) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_sync_shadows) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_has_sample_dependency) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_find_od_for_track) )
@@ -745,7 +788,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_nalu_extract_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_get_nalu_extract_mode) )
 #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) )
 
 # ifndef GPAC_DISABLE_ISOM_DUMP
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_dump) )
@@ -869,13 +917,16 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_add_blink) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_set_wrap) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_text_to_sample) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_ismacryp_protection) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_remove_track_protection) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_ismacryp_protection) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_change_ismacryp_protection) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_avc_config_new) )
 #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_update) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_hevc_set_inband_config) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_shvc_config_update) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_new) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_3gp_config_update) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_media_timescale) )
@@ -900,6 +951,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_rvc_config) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_rap_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_roll_group) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_sample_cenc_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_composition_offset_mode) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_output_buffering) )
 
@@ -932,9 +984,12 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_finalize_for_fragment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_start_fragment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_flush_fragments) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_fragment_reference_time) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_fragment_option) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_add_sample) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_append_data) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_fragment_add_sai) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_isom_clone_pssh) ) 
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_start_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_close_segment) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_isom_set_traf_base_media_decode_time) )
@@ -1176,10 +1231,13 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_import) )
 #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_avc_rewrite_samples) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_split_svc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_merge_svc) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_split_hevc_tiles) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_split_shvc) )
+
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -1192,11 +1250,18 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_get_sps_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_get_pps_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_avc_get_profile_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_parse_nalu) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_read_sps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_media_avc_read_pps) )
 
 #ifndef GPAC_DISABLE_HEVC
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_vps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_sps) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_media_hevc_read_pps) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_get_sps_info) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_get_profile_name) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_hevc_get_sps_info_with_state) )
+
 #endif //GPAC_DISABLE_HEVC
 
 #endif /*GPAC_DISABLE_AV_PARSERS*/
@@ -1213,6 +1278,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_init) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_decrypt) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_encrypt) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_crypt_set_key) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_crypt_set_state) )
 #endif GPAC_DISABLE_MCRYPT
 #pragma comment (linker, EXPORT_SYMBOL(gf_sha1_csum) )
@@ -1254,6 +1320,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_img_jpeg_dec) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_img_png_dec) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_img_png_enc) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_img_png_enc_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_img_file_dec) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m4v_get_profile_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mp3_version) )
@@ -1264,13 +1331,14 @@
 
 #if !defined(GPAC_DISABLE_MCRYPT) && !defined(GPAC_DISABLE_ISOM_WRITE)
 /*ismacryp.h exports*/
-#pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_crypt_file) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_decrypt_file) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_crypt_file) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_decrypt_file) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_encrypt_track) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_decrypt_track) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_gpac_get_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_ismacryp_mpeg4ip_get_info) )
 
+
 #endif
 
 /*scene_manager.h exports*/
@@ -1455,9 +1523,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dom_listener_build) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dom_listener_del) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_sg_handle_dom_event) )
-#pragma comment (linker, EXPORT_SYMBOL(sg_fire_dom_event) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_sg_fire_dom_event) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_event_target_get) )
-#pragma comment (linker, EXPORT_SYMBOL(gf_mo_event_target_add_object) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_mo_event_target_remove_by_node) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_event_target_get_node) )
 
@@ -1633,6 +1700,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_send_event) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_lock_compositor) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_term_switch_quality) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_term_get_visual_output_size) )
 
 /*terminal_dev exports*/
 #pragma comment (linker, EXPORT_SYMBOL(gf_scene_new) )
@@ -1736,7 +1804,7 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_get_stream_name) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_crc32_check) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_restamp) )
-
+#pragma comment (linker, EXPORT_SYMBOL(gf_m2ts_demux_file) )
 
 /* carousel.h */
 #ifdef GPAC_ENABLE_DSMCC
@@ -1829,6 +1897,8 @@
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_group_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_group_udta) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_group_selected) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_group_selectable) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_debug_group) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_info) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_switch_quality) )
 #pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_duration) )
@@ -1850,44 +1920,48 @@
 #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_group_check_bandwidth) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_resync_to_segment) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_group_loop_detected) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_is_dynamic_mpd) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_get_min_buffer_time) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_idle_interval) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_utc_shift) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_enable_utc_drift_compensation) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_dash_set_max_resolution) )
+#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) )
+#endif
+
+#ifndef GPAC_DISABLE_VTT
+#pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_js_addCue) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_js_removeCues) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_parse_cues_from_data) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_parse_iso_cues) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_webvtt_cue_del) )
+#endif
+
+#ifndef GPAC_DISABLE_MSE
+#pragma comment (linker, EXPORT_SYMBOL(gf_mse_track_buffer_get_next_packet) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mse_track_buffer_release_packet) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mse_mediasource_del) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mse_mediasource_open) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mse_mediasource_close) )
+#pragma comment (linker, EXPORT_SYMBOL(gf_mse_mediasource_end) )
 #endif
 
 #pragma comment (linker, EXPORT_SYMBOL(utf8_to_ucs4) )
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp.c -> gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp.c Changed

@@ -227,7 +227,7 @@
 			//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, (IsSource==2), local_ip);
+			e = gf_sk_setup_multicast(ch->rtp, ch->net_info.source, ch->net_info.port_first, ch->net_info.TTL, 0, local_ip);
 			if (e) return e;
 		}
 		if (UDPBufferSize) gf_sk_set_buffer_size(ch->rtp, IsSource, UDPBufferSize);
@@ -266,7 +266,7 @@
 		} else {
 			if (!ch->net_info.port_last) ch->net_info.port_last = ch->net_info.client_port_last;
 			//Bind to multicast (auto-join the group)
-			e = gf_sk_setup_multicast(ch->rtcp, ch->net_info.source, ch->net_info.port_last, ch->net_info.TTL, (IsSource==2), local_ip);
+			e = gf_sk_setup_multicast(ch->rtcp, ch->net_info.source, ch->net_info.port_last, ch->net_info.TTL, 0, local_ip);
 			if (e) return e;
 		}
 	}
@@ -887,7 +887,7 @@
 discard:
 	gf_free(it->pck);
 	gf_free(it);
-	GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[rtp] Packet Reorderer: Dropping packet %d", pck_seqnum));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[rtp] Packet Reorderer: Dropping packet %d\n", pck_seqnum));
 	return GF_OK;
 }

gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp_depacketizer.c -> gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_depacketizer.c Changed

@@ -726,6 +726,133 @@
 	}
 }
 
+#ifndef GPAC_DISABLE_HEVC
+
+static void gf_rtp_hevc_flush(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, Bool missed_end)
+{
+	char *data;
+	u32 data_size, nal_s;
+	if (!rtp->inter_bs) return;
+
+	data = NULL;
+	data_size = 0;
+	gf_bs_get_content(rtp->inter_bs, &data, &data_size);
+	gf_bs_del(rtp->inter_bs);
+	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;
+	/*set F-bit since nal is corrupted*/
+	if (missed_end) data[4] |= 0x80;
+
+	rtp->sl_hdr.accessUnitEndFlag = (rtp->flags & GF_RTP_UNRELIABLE_M) ? 0 : hdr->Marker;
+	rtp->sl_hdr.compositionTimeStampFlag = 1;
+	rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
+	rtp->sl_hdr.decodingTimeStampFlag = 0;
+	rtp->on_sl_packet(rtp->udta, data, data_size, &rtp->sl_hdr, GF_OK);
+	rtp->sl_hdr.accessUnitStartFlag = 0;
+	rtp->sl_hdr.randomAccessPointFlag = 0;
+	gf_free(data);
+}
+
+static void gf_rtp_parse_hevc(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
+{
+	u32 nal_type;
+	char nalu_size[4];
+
+	nal_type = (payload[0] & 0x7E) >> 1;
+
+	/*set start*/
+	if (rtp->sl_hdr.compositionTimeStamp != hdr->TimeStamp) {
+		if (rtp->flags & GF_RTP_UNRELIABLE_M) {
+			rtp->sl_hdr.accessUnitEndFlag = 1;
+			rtp->on_sl_packet(rtp->udta, NULL, 0, &rtp->sl_hdr, GF_OK);
+		}
+		rtp->sl_hdr.accessUnitEndFlag = 0;
+		rtp->sl_hdr.accessUnitStartFlag = 1;
+		rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
+		rtp->sl_hdr.compositionTimeStampFlag = 1;
+		rtp->sl_hdr.decodingTimeStampFlag = 0;
+		rtp->sl_hdr.randomAccessPointFlag = 0;
+	} else if (rtp->sl_hdr.accessUnitEndFlag) {
+		rtp->flags |= GF_RTP_UNRELIABLE_M;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[HEVC RTP] error in Marker bit - switching to unreliable mode\n"));
+	}
+	
+	/*Single NALU*/
+	if (nal_type <= 40) {
+		if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
+			rtp->sl_hdr.randomAccessPointFlag = 1;
+		}
+
+		rtp->sl_hdr.accessUnitEndFlag = 0;
+
+		/*signal NALU size on 4 bytes*/
+		nalu_size[0] = size>>24; nalu_size[1] = size>>16; nalu_size[2] = size>>8; nalu_size[3] = size&0xFF;
+		rtp->on_sl_packet(rtp->udta, nalu_size, 4, &rtp->sl_hdr, GF_OK);
+
+		rtp->sl_hdr.accessUnitStartFlag = 0;
+		rtp->sl_hdr.compositionTimeStampFlag = 1;
+		rtp->sl_hdr.compositionTimeStamp = hdr->TimeStamp;
+		rtp->sl_hdr.accessUnitEndFlag = (rtp->flags & GF_RTP_UNRELIABLE_M) ? 0 : hdr->Marker;
+
+		/*send NAL payload*/
+		rtp->on_sl_packet(rtp->udta, payload, size, &rtp->sl_hdr, GF_OK);
+	}
+	/*AP NALU*/
+	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]; 
+			offset += 2;
+			nal_type = (payload[offset] & 0x7E) >> 1;
+			if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
+				rtp->sl_hdr.randomAccessPointFlag = 1;
+			}
+
+			/*signal NALU size on 4 bytes*/
+			nalu_size[0] = nal_size>>24; nalu_size[1] = nal_size>>16; nalu_size[2] = nal_size>>8; nalu_size[3] = nal_size&0xFF;
+			rtp->on_sl_packet(rtp->udta, nalu_size, 4, &rtp->sl_hdr, GF_OK);
+
+			rtp->sl_hdr.accessUnitStartFlag = 0;
+			rtp->sl_hdr.compositionTimeStampFlag = 0;
+			rtp->sl_hdr.accessUnitEndFlag = (!(rtp->flags & GF_RTP_UNRELIABLE_M) && hdr->Marker && (offset+nal_size==size)) ? 1 : 0;
+			rtp->on_sl_packet(rtp->udta, payload+offset, nal_size, &rtp->sl_hdr, GF_OK);
+			offset += nal_size;
+		}
+	}
+	/*FU NALU*/
+	else if (nal_type == 49) {
+		Bool is_start = payload[2] & 0x80;
+		Bool is_end = payload[2] & 0x40;
+		/*flush*/
+		if (is_start) gf_rtp_hevc_flush(rtp, hdr, 1);
+
+		nal_type = payload[2] & 0x3F;
+		if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
+			rtp->sl_hdr.randomAccessPointFlag = 1;
+		}
+
+		/*setup*/
+		if (!rtp->inter_bs) {
+			char nal_hdr[2];
+			rtp->inter_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+			/*coypy F bit highest bit of LayerId*/
+			nal_hdr[0] = payload[0] & 0x81;
+			/*assign NAL type*/
+			nal_hdr[0] |= (payload[2] & 0x3F) << 1;
+			/*copy LayerId and TID*/
+			nal_hdr[1] = payload[1];
+			/*dummy size field*/
+			gf_bs_write_u32(rtp->inter_bs, 0);
+			gf_bs_write_data(rtp->inter_bs, nal_hdr, 2);
+		}
+		gf_bs_write_data(rtp->inter_bs, payload+3, size-3);
+		if (is_end || hdr->Marker) gf_rtp_hevc_flush(rtp, hdr, 0);
+	}
+}
+#endif
+
 
 static void gf_rtp_parse_latm(GF_RTPDepacketizer *rtp, GF_RTPHeader *hdr, char *payload, u32 size)
 {
@@ -916,6 +1043,7 @@
 	else if (!stricmp(map->payload_name, "richmedia+xml")) return GF_RTP_PAYT_3GPP_DIMS;
 	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 return 0;
 }
 
@@ -1392,6 +1520,83 @@
 		/*assign depacketizer*/
 		rtp->depacketize = gf_rtp_parse_h264;
 		break;
+	case GF_RTP_PAYT_HEVC:
+#ifndef GPAC_DISABLE_HEVC
+	{
+		GF_SDP_FMTP *fmtp;
+		GF_HEVCConfig *hevcc = gf_odf_hevc_cfg_new();
+		hevcc->configurationVersion = 1;
+		hevcc->nal_unit_size = 4;
+		rtp->sl_map.StreamType = 4;
+		rtp->sl_map.ObjectTypeIndication = GPAC_OTI_VIDEO_HEVC;
+		/*we will signal RAPs*/
+		rtp->sl_map.RandomAccessIndication = 1;
+		i=0;
+		while ((fmtp = (GF_SDP_FMTP*)gf_list_enum(media->FMTP, &i))) {
+			GF_X_Attribute *att;
+			if (fmtp->PayloadType != map->PayloadType) continue;
+			j=0;
+			while ((att = (GF_X_Attribute *)gf_list_enum(fmtp->Attributes, &j))) {
+				char *nal_ptr, *sep;
+				GF_HEVCParamArray *ar;
+				if (!stricmp(att->Name, "sprop-vps")) {
+					GF_SAFEALLOC(ar, GF_HEVCParamArray);
+					ar->nalus = gf_list_new();
+					ar->type = GF_HEVC_NALU_VID_PARAM;
+				}
+				else if (!stricmp(att->Name, "sprop-sps")) {
+					GF_SAFEALLOC(ar, GF_HEVCParamArray);
+					ar->nalus = gf_list_new();
+					ar->type = GF_HEVC_NALU_SEQ_PARAM;
+				}
+				else if (!stricmp(att->Name, "sprop-pps")) {
+					GF_SAFEALLOC(ar, GF_HEVCParamArray);
+					ar->nalus = gf_list_new();
+					ar->type = GF_HEVC_NALU_PIC_PARAM;
+				}
+				else
+					continue;
+				nal_ptr = att->Value;
+				while (nal_ptr) {
+					u32 b64size, ret;
+					char *b64_d;
+					GF_AVCConfigSlot *sl;
+
+					sep = strchr(nal_ptr, ',');
+					if (sep) sep[0] = 0;
+
+					b64size = (u32) strlen(nal_ptr);
+					b64_d = (char*)gf_malloc(sizeof(char)*b64size);
+					ret = gf_base64_decode(nal_ptr, b64size, b64_d, b64size); 
+					b64_d[ret] = 0;
+
+					sl = (GF_AVCConfigSlot *)gf_malloc(sizeof(GF_AVCConfigSlot));
+					sl->size = ret;
+					sl->data = (char*)gf_malloc(sizeof(char)*sl->size);
+					memcpy(sl->data, b64_d, sizeof(char)*sl->size);
+					gf_list_add(ar->nalus, sl);
+
+					gf_free(b64_d);
+
+					if (sep) {
+						sep[0] = ',';
+						nal_ptr = sep+1;
+					} else {
+						break;
+					}
+				}
+				if (!hevcc->param_array) hevcc->param_array = gf_list_new();
+				gf_list_add(hevcc->param_array, ar);
+			}
+		}
+		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;
+#else
+		return GF_NOT_SUPPORTED;
+#endif
+		break;
 #endif /*GPAC_DISABLE_AV_PARSERS*/
 
 	/*todo - rewrite DIMS config*/

gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp_packetizer.c -> gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_packetizer.c Changed

@@ -117,6 +117,8 @@
 		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:
 		return GF_NOT_SUPPORTED;
 	}
@@ -204,7 +206,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) {
+			if ((OTI != GPAC_OTI_VIDEO_AVC) && (OTI != GPAC_OTI_VIDEO_SVC) && (OTI != GPAC_OTI_VIDEO_HEVC)) {
 				builder->flags &= ~GP_RTP_PCK_USE_MULTI;
 			}
 		}
@@ -525,6 +527,10 @@
 		strcpy(szMediaName, "video");
 		strcpy(szPayloadName, "H264-SVC");
 		return 1;
+	case GF_RTP_PAYT_HEVC:
+		strcpy(szMediaName, "video");
+		strcpy(szPayloadName, "H265");
+		return 1;
 	default:
 		strcpy(szMediaName, "");
 		strcpy(szPayloadName, "");

gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp_pck_mpeg4.c -> gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_pck_mpeg4.c Changed

@@ -535,6 +535,161 @@
 	return GF_OK;
 }
 
+GF_Err gp_rtp_builder_do_hevc(GP_RTPPacketizer *builder, char *nalu, u32 nalu_size, u8 IsAUEnd, u32 FullAUSize)
+{
+	u32 do_flush, bytesLeft, size;
+
+	do_flush = 0;
+	if (!nalu) do_flush = 1;
+	else if (builder->sl_header.accessUnitStartFlag) do_flush = 1;
+	/*we must NOT fragment a NALU*/
+	else if (builder->bytesInPacket + nalu_size + 4 >= builder->Path_MTU) do_flush = 2;
+	/*aggregation is disabled*/
+	else if (! (builder->flags & GP_RTP_PCK_USE_MULTI) ) do_flush = 2;
+
+	if (builder->bytesInPacket && do_flush) {
+		builder->rtp_header.Marker = (do_flush==1) ? 1 : 0;
+		/*insert payload_hdr in case of AP*/
+		if (strlen(builder->hevc_payload_hdr)) {
+			builder->OnData(builder->cbk_obj, (char *)builder->hevc_payload_hdr, 2, 1);
+			memset(builder->hevc_payload_hdr, 0, 2);
+		}
+		builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
+		builder->bytesInPacket = 0;
+	}
+
+	if (!nalu) return GF_OK;
+
+	/*need a new RTP packet*/
+	if (!builder->bytesInPacket) {
+		builder->rtp_header.PayloadType = builder->PayloadType;
+		builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
+		builder->rtp_header.SequenceNumber += 1;
+		builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
+	}
+
+	/*at this point we're sure the NALU fits in current packet OR must be splitted*/
+	/*check that we should use single NALU packet mode or aggreation packets mode*/
+	if (builder->bytesInPacket+nalu_size+4 < builder->Path_MTU) {
+		Bool use_AP = 1;
+		/*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*/
+			if (!builder->bytesInPacket) {
+				/*copy F bit and assign type*/
+				builder->hevc_payload_hdr[0] = (nalu[0] & 0x81) | (48 << 1);
+				/*copy LayerId and TID*/
+				builder->hevc_payload_hdr[1] = nalu[1];
+			}
+			else {
+				/*F bit of AP is 0 if the F nit of each aggreated NALU is 0; otherwise its must be 1*/
+				/*LayerId and TID must ne the lowest value of LayerId and TID of all aggreated NALU*/
+				u8 cur_LayerId, cur_TID, new_LayerId, new_TID;
+
+				builder->hevc_payload_hdr[0] |= (nalu[0] & 0x80);
+				cur_LayerId = ((builder->hevc_payload_hdr[0] & 0x01) << 5) + ((builder->hevc_payload_hdr[1] & 0xF8) >> 3);
+				new_LayerId = ((nalu[0] & 0x01) << 5) + ((nalu[1] & 0xF8) >> 3);
+				if (cur_LayerId > new_LayerId) {
+					builder->hevc_payload_hdr[0] = (builder->hevc_payload_hdr[0] & 0xFE) | (nalu[0] & 0x01);
+					builder->hevc_payload_hdr[1] = (builder->hevc_payload_hdr[1] & 0x07) | (nalu[1] & 0xF8);
+				}
+				cur_TID = builder->hevc_payload_hdr[1] & 0x07;
+				new_TID = nalu[1] & 0x07;
+				if (cur_TID > new_TID) {
+					builder->hevc_payload_hdr[1] = (builder->hevc_payload_hdr[1] & 0xF8) | (nalu[1] & 0x07);
+				}
+			}
+
+			/*add NALU size*/
+			nal_s[0] = nalu_size>>8;
+			nal_s[1] = nalu_size&0x00ff;
+			builder->OnData(builder->cbk_obj, (char *)nal_s, 2, 0);
+			builder->bytesInPacket += 2;
+		}
+		/*add data*/
+		if (builder->OnDataReference) 
+			builder->OnDataReference(builder->cbk_obj, nalu_size, 0);
+		else
+			builder->OnData(builder->cbk_obj, nalu, nalu_size, 0);
+
+		builder->bytesInPacket += nalu_size;
+
+		if (IsAUEnd) {
+			builder->rtp_header.Marker = 1;
+			if (strlen(builder->hevc_payload_hdr)) {
+				builder->OnData(builder->cbk_obj, (char *)builder->hevc_payload_hdr, 2, 1);
+				memset(builder->hevc_payload_hdr, 0, 2);
+			}
+			builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
+			builder->bytesInPacket = 0;
+		}
+	}
+	/*fragmentation unit*/
+	else {
+		u32 offset;
+		char payload_hdr[2];
+		char shdr;
+
+		assert(nalu_size>=builder->Path_MTU);
+		assert(!builder->bytesInPacket);
+
+		/*FU payload doesn't have the NAL hdr (2 bytes*/
+		bytesLeft = nalu_size - 2;
+		offset = 2;
+		while (bytesLeft) {
+			if (3 + bytesLeft > builder->Path_MTU) {
+				size = builder->Path_MTU - 3;
+			} else {
+				size = bytesLeft;
+			}
+
+			/*declare PayloadHdr for FU*/
+			memset(payload_hdr, 0, 2);
+			/*copy F bit and assign type*/
+			payload_hdr[0] = (nalu[0] & 0x81) | (49 << 1);
+			/*copy LayerId and TID*/
+			payload_hdr[1] = nalu[1];
+			builder->OnData(builder->cbk_obj, (char *)payload_hdr, 2, 0);
+
+			/*declare FU header*/
+			shdr = 0;
+			/*assign type*/
+			shdr |= (nalu[0] & 0x7E) >> 1;
+			/*start bit*/
+			if (offset==2) shdr |= 0x80;
+			/*end bit*/
+			else if (size == bytesLeft) shdr |= 0x40;
+
+			builder->OnData(builder->cbk_obj, &shdr, 1, 0);
+
+			/*add data*/
+			if (builder->OnDataReference) 
+				builder->OnDataReference(builder->cbk_obj, size, offset);
+			else
+				builder->OnData(builder->cbk_obj, nalu+offset, size, 0);
+
+			offset += size;
+			bytesLeft -= size;
+
+			/*flush no matter what (FUs cannot be agreggated)*/
+			builder->rtp_header.Marker = (IsAUEnd && !bytesLeft) ? 1 : 0;
+			builder->OnPacketDone(builder->cbk_obj, &builder->rtp_header);
+			builder->bytesInPacket = 0;
+
+			if (bytesLeft) {
+				builder->rtp_header.PayloadType = builder->PayloadType;
+				builder->rtp_header.TimeStamp = (u32) builder->sl_header.compositionTimeStamp;
+				builder->rtp_header.SequenceNumber += 1;
+				builder->OnNewPacket(builder->cbk_obj, &builder->rtp_header);
+			}
+		}
+	}
+	return GF_OK;
+}
+
 void latm_flush(GP_RTPPacketizer *builder)
 {
 	if (builder->bytesInPacket) {
@@ -568,7 +723,6 @@
 	data_offset = 0;
 	fragmented = 0;
 	while (data_size > 0) { 
-
 		latm_hdr_size = (data_size / 255) + 1; 
 		/*fragmenting*/
 		if (latm_hdr_size + data_size > builder->Path_MTU) {
@@ -624,4 +778,5 @@
 	return GF_OK; 
 }
 
+
 #endif /*GPAC_DISABLE_STREAMING*/

gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtp_streamer.c -> gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtp_streamer.c Changed

@@ -301,6 +301,12 @@
 			rtp_type = GF_RTP_PAYT_H264_SVC;
 			PL_ID = 0x0F;
 			break;
+		/*HEVC*/
+		case GPAC_OTI_VIDEO_HEVC:
+			required_rate = 90000;	/* "90 kHz clock rate MUST be used"*/
+			rtp_type = GF_RTP_PAYT_HEVC;
+			PL_ID = 0x0F;
+			break;
 		}
 		break;
 
@@ -611,6 +617,36 @@
 			strcat(sdpLine, "\n");
 		}
 	}
+	else if (rtp->packetizer->rtp_payt == GF_RTP_PAYT_HEVC) {
+#ifndef GPAC_DISABLE_HEVC
+		GF_HEVCConfig *hevcc = dsi ? gf_odf_hevc_cfg_read(dsi, dsi_len, 0) : NULL;
+		if (hevcc) {
+			u32 count, i, j, b64s;
+			char b64[200];
+			sprintf(sdpLine, "a=fmtp:%d", rtp->packetizer->PayloadType);
+			count = gf_list_count(hevcc->param_array);
+			for (i = 0; i < count; i++) {
+				GF_HEVCParamArray *ar = (GF_HEVCParamArray *)gf_list_get(hevcc->param_array, i);
+				if (ar->type==GF_HEVC_NALU_SEQ_PARAM) {
+					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) {
+					strcat(sdpLine, "; sprop-vps=");
+				}
+				for (j = 0; j < gf_list_count(ar->nalus); j++) {
+					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(ar->nalus, j);
+					b64s = gf_base64_encode(sl->data, sl->size, b64, 200);
+					b64[b64s]=0;
+					if (j) strcat(sdpLine, ", ");
+					strcat(sdpLine, b64);
+				}
+			}
+			gf_odf_hevc_cfg_del(hevcc);
+			strcat(sdpLine, "\n");
+		}
+#endif
+	}
 	/*MPEG-4 decoder config*/
 	else if (rtp->packetizer->rtp_payt==GF_RTP_PAYT_MPEG4) {
 		gf_rtp_builder_format_sdp(rtp->packetizer, payloadName, sdpLine, dsi, dsi_len);

gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtsp_common.c -> gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtsp_common.c Changed

@@ -41,11 +41,13 @@
 		//Locate header / body
 		if (!BodyStart) gf_rtsp_get_body_info(sess, &BodyStart, &body_size);
 		
-		//enough data
-		res = sess->CurrentSize - sess->CurrentPos;
-		if (!body_size || (res >= body_size + BodyStart)) {
-			//done
-			break;
+		if (BodyStart) {
+			//enough data
+			res = sess->CurrentSize - sess->CurrentPos;
+			if (!body_size || (res >= body_size + BodyStart)) {
+				//done
+				break;
+			}
 		}
 		//this is the tricky part: if we do NOT have a body start -> we refill
 		e = gf_rtsp_refill_buffer(sess);
@@ -57,34 +59,36 @@
 void gf_rtsp_get_body_info(GF_RTSPSession *sess, u32 *body_start, u32 *body_size)
 {
 	u32 i;
+	s32 start;
 	char *buffer;
 	char *cl_str, val[30];
 
 	*body_start = *body_size = 0;
 
 	buffer = sess->TCPBuffer + sess->CurrentPos;
-	*body_start = gf_token_find(buffer, 0, sess->CurrentSize - sess->CurrentPos, "\r\n\r\n");
+	start = gf_token_find(buffer, 0, sess->CurrentSize - sess->CurrentPos, "\r\n\r\n");
+	if (start<=0) {
+		return;
+	}
 
 	//if found add the 2 "\r\n" and parse it
-	if (*body_start) {
-		*body_start += 4;
+	*body_start = start + 4;
 		
-		//get the content length
-		cl_str = strstr(buffer, "Content-Length: ");
-		if (!cl_str) cl_str = strstr(buffer, "Content-length: ");
+	//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;
-			while (cl_str[i] != '\r') {
-				val[i] = cl_str[i];
-				i += 1;
-			}
-			val[i] = 0;
-			*body_size = atoi(val);
-		} else {
-			*body_size = 0;
+	if (cl_str) {
+		cl_str += 16;
+		i = 0;
+		while (cl_str[i] != '\r') {
+			val[i] = cl_str[i];
+			i += 1;
 		}
+		val[i] = 0;
+		*body_size = atoi(val);
+	} else {
+		*body_size = 0;
 	}
 }

gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtsp_response.c -> gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtsp_response.c Changed

@@ -325,14 +325,18 @@
 
 	//parse first line
 	ret = gf_token_get_line(buffer, 0, Size, LineBuffer, 1024);
-	if (ret < 0) return GF_REMOTE_SERVICE_ERROR;
+	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) return GF_REMOTE_SERVICE_ERROR;
-	if (strcmp(ValBuf, GF_RTSP_VERSION)) return GF_SERVICE_ERROR;
+	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) return GF_REMOTE_SERVICE_ERROR;
+	if (Pos <= 0) 
+		return GF_REMOTE_SERVICE_ERROR;
 	rsp->ResponseCode = atoi(ValBuf);
 	//string info
 	Pos = gf_token_get(LineBuffer, Pos, "\t\r\n", ValBuf, 400);
@@ -374,11 +378,13 @@
 
 
 	e = gf_rtsp_check_connection(sess);
-	if (e) goto exit;
+	if (e) 
+		goto exit;
 
 	//push data in our queue
 	e = gf_rtsp_fill_buffer(sess);
-	if (e) goto exit;
+	if (e) 
+		goto exit;
 
 	//this is interleaved data
 	if (!IsRTSPMessage(sess->TCPBuffer+sess->CurrentPos) ) {
@@ -387,7 +393,8 @@
 		goto exit;
 	}
 	e = gf_rtsp_read_reply(sess);
-	if (e) goto exit;
+	if (e)
+		goto exit;
 
 	//get the reply
 	gf_rtsp_get_body_info(sess, &BodyStart, &size);
@@ -432,6 +439,7 @@
 	}
 
 	if (sess->CSeq != rsp->CSeq + sess->NbPending) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[RTSP] Invalid sequence number - got %d but expected %d\n", sess->CSeq, rsp->CSeq + sess->NbPending));
 		e = GF_REMOTE_SERVICE_ERROR;
 		goto exit;
 	}

gpac-0.5.0.svn4668.tar.bz2/src/ietf/rtsp_session.c -> gpac-0.5.0.svn5178.tar.bz2/src/ietf/rtsp_session.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/avc_ext.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/avc_ext.c Changed

@@ -37,10 +37,30 @@
 {
 	GF_MPEGVisualSampleEntryBox *entry;
 	if (mdia->handler->handlerType != GF_ISOM_MEDIA_VISUAL) return 0;
-	if (_entry->type==GF_ISOM_BOX_TYPE_GNRV) return 0;
+	switch (_entry->type) {
+	case GF_4CC('a','v','c','1'):
+	case GF_4CC('a','v','c','2'):
+	case GF_4CC('a','v','c','3'):
+	case GF_4CC('a','v','c','4'):
+	case GF_4CC('s','v','c','1'):
+	case GF_4CC('s','v','c','2'):
+	case GF_4CC('m','v','c','1'):
+	case GF_4CC('m','v','c','2'):
+	case GF_4CC('h','v','c','1'):
+	case GF_4CC('h','e','v','1'):
+	case GF_4CC('h','v','c','2'):
+	case GF_4CC('h','e','v','2'):
+	case GF_4CC('s','h','v','1'):
+	case GF_4CC('s','h','c','1'):
+	case GF_4CC('m','h','v','1'):
+	case GF_4CC('m','h','c','1'):
+		return 1;
+	default:
+		return 0;
+	}
 	entry = (GF_MPEGVisualSampleEntryBox*)_entry;
 	if (!entry) return 0;
-	if (entry->avc_config || entry->svc_config || entry->hevc_config) return 1;
+	if (entry->avc_config || entry->svc_config || entry->hevc_config || entry->shvc_config) return 1;
 	return 0;
 }
 
@@ -80,21 +100,236 @@
 	}
 }*/
 
-/* Rewrite mode:
- * mode = 0: playback
- * mode = 1: streaming
- */
+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)
+{
+	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;
+	GF_ISOSample *ref_samp;
+	GF_BitStream *ref_bs;
+	GF_TrackBox *ref_trak;
+	s8 sample_offset;
+	char*buffer = NULL;
+	u32 max_size = 0;
+
+	nb_bytes_nalh = is_hevc ? 2 : 1;
+
+	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);
+		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;
+
+		cur_extract_mode = gf_isom_get_nalu_extract_mode(file, ref_track_num);
+
+		//we must be in inspect mode only otherwise the reference sample will not be the one stored on file (change in start codes, PS inserted or other NALUs inserted)
+		//and this will corrupt extraction (wrong data offsets)
+		ref_extract_mode = GF_ISOM_NALU_EXTRACT_INSPECT;
+		gf_isom_set_nalu_extract_mode(file, ref_track_num, ref_extract_mode);
+
+		ref_trak = gf_isom_get_track_from_file(file, ref_track_num);
+		if (!ref_trak) return GF_ISOM_INVALID_FILE;
+
+		ref_samp = gf_isom_sample_new();
+		if (!ref_samp) return GF_IO_ERR;
+
+		//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) 
+			sample_offset = 0;
+
+		e = Media_GetSample(ref_trak->Media, sampleNumber + sample_offset, &ref_samp, &di, 0, NULL);
+		if (e) return e;
+
+		if (rewrite_start_codes) {
+			gf_bs_write_int(dst_bs, 1, 32);
+			if (is_hevc) {
+				gf_bs_write_int(dst_bs, 0, 1);
+				gf_bs_write_int(dst_bs, GF_HEVC_NALU_ACCESS_UNIT, 6);
+				gf_bs_write_int(dst_bs, 0, 9);
+				/*pic-type - by default we signal all slice types possible*/
+				gf_bs_write_int(dst_bs, 2, 3);
+				gf_bs_write_int(dst_bs, 0, 5);
+			} else {
+				gf_bs_write_int(dst_bs, (ref_samp->data[0] & 0x60) | GF_AVC_NALU_ACCESS_UNIT, 8);
+				gf_bs_write_int(dst_bs, 0xF0 , 8); /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
+			}
+		}
+		ref_bs = gf_bs_new(ref_samp->data + data_offset, ref_samp->dataLength - data_offset, GF_BITSTREAM_READ);
+		if (!data_length)
+			data_length = ref_samp->dataLength - data_offset;
+
+		assert(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);
+
+			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;
+		}
+
+		gf_isom_sample_del(&ref_samp);
+		ref_samp = NULL;
+		gf_bs_del(ref_bs);
+		ref_bs = NULL;
+		if (buffer) gf_free(buffer);
+		gf_isom_set_nalu_extract_mode(file, ref_track_num, cur_extract_mode);
+		break;
+	case 1:
+		//skip to end of this NALU
+		gf_bs_skip_bytes(src_bs, nal_size - nb_bytes_nalh);
+		break;
+	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) 
+			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 - nb_bytes_nalh);
+		gf_free(buffer);
+		break;
+	}
+	return GF_OK;
+}
+
+static Bool is_sample_idr(GF_ISOSample *sample, GF_MPEGVisualSampleEntryBox *entry)
+{
+	Bool is_hevc = 0;
+	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) {
+		nalu_size_field = entry->hevc_config->config->nal_unit_size;
+		is_hevc = 1;
+	}
+	else if (entry->shvc_config) {
+		nalu_size_field = entry->shvc_config->config->nal_unit_size;
+		is_hevc = 1;
+	}
+	if (!nalu_size_field) return 0;
+
+	bs = gf_bs_new(sample->data, sample->dataLength, GF_BITSTREAM_READ);
+	while (gf_bs_available(bs)) {
+		u8 nal_type;
+		u32 size = gf_bs_read_int(bs, 8*nalu_size_field);
+
+		if (is_hevc) {
+#ifndef GPAC_DISABLE_HEVC
+			u16 nal_hdr = gf_bs_read_u16(bs);
+			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_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:
+				gf_bs_del(bs);
+				return 1;
+			case GF_HEVC_NALU_ACCESS_UNIT:
+			case GF_HEVC_NALU_FILLER_DATA:
+			case GF_HEVC_NALU_SEI_PREFIX:
+				break;
+			default:
+				gf_bs_del(bs);
+				return 0;
+			}
+			gf_bs_skip_bytes(bs, size - 2);
+#endif
+		} else {
+			u8 nal_hdr = gf_bs_read_u8(bs);
+			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:
+				gf_bs_del(bs);
+				return 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;
+			}
+			gf_bs_skip_bytes(bs, size - 2);
+		} 
+	}
+	gf_bs_del(bs);
+	return 0;
+}
+
+static void nalu_merge_ps(GF_BitStream *ps_bs, Bool rewrite_start_codes, u32 nal_unit_size_field, GF_MPEGVisualSampleEntryBox *entry, Bool is_hevc)
+{
+	u32 i, count;
+	if (is_hevc) {
+		if (entry->hevc_config) {
+			count = gf_list_count(entry->hevc_config->config->param_array);
+			for (i=0; i<count; i++) {
+				GF_HEVCParamArray *ar = gf_list_get(entry->hevc_config->config->param_array, i);
+				rewrite_nalus_list(ar->nalus, ps_bs, rewrite_start_codes, nal_unit_size_field);
+			}
+		}
+		if (entry->shvc_config) {
+			count = gf_list_count(entry->shvc_config->config->param_array);
+			for (i=0; i<count; i++) {
+				GF_HEVCParamArray *ar = gf_list_get(entry->shvc_config->config->param_array, i);
+				rewrite_nalus_list(ar->nalus, ps_bs, rewrite_start_codes, nal_unit_size_field);
+			}
+		}
+	} else {
+		if (entry->avc_config) {
+			rewrite_nalus_list(entry->avc_config->config->sequenceParameterSets, ps_bs, rewrite_start_codes, nal_unit_size_field);
+			rewrite_nalus_list(entry->avc_config->config->sequenceParameterSetExtensions, ps_bs, rewrite_start_codes, nal_unit_size_field);
+			rewrite_nalus_list(entry->avc_config->config->pictureParameterSets, ps_bs, rewrite_start_codes, nal_unit_size_field);
+		}
+
+		/*add svc config */
+		if (entry->svc_config) {
+			rewrite_nalus_list(entry->svc_config->config->sequenceParameterSets, ps_bs, rewrite_start_codes, nal_unit_size_field);
+			rewrite_nalus_list(entry->svc_config->config->pictureParameterSets, ps_bs, rewrite_start_codes, nal_unit_size_field);
+		}
+	}
+}
+
+
 GF_Err gf_isom_nalu_sample_rewrite(GF_MediaBox *mdia, GF_ISOSample *sample, u32 sampleNumber, GF_MPEGVisualSampleEntryBox *entry)
 {
 	Bool is_hevc = 0;
 	GF_Err e = GF_OK;
 	GF_ISOSample *ref_samp;
 	GF_BitStream *src_bs, *ref_bs, *dst_bs, *ps_bs;
-	u64 offset;
-	u32 ref_nalu_size, data_offset, data_length, copy_size, nal_size, max_size, di, nal_unit_size_field, cur_extract_mode, extractor_mode, ref_extract_mode;
+	u32 nal_size, max_size, nal_unit_size_field, extractor_mode;
 	Bool rewrite_ps, rewrite_start_codes, insert_vdrd_code;
-	u8 ref_track_ID, ref_track_num;
-	s8 sample_offset, nal_type;
+	s8 nal_type;
 	u32 nal_hdr;
 	u32 temporal_id = 0;
 	char *buffer;
@@ -104,7 +339,12 @@
 	ref_samp = NULL;
 	buffer = NULL;
 	rewrite_ps = (mdia->mediaTrack->extractor_mode & GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG) ? 1 : 0;
-	if (! sample->IsRAP) rewrite_ps = 0;
+	if ( mdia->information->sampleTable->no_sync_found) {
+		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;
@@ -120,9 +360,15 @@
 
 	if (!entry) return GF_BAD_PARAM;
 	nal_unit_size_field = 0;
-	/*if svc rewrire*/
+	/*if svc rewrite*/
 	if (entry->svc_config && entry->svc_config->config) nal_unit_size_field = entry->svc_config->config->nal_unit_size;
-	/*if mvc rewrire*/
+	/*if mvc rewrite*/
+
+	/*if shvc rewrite*/
+	else if (entry->shvc_config && entry->shvc_config->config)  {
+		is_hevc = 1;
+		nal_unit_size_field = entry->shvc_config->config->nal_unit_size;
+	}
 
 	/*otherwise do nothing*/
 	else if (!rewrite_ps && !rewrite_start_codes) {
@@ -131,11 +377,12 @@
 
 	if (!nal_unit_size_field) {
 		if (entry->avc_config) nal_unit_size_field = entry->avc_config->config->nal_unit_size;
-		else if (entry->hevc_config) {
-			nal_unit_size_field = entry->hevc_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;
 		}
 	}
+
 	if (!nal_unit_size_field) return GF_ISOM_INVALID_FILE;
 
 	dst_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -148,8 +395,12 @@
 
 		//we are SVC, don't write NALU delim, only insert VDRD NALU
 		if (insert_vdrd_code) {
-			gf_bs_write_int(dst_bs, 1, 32);
-			gf_bs_write_int(dst_bs, GF_AVC_NALU_VDRD , 8);
+			//todo later ...
+			if (is_hevc) {
+			} else {
+				gf_bs_write_int(dst_bs, 1, 32);
+				gf_bs_write_int(dst_bs, GF_AVC_NALU_VDRD , 8);
+			}
 		}
 		//AVC/HEVC base, insert NALU delim
 		else {
@@ -173,16 +424,48 @@
 	}
 
 	if (rewrite_ps) {
-		if (is_hevc) {
-			u32 i, count;
-			count = gf_list_count(entry->hevc_config->config->param_array);
-			for (i=0; i<count; i++) {
-				GF_HEVCParamArray *ar = gf_list_get(entry->hevc_config->config->param_array, i);
-				rewrite_nalus_list(ar->nalus, ps_bs, rewrite_start_codes, nal_unit_size_field);
+		//in insepct 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++) {
+					GF_TrackBox *a_track = GetTrackbyID(mdia->mediaTrack->moov, scal->trackIDs[i]);
+					GF_MPEGVisualSampleEntryBox *an_entry = NULL;
+					if (a_track && a_track->Media && a_track->Media->information && a_track->Media->information->sampleTable && a_track->Media->information->sampleTable->SampleDescription)
+						an_entry = gf_list_get(a_track->Media->information->sampleTable->SampleDescription->other_boxes, 0);
+
+					if (an_entry)
+						nalu_merge_ps(ps_bs, rewrite_start_codes, nal_unit_size_field, an_entry, is_hevc);
+				}
 			}
+		}
+		nalu_merge_ps(ps_bs, rewrite_start_codes, nal_unit_size_field, entry, is_hevc);
 
+
+		if (is_hevc) {
 			/*little optimization if we are not asked to start codes: copy over the sample*/
-			if (!rewrite_start_codes) {
+			if (!rewrite_start_codes && !entry->shvc_config) {
+				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
+					//this is not correct since we are not sure whether they are the same xPS or not, but it crashes openHEVC ...
+					switch (nal_type) {
+#ifndef GPAC_DISABLE_HEVC
+					case GF_HEVC_NALU_VID_PARAM:
+					case GF_HEVC_NALU_SEQ_PARAM:
+					case GF_HEVC_NALU_PIC_PARAM:
+						break;
+#endif
+					default:
+						gf_bs_transfer(dst_bs, ps_bs);
+						break;
+					}
+					gf_bs_del(ps_bs);
+					ps_bs = NULL;
+				}
 				gf_bs_write_data(dst_bs, sample->data, sample->dataLength);
 				gf_free(sample->data);
 				sample->data = NULL;
@@ -191,23 +474,11 @@
 				gf_bs_del(dst_bs);
 				return GF_OK;
 			}
-		} else {
-			if (entry->avc_config) {
-				rewrite_nalus_list(entry->avc_config->config->sequenceParameterSets, ps_bs, rewrite_start_codes, nal_unit_size_field);
-				rewrite_nalus_list(entry->avc_config->config->sequenceParameterSetExtensions, ps_bs, rewrite_start_codes, nal_unit_size_field);
-				rewrite_nalus_list(entry->avc_config->config->pictureParameterSets, ps_bs, rewrite_start_codes, nal_unit_size_field);
-			}
-
-			/*add svc config */
-			if (entry->svc_config) {
-				rewrite_nalus_list(entry->svc_config->config->sequenceParameterSets, ps_bs, rewrite_start_codes, nal_unit_size_field);
-				rewrite_nalus_list(entry->svc_config->config->pictureParameterSets, ps_bs, rewrite_start_codes, nal_unit_size_field);
-			}
 		}
 	}
 
 	/*little optimization if we are not asked to rewrite extractors or start codes: copy over the sample*/
-	if (!entry->svc_config && !rewrite_start_codes && !rewrite_ps) {
+	if (!entry->svc_config && !entry->shvc_config && !rewrite_start_codes && !rewrite_ps) {
 		if (ps_bs)
 		{
 			gf_bs_transfer(dst_bs, ps_bs);
@@ -253,26 +524,32 @@
 				continue;
 			}
 			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);
+				if (e) goto exit;
+				break;
+
 			case GF_HEVC_NALU_SLICE_TSA_N:
 			case GF_HEVC_NALU_SLICE_STSA_N:
 			case GF_HEVC_NALU_SLICE_TSA_R:
 			case GF_HEVC_NALU_SLICE_STSA_R:
 				if (temporal_id < (nal_hdr & 0x7))
 					temporal_id = (nal_hdr & 0x7);
-				break;
+			default:
+				/*rewrite nal*/
+				gf_bs_read_data(src_bs, buffer, nal_size-2);
+				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_u16(dst_bs, nal_hdr);
+				gf_bs_write_data(dst_bs, buffer, nal_size-2);
 			}
 #endif
 			
-			/*rewrite nal*/
-			gf_bs_read_data(src_bs, buffer, nal_size-2);
-			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_u16(dst_bs, nal_hdr);
-			gf_bs_write_data(dst_bs, buffer, nal_size-2);
-
+			//done with HEVC
 			continue;
 		} 
 		
@@ -283,99 +560,8 @@
 				continue;		
 			//extractor
 			case 31:
-				switch (extractor_mode) {
-					case 0:
-						gf_bs_read_int(src_bs, 24); //3 bytes of NALUHeader in extractor
-						ref_track_ID = gf_bs_read_u8(src_bs);
-						sample_offset = (s8) gf_bs_read_int(src_bs, 8);
-						data_offset = gf_bs_read_u32(src_bs);
-						data_length = gf_bs_read_u32(src_bs);
-
-						ref_track_num = gf_isom_get_track_by_id(file, ref_track_ID);
-						if (!ref_track_num) {
-							e = GF_BAD_PARAM;
-							goto exit;
-						}
-						cur_extract_mode = gf_isom_get_nalu_extract_mode(file, ref_track_num);
-						ref_extract_mode = GF_ISOM_NALU_EXTRACT_INSPECT;
-						if (rewrite_ps)
-							ref_extract_mode |= GF_ISOM_NALU_EXTRACT_INBAND_PS_FLAG;
-						gf_isom_set_nalu_extract_mode(file, ref_track_num, ref_extract_mode);
-						ref_samp = gf_isom_get_sample(file, ref_track_num, sampleNumber+sample_offset, &di);
-						if (!ref_samp) {
-							e = GF_IO_ERR;
-							goto exit;
-						}
-						if (rewrite_start_codes) {
-							gf_bs_write_int(dst_bs, 1, 32);
-							if (is_hevc) {
-								gf_bs_write_int(dst_bs, 0, 1);
-								gf_bs_write_int(dst_bs, GF_HEVC_NALU_ACCESS_UNIT, 6);
-								gf_bs_write_int(dst_bs, 0, 9);
-								/*pic-type - by default we signal all slice types possible*/
-								gf_bs_write_int(dst_bs, 2, 3);
-								gf_bs_write_int(dst_bs, 0, 5);
-							} else {
-								gf_bs_write_int(dst_bs, (ref_samp->data[0] & 0x60) | GF_AVC_NALU_ACCESS_UNIT, 8);
-								gf_bs_write_int(dst_bs, 0xF0 , 8); /*7 "all supported NALUs" (=111) + rbsp trailing (10000)*/;
-							}
-						}
-						ref_bs = gf_bs_new(ref_samp->data, ref_samp->dataLength, GF_BITSTREAM_READ);
-						offset = 0;
-						while (gf_bs_available(ref_bs)) {
-							if (gf_bs_get_position(ref_bs) < data_offset) {
-								ref_nalu_size = gf_bs_read_int(ref_bs, 8*nal_unit_size_field);
-								offset += ref_nalu_size + nal_unit_size_field;
-								if ((offset > data_offset) || (offset >= gf_bs_get_size(ref_bs))) {
-									e = GF_BAD_PARAM;
-									goto exit;
-								}
-
-								e = gf_bs_seek(ref_bs, offset);
-								if (e)
-									goto exit;
-								continue;
-							}
-							ref_nalu_size = gf_bs_read_int(ref_bs, 8*nal_unit_size_field);
-							copy_size = data_length ? data_length : ref_nalu_size;
-							assert(copy_size <= ref_nalu_size);
-							nal_hdr = gf_bs_read_u8(ref_bs); //rewrite NAL type
-							if ((copy_size-1)>max_size) {
-								buffer = (char*)gf_realloc(buffer, sizeof(char)*(copy_size-1));
-								max_size = copy_size-1;
-							}			
-							gf_bs_read_data(ref_bs, buffer, copy_size-1);
-
-							if (rewrite_start_codes) 
-								gf_bs_write_u32(dst_bs, 1);
-							else
-								gf_bs_write_int(dst_bs, copy_size, 8*nal_unit_size_field);
-
-							gf_bs_write_u8(dst_bs, nal_hdr);
-							gf_bs_write_data(dst_bs, buffer, copy_size-1);
-						}
-
-						gf_isom_sample_del(&ref_samp);
-						ref_samp = NULL;
-						gf_bs_del(ref_bs);
-						ref_bs = NULL;
-						gf_isom_set_nalu_extract_mode(file, ref_track_num, cur_extract_mode);
-						break;
-					case 1:
-						//skip to end of this NALU
-						gf_bs_skip_bytes(src_bs, nal_size-1);
-						continue;
-					case 2:
-						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);
-						break;
-				}
+				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_SEI:
 			case GF_AVC_NALU_SEQ_PARAM:
@@ -439,7 +625,7 @@
 	gf_bs_del(bs);
 	bs = gf_bs_new(data, data_size, GF_BITSTREAM_READ);
 
-	new_cfg = gf_odf_hevc_cfg_read_bs(bs);
+	new_cfg = gf_odf_hevc_cfg_read_bs(bs, cfg->is_shvc);
 	gf_bs_del(bs);
 	gf_free(data);
 	return new_cfg;
@@ -495,8 +681,102 @@
 	return cfg_new;	
 }
 
+static void merge_avc_config(GF_AVCConfig *dst_cfg, GF_AVCConfig *src_cfg)
+{
+	GF_AVCConfig *cfg = AVC_DuplicateConfig(src_cfg);
+	while (gf_list_count(cfg->sequenceParameterSets)) {
+		GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(cfg->sequenceParameterSets, 0);
+		gf_list_rem(cfg->sequenceParameterSets, 0);
+		gf_list_insert(dst_cfg->sequenceParameterSets, p, 0);
+	}
+	while (gf_list_count(cfg->pictureParameterSets)) {
+		GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(cfg->pictureParameterSets, 0);
+		gf_list_rem(cfg->pictureParameterSets, 0);
+		gf_list_insert(dst_cfg->pictureParameterSets, p, 0);
+	}
+	gf_odf_avc_cfg_del(cfg);
+}
 
-void AVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc)
+void merge_hevc_config(GF_HEVCConfig *dst_cfg, GF_HEVCConfig *src_cfg)
+{
+	GF_HEVCConfig *cfg = HEVC_DuplicateConfig(src_cfg);
+	//merge all xPS
+	u32 i, j, count = cfg->param_array ? gf_list_count(cfg->param_array) : 0;
+	for (i=0; i<count; i++) {
+		GF_HEVCParamArray *ar_h = NULL;
+		u32 count2 = dst_cfg->param_array ? gf_list_count(dst_cfg->param_array) : 0;
+		GF_HEVCParamArray *ar = gf_list_get(cfg->param_array, i);
+		for (j=0; j<count2; j++) {
+			ar_h = gf_list_get(dst_cfg->param_array, j);
+			if (ar_h->type==ar->type) {
+				break;
+			}
+			ar_h = NULL;
+		}
+		if (!ar_h) {
+			gf_list_add(dst_cfg->param_array, ar);
+			gf_list_rem(cfg->param_array, i);
+			count--;
+			i--;
+		} else {
+			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);
+			}
+
+		}
+	}
+	gf_odf_hevc_cfg_del(cfg);
+
+#define CHECK_CODE(__code)	if (dst_cfg->__code < src_cfg->__code) dst_cfg->__code = src_cfg->__code;
+
+	CHECK_CODE(configurationVersion)
+	CHECK_CODE(profile_idc)
+	CHECK_CODE(profile_space)
+	CHECK_CODE(tier_flag)
+	CHECK_CODE(general_profile_compatibility_flags)
+	CHECK_CODE(progressive_source_flag)
+	CHECK_CODE(interlaced_source_flag)
+	CHECK_CODE(constraint_indicator_flags)
+	CHECK_CODE(level_idc)
+	CHECK_CODE(min_spatial_segmentation_idc)
+
+}
+
+void merge_all_config(GF_AVCConfig *avc_cfg, GF_HEVCConfig *hevc_cfg, GF_MediaBox *mdia)
+{
+	u32 i;
+	GF_TrackReferenceTypeBox *scal = NULL;
+	Track_FindRef(mdia->mediaTrack, GF_4CC('s','c','a','l'), &scal);
+
+	if (!scal) return;
+
+	for (i=0; i<scal->trackIDCount; i++) {
+		GF_TrackBox *a_track = GetTrackbyID(mdia->mediaTrack->moov, scal->trackIDs[i]);
+		GF_MPEGVisualSampleEntryBox *an_entry = NULL;
+		if (a_track && a_track->Media && a_track->Media->information && a_track->Media->information->sampleTable && a_track->Media->information->sampleTable->SampleDescription)
+			an_entry = gf_list_get(a_track->Media->information->sampleTable->SampleDescription->other_boxes, 0);
+
+		if (!an_entry) continue;
+
+		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) 
+			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->hevc_config && an_entry->hevc_config->config) 
+			merge_hevc_config(hevc_cfg, an_entry->hevc_config->config);
+	}
+
+	if (hevc_cfg) hevc_cfg->is_shvc = 0;
+}
+
+void AVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *avc, GF_MediaBox *mdia)
 {
 	GF_AVCConfig *avcc, *svcc;
 	if (avc->emul_esd) gf_odf_desc_del((GF_Descriptor *)avc->emul_esd);
@@ -528,36 +808,38 @@
 		avcc = avc->avc_config->config ? AVC_DuplicateConfig(avc->avc_config->config) : NULL;
 		/*merge SVC config*/
 		if (avc->svc_config) {
-			svcc = AVC_DuplicateConfig(avc->svc_config->config);
-			while (gf_list_count(svcc->sequenceParameterSets)) {
-				GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(svcc->sequenceParameterSets, 0);
-				gf_list_rem(svcc->sequenceParameterSets, 0);
-				gf_list_add(avcc->sequenceParameterSets, p);
-			}
-			while (gf_list_count(svcc->pictureParameterSets)) {
-				GF_AVCConfigSlot *p = (GF_AVCConfigSlot*)gf_list_get(svcc->pictureParameterSets, 0);
-				gf_list_rem(svcc->pictureParameterSets, 0);
-				gf_list_add(avcc->pictureParameterSets, p);
-			}
-			gf_odf_avc_cfg_del(svcc);
+			merge_avc_config(avcc, avc->svc_config->config);
 		}
 		if (avcc) {
+			if (mdia) merge_all_config(avcc, NULL, mdia);
+
 			gf_odf_avc_cfg_write(avcc, &avc->emul_esd->decoderConfig->decoderSpecificInfo->data, &avc->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
 			gf_odf_avc_cfg_del(avcc);
 		}
 	} else if (avc->svc_config) {
 		svcc = AVC_DuplicateConfig(avc->svc_config->config);
+
+		if (mdia) merge_all_config(svcc, NULL, mdia);
+
 		gf_odf_avc_cfg_write(svcc, &avc->emul_esd->decoderConfig->decoderSpecificInfo->data, &avc->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
 		gf_odf_avc_cfg_del(svcc);
 	}
 }
 
-void HEVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *hevc)
+void AVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *avc)
+{
+	AVC_RewriteESDescriptorEx(avc, NULL);
+}
+
+void HEVC_RewriteESDescriptorEx(GF_MPEGVisualSampleEntryBox *hevc, GF_MediaBox *mdia)
 {
 	if (hevc->emul_esd) gf_odf_desc_del((GF_Descriptor *)hevc->emul_esd);
 	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) 
+		hevc->emul_esd->decoderConfig->objectTypeIndication = GPAC_OTI_VIDEO_SHVC;
+
 	if (hevc->bitrate) {
 		hevc->emul_esd->decoderConfig->bufferSizeDB = hevc->bitrate->bufferSizeDB;
 		hevc->emul_esd->decoderConfig->avgBitrate = hevc->bitrate->avgBitrate;
@@ -574,10 +856,26 @@
 				gf_odf_desc_del(clone);
 		}
 	}
-	if (hevc->hevc_config && hevc->hevc_config->config) {
-		gf_odf_hevc_cfg_write(hevc->hevc_config->config, &hevc->emul_esd->decoderConfig->decoderSpecificInfo->data, &hevc->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
+
+	if (hevc->hevc_config || hevc->shvc_config) {
+		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);
+		}
+
+		if (mdia) merge_all_config(NULL, hcfg, mdia);
+
+		if (hcfg) {
+			gf_odf_hevc_cfg_write(hcfg, &hevc->emul_esd->decoderConfig->decoderSpecificInfo->data, &hevc->emul_esd->decoderConfig->decoderSpecificInfo->dataLength);
+			gf_odf_hevc_cfg_del(hcfg);
+		}
 	}
 }
+void HEVC_RewriteESDescriptor(GF_MPEGVisualSampleEntryBox *hevc)
+{
+	HEVC_RewriteESDescriptorEx(hevc, NULL);
+}
 
 GF_Err AVC_HEVC_UpdateESD(GF_MPEGVisualSampleEntryBox *avc, GF_ESD *esd)
 {
@@ -620,23 +918,22 @@
 		}
 	}
 
-	/*update GF_AVCConfig*/
-	if (!avc->svc_config) {
-		if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
-			if (!avc->hevc_config) avc->hevc_config = (GF_HEVCConfigurationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
-			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-				if (avc->hevc_config->config) gf_odf_hevc_cfg_del(avc->hevc_config->config);
-				avc->hevc_config->config = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-			}
-		} else {
-			if (!avc->avc_config) avc->avc_config = (GF_AVCConfigurationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
-			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-				if (avc->avc_config->config) gf_odf_avc_cfg_del(avc->avc_config->config);
-				avc->avc_config->config = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
-			}
-		}
 
+	if (!avc->shvc_config && (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC)) {
+		if (!avc->hevc_config) avc->hevc_config = (GF_HEVCConfigurationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
+		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+			if (avc->hevc_config->config) gf_odf_hevc_cfg_del(avc->hevc_config->config);
+			avc->hevc_config->config = gf_odf_hevc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 0);
+		}
 	}
+	else if (!avc->svc_config && (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC)) {
+		if (!avc->avc_config) avc->avc_config = (GF_AVCConfigurationBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_AVCC);
+		if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+			if (avc->avc_config->config) gf_odf_avc_cfg_del(avc->avc_config->config);
+			avc->avc_config->config = gf_odf_avc_cfg_read(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength);
+		}
+	}
+
 	gf_odf_desc_del((GF_Descriptor *)esd);
 	if (avc->hevc_config) {
 		HEVC_RewriteESDescriptor(avc);
@@ -669,7 +966,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	//create a new entry
 	entry = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_AVC1);
@@ -870,7 +1168,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	//create a new entry
 	entry = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SVC1);
@@ -904,7 +1203,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	//create a new entry
 	entry = (GF_MPEGVisualSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_HVC1);
@@ -929,36 +1229,86 @@
 	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 || !DescriptionIndex) return GF_BAD_PARAM;
+	if (!trak || !trak->Media || !DescriptionIndex) return GF_BAD_PARAM;
 	entry = (GF_MPEGVisualSampleEntryBox *)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	if (!entry) return GF_BAD_PARAM;
 	switch (entry->type) {
 	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:
 		break;
 	default:
 		return GF_BAD_PARAM;
 	}
 
-	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 = HEVC_DuplicateConfig(cfg);
+	if (operand_type<=1) {
+		if (!entry->hevc_config) entry->hevc_config = (GF_HEVCConfigurationBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_HVCC);
 
-	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);
+		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;
+		}
+		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;
+			/*we want to force hev1*/
+			if (operand_type==1) ar->array_completeness = 0;
 
-		if (!ar->array_completeness) {
-			array_incomplete = 1;
-			break;
+			if (!ar->array_completeness) {
+				array_incomplete = 1;
+
+				while (gf_list_count(ar->nalus)) {
+					GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, 0);
+					gf_list_rem(ar->nalus, 0);
+					if (sl->data) gf_free(sl->data);
+					gf_free(sl);
+				}
+				gf_list_del(ar->nalus);
+				gf_free(ar);
+				gf_list_rem(entry->hevc_config->config->param_array, i);
+				i--;
+
+			}
+		}
+		entry->type = array_incomplete ? GF_ISOM_BOX_TYPE_HEV1 : GF_ISOM_BOX_TYPE_HVC1;
+	} else {
+
+		/*SVCC replacement*/
+		if (operand_type==2) {
+			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);
+			entry->shvc_config->config = HEVC_DuplicateConfig(cfg);
+			entry->type = GF_ISOM_BOX_TYPE_HVC1;
+		}
+		/*SVCC replacement and HEVC removal*/
+		else if (operand_type==3) {
+			if (!cfg) {
+				if (entry->shvc_config) {
+					gf_isom_box_del((GF_Box*)entry->shvc_config);
+					entry->shvc_config = NULL;
+				}
+				if (entry->type==GF_ISOM_BOX_TYPE_SHV1) entry->type = GF_ISOM_BOX_TYPE_HEV1;
+				else entry->type = GF_ISOM_BOX_TYPE_HVC1;
+			} else {
+				entry->type = GF_ISOM_BOX_TYPE_SHC1;
+				if (entry->hevc_config) {
+					gf_isom_box_del((GF_Box*)entry->hevc_config);
+					entry->hevc_config = NULL;
+				}
+				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);
+				entry->shvc_config->config = HEVC_DuplicateConfig(cfg);
+			}
 		}
 	}
 
-	entry->type = array_incomplete ? GF_ISOM_BOX_TYPE_HEV1 : GF_ISOM_BOX_TYPE_HVC1;
-	
 	HEVC_RewriteESDescriptor(entry);
 	return GF_OK;
 }
@@ -975,6 +1325,12 @@
 	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, NULL, 1);
 }
 
+GF_Err gf_isom_shvc_config_update(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex, GF_HEVCConfig *cfg, Bool is_add)
+{
+	if (cfg) cfg->is_shvc = 1;
+	return gf_isom_hevc_config_update_ex(the_file, trackNumber, DescriptionIndex, cfg, is_add ? 2 : 3);
+}
+
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_EXPORT
@@ -1001,16 +1357,10 @@
 	GF_MPEGVisualSampleEntryBox *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
-
+	if (gf_isom_get_hevc_shvc_type(the_file, trackNumber, DescriptionIndex)==GF_ISOM_HEVCTYPE_NONE)
+		return NULL;
 	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
 	if (!entry) return NULL;
-	switch (entry->type) {
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
-		break;
-	default:
-		return NULL;
-	}
 	if (!entry->hevc_config) return NULL;
 	return HEVC_DuplicateConfig(entry->hevc_config->config);
 }
@@ -1034,14 +1384,21 @@
 GF_EXPORT
 u32 gf_isom_get_avc_svc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
 {
+	u32 type;
 	GF_TrackBox *trak;
 	GF_MPEGVisualSampleEntryBox *entry;
 	trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !trak->Media || !DescriptionIndex) return GF_ISOM_AVCTYPE_NONE;
 	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);
-	if (!entry) return GF_ISOM_AVCTYPE_NONE;
-	switch (entry->type) {
+	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;
+	}
+
+	switch (type) {
 	case GF_ISOM_BOX_TYPE_AVC1:
 	case GF_ISOM_BOX_TYPE_AVC2:
 	case GF_ISOM_BOX_TYPE_AVC3:
@@ -1057,6 +1414,55 @@
 	return GF_ISOM_AVCTYPE_NONE;
 }
 
+GF_EXPORT
+u32 gf_isom_get_hevc_shvc_type(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	u32 type;
+	GF_TrackBox *trak;
+	GF_MPEGVisualSampleEntryBox *entry;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !DescriptionIndex) return GF_ISOM_HEVCTYPE_NONE;
+	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;
+	}
+
+	switch (type) {
+	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:
+		break;
+	default:
+		return GF_ISOM_HEVCTYPE_NONE;
+	}
+	if (entry->hevc_config && !entry->shvc_config) return GF_ISOM_HEVCTYPE_HEVC_ONLY;
+	if (entry->hevc_config && entry->shvc_config) return GF_ISOM_HEVCTYPE_HEVC_SHVC;
+	if (!entry->hevc_config && entry->shvc_config) return GF_ISOM_HEVCTYPE_SHVC_ONLY;
+	return GF_ISOM_HEVCTYPE_NONE;
+}
+
+GF_EXPORT
+GF_HEVCConfig *gf_isom_shvc_config_get(GF_ISOFile *the_file, u32 trackNumber, u32 DescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_MPEGVisualSampleEntryBox *entry;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak || !trak->Media || !DescriptionIndex) return NULL;
+	if (gf_isom_get_hevc_shvc_type(the_file, trackNumber, DescriptionIndex)==GF_ISOM_HEVCTYPE_NONE)
+		return NULL;
+	entry = (GF_MPEGVisualSampleEntryBox*)gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, DescriptionIndex-1);
+	if (!entry) return NULL;
+	if (!entry->shvc_config) return NULL;
+	return HEVC_DuplicateConfig(entry->shvc_config->config);
+}
+
 
 void btrt_del(GF_Box *s)
 {
@@ -1158,10 +1564,11 @@
 GF_Err m4ds_Size(GF_Box *s)
 {
 	GF_Err e;
-	u32 descSize;
+	u32 descSize = 0;
 	GF_MPEG4ExtensionDescriptorsBox *ptr = (GF_MPEG4ExtensionDescriptorsBox *)s;
 	e = gf_isom_box_get_size(s);
-	if (!e) e = gf_odf_desc_list_size(ptr->descriptors, &descSize);
+	if (e) return e;
+	e = gf_odf_desc_list_size(ptr->descriptors, &descSize);
 	ptr->size += descSize;
 	return e;
 }
@@ -1175,6 +1582,7 @@
 	if (ptr->config) gf_odf_avc_cfg_del(ptr->config);
 	gf_free(ptr);
 }
+
 GF_Err avcc_Read(GF_Box *s, GF_BitStream *bs)
 {
 	u32 i, count;
@@ -1252,6 +1660,11 @@
 
 			count = gf_bs_read_int(bs, 8);
 			ptr->size -= 4;
+			if (count*2 > ptr->size) {
+				//ffmpeg just ignores this part while allocating bytes (filled with garbage?)
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CODING, ("AVCC: invalid numOfSequenceParameterSetExt value. Skipping.\n"));
+				return GF_OK;
+			}
 			if (count) {
 				ptr->config->sequenceParameterSetExtensions = gf_list_new();
 				for (i=0; i<count; i++) {
@@ -1268,6 +1681,7 @@
 	}
 	return GF_OK;
 }
+
 GF_Box *avcc_New()
 {
 	GF_AVCConfigurationBox *tmp = (GF_AVCConfigurationBox *) gf_malloc(sizeof(GF_AVCConfigurationBox));
@@ -1396,7 +1810,7 @@
 	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);
+	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 ;
 	if (pos < ptr->size)
 		ptr->size -= (u32) pos;
@@ -1436,6 +1850,9 @@
 		return e;
 	}
 	ptr->size += 23;
+	if (ptr->config->is_shvc) {
+		ptr->size += 3;
+	}
 
 	count = gf_list_count(ptr->config->param_array);
 	for (i=0; i<count; i++) {

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_code_adobe.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_adobe.c Changed

@@ -1,691 +1,691 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Author: Romain Bouqueau
- *			Copyright (c) Romain Bouqueau 2012-
- *				All rights reserved
- *
- *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
- *
- *  This file is part of GPAC / ISO Media File Format sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <gpac/internal/isomedia_dev.h>
-
-#ifndef GPAC_DISABLE_ISOM_ADOBE
-
-#ifndef GPAC_DISABLE_ISOM
-
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-
-void abst_del(GF_Box *s)
-{
-	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
-	if (ptr == NULL) return;
-
-	if (ptr->movie_identifier)
-		gf_free(ptr->movie_identifier);
-	if (ptr->drm_data)
-		gf_free(ptr->drm_data);
-	if (ptr->meta_data)
-		gf_free(ptr->meta_data);
-
-	while (gf_list_count(ptr->server_entry_table)) {
-		gf_free(gf_list_get(ptr->server_entry_table, 0));
-		gf_list_rem(ptr->server_entry_table, 0);
-	}
-	gf_list_del(ptr->server_entry_table);
-
-	while (gf_list_count(ptr->quality_entry_table)) {
-		gf_free(gf_list_get(ptr->quality_entry_table, 0));
-		gf_list_rem(ptr->quality_entry_table, 0);
-	}
-	gf_list_del(ptr->quality_entry_table);
-
-	while (gf_list_count(ptr->segment_run_table_entries)) {
-		gf_isom_box_del((GF_Box *)gf_list_get(ptr->segment_run_table_entries, 0));
-		gf_list_rem(ptr->segment_run_table_entries, 0);
-	}
-	gf_list_del(ptr->segment_run_table_entries);
-
-	while (gf_list_count(ptr->fragment_run_table_entries)) {
-		gf_isom_box_del((GF_Box *)gf_list_get(ptr->fragment_run_table_entries, 0));
-		gf_list_rem(ptr->fragment_run_table_entries, 0);
-	}
-	gf_list_del(ptr->fragment_run_table_entries);
-
-	gf_free(ptr);
-}
-
-GF_Err abst_Read(GF_Box *s, GF_BitStream *bs)
-{
-	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
-	int i;
-	u32 tmp_strsize = (u32) ptr->size - 8;
-	char *tmp_str = gf_malloc(sizeof(char)*tmp_strsize);
-
-	GF_Err e = gf_isom_full_box_read(s, bs);
-	if (e) return e;
-
-	ptr->bootstrapinfo_version = gf_bs_read_u32(bs);
-	ptr->profile = gf_bs_read_int(bs, 2);
-	ptr->live = gf_bs_read_int(bs, 1);
-	ptr->update = gf_bs_read_int(bs, 1);
-	ptr->reserved = gf_bs_read_int(bs, 4);
-	ptr->time_scale = gf_bs_read_u32(bs);
-	ptr->current_media_time = gf_bs_read_u64(bs);
-	ptr->smpte_time_code_offset = gf_bs_read_u64(bs);
-	i=0;
-	tmp_strsize=(u32)ptr->size-8;
-	while (tmp_strsize) {
-		tmp_str[i] = gf_bs_read_u8(bs);
-		tmp_strsize--;
-		if (!tmp_str[i])
-			break;
-		i++;
-	}
-	if (i)
-		ptr->movie_identifier = gf_strdup(tmp_str);
-	
-	ptr->server_entry_count = gf_bs_read_u8(bs);
-	for (i=0; i<ptr->server_entry_count; i++) {
-		int j=0;
-		tmp_strsize=(u32)ptr->size-8;
-		while (tmp_strsize) {
-			tmp_str[j] = gf_bs_read_u8(bs);
-			tmp_strsize--;
-			if (!tmp_str[j])
-				break;
-			j++;
-		}
-		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;
-		tmp_strsize=(u32)ptr->size-8;
-		while (tmp_strsize) {
-			tmp_str[j] = gf_bs_read_u8(bs);
-			tmp_strsize--;
-			if (!tmp_str[j])
-				break;
-			j++;
-		}
-		gf_list_insert(ptr->quality_entry_table, gf_strdup(tmp_str), i);
-	}
-
-	i=0;
-	tmp_strsize=(u32)ptr->size-8;
-	while (tmp_strsize) {
-		tmp_str[i] = gf_bs_read_u8(bs);
-		tmp_strsize--;
-		if (!tmp_str[i])
-			break;
-		i++;
-	}
-	if (i)
-		ptr->drm_data = gf_strdup(tmp_str);
-
-	i=0;
-	tmp_strsize=(u32)ptr->size-8;
-	while (tmp_strsize) {
-		tmp_str[i] = gf_bs_read_u8(bs);
-		tmp_strsize--;
-		if (!tmp_str[i])
-			break;
-		i++;
-	}
-	if (i)
-		ptr->meta_data = gf_strdup(tmp_str);
-	
-	ptr->segment_run_table_count = gf_bs_read_u8(bs);
-	for (i=0; i<ptr->segment_run_table_count; i++) {
-		GF_AdobeSegmentRunTableBox *asrt;
-		e = gf_isom_parse_box((GF_Box **)&asrt, bs);
-		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;	
-		e = gf_isom_parse_box((GF_Box **)&afrt, bs);
-		if (e) return e;
-		gf_list_insert(ptr->fragment_run_table_entries, afrt, i);
-	}
-
-	gf_free(tmp_str);
-
-	return GF_OK;
-}
-
-GF_Box *abst_New()
-{
-	ISOM_DECL_BOX_ALLOC(GF_AdobeBootstrapInfoBox, GF_ISOM_BOX_TYPE_ABST);
-	tmp->server_entry_table = gf_list_new();
-	tmp->quality_entry_table = gf_list_new();
-	tmp->segment_run_table_entries = gf_list_new();
-	tmp->fragment_run_table_entries = gf_list_new();
-	return (GF_Box *)tmp;
-}
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err abst_Write(GF_Box *s, GF_BitStream *bs)
-{
-	GF_Err e;
-	unsigned int i;
-	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
-
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-
-	gf_bs_write_u32(bs, ptr->bootstrapinfo_version);
-	gf_bs_write_int(bs, ptr->profile, 2);
-	gf_bs_write_int(bs, ptr->live, 1);
-	gf_bs_write_int(bs, ptr->update, 1);
-	gf_bs_write_int(bs, ptr->reserved, 4);
-	gf_bs_write_u32(bs, ptr->time_scale);
-	gf_bs_write_u64(bs, ptr->current_media_time);
-	gf_bs_write_u64(bs, ptr->smpte_time_code_offset);
-	if (ptr->movie_identifier)
-		gf_bs_write_data(bs, ptr->movie_identifier, (u32)strlen(ptr->movie_identifier) + 1);
-	else
-		gf_bs_write_u8(bs, 0);
-
-	gf_bs_write_u8(bs, ptr->server_entry_count);
-	for (i=0; i<ptr->server_entry_count; i++) {
-		char *str = (char*)gf_list_get(ptr->server_entry_table, i);
-		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
-	}
-
-	gf_bs_write_u8(bs, ptr->quality_entry_count);
-	for (i=0; i<ptr->quality_entry_count; i++) {
-		char *str = (char*)gf_list_get(ptr->quality_entry_table, i);
-		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
-	}
-
-	if (ptr->drm_data)
-		gf_bs_write_data(bs, ptr->drm_data, (u32)strlen(ptr->drm_data) + 1);
-	else
-		gf_bs_write_u8(bs, 0);
-
-	if (ptr->meta_data)
-		gf_bs_write_data(bs, ptr->meta_data, (u32)strlen(ptr->meta_data) + 1);
-	else
-		gf_bs_write_u8(bs, 0);
-
-	gf_bs_write_u8(bs, ptr->segment_run_table_count);
-	for (i=0; i<ptr->segment_run_table_count; i++) {
-		e = gf_isom_box_write((GF_Box *)gf_list_get(ptr->segment_run_table_entries, i), bs);
-		if (e) return e;
-	}
-
-	gf_bs_write_u8(bs, ptr->fragment_run_table_count);
-	for (i=0; i<ptr->fragment_run_table_count; i++) {
-		e = gf_isom_box_write((GF_Box *)gf_list_get(ptr->fragment_run_table_entries, i), bs);
-		if (e) return e;
-	}
-
-	return GF_OK;
-}
-
-
-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;
-
-	for (i=0; i<ptr->server_entry_count; i++)
-			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 += (ptr->drm_data ? (strlen(ptr->drm_data) + 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);
-		e = gf_isom_box_size(box);
-		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);
-		e = gf_isom_box_size(box);
-		if (e) return e;
-		s->size += box->size;
-	}
-
-	return GF_OK;
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-void afra_del(GF_Box *s)
-{
-	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
-	if (ptr == NULL) return;
-
-	while (gf_list_count(ptr->local_access_entries)) {
-		gf_free(gf_list_get(ptr->local_access_entries, 0));
-		gf_list_rem(ptr->local_access_entries, 0);
-	}
-	gf_list_del(ptr->local_access_entries);
-
-	while (gf_list_count(ptr->global_access_entries)) {
-		gf_free(gf_list_get(ptr->global_access_entries, 0));
-		gf_list_rem(ptr->global_access_entries, 0);
-	}
-	gf_list_del(ptr->global_access_entries);
-
-	gf_free(ptr);
-}
-
-GF_Err afra_Read(GF_Box *s, GF_BitStream *bs)
-{
-	unsigned int i;
-	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
-
-	GF_Err e = gf_isom_full_box_read(s, bs);
-	if (e) return e;
-
-	ptr->long_ids = gf_bs_read_int(bs, 1);
-	ptr->long_offsets = gf_bs_read_int(bs, 1);
-	ptr->global_entries = gf_bs_read_int(bs, 1);
-	ptr->reserved = gf_bs_read_int(bs, 5);
-	ptr->time_scale = gf_bs_read_u32(bs);
-
-	ptr->entry_count = gf_bs_read_u32(bs);
-	for (i=0; i<ptr->entry_count; i++) {
-		GF_AfraEntry *ae = gf_malloc(sizeof(GF_AfraEntry));
-
-		ae->time = gf_bs_read_u64(bs);
-		if (ptr->long_offsets)
-			ae->offset = gf_bs_read_u64(bs);
-		else
-			ae->offset = gf_bs_read_u32(bs);
-
-		gf_list_insert(ptr->local_access_entries, ae, i);
-	}
-
-	if (ptr->global_entries) {
-		ptr->global_entry_count = gf_bs_read_u32(bs);
-		for (i=0; i<ptr->global_entry_count; i++) {
-			GF_GlobalAfraEntry *ae = gf_malloc(sizeof(GF_GlobalAfraEntry));
-
-			ae->time = gf_bs_read_u64(bs);
-			if (ptr->long_ids) {
-				ae->segment = gf_bs_read_u32(bs);
-				ae->fragment = gf_bs_read_u32(bs);
-			} else {
-				ae->segment = gf_bs_read_u16(bs);
-				ae->fragment = gf_bs_read_u16(bs);
-			}
-			if (ptr->long_offsets) {
-				ae->afra_offset = gf_bs_read_u64(bs);
-				ae->offset_from_afra = gf_bs_read_u64(bs);
-			}else {
-				ae->afra_offset = gf_bs_read_u32(bs);
-				ae->offset_from_afra = gf_bs_read_u32(bs);
-			}
-
-			gf_list_insert(ptr->global_access_entries, ae, i);
-		}
-	}
-
-	return GF_OK;
-}
-
-GF_Box *afra_New()
-{
-	ISOM_DECL_BOX_ALLOC(GF_AdobeFragRandomAccessBox, GF_ISOM_BOX_TYPE_AFRA);
-	tmp->local_access_entries = gf_list_new();
-	tmp->global_access_entries = gf_list_new();
-	return (GF_Box *)tmp;
-}
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err afra_Write(GF_Box *s, GF_BitStream *bs)
-{
-	GF_Err e;
-	unsigned int i;
-	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
-
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-
-	gf_bs_write_int(bs, ptr->long_ids, 1);
-	gf_bs_write_int(bs, ptr->long_offsets, 1);
-	gf_bs_write_int(bs, ptr->global_entries, 1);
-	gf_bs_write_int(bs, 0, 5);
-	gf_bs_write_u32(bs, ptr->time_scale);
-
-	gf_bs_write_u32(bs, ptr->entry_count);
-	for (i=0; i<ptr->entry_count; i++) {
-		GF_AfraEntry *ae = (GF_AfraEntry *)gf_list_get(ptr->local_access_entries, i);
-		gf_bs_write_u64(bs, ae->time);
-		if (ptr->long_offsets)
-			gf_bs_write_u64(bs, ae->offset);
-		else
-			gf_bs_write_u32(bs, (u32)ae->offset);
-	}
-
-	if (ptr->global_entries) {
-		gf_bs_write_u32(bs, ptr->global_entry_count);
-		for (i=0; i<ptr->global_entry_count; i++) {
-			GF_GlobalAfraEntry *gae = (GF_GlobalAfraEntry *)gf_list_get(ptr->global_access_entries, i);
-			gf_bs_write_u64(bs, gae->time);
-			if (ptr->long_ids) {
-				gf_bs_write_u32(bs, gae->segment);
-				gf_bs_write_u32(bs, gae->fragment);
-			} else {
-				gf_bs_write_u16(bs, (u16)gae->segment);
-				gf_bs_write_u16(bs, (u16)gae->fragment);
-			}
-			if (ptr->long_offsets) {
-				gf_bs_write_u64(bs, gae->afra_offset);
-				gf_bs_write_u64(bs, gae->offset_from_afra);
-			} else {
-				gf_bs_write_u32(bs, (u32)gae->afra_offset);
-				gf_bs_write_u32(bs, (u32)gae->offset_from_afra);
-			}
-		}
-	}
-
-	return GF_OK;
-}
-
-
-GF_Err afra_Size(GF_Box *s)
-{
-	GF_Err e;
-	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
-
-	e = gf_isom_full_box_get_size(s);
-	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);
-
-	return GF_OK;
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-void asrt_del(GF_Box *s)
-{
-	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
-	if (ptr == NULL) return;
-
-	while (gf_list_count(ptr->quality_segment_url_modifiers)) {
-		gf_free(gf_list_get(ptr->quality_segment_url_modifiers, 0));
-		gf_list_rem(ptr->quality_segment_url_modifiers, 0);
-	}
-	gf_list_del(ptr->quality_segment_url_modifiers);
-
-	while (gf_list_count(ptr->segment_run_entry_table)) {
-		gf_free(gf_list_get(ptr->segment_run_entry_table, 0));
-		gf_list_rem(ptr->segment_run_entry_table, 0);
-	}
-	gf_list_del(ptr->segment_run_entry_table);
-
-	gf_free(ptr);
-}
-
-GF_Err asrt_Read(GF_Box *s, GF_BitStream *bs)
-{
-	unsigned int i;
-	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
-
-	GF_Err e = gf_isom_full_box_read(s, bs);
-	if (e) return e;
-
-	ptr->quality_entry_count = gf_bs_read_u8(bs);
-	for (i=0; i<ptr->quality_entry_count; i++) {
-		int j=0;
-		u32 tmp_strsize=(u32)ptr->size-8;
-		char *tmp_str = (char*) gf_malloc(tmp_strsize);
-		while (tmp_strsize) {
-			tmp_str[j] = gf_bs_read_u8(bs);
-			tmp_strsize--;
-			if (!tmp_str[j])
-				break;
-			j++;
-		}
-		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
-	}
-
-	ptr->segment_run_entry_count = gf_bs_read_u32(bs);
-	for (i=0; i<ptr->segment_run_entry_count; i++) {
-		GF_AdobeSegmentRunEntry *sre = gf_malloc(sizeof(GF_AdobeSegmentRunEntry));
-		sre->first_segment = gf_bs_read_u32(bs);
-		sre->fragment_per_segment = gf_bs_read_u32(bs);
-		gf_list_insert(ptr->segment_run_entry_table, sre, i);
-	}
-
-	return GF_OK;
-}
-
-GF_Box *asrt_New()
-{
-	ISOM_DECL_BOX_ALLOC(GF_AdobeSegmentRunTableBox, GF_ISOM_BOX_TYPE_ASRT);
-	tmp->quality_segment_url_modifiers = gf_list_new();
-	tmp->segment_run_entry_table = gf_list_new();
-	return (GF_Box *)tmp;
-}
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err asrt_Write(GF_Box *s, GF_BitStream *bs)
-{
-	GF_Err e;
-	unsigned int i;
-	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
-
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-
-	gf_bs_write_u8(bs, ptr->quality_entry_count);
-	for (i=0; i<ptr->quality_entry_count; i++) {
-		char *str = (char*)gf_list_get(ptr->quality_segment_url_modifiers, i);
-		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
-	}
-
-	gf_bs_write_u32(bs, ptr->segment_run_entry_count);
-	for (i=0; i<ptr->segment_run_entry_count; i++) {
-		GF_AdobeSegmentRunEntry *sre = (GF_AdobeSegmentRunEntry *)gf_list_get(ptr->segment_run_entry_table, i);
-		gf_bs_write_u32(bs, sre->first_segment);
-		gf_bs_write_u32(bs, sre->fragment_per_segment);
-	}
-
-	return GF_OK;
-}
-
-
-GF_Err asrt_Size(GF_Box *s)
-{
-	int i;
-	GF_Err e;
-	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
-
-	e = gf_isom_full_box_get_size(s);
-	if (e) return e;
-
-	s->size += 5;
-
-	for (i=0; i<ptr->quality_entry_count; i++)
-		s->size += strlen(gf_list_get(ptr->quality_segment_url_modifiers, i)) + 1;
-
-	s->size += ptr->segment_run_entry_count * sizeof(GF_AdobeSegmentRunEntry);
-
-	return GF_OK;
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-void afrt_del(GF_Box *s)
-{
-	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
-	if (ptr == NULL) return;
-
-	while (gf_list_count(ptr->quality_segment_url_modifiers)) {
-		gf_free(gf_list_get(ptr->quality_segment_url_modifiers, 0));
-		gf_list_rem(ptr->quality_segment_url_modifiers, 0);
-	}
-	gf_list_del(ptr->quality_segment_url_modifiers);
-
-	while (gf_list_count(ptr->fragment_run_entry_table)) {
-		gf_free(gf_list_get(ptr->fragment_run_entry_table, 0));
-		gf_list_rem(ptr->fragment_run_entry_table, 0);
-	}
-	gf_list_del(ptr->fragment_run_entry_table);
-
-	gf_free(ptr);
-}
-
-GF_Err afrt_Read(GF_Box *s, GF_BitStream *bs)
-{
-	unsigned int i;
-	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
-
-	GF_Err e = gf_isom_full_box_read(s, bs);
-	if (e) return e;
-
-	ptr->timescale = gf_bs_read_u32(bs);
-
-	ptr->quality_entry_count = gf_bs_read_u8(bs);
-	for (i=0; i<ptr->quality_entry_count; i++) {
-		int j=0;
-		u32 tmp_strsize=(u32)ptr->size-8;
-		char *tmp_str = (char*) gf_malloc(tmp_strsize);
-		while (tmp_strsize) {
-			tmp_str[j] = gf_bs_read_u8(bs);
-			tmp_strsize--;
-			if (!tmp_str[j])
-				break;
-			j++;
-		}
-		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
-	}
-
-	ptr->fragment_run_entry_count = gf_bs_read_u32(bs);
-	for (i=0; i<ptr->fragment_run_entry_count; i++) {
-		GF_AdobeFragmentRunEntry *fre = gf_malloc(sizeof(GF_AdobeFragmentRunEntry));
-		fre->first_fragment = gf_bs_read_u32(bs);
-		fre->first_fragment_timestamp = gf_bs_read_u64(bs);
-		fre->fragment_duration = gf_bs_read_u32(bs);
-		if (!fre->fragment_duration)
-			fre->discontinuity_indicator = gf_bs_read_u8(bs);
-		gf_list_insert(ptr->fragment_run_entry_table, fre, i);
-	}
-
-	return GF_OK;
-}
-
-GF_Box *afrt_New()
-{
-	ISOM_DECL_BOX_ALLOC(GF_AdobeFragmentRunTableBox, GF_ISOM_BOX_TYPE_AFRT);
-	tmp->quality_segment_url_modifiers = gf_list_new();
-	tmp->fragment_run_entry_table = gf_list_new();
-	return (GF_Box *)tmp;
-}
-
-#ifndef GPAC_DISABLE_ISOM_WRITE
-
-GF_Err afrt_Write(GF_Box *s, GF_BitStream *bs)
-{
-	GF_Err e;
-	unsigned int i;
-	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
-
-	e = gf_isom_full_box_write(s, bs);
-	if (e) return e;
-
-	gf_bs_write_u32(bs, ptr->timescale);
-	gf_bs_write_u8(bs, ptr->quality_entry_count);
-	for (i=0; i<ptr->quality_entry_count; i++) {
-		char *str = (char*)gf_list_get(ptr->quality_segment_url_modifiers, i);
-		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
-	}
-
-	gf_bs_write_u32(bs, ptr->fragment_run_entry_count);
-	for (i=0; i<ptr->fragment_run_entry_count; i++) {
-		GF_AdobeFragmentRunEntry *fre = (GF_AdobeFragmentRunEntry *)gf_list_get(ptr->fragment_run_entry_table, i);
-		gf_bs_write_u32(bs, fre->first_fragment);
-		gf_bs_write_u64(bs, fre->first_fragment_timestamp);
-		gf_bs_write_u32(bs, fre->fragment_duration);
-		if (!fre->fragment_duration)
-			gf_bs_write_u8(bs, fre->discontinuity_indicator);
-	}
-
-	return GF_OK;
-}
-
-
-GF_Err afrt_Size(GF_Box *s)
-{
-	u32 i;
-	GF_Err e;
-	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
-
-	e = gf_isom_full_box_get_size(s);
-	if (e) return e;
-
-	s->size += 5;
-
-	for (i=0; i<ptr->quality_entry_count; i++)
-		s->size += strlen(gf_list_get(ptr->quality_segment_url_modifiers, i)) + 1;
-
-	s->size += 4;
-
-	for (i=0; i<ptr->fragment_run_entry_count; i++) {
-		GF_AdobeFragmentRunEntry *fre = (GF_AdobeFragmentRunEntry *)gf_list_get(ptr->fragment_run_entry_table, i);
-		if (fre->fragment_duration)
-			s->size += 16;
-		else
-			s->size += 17;
-	}
-
-	return GF_OK;
-}
-
-#endif /*GPAC_DISABLE_ISOM_WRITE*/
-
-#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
-
-#endif /*GPAC_DISABLE_ISOM*/
-
-#endif /*GPAC_DISABLE_ISOM_ADOBE*/
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Author: Romain Bouqueau
+ *			Copyright (c) Romain Bouqueau 2012-
+ *				All rights reserved
+ *
+ *          Note: this development was kindly sponsorized by Vizion'R (http://vizionr.com)
+ *
+ *  This file is part of GPAC / ISO Media File Format sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/internal/isomedia_dev.h>
+
+#ifndef GPAC_DISABLE_ISOM_ADOBE
+
+#ifndef GPAC_DISABLE_ISOM
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+
+void abst_del(GF_Box *s)
+{
+	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
+	if (ptr == NULL) return;
+
+	if (ptr->movie_identifier)
+		gf_free(ptr->movie_identifier);
+	if (ptr->drm_data)
+		gf_free(ptr->drm_data);
+	if (ptr->meta_data)
+		gf_free(ptr->meta_data);
+
+	while (gf_list_count(ptr->server_entry_table)) {
+		gf_free(gf_list_get(ptr->server_entry_table, 0));
+		gf_list_rem(ptr->server_entry_table, 0);
+	}
+	gf_list_del(ptr->server_entry_table);
+
+	while (gf_list_count(ptr->quality_entry_table)) {
+		gf_free(gf_list_get(ptr->quality_entry_table, 0));
+		gf_list_rem(ptr->quality_entry_table, 0);
+	}
+	gf_list_del(ptr->quality_entry_table);
+
+	while (gf_list_count(ptr->segment_run_table_entries)) {
+		gf_isom_box_del((GF_Box *)gf_list_get(ptr->segment_run_table_entries, 0));
+		gf_list_rem(ptr->segment_run_table_entries, 0);
+	}
+	gf_list_del(ptr->segment_run_table_entries);
+
+	while (gf_list_count(ptr->fragment_run_table_entries)) {
+		gf_isom_box_del((GF_Box *)gf_list_get(ptr->fragment_run_table_entries, 0));
+		gf_list_rem(ptr->fragment_run_table_entries, 0);
+	}
+	gf_list_del(ptr->fragment_run_table_entries);
+
+	gf_free(ptr);
+}
+
+GF_Err abst_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
+	int i;
+	u32 tmp_strsize = (u32) ptr->size - 8;
+	char *tmp_str = gf_malloc(sizeof(char)*tmp_strsize);
+
+	GF_Err e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->bootstrapinfo_version = gf_bs_read_u32(bs);
+	ptr->profile = gf_bs_read_int(bs, 2);
+	ptr->live = gf_bs_read_int(bs, 1);
+	ptr->update = gf_bs_read_int(bs, 1);
+	ptr->reserved = gf_bs_read_int(bs, 4);
+	ptr->time_scale = gf_bs_read_u32(bs);
+	ptr->current_media_time = gf_bs_read_u64(bs);
+	ptr->smpte_time_code_offset = gf_bs_read_u64(bs);
+	i=0;
+	tmp_strsize=(u32)ptr->size-8;
+	while (tmp_strsize) {
+		tmp_str[i] = gf_bs_read_u8(bs);
+		tmp_strsize--;
+		if (!tmp_str[i])
+			break;
+		i++;
+	}
+	if (i)
+		ptr->movie_identifier = gf_strdup(tmp_str);
+	
+	ptr->server_entry_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->server_entry_count; i++) {
+		int j=0;
+		tmp_strsize=(u32)ptr->size-8;
+		while (tmp_strsize) {
+			tmp_str[j] = gf_bs_read_u8(bs);
+			tmp_strsize--;
+			if (!tmp_str[j])
+				break;
+			j++;
+		}
+		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;
+		tmp_strsize=(u32)ptr->size-8;
+		while (tmp_strsize) {
+			tmp_str[j] = gf_bs_read_u8(bs);
+			tmp_strsize--;
+			if (!tmp_str[j])
+				break;
+			j++;
+		}
+		gf_list_insert(ptr->quality_entry_table, gf_strdup(tmp_str), i);
+	}
+
+	i=0;
+	tmp_strsize=(u32)ptr->size-8;
+	while (tmp_strsize) {
+		tmp_str[i] = gf_bs_read_u8(bs);
+		tmp_strsize--;
+		if (!tmp_str[i])
+			break;
+		i++;
+	}
+	if (i)
+		ptr->drm_data = gf_strdup(tmp_str);
+
+	i=0;
+	tmp_strsize=(u32)ptr->size-8;
+	while (tmp_strsize) {
+		tmp_str[i] = gf_bs_read_u8(bs);
+		tmp_strsize--;
+		if (!tmp_str[i])
+			break;
+		i++;
+	}
+	if (i)
+		ptr->meta_data = gf_strdup(tmp_str);
+	
+	ptr->segment_run_table_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->segment_run_table_count; i++) {
+		GF_AdobeSegmentRunTableBox *asrt;
+		e = gf_isom_parse_box((GF_Box **)&asrt, bs);
+		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;	
+		e = gf_isom_parse_box((GF_Box **)&afrt, bs);
+		if (e) return e;
+		gf_list_insert(ptr->fragment_run_table_entries, afrt, i);
+	}
+
+	gf_free(tmp_str);
+
+	return GF_OK;
+}
+
+GF_Box *abst_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeBootstrapInfoBox, GF_ISOM_BOX_TYPE_ABST);
+	tmp->server_entry_table = gf_list_new();
+	tmp->quality_entry_table = gf_list_new();
+	tmp->segment_run_table_entries = gf_list_new();
+	tmp->fragment_run_table_entries = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err abst_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	unsigned int i;
+	GF_AdobeBootstrapInfoBox *ptr = (GF_AdobeBootstrapInfoBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u32(bs, ptr->bootstrapinfo_version);
+	gf_bs_write_int(bs, ptr->profile, 2);
+	gf_bs_write_int(bs, ptr->live, 1);
+	gf_bs_write_int(bs, ptr->update, 1);
+	gf_bs_write_int(bs, ptr->reserved, 4);
+	gf_bs_write_u32(bs, ptr->time_scale);
+	gf_bs_write_u64(bs, ptr->current_media_time);
+	gf_bs_write_u64(bs, ptr->smpte_time_code_offset);
+	if (ptr->movie_identifier)
+		gf_bs_write_data(bs, ptr->movie_identifier, (u32)strlen(ptr->movie_identifier) + 1);
+	else
+		gf_bs_write_u8(bs, 0);
+
+	gf_bs_write_u8(bs, ptr->server_entry_count);
+	for (i=0; i<ptr->server_entry_count; i++) {
+		char *str = (char*)gf_list_get(ptr->server_entry_table, i);
+		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
+	}
+
+	gf_bs_write_u8(bs, ptr->quality_entry_count);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(ptr->quality_entry_table, i);
+		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
+	}
+
+	if (ptr->drm_data)
+		gf_bs_write_data(bs, ptr->drm_data, (u32)strlen(ptr->drm_data) + 1);
+	else
+		gf_bs_write_u8(bs, 0);
+
+	if (ptr->meta_data)
+		gf_bs_write_data(bs, ptr->meta_data, (u32)strlen(ptr->meta_data) + 1);
+	else
+		gf_bs_write_u8(bs, 0);
+
+	gf_bs_write_u8(bs, ptr->segment_run_table_count);
+	for (i=0; i<ptr->segment_run_table_count; i++) {
+		e = gf_isom_box_write((GF_Box *)gf_list_get(ptr->segment_run_table_entries, i), bs);
+		if (e) return e;
+	}
+
+	gf_bs_write_u8(bs, ptr->fragment_run_table_count);
+	for (i=0; i<ptr->fragment_run_table_count; i++) {
+		e = gf_isom_box_write((GF_Box *)gf_list_get(ptr->fragment_run_table_entries, i), bs);
+		if (e) return e;
+	}
+
+	return GF_OK;
+}
+
+
+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;
+
+	for (i=0; i<ptr->server_entry_count; i++)
+			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 += (ptr->drm_data ? (strlen(ptr->drm_data) + 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);
+		e = gf_isom_box_size(box);
+		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);
+		e = gf_isom_box_size(box);
+		if (e) return e;
+		s->size += box->size;
+	}
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+void afra_del(GF_Box *s)
+{
+	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
+	if (ptr == NULL) return;
+
+	while (gf_list_count(ptr->local_access_entries)) {
+		gf_free(gf_list_get(ptr->local_access_entries, 0));
+		gf_list_rem(ptr->local_access_entries, 0);
+	}
+	gf_list_del(ptr->local_access_entries);
+
+	while (gf_list_count(ptr->global_access_entries)) {
+		gf_free(gf_list_get(ptr->global_access_entries, 0));
+		gf_list_rem(ptr->global_access_entries, 0);
+	}
+	gf_list_del(ptr->global_access_entries);
+
+	gf_free(ptr);
+}
+
+GF_Err afra_Read(GF_Box *s, GF_BitStream *bs)
+{
+	unsigned int i;
+	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
+
+	GF_Err e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->long_ids = gf_bs_read_int(bs, 1);
+	ptr->long_offsets = gf_bs_read_int(bs, 1);
+	ptr->global_entries = gf_bs_read_int(bs, 1);
+	ptr->reserved = gf_bs_read_int(bs, 5);
+	ptr->time_scale = gf_bs_read_u32(bs);
+
+	ptr->entry_count = gf_bs_read_u32(bs);
+	for (i=0; i<ptr->entry_count; i++) {
+		GF_AfraEntry *ae = gf_malloc(sizeof(GF_AfraEntry));
+
+		ae->time = gf_bs_read_u64(bs);
+		if (ptr->long_offsets)
+			ae->offset = gf_bs_read_u64(bs);
+		else
+			ae->offset = gf_bs_read_u32(bs);
+
+		gf_list_insert(ptr->local_access_entries, ae, i);
+	}
+
+	if (ptr->global_entries) {
+		ptr->global_entry_count = gf_bs_read_u32(bs);
+		for (i=0; i<ptr->global_entry_count; i++) {
+			GF_GlobalAfraEntry *ae = gf_malloc(sizeof(GF_GlobalAfraEntry));
+
+			ae->time = gf_bs_read_u64(bs);
+			if (ptr->long_ids) {
+				ae->segment = gf_bs_read_u32(bs);
+				ae->fragment = gf_bs_read_u32(bs);
+			} else {
+				ae->segment = gf_bs_read_u16(bs);
+				ae->fragment = gf_bs_read_u16(bs);
+			}
+			if (ptr->long_offsets) {
+				ae->afra_offset = gf_bs_read_u64(bs);
+				ae->offset_from_afra = gf_bs_read_u64(bs);
+			}else {
+				ae->afra_offset = gf_bs_read_u32(bs);
+				ae->offset_from_afra = gf_bs_read_u32(bs);
+			}
+
+			gf_list_insert(ptr->global_access_entries, ae, i);
+		}
+	}
+
+	return GF_OK;
+}
+
+GF_Box *afra_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeFragRandomAccessBox, GF_ISOM_BOX_TYPE_AFRA);
+	tmp->local_access_entries = gf_list_new();
+	tmp->global_access_entries = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err afra_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	unsigned int i;
+	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_int(bs, ptr->long_ids, 1);
+	gf_bs_write_int(bs, ptr->long_offsets, 1);
+	gf_bs_write_int(bs, ptr->global_entries, 1);
+	gf_bs_write_int(bs, 0, 5);
+	gf_bs_write_u32(bs, ptr->time_scale);
+
+	gf_bs_write_u32(bs, ptr->entry_count);
+	for (i=0; i<ptr->entry_count; i++) {
+		GF_AfraEntry *ae = (GF_AfraEntry *)gf_list_get(ptr->local_access_entries, i);
+		gf_bs_write_u64(bs, ae->time);
+		if (ptr->long_offsets)
+			gf_bs_write_u64(bs, ae->offset);
+		else
+			gf_bs_write_u32(bs, (u32)ae->offset);
+	}
+
+	if (ptr->global_entries) {
+		gf_bs_write_u32(bs, ptr->global_entry_count);
+		for (i=0; i<ptr->global_entry_count; i++) {
+			GF_GlobalAfraEntry *gae = (GF_GlobalAfraEntry *)gf_list_get(ptr->global_access_entries, i);
+			gf_bs_write_u64(bs, gae->time);
+			if (ptr->long_ids) {
+				gf_bs_write_u32(bs, gae->segment);
+				gf_bs_write_u32(bs, gae->fragment);
+			} else {
+				gf_bs_write_u16(bs, (u16)gae->segment);
+				gf_bs_write_u16(bs, (u16)gae->fragment);
+			}
+			if (ptr->long_offsets) {
+				gf_bs_write_u64(bs, gae->afra_offset);
+				gf_bs_write_u64(bs, gae->offset_from_afra);
+			} else {
+				gf_bs_write_u32(bs, (u32)gae->afra_offset);
+				gf_bs_write_u32(bs, (u32)gae->offset_from_afra);
+			}
+		}
+	}
+
+	return GF_OK;
+}
+
+
+GF_Err afra_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeFragRandomAccessBox *ptr = (GF_AdobeFragRandomAccessBox *)s;
+
+	e = gf_isom_full_box_get_size(s);
+	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);
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+void asrt_del(GF_Box *s)
+{
+	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
+	if (ptr == NULL) return;
+
+	while (gf_list_count(ptr->quality_segment_url_modifiers)) {
+		gf_free(gf_list_get(ptr->quality_segment_url_modifiers, 0));
+		gf_list_rem(ptr->quality_segment_url_modifiers, 0);
+	}
+	gf_list_del(ptr->quality_segment_url_modifiers);
+
+	while (gf_list_count(ptr->segment_run_entry_table)) {
+		gf_free(gf_list_get(ptr->segment_run_entry_table, 0));
+		gf_list_rem(ptr->segment_run_entry_table, 0);
+	}
+	gf_list_del(ptr->segment_run_entry_table);
+
+	gf_free(ptr);
+}
+
+GF_Err asrt_Read(GF_Box *s, GF_BitStream *bs)
+{
+	unsigned int i;
+	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
+
+	GF_Err e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->quality_entry_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		int j=0;
+		u32 tmp_strsize=(u32)ptr->size-8;
+		char *tmp_str = (char*) gf_malloc(tmp_strsize);
+		while (tmp_strsize) {
+			tmp_str[j] = gf_bs_read_u8(bs);
+			tmp_strsize--;
+			if (!tmp_str[j])
+				break;
+			j++;
+		}
+		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
+	}
+
+	ptr->segment_run_entry_count = gf_bs_read_u32(bs);
+	for (i=0; i<ptr->segment_run_entry_count; i++) {
+		GF_AdobeSegmentRunEntry *sre = gf_malloc(sizeof(GF_AdobeSegmentRunEntry));
+		sre->first_segment = gf_bs_read_u32(bs);
+		sre->fragment_per_segment = gf_bs_read_u32(bs);
+		gf_list_insert(ptr->segment_run_entry_table, sre, i);
+	}
+
+	return GF_OK;
+}
+
+GF_Box *asrt_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeSegmentRunTableBox, GF_ISOM_BOX_TYPE_ASRT);
+	tmp->quality_segment_url_modifiers = gf_list_new();
+	tmp->segment_run_entry_table = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err asrt_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	unsigned int i;
+	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u8(bs, ptr->quality_entry_count);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(ptr->quality_segment_url_modifiers, i);
+		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
+	}
+
+	gf_bs_write_u32(bs, ptr->segment_run_entry_count);
+	for (i=0; i<ptr->segment_run_entry_count; i++) {
+		GF_AdobeSegmentRunEntry *sre = (GF_AdobeSegmentRunEntry *)gf_list_get(ptr->segment_run_entry_table, i);
+		gf_bs_write_u32(bs, sre->first_segment);
+		gf_bs_write_u32(bs, sre->fragment_per_segment);
+	}
+
+	return GF_OK;
+}
+
+
+GF_Err asrt_Size(GF_Box *s)
+{
+	int i;
+	GF_Err e;
+	GF_AdobeSegmentRunTableBox *ptr = (GF_AdobeSegmentRunTableBox *)s;
+
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+
+	s->size += 5;
+
+	for (i=0; i<ptr->quality_entry_count; i++)
+		s->size += strlen(gf_list_get(ptr->quality_segment_url_modifiers, i)) + 1;
+
+	s->size += ptr->segment_run_entry_count * sizeof(GF_AdobeSegmentRunEntry);
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+void afrt_del(GF_Box *s)
+{
+	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
+	if (ptr == NULL) return;
+
+	while (gf_list_count(ptr->quality_segment_url_modifiers)) {
+		gf_free(gf_list_get(ptr->quality_segment_url_modifiers, 0));
+		gf_list_rem(ptr->quality_segment_url_modifiers, 0);
+	}
+	gf_list_del(ptr->quality_segment_url_modifiers);
+
+	while (gf_list_count(ptr->fragment_run_entry_table)) {
+		gf_free(gf_list_get(ptr->fragment_run_entry_table, 0));
+		gf_list_rem(ptr->fragment_run_entry_table, 0);
+	}
+	gf_list_del(ptr->fragment_run_entry_table);
+
+	gf_free(ptr);
+}
+
+GF_Err afrt_Read(GF_Box *s, GF_BitStream *bs)
+{
+	unsigned int i;
+	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
+
+	GF_Err e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->timescale = gf_bs_read_u32(bs);
+
+	ptr->quality_entry_count = gf_bs_read_u8(bs);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		int j=0;
+		u32 tmp_strsize=(u32)ptr->size-8;
+		char *tmp_str = (char*) gf_malloc(tmp_strsize);
+		while (tmp_strsize) {
+			tmp_str[j] = gf_bs_read_u8(bs);
+			tmp_strsize--;
+			if (!tmp_str[j])
+				break;
+			j++;
+		}
+		gf_list_insert(ptr->quality_segment_url_modifiers, tmp_str, i);
+	}
+
+	ptr->fragment_run_entry_count = gf_bs_read_u32(bs);
+	for (i=0; i<ptr->fragment_run_entry_count; i++) {
+		GF_AdobeFragmentRunEntry *fre = gf_malloc(sizeof(GF_AdobeFragmentRunEntry));
+		fre->first_fragment = gf_bs_read_u32(bs);
+		fre->first_fragment_timestamp = gf_bs_read_u64(bs);
+		fre->fragment_duration = gf_bs_read_u32(bs);
+		if (!fre->fragment_duration)
+			fre->discontinuity_indicator = gf_bs_read_u8(bs);
+		gf_list_insert(ptr->fragment_run_entry_table, fre, i);
+	}
+
+	return GF_OK;
+}
+
+GF_Box *afrt_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeFragmentRunTableBox, GF_ISOM_BOX_TYPE_AFRT);
+	tmp->quality_segment_url_modifiers = gf_list_new();
+	tmp->fragment_run_entry_table = gf_list_new();
+	return (GF_Box *)tmp;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err afrt_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	unsigned int i;
+	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
+
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u32(bs, ptr->timescale);
+	gf_bs_write_u8(bs, ptr->quality_entry_count);
+	for (i=0; i<ptr->quality_entry_count; i++) {
+		char *str = (char*)gf_list_get(ptr->quality_segment_url_modifiers, i);
+		gf_bs_write_data(bs, str, (u32)strlen(str) + 1);
+	}
+
+	gf_bs_write_u32(bs, ptr->fragment_run_entry_count);
+	for (i=0; i<ptr->fragment_run_entry_count; i++) {
+		GF_AdobeFragmentRunEntry *fre = (GF_AdobeFragmentRunEntry *)gf_list_get(ptr->fragment_run_entry_table, i);
+		gf_bs_write_u32(bs, fre->first_fragment);
+		gf_bs_write_u64(bs, fre->first_fragment_timestamp);
+		gf_bs_write_u32(bs, fre->fragment_duration);
+		if (!fre->fragment_duration)
+			gf_bs_write_u8(bs, fre->discontinuity_indicator);
+	}
+
+	return GF_OK;
+}
+
+
+GF_Err afrt_Size(GF_Box *s)
+{
+	u32 i;
+	GF_Err e;
+	GF_AdobeFragmentRunTableBox *ptr = (GF_AdobeFragmentRunTableBox *)s;
+
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+
+	s->size += 5;
+
+	for (i=0; i<ptr->quality_entry_count; i++)
+		s->size += strlen(gf_list_get(ptr->quality_segment_url_modifiers, i)) + 1;
+
+	s->size += 4;
+
+	for (i=0; i<ptr->fragment_run_entry_count; i++) {
+		GF_AdobeFragmentRunEntry *fre = (GF_AdobeFragmentRunEntry *)gf_list_get(ptr->fragment_run_entry_table, i);
+		if (fre->fragment_duration)
+			s->size += 16;
+		else
+			s->size += 17;
+	}
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
+
+#endif /*GPAC_DISABLE_ISOM*/
+
+#endif /*GPAC_DISABLE_ISOM_ADOBE*/

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_code_base.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_base.c Changed

@@ -2701,6 +2701,11 @@
 		ptr->timeScale = gf_bs_read_u32(bs);
 		ptr->duration = gf_bs_read_u32(bs);
 	}
+	if (!ptr->timeScale) {
+		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"
@@ -2958,6 +2963,7 @@
 	GF_MediaInformationBox *ptr = (GF_MediaInformationBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_NMHD:
+	case GF_ISOM_BOX_TYPE_STHD:
 	case GF_ISOM_BOX_TYPE_VMHD:
 	case GF_ISOM_BOX_TYPE_SMHD:
 	case GF_ISOM_BOX_TYPE_HMHD:
@@ -3392,8 +3398,9 @@
 
 GF_Box *enca_New() 
 {
-	ISOM_DECL_BOX_ALLOC(GF_Box, GF_ISOM_BOX_TYPE_ENCA);
-	return tmp;
+	ISOM_DECL_BOX_ALLOC(GF_MPEGAudioSampleEntryBox, GF_ISOM_BOX_TYPE_ENCA);
+	gf_isom_audio_sample_entry_init((GF_AudioSampleEntryBox*)tmp);
+	return (GF_Box *)tmp;
 }
 
  
@@ -3476,8 +3483,9 @@
 
 GF_Box *encs_New()
 {
-	ISOM_DECL_BOX_ALLOC(GF_Box, GF_ISOM_BOX_TYPE_ENCS);
-	return tmp;
+	ISOM_DECL_BOX_ALLOC(GF_MPEGSampleEntryBox, GF_ISOM_BOX_TYPE_ENCS);
+	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
+	return (GF_Box *)tmp;
 }
 
  
@@ -3524,6 +3532,7 @@
 	if (ptr->avc_config) gf_isom_box_del((GF_Box *) ptr->avc_config);
 	if (ptr->svc_config) gf_isom_box_del((GF_Box *) ptr->svc_config);
 	if (ptr->hevc_config) gf_isom_box_del((GF_Box *) ptr->hevc_config);
+	if (ptr->shvc_config) gf_isom_box_del((GF_Box *) ptr->shvc_config);
 	if (ptr->bitrate) gf_isom_box_del((GF_Box *) ptr->bitrate);
 	if (ptr->descr) gf_isom_box_del((GF_Box *) ptr->descr);
 	if (ptr->ipod_ext) gf_isom_box_del((GF_Box *)ptr->ipod_ext);
@@ -3559,6 +3568,10 @@
 		if (ptr->svc_config) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		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;
+		break;
 	case GF_ISOM_BOX_TYPE_BTRT:
 		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
 		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
@@ -3596,11 +3609,11 @@
 	/*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 ) HEVC_RewriteESDescriptor(mp4v);
+	if (mp4v->hevc_config || mp4v->shvc_config) HEVC_RewriteESDescriptor(mp4v);
 	return GF_OK;
 }
 
-static GF_Box *mp4v_encv_avc1_new(u32 type)
+GF_Box *mp4v_encv_avc_hevc_new(u32 type)
 {
 	GF_MPEGVisualSampleEntryBox *tmp;
 	GF_SAFEALLOC(tmp, GF_MPEGVisualSampleEntryBox);
@@ -3610,53 +3623,8 @@
 	tmp->type = type;
 	return (GF_Box *)tmp;
 }
-GF_Box *mp4v_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_MP4V);
-}
-
-GF_Box *avc1_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_AVC1);
-}
 
-GF_Box *avc2_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_AVC2);
-}
-
-GF_Box *avc3_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_AVC3);
-}
-
-GF_Box *avc4_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_AVC4);
-}
-
-GF_Box *svc1_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_SVC1);
-}
-
-GF_Box *hvc1_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_HVC1);
-}
 
-GF_Box *hev1_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_HEV1);
-}
-
-
-GF_Box *encv_New()
-{
-	return mp4v_encv_avc1_new(GF_ISOM_BOX_TYPE_ENCV);
-}
-
- 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
 GF_Err mp4v_Write(GF_Box *s, GF_BitStream *bs)
@@ -3677,7 +3645,7 @@
 		e = gf_isom_box_write((GF_Box *)ptr->esd, bs);
 		if (e) return e;
 	}
-	/*avc1*/
+	/*avc or hevc*/
 	else {
 		if (ptr->avc_config && ptr->avc_config->config) {
 			e = gf_isom_box_write((GF_Box *) ptr->avc_config, bs);
@@ -3703,6 +3671,10 @@
 			e = gf_isom_box_write((GF_Box *) ptr->svc_config, bs);
 			if (e) return e;
 		}
+		if (ptr->shvc_config && ptr->shvc_config->config) {
+			e = gf_isom_box_write((GF_Box *) ptr->shvc_config, bs);
+			if (e) return e;
+		}
 	}
 	if (ptr->rvcc) {
 		e = gf_isom_box_write((GF_Box *)ptr->rvcc, bs);
@@ -3725,7 +3697,7 @@
 		if (e) return e;
 		ptr->size += ptr->esd->size;
 	} else {
-		if (!ptr->avc_config && !ptr->svc_config && !ptr->hevc_config) {
+		if (!ptr->avc_config && !ptr->svc_config && !ptr->hevc_config && !ptr->shvc_config) {
 			return GF_ISOM_INVALID_FILE;
 		}
 
@@ -3747,6 +3719,12 @@
 			ptr->size += ptr->svc_config->size;
 		}
 
+		if (ptr->shvc_config && ptr->shvc_config->config) {
+			e = gf_isom_box_size((GF_Box *) ptr->shvc_config); 
+			if (e) return e;
+			ptr->size += ptr->shvc_config->size;
+		}
+
 		if (ptr->ipod_ext) {
 			e = gf_isom_box_size((GF_Box *) ptr->ipod_ext);
 			if (e) return e;
@@ -3940,6 +3918,10 @@
 		ptr->timeScale = gf_bs_read_u32(bs);
 		ptr->duration = gf_bs_read_u32(bs);
 	}
+	if (!ptr->timeScale) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Movie header timescale is invalid (0) - defaulting to 600\n" ));
+		ptr->timeScale = 600;
+	}
 	ptr->preferredRate = gf_bs_read_u32(bs);
 	ptr->preferredVolume = gf_bs_read_u16(bs);
 	gf_bs_read_data(bs, ptr->reserved, 10);
@@ -4466,6 +4448,18 @@
 		gf_list_add(ptr->sai_offsets, a);
 		break;
 
+	case GF_ISOM_BOX_TYPE_SENC:
+		ptr->senc = a;
+		return gf_isom_box_add_default((GF_Box *)ptr, a);
+	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: 
+		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);
+		}
+
 	default:
 		return gf_isom_box_add_default((GF_Box *)ptr, a);
 	}
@@ -4521,6 +4515,9 @@
 		e = stbl_AddBox(ptr, a);
 		if (e) return e;
 	}
+	if (!ptr->SyncSample) 
+		ptr->no_sync_found = 1;
+
 	return GF_OK;
 }
 
@@ -4974,16 +4971,23 @@
 	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_TX3G:
 	case GF_ISOM_BOX_TYPE_TEXT:
 	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_DIMS:
 	case GF_ISOM_BOX_TYPE_AC3:
 	case GF_ISOM_BOX_TYPE_LSR1:
 	case GF_ISOM_BOX_TYPE_WVTT:
-		return gf_isom_box_add_default((GF_Box*)ptr, a);
+	case GF_ISOM_BOX_TYPE_STPP:
+	case GF_ISOM_BOX_TYPE_SBTT:
+	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:
@@ -5585,6 +5589,16 @@
 		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" ));
+				ptr->entries[i].sampleDelta = 1;
+			} else if (ptr->entries[i].sampleCount>1) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] more than one sample at the end of the track with sample_delta=0 - forbidden ! Fixing to 1\n" ));
+				ptr->entries[i].sampleDelta = 1;
+			}
+		}
 	}
 	//remove the last sample delta.
 #ifndef GPAC_DISABLE_ISOM_WRITE
@@ -5650,7 +5664,7 @@
 	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) {
@@ -5908,6 +5922,7 @@
 	if (ptr->subs) gf_isom_box_del((GF_Box *) ptr->subs);
 	if (ptr->tfdt) gf_isom_box_del((GF_Box *) ptr->tfdt);
 	if (ptr->piff_sample_encryption) gf_isom_box_del((GF_Box *) ptr->piff_sample_encryption);
+	if (ptr->sample_encryption) gf_isom_box_del((GF_Box *) ptr->sample_encryption);
 	gf_isom_box_array_del(ptr->TrackRuns);
 	if (ptr->sampleGroups) gf_isom_box_array_del(ptr->sampleGroups);
 	if (ptr->sampleGroupsDescription) gf_isom_box_array_del(ptr->sampleGroupsDescription);
@@ -5964,6 +5979,11 @@
 		} 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;
+		ptr->sample_encryption->traf = ptr;
+		return GF_OK;
 	default:
 		return gf_isom_box_add_default(s, a);
 	}
@@ -6073,6 +6093,11 @@
 		e = gf_isom_box_write((GF_Box *) ptr->piff_sample_encryption, bs);
 		if (e) return e;
 	}
+
+	if (ptr->sample_encryption) {
+		e = gf_isom_box_write((GF_Box *) ptr->sample_encryption, bs);
+		if (e) return e;
+	}
 	return GF_OK;
 }
 
@@ -6125,6 +6150,11 @@
 		e = gf_isom_box_array_size(s, ptr->sai_offsets);
 		if (e) return e;
 	}
+	if (ptr->sample_encryption) {
+		e = gf_isom_box_size((GF_Box *) ptr->sample_encryption);
+		if (e) return e;
+		ptr->size += ptr->sample_encryption->size;
+	}
 	return gf_isom_box_array_size(s, ptr->TrackRuns);
 }
 
@@ -6178,13 +6208,18 @@
 		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_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_HVC2:
+		case GF_ISOM_BOX_TYPE_HEV2:
+		case GF_ISOM_BOX_TYPE_SHC1:
+		case GF_ISOM_BOX_TYPE_SHV1:
 		case GF_ISOM_BOX_TYPE_TX3G:
 		case GF_ISOM_BOX_TYPE_TEXT:
 		case GF_ISOM_BOX_TYPE_ENCT:
@@ -6192,6 +6227,8 @@
 		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:
 			continue;
 		default:
 			break;
@@ -6306,7 +6343,17 @@
 	e = gf_isom_read_box_list(s, bs, trak_AddBox);
 	if (e) return e;
 	gf_isom_check_sample_desc(ptr);
-	return GF_OK;
+
+	//we should only parse senc/psec when no saiz/saio is present, otherwise we fetch the info directly
+	if (ptr->Media && ptr->Media->information && ptr->Media->information->sampleTable /*&& !ptr->Media->information->sampleTable->sai_sizes*/) {
+		if (ptr->Media->information->sampleTable->senc) {
+			e = senc_Parse(bs, ptr, NULL, (GF_SampleEncryptionBox *)ptr->Media->information->sampleTable->senc);
+		}
+		else if (ptr->Media->information->sampleTable->piff_psec) {
+			e = senc_Parse(bs, ptr, NULL, (GF_SampleEncryptionBox *) ptr->Media->information->sampleTable->piff_psec);
+		}
+	}
+	return e;
 }
 
 GF_Box *trak_New()
@@ -7244,7 +7291,7 @@
 
 GF_Err metx_AddBox(GF_Box *s, GF_Box *a)
 {
-	GF_MPEGVisualSampleEntryBox *ptr = (GF_MPEGVisualSampleEntryBox *)s;
+	GF_MetaDataSampleEntryBox *ptr = (GF_MetaDataSampleEntryBox *)s;
 	switch (a->type) {
 	case GF_ISOM_BOX_TYPE_SINF:
 		gf_list_add(ptr->protections, a);
@@ -7338,7 +7385,7 @@
 		e = gf_isom_box_write((GF_Box *)ptr->bitrate, bs);
 		if (e) return e;
 	}
-	return gf_isom_box_array_size(s, ptr->protections);
+	return gf_isom_box_array_write(s, ptr->protections, bs);
 }
 
 GF_Err metx_Size(GF_Box *s)
@@ -7370,7 +7417,146 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+/* SimpleTextSampleEntry */
+GF_Box *stse_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_SimpleTextSampleEntryBox, GF_ISOM_BOX_TYPE_STSE);
+	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
+	return (GF_Box *)tmp;
+}
+
+
+void stse_del(GF_Box *s)
+{
+	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox*)s;
+	if (ptr == NULL) return;
+	gf_isom_sample_entry_predestroy((GF_SampleEntryBox *)s);
+
+	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);
+	gf_free(ptr);
+}
+
+
+GF_Err stse_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;
+		break;
+	case GF_ISOM_BOX_TYPE_BTRT:
+		if (ptr->bitrate) ERROR_ON_DUPLICATED_BOX(a, ptr)
+		ptr->bitrate = (GF_MPEG4BitRateBox *)a;
+		break;
+	case GF_ISOM_BOX_TYPE_SINF:
+		gf_list_add(ptr->protections, a);
+		break;
+	default:
+		return gf_isom_box_add_default(s, a);
+	}
+	return GF_OK;
+}
+
+GF_Err stse_Read(GF_Box *s, GF_BitStream *bs)
+{
+	u32 size, i;
+	char *str;
+	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox*)s;
+
+	gf_bs_read_data(bs, ptr->reserved, 6);
+	ptr->dataReferenceIndex = gf_bs_read_u16(bs);
+
+	size = (u32) ptr->size - 8;
+	str = (char *)gf_malloc(sizeof(char)*size);
+
+	i=0;
+
+	while (size) {
+		str[i] = gf_bs_read_u8(bs);
+		size--;
+		if (!str[i])
+			break;
+		i++;
+	}
+	if (i) ptr->content_encoding = gf_strdup(str);
+
+	i=0;
+	while (size) {
+		str[i] = gf_bs_read_u8(bs);
+		size--;
+		if (!str[i])
+			break;
+		i++;
+	}
+	if (i) ptr->mime_type = gf_strdup(str);
 
+	ptr->size = size;
+	gf_free(str);
+	return gf_isom_read_box_list(s, bs, stse_AddBox);
+}
+
+ 
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err stse_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox *)s;
+	GF_Err e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+
+	gf_bs_write_data(bs, ptr->reserved, 6);
+	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
+
+	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) 
+		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;
+	}
+	if (ptr->config) {
+		e = gf_isom_box_write((GF_Box *)ptr->config, bs);
+		if (e) return e;
+	}
+	return gf_isom_box_array_write(s, ptr->protections, bs);
+}
+
+GF_Err stse_Size(GF_Box *s)
+{
+	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox *)s;
+	GF_Err e = gf_isom_box_get_size(s);
+	if (e) return e;
+	ptr->size += 8;
+
+	if (ptr->content_encoding)
+		ptr->size += strlen(ptr->content_encoding);
+	ptr->size++;
+	if (ptr->mime_type)
+		ptr->size += strlen(ptr->mime_type);
+	ptr->size++;
+	if (ptr->bitrate) {
+		e = gf_isom_box_size((GF_Box *)ptr->bitrate);
+		if (e) return e;
+		ptr->size += ptr->bitrate->size;
+	}
+	if (ptr->config) {
+		e = gf_isom_box_size((GF_Box *)ptr->config);
+		if (e) return e;
+		ptr->size += ptr->config->size;
+	}
+	return gf_isom_box_array_size(s, ptr->protections);
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
 
 GF_Box *dac3_New(u32 boxType)
 {
@@ -8240,6 +8426,16 @@
 		*total_bytes = 1;
 		return ptr;
 	}
+	case GF_4CC( 's', 'e', 'i', 'g' ):
+	{
+		GF_CENCSampleEncryptionGroupEntry *ptr;
+		GF_SAFEALLOC(ptr, GF_CENCSampleEncryptionGroupEntry);
+		ptr->IsEncrypted = gf_bs_read_u24(bs);
+		ptr->IV_size = gf_bs_read_u8(bs);
+		gf_bs_read_data(bs, (char *)ptr->KID, 16);
+		*total_bytes = 20;
+		return ptr;
+	}
 	default:
 	{
 		GF_DefaultSampleGroupDescriptionEntry *ptr;
@@ -8260,6 +8456,7 @@
 	switch (grouping_type) {
 	case GF_4CC( 'r', 'o', 'l', 'l' ):
 	case GF_4CC( 'r', 'a', 'p', ' ' ):
+	case GF_4CC( 's', 'e', 'i', 'g' ):
 		gf_free(entry);
 		return;
 
@@ -8273,7 +8470,7 @@
 	}
 }
 
-static void	sgpd_write_entry(u32 grouping_type, void *entry, GF_BitStream *bs)
+void sgpd_write_entry(u32 grouping_type, void *entry, GF_BitStream *bs)
 {
 	switch (grouping_type) {
 	case GF_4CC( 'r', 'o', 'l', 'l' ):
@@ -8283,6 +8480,11 @@
 		gf_bs_write_int(bs, ((GF_VisualRandomAccessEntry*)entry)->num_leading_samples_known, 1);
 		gf_bs_write_int(bs, ((GF_VisualRandomAccessEntry*)entry)->num_leading_samples, 7);
 		return;
+	case GF_4CC( 's', 'e', 'i', 'g' ):
+		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);
+		return;
 	default:
 		{
 		GF_DefaultSampleGroupDescriptionEntry *ptr = (GF_DefaultSampleGroupDescriptionEntry *)entry;
@@ -8297,12 +8499,13 @@
 		return 2;
 	case GF_4CC( 'r', 'a', 'p', ' ' ):
 		return 1;
+	case GF_4CC( 's', 'e', 'i', 'g' ):
+		return 20;
 	default:
 		return ((GF_DefaultSampleGroupDescriptionEntry *)entry)->length;
 	}
 }
 
-
 GF_Box *sgpd_New()
 {
 	ISOM_DECL_BOX_ALLOC(GF_SampleGroupDescriptionBox, GF_ISOM_BOX_TYPE_SGPD);
@@ -8466,7 +8669,7 @@
 	}
 	gf_bs_write_u8(bs, ptr->default_sample_info_size);
 	gf_bs_write_u32(bs, ptr->sample_count);
-	if (ptr->default_sample_info_size) {
+	if (!ptr->default_sample_info_size) {
 		gf_bs_write_data(bs, (char *) ptr->sample_info_size, ptr->sample_count);
 	}
 	return GF_OK;
@@ -8514,7 +8717,7 @@
 	}
 	ptr->entry_count = gf_bs_read_u32(bs);
 	ptr->size -= 4;
-	if (ptr->entry_count>1) {
+	if (ptr->entry_count) {
 		u32 i;
 		if (ptr->version==0) {
 			ptr->offsets = gf_malloc(sizeof(u32)*ptr->entry_count);
@@ -8527,14 +8730,6 @@
 				ptr->offsets_large[i] = gf_bs_read_u64(bs);
 			ptr->size -= 8*ptr->entry_count;
 		}
-	} else {
-		if (ptr->version==0) {
-			ptr->single_offset = gf_bs_read_u32(bs);
-			ptr->size -= 4;
-		} else {
-			ptr->single_offset = gf_bs_read_u64(bs);
-			ptr->size -= 8;
-		}
 	}
 	return GF_OK;
 }
@@ -8560,22 +8755,24 @@
 		gf_bs_write_u32(bs, ptr->aux_info_type_parameter);
 	}
 	gf_bs_write_u32(bs, ptr->entry_count);
-	if (ptr->entry_count>1) {
+	if (ptr->entry_count) {
 		u32 i;
+		//store position in bitstream before writing data - offsets can be NULL if a single offset is rewritten later on (cf senc_write)
+		ptr->offset_first_offset_field = gf_bs_get_position(bs);
 		if (ptr->version==0) {
-			assert(ptr->offsets);
-			for (i=0; i<ptr->entry_count; i++)
-				gf_bs_write_u32(bs, ptr->offsets[i]);
-		} else {
-			assert(ptr->offsets_large);
-			for (i=0; i<ptr->entry_count; i++)
-				gf_bs_write_u64(bs, ptr->offsets_large[i]);
-		}
-	} else {
-		if (ptr->version==0) {
-			gf_bs_write_u32(bs, (u32) ptr->single_offset);
+			if (!ptr->offsets) {
+				gf_bs_write_u32(bs, 0);
+			} else {
+				for (i=0; i<ptr->entry_count; i++)
+					gf_bs_write_u32(bs, ptr->offsets[i]);
+			}
 		} else {
-			gf_bs_write_u64(bs, ptr->single_offset);
+			if (!ptr->offsets_large) {
+				gf_bs_write_u64(bs, 0);
+			} else {
+				for (i=0; i<ptr->entry_count; i++)
+					gf_bs_write_u64(bs, ptr->offsets_large[i]);
+			}
 		}
 	}
 	return GF_OK;
@@ -8589,7 +8786,7 @@
 	if (ptr->aux_info_type || ptr->aux_info_type_parameter) {
 		ptr->flags |= 1;
 	}
-	if (ptr->offsets_large || (ptr->single_offset >0xFFFFFFFF)) {
+	if (ptr->offsets_large) {
 		ptr->version = 1;
 	}
 
@@ -8603,4 +8800,32 @@
 #endif //GPAC_DISABLE_ISOM_WRITE
 
 
+void prft_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err prft_Read(GF_Box *s,GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_ProducerReferenceTimeBox *ptr = (GF_ProducerReferenceTimeBox *) s;
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+	ptr->refTrackID = gf_bs_read_u32(bs);
+	ptr->ntp = gf_bs_read_u64(bs);
+	if (ptr->version==0) {
+		ptr->timestamp = gf_bs_read_u32(bs);
+	} else {
+		ptr->timestamp = gf_bs_read_u64(bs);
+	}
+	return GF_OK;
+}
+
+GF_Box *prft_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_ProducerReferenceTimeBox, GF_ISOM_BOX_TYPE_PRFT);	
+	gf_isom_full_box_init((GF_Box *)tmp);
+	return (GF_Box *)tmp;
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_code_drm.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_code_drm.c Changed

@@ -233,6 +233,7 @@
 	if (ptr->okms) gf_isom_box_del((GF_Box *)ptr->okms);
 	if (ptr->tenc) gf_isom_box_del((GF_Box *)ptr->tenc);
 	if (ptr->piff_tenc) gf_isom_box_del((GF_Box *)ptr->piff_tenc);
+	if (ptr->adkm) gf_isom_box_del((GF_Box *)ptr->adkm);
 	gf_free(ptr);
 }
 
@@ -256,6 +257,10 @@
 		if (ptr->tenc) return GF_ISOM_INVALID_FILE;
 		ptr->tenc = (GF_TrackEncryptionBox *)a;
 		return GF_OK;
+	case GF_ISOM_BOX_TYPE_ADKM:
+		if (ptr->adkm) return GF_ISOM_INVALID_FILE;
+		ptr->adkm = (GF_AdobeDRMKeyManagementSystemBox *)a;
+		return GF_OK;
 	case GF_ISOM_BOX_TYPE_UUID:
 		if (((GF_UUIDBox*)a)->internal_4cc==GF_ISOM_BOX_UUID_TENC) {
 			if (ptr->piff_tenc) return GF_ISOM_INVALID_FILE;
@@ -299,6 +304,10 @@
 		e = gf_isom_box_write((GF_Box *) ptr->tenc, bs);
 		if (e) return e;
 	}
+	if (ptr->adkm) {
+		e = gf_isom_box_write((GF_Box *) ptr->adkm, bs);
+		if (e) return e;
+	}
 	if (ptr->piff_tenc) {
 		e = gf_isom_box_write((GF_Box *) ptr->piff_tenc, bs);
 		if (e) return e;
@@ -334,6 +343,11 @@
 		if (e) return e;
 		ptr->size += ptr->tenc->size;
 	}
+	if (ptr->adkm) {
+		e = gf_isom_box_size((GF_Box *) ptr->adkm);
+		if (e) return e;
+		ptr->size += ptr->adkm->size;
+	}
 	if (ptr->piff_tenc) {
 		e = gf_isom_box_size((GF_Box *) ptr->tenc);
 		if (e) return e;
@@ -904,7 +918,7 @@
 		ptr->size -= 4;
 		if (ptr->KID_count) {
 			u32 i;
-			ptr->KIDs = gf_malloc(sizeof(bin128));
+			ptr->KIDs = gf_malloc(ptr->KID_count*sizeof(bin128));
 			for (i=0; i<ptr->KID_count; i++) {
 				gf_bs_read_data(bs, (char *) ptr->KIDs[i], 16);
 				ptr->size -= 16;
@@ -960,7 +974,7 @@
 
 	ptr->size += 16;
 	if (ptr->version) ptr->size += 4 + 16*ptr->KID_count;
-	ptr->size += 4 + ptr->private_data ? ptr->private_data_size : 0;
+	ptr->size += 4 + (ptr->private_data ? ptr->private_data_size : 0);
 	return GF_OK;
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
@@ -1088,10 +1102,16 @@
 void piff_psec_del(GF_Box *s)
 {
 	GF_PIFFSampleEncryptionBox *ptr = (GF_PIFFSampleEncryptionBox *)s;
-	if (ptr->cenc_data) gf_free(ptr->cenc_data);
+	while (gf_list_count(ptr->samp_aux_info)) {
+		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, 0);
+		if (sai) gf_isom_cenc_samp_aux_info_del(sai);
+		gf_list_rem(ptr->samp_aux_info, 0);
+	}
+	if (ptr->samp_aux_info) gf_list_del(ptr->samp_aux_info);
 	gf_free(s);
 }
 
+
 GF_Err piff_psec_Read(GF_Box *s, GF_BitStream *bs)
 {
 	GF_PIFFSampleEncryptionBox *ptr = (GF_PIFFSampleEncryptionBox *)s;
@@ -1106,20 +1126,40 @@
 		gf_bs_read_data(bs, (char *) ptr->KID, 16);
 		ptr->size -= 20;
 	}
-	ptr->sample_count = gf_bs_read_u32(bs);
-	ptr->size -= 4;
-	ptr->cenc_data_size = (u32) ptr->size;
-	ptr->cenc_data = gf_malloc(sizeof(char)*ptr->cenc_data_size);
-	gf_bs_read_data(bs, ptr->cenc_data, ptr->cenc_data_size);
+
+	ptr->bs_offset = gf_bs_get_position(bs);
+	gf_bs_skip_bytes(bs, ptr->size);
 	ptr->size = 0;
 	return GF_OK;
 }
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
+GF_Err store_senc_info(GF_SampleEncryptionBox *ptr, GF_BitStream *bs)
+{
+	GF_Err e;
+	u64 pos;
+	if (!ptr->cenc_saio) return GF_OK;
+
+	pos = gf_bs_get_position(bs);
+	if (pos>0xFFFFFFFFULL) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] \"senc\" offset larger than 32-bits , cannot store.\n"));
+		return GF_NOT_SUPPORTED;
+	}
+	e = gf_bs_seek(bs, ptr->cenc_saio->offset_first_offset_field);
+	if (e) return e;
+	if (ptr->traf) {
+		gf_bs_write_u32(bs, (u32) ( pos - ptr->traf->moof_start_in_bs) );
+	} else {
+		gf_bs_write_u32(bs, (u32) pos);
+	}
+	return gf_bs_seek(bs, pos);
+}
+
 GF_Err piff_psec_Write(GF_Box *s, GF_BitStream *bs)
 {
 	GF_Err e;
+	u32 sample_count;
 	GF_PIFFSampleEncryptionBox *ptr = (GF_PIFFSampleEncryptionBox *) s;
 	if (!s) return GF_BAD_PARAM;
 
@@ -1133,15 +1173,30 @@
 		gf_bs_write_u8(bs, ptr->IV_size);
 		gf_bs_write_data(bs, (char *) ptr->KID, 16);
 	}
-	gf_bs_write_u32(bs, ptr->sample_count);
-	if (ptr->cenc_data && ptr->cenc_data_size) {
-		gf_bs_write_data(bs, ptr->cenc_data, ptr->cenc_data_size);
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	gf_bs_write_u32(bs, sample_count);
+	if (sample_count) {
+		u32 i, j;
+		e = store_senc_info((GF_SampleEncryptionBox *)ptr, bs);
+		if (e) return e;
+
+		for (i = 0; i < sample_count; i++) {
+			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+			if (! sai->IV_size) continue;
+			gf_bs_write_data(bs, (char *)sai->IV, sai->IV_size);
+			gf_bs_write_u16(bs, sai->subsample_count);
+			for (j = 0; j < sai->subsample_count; j++) {
+				gf_bs_write_u16(bs, sai->subsamples[j].bytes_clear_data);
+				gf_bs_write_u32(bs, sai->subsamples[j].bytes_encrypted_data);
+			}
+		}
 	}
 	return GF_OK;
 }
 
 GF_Err piff_psec_Size(GF_Box *s)
 {
+	u32 i, sample_count;
 	GF_Err e;
 	GF_PIFFSampleEncryptionBox *ptr = (GF_PIFFSampleEncryptionBox*)s;
 	e = gf_isom_box_get_size(s);
@@ -1151,8 +1206,13 @@
 		ptr->size += 20;
 	}
 	ptr->size += 4;
-	if (ptr->cenc_data && ptr->cenc_data_size) {
-		ptr->size += ptr->cenc_data_size;
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	if (sample_count) {
+		for (i = 0; i < sample_count; i++) {
+			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+			if (! sai->IV_size) continue;
+			ptr->size += 18 + 6*sai->subsample_count;
+		}
 	}
 	return GF_OK;
 }
@@ -1173,12 +1233,11 @@
 
 GF_Err piff_pssh_Read(GF_Box *s, GF_BitStream *bs)
 {
+	GF_Err e;
 	GF_PIFFProtectionSystemHeaderBox *ptr = (GF_PIFFProtectionSystemHeaderBox*)s;
 
-	if (ptr->size<4) return GF_ISOM_INVALID_FILE;
-	ptr->version = gf_bs_read_u8(bs);
-	ptr->flags = gf_bs_read_u24(bs);
-	ptr->size -= 4;
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
 
 	gf_bs_read_data(bs, (char *) ptr->SystemID, 16);
 	ptr->private_data_size = gf_bs_read_u32(bs);
@@ -1193,14 +1252,9 @@
 
 GF_Err piff_pssh_Write(GF_Box *s, GF_BitStream *bs)
 {
-	GF_Err e;
 	GF_PIFFProtectionSystemHeaderBox *ptr = (GF_PIFFProtectionSystemHeaderBox *) s;
-	if (!s) return GF_BAD_PARAM;
-
-	e = gf_isom_box_write_header(s, bs);
+	GF_Err e = gf_isom_full_box_write(s, bs);
 	if (e) return e;
-	gf_bs_write_u8(bs, ptr->version);
-	gf_bs_write_u24(bs, ptr->flags);
 
 	gf_bs_write_data(bs, (char *) ptr->SystemID, 16);
 	gf_bs_write_u32(bs, ptr->private_data_size);
@@ -1219,4 +1273,608 @@
 }
 #endif //GPAC_DISABLE_ISOM_WRITE
 
+GF_Box *senc_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_SampleEncryptionBox, GF_ISOM_BOX_TYPE_SENC);
+	return (GF_Box *)tmp;
+}
+
+void senc_del(GF_Box *s)
+{
+	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *)s;
+	while (gf_list_count(ptr->samp_aux_info)) {
+		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, 0);
+		if (sai) gf_isom_cenc_samp_aux_info_del(sai);
+		gf_list_rem(ptr->samp_aux_info, 0);
+	}
+	if (ptr->samp_aux_info) gf_list_del(ptr->samp_aux_info);
+	gf_free(s);
+}
+
+GF_Err senc_Parse(GF_BitStream *bs, GF_TrackBox *trak, GF_TrackFragmentBox *traf, GF_SampleEncryptionBox *ptr)
+{
+	GF_Err e;
+	u32 i, j, count;
+	u64 pos = gf_bs_get_position(bs);
+	gf_bs_seek(bs, ptr->bs_offset);
+
+	count = gf_bs_read_u32(bs);
+	if (!ptr->samp_aux_info) ptr->samp_aux_info = gf_list_new();
+	for (i=0; i<count; i++) {
+		u32 is_encrypted;
+		GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
+		memset(sai, 0, sizeof(GF_CENCSampleAuxInfo));
+
+		e = gf_isom_get_sample_cenc_info_ex(trak, traf, (trak ? trak->sample_count_at_seg_start : 0 )+ i+1, &is_encrypted, &sai->IV_size, NULL);
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[isobmf] could not get cenc info for sample %d: %s\n", trak->sample_count_at_seg_start + i+1, gf_error_to_string(e) ));
+			return e;
+		}
+		if (is_encrypted) {
+			gf_bs_read_data(bs, (char *)sai->IV, sai->IV_size);
+			if (ptr->flags & 0x00000002) {
+				sai->subsample_count = gf_bs_read_u16(bs);
+				sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
+				for (j = 0; j < sai->subsample_count; j++) {
+					sai->subsamples[j].bytes_clear_data = gf_bs_read_u16(bs);
+					sai->subsamples[j].bytes_encrypted_data = gf_bs_read_u32(bs);
+				}
+			}
+		}
+		gf_list_add(ptr->samp_aux_info, sai);
+	}
+	gf_bs_seek(bs, pos);
+	return GF_OK;
+}
+
+
+GF_Err senc_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *)s;
+	//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
+	ptr->version = gf_bs_read_u8(bs);
+	ptr->flags = gf_bs_read_u24(bs);
+	ptr->size -= 4;
+
+	ptr->bs_offset = gf_bs_get_position(bs);
+	gf_bs_skip_bytes(bs, ptr->size);
+	ptr->size = 0;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+
+GF_Err senc_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	u32 sample_count;
+	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *) s;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
+	gf_bs_write_u8(bs, ptr->version);
+	gf_bs_write_u24(bs, ptr->flags);
+
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	gf_bs_write_u32(bs, sample_count);
+	if (sample_count) {
+		u32 i, j;
+
+		e = store_senc_info(ptr, bs);
+		if (e) return e;
+
+		for (i = 0; i < sample_count; i++) {
+			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+			if (! sai->IV_size) continue;
+			gf_bs_write_data(bs, (char *)sai->IV, sai->IV_size);
+			if (ptr->flags & 0x00000002) {
+				gf_bs_write_u16(bs, sai->subsample_count);
+				for (j = 0; j < sai->subsample_count; j++) {
+					gf_bs_write_u16(bs, sai->subsamples[j].bytes_clear_data);
+					gf_bs_write_u32(bs, sai->subsamples[j].bytes_encrypted_data);
+				}
+			}
+		}
+	}
+	return GF_OK;
+}
+
+GF_Err senc_Size(GF_Box *s)
+{
+	GF_Err e;
+	u32 sample_count;
+	u32 i;
+	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox*)s;
+	//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	ptr->size += 4;
+
+	ptr->size += 4;
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	if (sample_count) {
+		for (i = 0; i < sample_count; i++) {
+			GF_CENCSampleAuxInfo *sai = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+			if (! sai->IV_size) continue;
+			ptr->size += sai->IV_size;
+			if (ptr->flags & 0x00000002) 
+				ptr->size += 2 + 6*sai->subsample_count;
+		}
+	}
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+GF_Box *adkm_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeDRMKeyManagementSystemBox, GF_ISOM_BOX_TYPE_ADKM);
+	tmp->version = 1;
+	tmp->flags = 0;
+	return (GF_Box *)tmp;
+}
+
+void adkm_del(GF_Box *s)
+{
+	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
+	if (!ptr) return;
+	if (ptr->header) gf_isom_box_del((GF_Box *)ptr->header);
+	if (ptr->au_format) gf_isom_box_del((GF_Box *)ptr->au_format);
+	gf_free(s);
+}
+
+GF_Err adkm_AddBox(GF_Box *s, GF_Box *a)
+{
+	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
+	switch (a->type) {
+	case GF_ISOM_BOX_TYPE_AHDR: 
+		if (ptr->header) return GF_ISOM_INVALID_FILE;
+		ptr->header = (GF_AdobeDRMHeaderBox *)a; 
+		break;
+	case GF_ISOM_BOX_TYPE_ADAF: 
+		if (ptr->au_format) return GF_ISOM_INVALID_FILE;
+		ptr->au_format = (GF_AdobeDRMAUFormatBox *)a; 
+		break;
+
+	default: 
+		return gf_isom_box_add_default(s, a);
+	}
+	return GF_OK;
+}
+
+GF_Err adkm_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+	return gf_isom_read_box_list(s, bs, adkm_AddBox);
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err adkm_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	//ahdr
+	e = gf_isom_box_write((GF_Box *) ptr->header, bs);
+	if (e) return e;
+	//adaf
+	e = gf_isom_box_write((GF_Box *) ptr->au_format, bs);
+	if (e) return e;
+
+	return GF_OK;
+}
+
+GF_Err adkm_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	e = gf_isom_box_size((GF_Box *) ptr->header);
+	if (e) return e;
+	ptr->size += ptr->header->size;
+	e = gf_isom_box_size((GF_Box *) ptr->au_format);
+	if (e) return e;
+	ptr->size += ptr->au_format->size;
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+GF_Box *ahdr_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeDRMHeaderBox, GF_ISOM_BOX_TYPE_AHDR);
+	tmp->version = 2;
+	tmp->flags = 0;
+	return (GF_Box *)tmp;
+}
+
+void ahdr_del(GF_Box *s)
+{
+	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
+	if (!ptr) return;
+	if (ptr->std_enc_params) gf_isom_box_del((GF_Box *)ptr->std_enc_params);
+	gf_free(s);
+}
+
+
+GF_Err ahdr_AddBox(GF_Box *s, GF_Box *a)
+{
+	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
+	switch (a->type) {
+	case GF_ISOM_BOX_TYPE_APRM: 
+		if (ptr->std_enc_params) return GF_ISOM_INVALID_FILE;
+		ptr->std_enc_params = (GF_AdobeStdEncryptionParamsBox *)a; 
+		break;
+
+	default: 
+		return gf_isom_box_add_default(s, a);
+	}
+	return GF_OK;
+}
+
+GF_Err ahdr_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+	return gf_isom_read_box_list(s, bs, ahdr_AddBox);
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err ahdr_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	e = gf_isom_box_write((GF_Box *) ptr->std_enc_params, bs);
+	if (e) return e;
+
+	return GF_OK;
+}
+
+GF_Err ahdr_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	e = gf_isom_box_size((GF_Box *) ptr->std_enc_params);
+	if (e) return e;
+	ptr->size += ptr->std_enc_params->size;
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+GF_Box *aprm_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeStdEncryptionParamsBox, GF_ISOM_BOX_TYPE_APRM);
+	tmp->version = 1;
+	tmp->flags = 0;
+	return (GF_Box *)tmp;
+}
+
+void aprm_del(GF_Box *s)
+{
+	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
+	if (!ptr) return;
+	if (ptr->enc_info) gf_isom_box_del((GF_Box *)ptr->enc_info);
+	if (ptr->key_info) gf_isom_box_del((GF_Box *)ptr->key_info);
+	gf_free(s);
+}
+
+GF_Err aprm_AddBox(GF_Box *s, GF_Box *a)
+{
+	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
+	switch (a->type) {
+	case GF_ISOM_BOX_TYPE_AHDR: 
+		if (ptr->enc_info) return GF_ISOM_INVALID_FILE;
+		ptr->enc_info = (GF_AdobeEncryptionInfoBox *)a; 
+		break;
+	case GF_ISOM_BOX_TYPE_ADAF: 
+		if (ptr->key_info) return GF_ISOM_INVALID_FILE;
+		ptr->key_info = (GF_AdobeKeyInfoBox *)a; 
+		break;
+
+	default: 
+		return gf_isom_box_add_default(s, a);
+	}
+	return GF_OK;
+}
+
+GF_Err aprm_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+	return gf_isom_read_box_list(s, bs, aprm_AddBox);
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err aprm_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	//ahdr
+	e = gf_isom_box_write((GF_Box *) ptr->enc_info, bs);
+	if (e) return e;
+	//adaf
+	e = gf_isom_box_write((GF_Box *) ptr->key_info, bs);
+	if (e) return e;
+
+	return GF_OK;
+}
+
+GF_Err aprm_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	e = gf_isom_box_size((GF_Box *) ptr->enc_info);
+	if (e) return e;
+	ptr->size += ptr->enc_info->size;
+	e = gf_isom_box_size((GF_Box *) ptr->key_info);
+	if (e) return e;
+	ptr->size += ptr->key_info->size;
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+GF_Box *aeib_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeEncryptionInfoBox, GF_ISOM_BOX_TYPE_AEIB);
+	tmp->version = 1;
+	tmp->flags = 0;
+	return (GF_Box *)tmp;
+}
+
+void aeib_del(GF_Box *s)
+{
+	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox*)s;
+	if (!ptr) return;
+	if (ptr->enc_algo) gf_free(ptr->enc_algo);
+	gf_free(ptr);
+}
+
+GF_Err aeib_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox*)s;
+	u32 len;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	len = (u32) ptr->size - 1;
+	if (len) {
+		if (ptr->enc_algo) return GF_ISOM_INVALID_FILE;
+		ptr->enc_algo = (char *)gf_malloc(len*sizeof(char));
+		gf_bs_read_data(bs, ptr->enc_algo, len);
+	}
+	ptr->key_length = gf_bs_read_u8(bs);
+	ptr->size = 0;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err aeib_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	if (ptr->enc_algo) {
+		gf_bs_write_data(bs, (char *) ptr->enc_algo, (u32) strlen(ptr->enc_algo));
+		gf_bs_write_u8(bs, 0); //string end
+	}
+	gf_bs_write_u8(bs, ptr->key_length);
+	return GF_OK;
+}
+
+GF_Err aeib_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox*)s;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	if (ptr->enc_algo)
+		ptr->size += strlen(ptr->enc_algo) + 1;
+	ptr->size += 1; //KeyLength
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+GF_Box *akey_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeKeyInfoBox, GF_ISOM_BOX_TYPE_AKEY);
+	tmp->version = 1;
+	tmp->flags = 0;
+	return (GF_Box *)tmp;
+}
+
+void akey_del(GF_Box *s)
+{
+	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
+	if (!ptr) return;
+	if (ptr->params) gf_isom_box_del((GF_Box *)ptr->params);
+	gf_free(s);
+}
+
+GF_Err akey_AddBox(GF_Box *s, GF_Box *a)
+{
+	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
+	switch (a->type) {
+	case GF_ISOM_BOX_TYPE_FLXS: 
+		if (ptr->params) return GF_ISOM_INVALID_FILE;
+		ptr->params = (GF_AdobeFlashAccessParamsBox *)a; 
+		break;
+	default: 
+		return gf_isom_box_add_default(s, a);
+	}
+	return GF_OK;
+}
+
+GF_Err akey_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	return gf_isom_read_box_list(s, bs, akey_AddBox);
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+GF_Err akey_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+	e = gf_isom_box_write((GF_Box *) ptr->params, bs);
+	if (e) return e;
+
+	return GF_OK;
+}
+
+GF_Err akey_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	e = gf_isom_box_size((GF_Box *) ptr->params);
+	if (e) return e;
+	ptr->size += ptr->params->size;
+	e = gf_isom_box_size((GF_Box *) ptr->params);
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+GF_Box *flxs_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeFlashAccessParamsBox, GF_ISOM_BOX_TYPE_FLXS);
+	return (GF_Box *)tmp;
+}
+
+void flxs_del(GF_Box *s)
+{
+	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox*)s;
+	if (!ptr) return;
+	if (ptr->metadata)
+		gf_free(ptr->metadata);
+	gf_free(ptr);
+}
+
+GF_Err flxs_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox*)s;
+	u32 len;
+
+	len = (u32) ptr->size;
+	if (len) {
+		if (ptr->metadata) return GF_ISOM_INVALID_FILE;
+		ptr->metadata = (char *)gf_malloc(len*sizeof(char));
+		gf_bs_read_data(bs, ptr->metadata, len);
+	}
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err flxs_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_box_write_header(s, bs);
+	if (e) return e;
+	if (ptr->metadata) {
+		gf_bs_write_data(bs, ptr->metadata, (u32) strlen(ptr->metadata));
+		gf_bs_write_u8(bs, 0); //string end
+	}
+	return GF_OK;
+}
+
+GF_Err flxs_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox*)s;
+	e = gf_isom_box_get_size(s);
+	if (e) return e;
+	if (ptr->metadata) 
+		ptr->size += strlen(ptr->metadata) + 1;
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+GF_Box *adaf_New()
+{
+	ISOM_DECL_BOX_ALLOC(GF_AdobeDRMAUFormatBox, GF_ISOM_BOX_TYPE_ADAF);
+	return (GF_Box *)tmp;
+}
+
+void adaf_del(GF_Box *s)
+{
+	gf_free(s);
+}
+
+GF_Err adaf_Read(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeDRMAUFormatBox *ptr = (GF_AdobeDRMAUFormatBox*)s;
+
+	e = gf_isom_full_box_read(s, bs);
+	if (e) return e;
+
+	ptr->selective_enc = gf_bs_read_u8(bs);
+	gf_bs_read_u8(bs);//resersed
+	ptr->IV_length = gf_bs_read_u8(bs);
+	ptr->size -= 3;
+	return GF_OK;
+}
+
+#ifndef GPAC_DISABLE_ISOM_WRITE
+
+GF_Err adaf_Write(GF_Box *s, GF_BitStream *bs)
+{
+	GF_Err e;
+	GF_AdobeDRMAUFormatBox *ptr = (GF_AdobeDRMAUFormatBox *) s;
+	if (!s) return GF_BAD_PARAM;
+	e = gf_isom_full_box_write(s, bs);
+	if (e) return e;
+
+	gf_bs_write_u8(bs, ptr->selective_enc);
+	gf_bs_write_u8(bs, 0x0);
+	gf_bs_write_u8(bs, ptr->IV_length);
+	return GF_OK;
+}
+
+GF_Err adaf_Size(GF_Box *s)
+{
+	GF_Err e;
+	GF_AdobeDRMAUFormatBox *ptr = (GF_AdobeDRMAUFormatBox*)s;
+	e = gf_isom_full_box_get_size(s);
+	if (e) return e;
+	ptr->size += 3;
+	return GF_OK;
+}
+#endif //GPAC_DISABLE_ISOM_WRITE
+
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_dump.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_dump.c Changed

@@ -25,6 +25,8 @@
 
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/utf.h>
+#include <gpac/network.h>
+#include <time.h>
 
 #ifndef GPAC_DISABLE_ISOM_DUMP
 
@@ -45,7 +47,6 @@
 	u32 i;
 	fprintf(trace, "data:application/octet-string,");
 	for (i=0; i<dataLength; i++) {
-		fprintf(trace, "%%");
 		fprintf(trace, "%02X", (unsigned char) data[i]);
 	}
 }
@@ -114,6 +115,7 @@
 	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_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_STBL:
 		return stbl_dump(a, trace);
@@ -306,6 +308,7 @@
 	case GF_ISOM_BOX_TYPE_SVCC: 
 		return avcc_dump(a, trace);
 	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);
@@ -318,6 +321,10 @@
 	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:
 		return mp4v_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_PASP:
 		return pasp_dump(a, trace);
@@ -389,7 +396,8 @@
 		return mp4v_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_ENCS:
 		return mp4s_dump(a, trace);
-
+	case GF_ISOM_BOX_TYPE_PRFT:
+		return prft_dump(a, trace);
 
 	case GF_ISOM_BOX_TYPE_0xA9NAM:
 	case GF_ISOM_BOX_TYPE_0xA9CMT:
@@ -470,6 +478,9 @@
 	case GF_ISOM_BOX_TYPE_PCRB:
 		return pcrb_dump(a, trace);
 
+	case GF_ISOM_BOX_TYPE_SENC:
+		return senc_dump(a, trace);
+
 	case GF_ISOM_BOX_TYPE_UUID:
 		switch ( ((GF_UnknownUUIDBox *)a)->internal_4cc) {
 		case GF_ISOM_BOX_UUID_TENC: return piff_tenc_dump(a, trace);
@@ -481,6 +492,10 @@
 			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_STTC:
 	case GF_ISOM_BOX_TYPE_VTTC:
 	case GF_ISOM_BOX_TYPE_CTIM:
 	case GF_ISOM_BOX_TYPE_IDEN:
@@ -493,7 +508,28 @@
 		return vtte_dump(a, trace);
 	case GF_ISOM_BOX_TYPE_WVTT:
 		return wvtt_dump(a, trace);
+
+	case GF_ISOM_BOX_TYPE_STPP:
+		return stpp_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_SBTT:
+		return metx_dump(a, trace);
 #endif
+
+		/*Adobe's protection boxes*/
+	case GF_ISOM_BOX_TYPE_ADKM:
+		return adkm_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_AHDR:
+		return ahdr_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_ADAF:
+		return adaf_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_APRM:
+		return aprm_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_AEIB:
+		return aeib_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_AKEY:
+		return akey_dump(a, trace);
+	case GF_ISOM_BOX_TYPE_FLXS:
+		return flxs_dump(a, trace);
 			
 	default: 
 		return defa_dump(a, trace);
@@ -555,6 +591,7 @@
 #endif
 #endif
 		case GF_ISOM_BOX_TYPE_MFRA:
+		case GF_ISOM_BOX_TYPE_PRFT:
 			break;
 
 		default:
@@ -760,6 +797,21 @@
 	if (p->Fragments) gf_box_dump(p->Fragments, trace);
 	if (p->sampleGroupsDescription) gf_box_array_dump(p->sampleGroupsDescription, trace);
 	if (p->sampleGroups) gf_box_array_dump(p->sampleGroups, trace);
+	if (p->sai_sizes) {
+		u32 i;
+		for (i = 0; i < gf_list_count(p->sai_sizes); i++) {
+			GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(p->sai_sizes, i);
+			gf_box_dump(saiz, trace);
+		}
+	}
+
+	if (p->sai_offsets) {
+		u32 i;
+		for (i = 0; i < gf_list_count(p->sai_offsets); i++) {
+			GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(p->sai_offsets, i);
+			gf_box_dump(saio, trace);
+		}
+	}
 	
 	gf_box_dump_done("SampleTableBox", a, trace);
 	return GF_OK;
@@ -988,6 +1040,7 @@
 		if (p->descr) gf_box_dump(p->descr, trace);
 		if (p->bitrate) gf_box_dump(p->bitrate, trace);
 		if (p->svc_config) gf_box_dump(p->svc_config, trace);
+		if (p->shvc_config) gf_box_dump(p->shvc_config, trace);
 	}
 	if (a->type == GF_ISOM_BOX_TYPE_ENCV) {
 		gf_box_array_dump(p->protections, trace);
@@ -1699,16 +1752,17 @@
 GF_Err hvcc_dump(GF_Box *a, FILE * trace)
 {
 	u32 i, count;
+	const char *name = (a->type==GF_ISOM_BOX_TYPE_HVCC) ? "HEVC" : "SHVC";
 	GF_HEVCConfigurationBox *p = (GF_HEVCConfigurationBox *) a;
 
-	fprintf(trace, "<HEVCConfigurationBox>\n");
+	fprintf(trace, "<%sConfigurationBox>\n", name);
 
-	fprintf(trace, "<HEVCDecoderConfigurationRecord nal_unit_size=\"%d\" ", p->config->nal_unit_size);
+	fprintf(trace, "<%sDecoderConfigurationRecord nal_unit_size=\"%d\" ", name, p->config->nal_unit_size);
 	fprintf(trace, "configurationVersion=\"%d\" ", p->config->configurationVersion);
 	fprintf(trace, "profile_space=\"%d\" ", p->config->profile_space);
 	fprintf(trace, "tier_flag=\"%d\" ", p->config->tier_flag);
 	fprintf(trace, "profile_idc=\"%d\" ", p->config->profile_idc);
-	fprintf(trace, "profile_compatibility_indications=\"%d\" ", p->config->profile_compatibility_indications);
+	fprintf(trace, "general_profile_compatibility_flags=\"%d\" ", p->config->general_profile_compatibility_flags);
 	fprintf(trace, "progressive_source_flag=\"%d\" ", p->config->progressive_source_flag);
 	fprintf(trace, "interlaced_source_flag=\"%d\" ", p->config->interlaced_source_flag);
 	fprintf(trace, "non_packed_constraint_flag=\"%d\" ", p->config->non_packed_constraint_flag);
@@ -1721,6 +1775,10 @@
 	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);
 
+	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);
+	}
+
 	fprintf(trace, ">\n");
 
 	count = gf_list_count(p->config->param_array);
@@ -1738,11 +1796,11 @@
 		fprintf(trace, "</ParameterSetArray>\n");
 	}
 
-	fprintf(trace, "</HEVCDecoderConfigurationRecord>\n");
+	fprintf(trace, "</%sDecoderConfigurationRecord>\n", name);
 
 	DumpBox(a, trace);
 	gf_box_dump_done(NULL, a, trace);
-	fprintf(trace, "</HEVCConfigurationBox>\n");
+	fprintf(trace, "</%sConfigurationBox>\n", name);
 	return GF_OK;
 }
 
@@ -2434,11 +2492,22 @@
 	if (p->sampleGroupsDescription) gf_box_array_dump(p->sampleGroupsDescription, trace);
 	if (p->sampleGroups) gf_box_array_dump(p->sampleGroups, trace);
 	gf_box_array_dump(p->TrackRuns, trace);
+	if (p->sai_sizes) gf_box_array_dump(p->sai_sizes, trace);
+	if (p->sai_offsets) gf_box_array_dump(p->sai_offsets, trace);
 	if (p->piff_sample_encryption) gf_box_dump(p->piff_sample_encryption, trace);
+	if (p->sample_encryption) gf_box_dump(p->sample_encryption, trace);
 	gf_box_dump_done("TrackFragmentBox", a, trace);
 	return GF_OK;
 }
 
+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_Err tfhd_dump(GF_Box *a, FILE * trace)
 {
 	GF_TrackFragmentHeaderBox *p;
@@ -2458,10 +2527,9 @@
 		fprintf(trace, " SampleDuration=\"%d\"", p->def_sample_duration);
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_SIZE)
 		fprintf(trace, " SampleSize=\"%d\"", p->def_sample_size);
+
 	if (p->flags & GF_ISOM_TRAF_SAMPLE_FLAGS) {
-		fprintf(trace, " SamplePadding=\"%d\"", GF_ISOM_GET_FRAG_PAD(p->def_sample_flags));
-		fprintf(trace, " SampleSync=\"%d\"", GF_ISOM_GET_FRAG_SYNC(p->def_sample_flags));
-		fprintf(trace, " SampleDegradationPriority=\"%d\"", GF_ISOM_GET_FRAG_DEG(p->def_sample_flags));
+		frag_dump_sample_flags(trace, p->def_sample_flags);
 	}
 
 	fprintf(trace, ">\n");
@@ -2505,8 +2573,7 @@
 				fprintf(trace, " CTSOffset=\"%d\"", ent->CTS_Offset);
 
 			if (p->flags & GF_ISOM_TRUN_FLAGS) {
-				fprintf(trace, " SamplePadding=\"%d\" Sync=\"%d\" DegradationPriority=\"%d\"",
-					GF_ISOM_GET_FRAG_PAD(ent->flags), GF_ISOM_GET_FRAG_SYNC(ent->flags), GF_ISOM_GET_FRAG_DEG(ent->flags));
+				frag_dump_sample_flags(trace, ent->flags);
 			}
 			fprintf(trace, "/>\n");
 		}
@@ -2723,6 +2790,8 @@
 	case GF_ISOM_BOX_TYPE_TX3G:
 		break;
 	case GF_ISOM_BOX_TYPE_TEXT:
+	case GF_ISOM_BOX_TYPE_STPP:
+	case GF_ISOM_BOX_TYPE_SBTT:
 	default:
 		return GF_BAD_PARAM;
 	}
@@ -3256,6 +3325,7 @@
 	if (p->isfm) gf_box_dump(p->isfm, trace);
 	if (p->okms) gf_box_dump(p->okms, trace);
 	if (p->tenc) gf_box_dump(p->tenc, trace);
+	if (p->adkm) gf_box_dump(p->adkm, trace);
 	gf_box_dump_done("SchemeInformationBox", a, trace);
 	return GF_OK;
 }
@@ -3264,11 +3334,11 @@
 {
 	GF_ISMAKMSBox *p;
 	p = (GF_ISMAKMSBox *)a;
-	fprintf(trace, "<ISMAKMSBox kms_URI=\"%s\">\n", p->URI);
+	fprintf(trace, "<KMSBox kms_URI=\"%s\">\n", p->URI);
 	DumpBox(a, trace);
 	gf_full_box_dump(a, trace);
 
-	gf_box_dump_done("ISMAKMSBox", a, trace);
+	gf_box_dump_done("KMSBox", a, trace);
 	return GF_OK;
 
 }
@@ -3718,6 +3788,24 @@
 	return GF_OK;
 }
 
+GF_Err stse_dump(GF_Box *a, FILE * trace)
+{
+	GF_SimpleTextSampleEntryBox *ptr = (GF_SimpleTextSampleEntryBox*)a;
+	const char *name = "SimpleTextSampleEntryBox";
+
+	fprintf(trace, "<%s ", name);
+	fprintf(trace, "mime_type=\"%s\" ", ptr->mime_type);
+	if (ptr->content_encoding) fprintf(trace, "content_encoding=\"%s\" ", ptr->content_encoding);
+	fprintf(trace, ">\n");
+	DumpBox(a, trace);
+
+	if (ptr->bitrate) gf_box_dump(ptr->bitrate, trace);
+	if (ptr->config) gf_box_dump(ptr->config, trace);
+
+	gf_box_dump_done(NULL, a, trace);
+	fprintf(trace, "</%s>\n", name);
+	return GF_OK;
+}
 
 GF_Err dims_dump(GF_Box *a, FILE * trace)
 {
@@ -3951,6 +4039,11 @@
 			if (((GF_VisualRandomAccessEntry*)entry)->num_leading_samples_known) fprintf(trace, " num_leading_samples=\"%d\" />", ((GF_VisualRandomAccessEntry*)entry)->num_leading_samples);
 			fprintf(trace, "/>\n");
 			break;
+		case GF_4CC( 's', 'e', 'i', 'g' ):
+			fprintf(trace, "<CENCSampleEncryptionGroupEntry IsEncrypted=\"%d\" IV_size=\"%d\" KID=\"", ((GF_CENCSampleEncryptionGroupEntry*)entry)->IsEncrypted, ((GF_CENCSampleEncryptionGroupEntry*)entry)->IV_size);
+			DumpDataHex(trace, (char *)((GF_CENCSampleEncryptionGroupEntry*)entry)->KID, 16);
+			fprintf(trace, "\"/>\n");
+			break;
 		default:
 			fprintf(trace, "<DefaultSampleGroupDescriptionEntry size=\"%d\" data=\"", ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
 			DumpData(trace, (char *) ((GF_DefaultSampleGroupDescriptionEntry*)entry)->data,  ((GF_DefaultSampleGroupDescriptionEntry*)entry)->length);
@@ -3968,7 +4061,13 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<SampleAuxiliaryInfoSizeBox default_sample_info_size=\"%d\" sample_count=\"%d\"", ptr->default_sample_info_size, ptr->sample_count);
-	if (ptr->flags & 1) fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
+	if (ptr->flags & 1) {
+		if (isalnum(ptr->aux_info_type>>24)) {	
+			fprintf(trace, " aux_info_type=\"%s\" aux_info_type_parameter=\"%d\"", gf_4cc_to_str(ptr->aux_info_type), ptr->aux_info_type_parameter);
+		} else {
+			fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
+		}
+	}
 	fprintf(trace, ">\n");
 	DumpBox(a, trace);
 	gf_full_box_dump((GF_Box *)a, trace);
@@ -3988,14 +4087,19 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<SampleAuxiliaryInfoOffsetBox entry_count=\"%d\"", ptr->entry_count);
-	if (ptr->flags & 1) fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
+	if (ptr->flags & 1) {
+		if (isalnum(ptr->aux_info_type>>24)) {	
+			fprintf(trace, " aux_info_type=\"%s\" aux_info_type_parameter=\"%d\"", gf_4cc_to_str(ptr->aux_info_type), ptr->aux_info_type_parameter);
+		} else {
+			fprintf(trace, " aux_info_type=\"%d\" aux_info_type_parameter=\"%d\"", ptr->aux_info_type, ptr->aux_info_type_parameter);
+		}
+	}
+
 	fprintf(trace, ">\n");
 	DumpBox(a, trace);
 	gf_full_box_dump((GF_Box *)a, trace);
 
-	if (ptr->single_offset) {
-		fprintf(trace, "<SAIChunkOffset offset=\""LLD"\"/>\n", ptr->single_offset);
-	} else if (ptr->version==0) {
+	if (ptr->version==0) {
 		for (i=0; i<ptr->entry_count; i++) {
 			fprintf(trace, "<SAIChunkOffset offset=\"%d\"/>\n", ptr->offsets[i]);
 		}
@@ -4014,7 +4118,7 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<ProtectionSystemHeaderBox SystemID=\"");
-	DumpData(trace, (char *) ptr->SystemID, 16);
+	DumpDataHex(trace, (char *) ptr->SystemID, 16);
 	fprintf(trace, "\">\n");
 	DumpBox(a, trace);
 	gf_full_box_dump((GF_Box *)a, trace);
@@ -4023,13 +4127,13 @@
 		u32 i;
 		for (i=0; i<ptr->KID_count; i++) {
 			fprintf(trace, " <PSSHKey KID=\"");
-			DumpData(trace, (char *) ptr->KIDs[i], 16);
+			DumpDataHex(trace, (char *) ptr->KIDs[i], 16);
 			fprintf(trace, "\"/>\n");
 		}
 	}
 	if (ptr->private_data_size) {
 		fprintf(trace, " <PSSHData size=\"%d\" value=\"", ptr->private_data_size);
-		DumpData(trace, (char *) ptr->private_data, ptr->private_data_size);
+		DumpDataHex(trace, (char *) ptr->private_data, ptr->private_data_size);
 		fprintf(trace, "\"/>\n");
 	}
 	gf_box_dump_done("ProtectionSystemHeaderBox", a, trace);
@@ -4042,7 +4146,7 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<TrackEncryptionBox isEncrypted=\"%d\" IV_size=\"%d\" KID=\"", ptr->IsEncrypted, ptr->IV_size);
-	DumpData(trace, (char *) ptr->KID, 16);
+	DumpDataHex(trace, (char *) ptr->KID, 16);
 	fprintf(trace, "\">\n");
 	DumpBox(a, trace);
 	gf_full_box_dump((GF_Box *)a, trace);
@@ -4072,7 +4176,7 @@
 	if (!a) return GF_BAD_PARAM;
 
 	fprintf(trace, "<PIFFTrackEncryptionBox AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
-	DumpData(trace,(char *) ptr->KID, 16);
+	DumpDataHex(trace,(char *) ptr->KID, 16);
 	fprintf(trace, "\">\n");
 	DumpBox(a, trace);
 	fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"%d\"/>\n", ptr->version, ptr->flags);
@@ -4082,47 +4186,176 @@
 
 GF_Err piff_psec_dump(GF_Box *a, FILE * trace)
 {
-	u32 IV_size = 0;
+	u32 i, j, sample_count;
 	GF_PIFFSampleEncryptionBox *ptr = (GF_PIFFSampleEncryptionBox *) a;
 	if (!a) return GF_BAD_PARAM;
 
-	fprintf(trace, "<PIFFSampleEncryptionBox sampleCount=\"%d\"", ptr->sample_count);
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	fprintf(trace, "<PIFFSampleEncryptionBox sampleCount=\"%d\"", sample_count);
 	if (ptr->flags & 1) {
-		fprintf(trace, " default_AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
+		fprintf(trace, " AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", ptr->AlgorithmID, ptr->IV_size);
 		DumpData(trace, (char *) ptr->KID, 16);
 		fprintf(trace, "\"");
-		IV_size = 0;
 	}
 	fprintf(trace, ">\n");
 	DumpBox(a, trace);
-	if (ptr->cenc_data) {
-		u32 i, j;
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-		for (i=0; i<ptr->sample_count; i++) {
-			GF_CENCSampleInfo *cenc_sample = gf_isom_cenc_get_sample(ptr->traf->trex->track, ptr->traf, i+1);
+	
+	if (sample_count) {
+		for (i=0; i<sample_count; i++) {
+			GF_CENCSampleAuxInfo *cenc_sample = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
 
 			if (cenc_sample) {
+				if  (!strlen((char *)cenc_sample->IV)) continue;
 				fprintf(trace, "<PIFFSampleEncryptionEntry IV=\"");
-				DumpDataHex(trace, (char *) cenc_sample->IV, IV_size);
-				fprintf(trace, "\" SubsampleCount=\"%d\"", cenc_sample->subsample_count);
-				if (cenc_sample->is_alt_info) {
-					fprintf(trace, " AlgorithmID=\"%d\" IV_size=\"%d\" KID=\"", cenc_sample->algo_id, cenc_sample->IV_size);
-					DumpDataHex(trace, (char *) cenc_sample->keyID, 16);
-					fprintf(trace, "\"");
+				DumpDataHex(trace, (char *) cenc_sample->IV, 16);
+				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);
+					}
 				}
+				fprintf(trace, "</PIFFSampleEncryptionEntry>\n");
+			}
+		}
+	}
+
+	gf_box_dump_done("PIFFSampleEncryptionBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err senc_dump(GF_Box *a, FILE * trace)
+{
+	u32 i, j, sample_count;
+	GF_SampleEncryptionBox *ptr = (GF_SampleEncryptionBox *) a;
+	if (!a) return GF_BAD_PARAM;
+
+	sample_count = gf_list_count(ptr->samp_aux_info);
+	fprintf(trace, "<SampleEncryptionBox sampleCount=\"%d\">\n", sample_count);
+	DumpBox(a, trace);
+	//WARNING - PSEC (UUID) IS TYPECASTED TO SENC (FULL BOX) SO WE CANNOT USE USUAL FULL BOX FUNCTIONS
+	fprintf(trace, "<FullBoxInfo Version=\"%d\" Flags=\"0x%X\"/>\n", ptr->version, ptr->flags);
+	for (i=0; i<sample_count; i++) {
+		GF_CENCSampleAuxInfo *cenc_sample = (GF_CENCSampleAuxInfo *)gf_list_get(ptr->samp_aux_info, i);
+
+		if (cenc_sample) {
+			fprintf(trace, "<SampleEncryptionEntry sampleCount=\"%d\" IV=\"", i+1);
+			DumpDataHex(trace, (char *) cenc_sample->IV, 16);
+			fprintf(trace, "\"");
+			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);
+					fprintf(trace, "<SubSampleEncryptionEntry NumClearBytes=\"%d\" NumEncryptedBytes=\"%d\"/>\n", cenc_sample->subsamples[j].bytes_clear_data, cenc_sample->subsamples[j].bytes_encrypted_data);
 				}
-				fprintf(trace, "</PIFFSampleEncryptionEntry>\n");
-	
-				gf_isom_cenc_sample_del(cenc_sample);
+			} else {
+				fprintf(trace, ">\n");
 			}
+			fprintf(trace, "</SampleEncryptionEntry>\n");
 		}
-#endif //	GPAC_DISABLE_ISOM_FRAGMENTS
 	}
-	gf_box_dump_done("PIFFSampleEncryptionBox", a, trace);
+
+	gf_box_dump_done("SampleEncryptionBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err prft_dump(GF_Box *a, FILE * trace)
+{
+	GF_ProducerReferenceTimeBox *ptr = (GF_ProducerReferenceTimeBox *) a;
+
+	time_t secs = (ptr->ntp >> 32) - GF_NTP_SEC_1900_TO_1970;
+	struct tm t = *gmtime(&secs);
+	fprintf(trace, "<ProducerReferenceTimeBox referenceTrackID=\"%d\" timestamp=\""LLU"\" NTP_frac=\"%d\"  UTCClock=\"%d-%02d-%02dT%02d:%02d:%02dZ\">\n", ptr->refTrackID, ptr->timestamp, (u32) (ptr->ntp&0xFFFFFFFFULL), 1900+t.tm_year, t.tm_mon+1, t.tm_mday, t.tm_hour, t.tm_min, (u32) t.tm_sec);
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	gf_box_dump_done("ProducerReferenceTimeBox", a, trace);
+
+	return GF_OK;
+}
+
+GF_Err adkm_dump(GF_Box *a, FILE * trace)
+{
+	GF_AdobeDRMKeyManagementSystemBox *ptr = (GF_AdobeDRMKeyManagementSystemBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<GF_AdobeDRMKeyManagementSystemBox>\n");
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	if (ptr->header) gf_box_dump((GF_Box *)ptr->header, trace);
+	if (ptr->au_format) gf_box_dump((GF_Box *)ptr->au_format, trace);
+	gf_box_dump_done("GF_AdobeDRMKeyManagementSystemBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err ahdr_dump(GF_Box *a, FILE * trace)
+{
+	GF_AdobeDRMHeaderBox *ptr = (GF_AdobeDRMHeaderBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<GF_AdobeDRMHeaderBox>\n");
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	if (ptr->std_enc_params) gf_box_dump((GF_Box *)ptr->std_enc_params, trace);
+	gf_box_dump_done("GF_AdobeDRMHeaderBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err aprm_dump(GF_Box *a, FILE * trace)
+{
+	GF_AdobeStdEncryptionParamsBox *ptr = (GF_AdobeStdEncryptionParamsBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<GF_AdobeStdEncryptionParamsBox>\n");
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	if (ptr->enc_info) gf_box_dump((GF_Box *)ptr->enc_info, trace);
+	if (ptr->key_info) gf_box_dump((GF_Box *)ptr->key_info, trace);
+	gf_box_dump_done("GF_AdobeStdEncryptionParamsBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err aeib_dump(GF_Box *a, FILE * trace)
+{
+	GF_AdobeEncryptionInfoBox *ptr = (GF_AdobeEncryptionInfoBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<GF_AdobeEncryptionInfoBox EncryptionAlgorithm=\"%s\" KeyLength=\"%d\">\n", ptr->enc_algo, ptr->key_length);
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	gf_box_dump_done("GF_AdobeEncryptionInfoBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err akey_dump(GF_Box *a, FILE * trace)
+{
+	GF_AdobeKeyInfoBox *ptr = (GF_AdobeKeyInfoBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<GF_AdobeKeyInfoBox>\n");
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	if (ptr->params) gf_box_dump((GF_Box *)ptr->params, trace);
+	gf_box_dump_done("GF_AdobeKeyInfoBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err flxs_dump(GF_Box *a, FILE * trace)
+{
+	GF_AdobeFlashAccessParamsBox *ptr = (GF_AdobeFlashAccessParamsBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<GF_AdobeFlashAccessParamsBox>\n");
+	DumpBox(a, trace);
+	if (ptr->metadata)
+		fprintf(trace, "<FmrmsV2Metadata=\"%s\"/>\n", ptr->metadata);
+	gf_box_dump_done("GF_AdobeFlashAccessParamsBox", a, trace);
+	return GF_OK;
+}
+
+GF_Err adaf_dump(GF_Box *a, FILE * trace)
+{
+	GF_AdobeDRMAUFormatBox *ptr = (GF_AdobeDRMAUFormatBox *)a;
+	if (!a) return GF_BAD_PARAM;
+	fprintf(trace, "<GF_AdobeDRMAUFormatBox SelectiveEncryption=\"%d\" IV_length=\"%d\">\n", ptr->selective_enc ? 1 : 0, ptr->IV_length);
+	DumpBox(a, trace);
+	gf_full_box_dump((GF_Box *)a, trace);
+	gf_box_dump_done("GF_AdobeDRMAUFormatBox", a, trace);
 	return GF_OK;
 }

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/box_funcs.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/box_funcs.c Changed

@@ -194,6 +194,7 @@
 	return e;
 }
 
+GF_EXPORT
 GF_Err gf_isom_parse_box(GF_Box **outBox, GF_BitStream *bs)
 {
 	return gf_isom_parse_box_ex(outBox, bs, 0);
@@ -235,7 +236,8 @@
 GF_Err gf_isom_read_box_list_ex(GF_Box *parent, GF_BitStream *bs, GF_Err (*add_box)(GF_Box *par, GF_Box *b), u32 parent_type)
 {
 	GF_Err e;
-	GF_Box *a;
+	GF_Box *a = NULL;
+	
 	while (parent->size) {
 		e = gf_isom_parse_box_ex(&a, bs, parent_type);
 		if (e) {
@@ -297,8 +299,33 @@
 		gf_bs_write_u32(bs, (u32) ptr->size);
 	}
 	gf_bs_write_u32(bs, ptr->type);
-	if (ptr->type == GF_ISOM_BOX_TYPE_UUID) 
-		gf_bs_write_data(bs, (char*)((GF_UUIDBox*)ptr)->uuid, 16);
+	if (ptr->type == GF_ISOM_BOX_TYPE_UUID) {
+		u32 i;
+		char uuid[16];
+		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;
+		}
+
+		for (i = 0; i < 16; i++) {
+			char t[3];
+			t[2] = 0;
+			t[0] = strUUID[2*i];
+			t[1] = strUUID[2*i+1];
+			uuid[i] = (u8) strtol(t, NULL, 16);
+		}
+
+		gf_bs_write_data(bs, uuid, 16);
+	}
 	if (ptr->size > 0xFFFFFFFF) 
 		gf_bs_write_u64(bs, ptr->size);
 	return GF_OK;
@@ -377,6 +404,7 @@
 	case GF_ISOM_BOX_TYPE_CRHD:
 	case GF_ISOM_BOX_TYPE_SDHD:
 	case GF_ISOM_BOX_TYPE_NMHD:
+	case GF_ISOM_BOX_TYPE_STHD:
 		a = nmhd_New();
 		if (a) a->type = boxType;
 		return a;
@@ -390,7 +418,6 @@
 	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_MP4V: return mp4v_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();
@@ -502,17 +529,28 @@
 		if (a) a->type = boxType;
 		return a;
 	case GF_ISOM_BOX_TYPE_HVCC: 
-		return hvcc_New();
+	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_AVC1: return avc1_New();
-	case GF_ISOM_BOX_TYPE_AVC2: return avc2_New();
-	case GF_ISOM_BOX_TYPE_AVC3: return avc3_New();
-	case GF_ISOM_BOX_TYPE_AVC4: return avc4_New();
-	case GF_ISOM_BOX_TYPE_SVC1: return svc1_New();
-	case GF_ISOM_BOX_TYPE_HVC1: return hvc1_New();
-	case GF_ISOM_BOX_TYPE_HEV1: return hev1_New();
+
+	case GF_ISOM_BOX_TYPE_MP4V: 
+	case GF_ISOM_BOX_TYPE_ENCV:
+	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:
+		return mp4v_encv_avc_hevc_new(boxType);
 
 	/*3GPP streaming text*/
 	case GF_ISOM_BOX_TYPE_FTAB: return ftab_New();
@@ -546,9 +584,10 @@
 	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_ENCV: return encv_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();
@@ -634,7 +673,12 @@
 #endif
 	case GF_ISOM_BOX_TYPE_RVCC: return rvcc_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);
@@ -643,8 +687,19 @@
 	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);
 #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();
+
 	default:
 		a = defa_New();
 		if (a) a->type = boxType;
@@ -817,8 +872,14 @@
 	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_HVCC: hvcc_del(a); return;
+	case GF_ISOM_BOX_TYPE_HVCC:
+	case GF_ISOM_BOX_TYPE_SHCC:
+		hvcc_del(a); return;
 
 	/*3GPP streaming text*/
 	case GF_ISOM_BOX_TYPE_FTAB: ftab_del(a); return;
@@ -861,6 +922,7 @@
 			gf_isom_box_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: 
@@ -949,7 +1011,12 @@
 	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;
+
 #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_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;
@@ -958,8 +1025,20 @@
 	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_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;
+
 	default:
 		defa_del(a);
 		return;
@@ -986,6 +1065,7 @@
 	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);
@@ -1104,8 +1184,13 @@
 	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:
 		return mp4v_Read(a, bs);
 	case GF_ISOM_BOX_TYPE_HVCC: 
+	case GF_ISOM_BOX_TYPE_SHCC:
 		return hvcc_Read(a, bs);
 
 	/*3GPP streaming text*/
@@ -1142,6 +1227,7 @@
 	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); 
@@ -1219,8 +1305,12 @@
 	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);
@@ -1229,8 +1319,20 @@
 	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);
+
 #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);
+
 	default:
 		return defa_Read(a, bs);
 	}
@@ -1257,6 +1359,7 @@
 	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);
@@ -1370,6 +1473,7 @@
 	case GF_ISOM_BOX_TYPE_SVCC: 
 		return avcc_Write(a, bs);
 	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);
@@ -1380,6 +1484,10 @@
 	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:
 		return mp4v_Write(a, bs);
 
 	/*3GPP streaming text*/
@@ -1416,6 +1524,9 @@
 	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);
@@ -1495,6 +1606,9 @@
 	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);
@@ -1503,8 +1617,19 @@
 	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);
 #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);
+
 	default:
 		return defa_Write(a, bs);
 	}
@@ -1540,6 +1665,7 @@
 	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);
@@ -1652,6 +1778,7 @@
 	case GF_ISOM_BOX_TYPE_SVCC: 
 		return avcc_Size(a);
 	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);
@@ -1662,6 +1789,10 @@
 	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:
 		return mp4v_Size(a);
 
 	/*3GPP streaming text*/
@@ -1698,6 +1829,7 @@
 	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);
@@ -1777,6 +1909,9 @@
 	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);
@@ -1785,8 +1920,19 @@
 	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);
 #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);
+
 	default: return defa_Size(a);
 	}
 }

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/data_map.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/data_map.c Changed

@@ -28,6 +28,10 @@
 
 #ifndef GPAC_DISABLE_ISOM
 
+#if !defined(NODEJS_FS_WATCH_PATCH) && defined(WIN32)
+#define NODEJS_FS_WATCH_PATCH
+#endif
+
 
 static u32 default_write_buffering_size = 0;
 
@@ -47,6 +51,8 @@
 {
 	if (!ptr) return;
 
+	if (ptr->szName) gf_free(ptr->szName);
+
 	//then delete the structure itself....
 	switch (ptr->type) {
 	//file-based
@@ -60,6 +66,7 @@
 	default:
 		break;
 	}
+
 }
 
 //Close a data entry
@@ -125,14 +132,18 @@
 	if (!strcmp(location, "mp4_tmp_edit")) {
 #ifndef GPAC_DISABLE_ISOM_WRITE
 		*outDataMap = gf_isom_fdm_new_temp(parentPath);
-		if (! (*outDataMap)) return GF_IO_ERR;
+		if (! (*outDataMap)) {
+			return GF_IO_ERR;
+		}
 		return GF_OK;
 #else
 		return GF_NOT_SUPPORTED;
 #endif
 	} else if (!strncmp(location, "gmem://", 7)) {
 		*outDataMap = gf_isom_fdm_new(location, GF_ISOM_DATA_MAP_READ);
-		if (! (*outDataMap)) return GF_IO_ERR;
+		if (! (*outDataMap)) {
+			return GF_IO_ERR;
+		}
 		return GF_OK;
 	}
 
@@ -146,10 +157,14 @@
 	}
 
 	//TEMP: however, only support for file right now (we'd have to add some callback functions at some point)
-	if (extern_file) return GF_NOT_SUPPORTED;
+	if (extern_file) {
+		return GF_NOT_SUPPORTED;
+	}
 
 	sPath = gf_url_get_absolute_path(location, parentPath);
-	if (sPath == NULL) return GF_URL_ERROR;
+	if (sPath == NULL) {
+		return GF_URL_ERROR;
+	}
 
 	if (mode == GF_ISOM_DATA_MAP_READ_ONLY) {
 		mode = GF_ISOM_DATA_MAP_READ;
@@ -166,10 +181,19 @@
 #endif
 	} else {
 		*outDataMap = gf_isom_fdm_new(sPath, mode);
+		if (*outDataMap) {
+			(*outDataMap)->szName = sPath;
+			sPath = NULL;
+		}
+	}
+
+	if (sPath) {
+		gf_free(sPath);
+	}
+	if (! (*outDataMap)) {
+		return GF_URL_ERROR;
 	}
 
-	gf_free(sPath);
-	if (! (*outDataMap)) return GF_URL_ERROR;
 	return GF_OK;
 }
 
@@ -260,6 +284,22 @@
 	}
 }
 
+void gf_isom_datamap_flush(GF_DataMap *map)
+{
+	if (!map) return;
+
+	if (map->type==GF_ISOM_DATA_FILE) {
+		GF_FileDataMap *fdm = (GF_FileDataMap *)map;
+		gf_bs_flush(fdm->bs);
+#ifdef NODEJS_FS_WATCH_PATCH
+		if (fdm->stream && fdm->szName) {
+			fclose(fdm->stream);
+			fdm->stream = gf_f64_open(fdm->szName, "a+b");
+			gf_bs_reassign(fdm->bs, fdm->stream);
+		}
+#endif
+	}
+}
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
@@ -299,7 +339,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 {
@@ -333,6 +373,8 @@
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
 
+#include <errno.h>
+#include <string.h>
 GF_DataMap *gf_isom_fdm_new(const char *sPath, u8 mode)
 {
 	u8 bs_mode;

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/drm_sample.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/drm_sample.c Changed

@@ -123,7 +123,7 @@
 static GF_ProtectionInfoBox *gf_isom_get_sinf_entry(GF_TrackBox *trak, u32 sampleDescriptionIndex, u32 scheme_type, GF_SampleEntryBox **out_sea)
 {
 	u32 i=0;
-	GF_SampleEntryBox *sea;
+	GF_SampleEntryBox *sea=NULL;
 	GF_ProtectionInfoBox *sinf;
 
 	Media_GetSampleDesc(trak->Media, sampleDescriptionIndex, &sea, NULL);
@@ -316,7 +316,7 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-GF_Err gf_isom_remove_ismacryp_protection(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex)
+GF_Err gf_isom_remove_track_protection(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex)
 {
 	GF_TrackBox *trak;
 	GF_Err e;
@@ -330,8 +330,12 @@
 	if (!trak || !trak->Media || !sampleDescriptionIndex) return GF_BAD_PARAM;
 
 	sea = NULL;
-	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ISMACRYP_SCHEME, &sea);
-	if (!sinf) return 0;
+	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENC_SCHEME, &sea);
+	if (!sinf) sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBC_SCHEME, &sea);
+	if (!sinf) sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ISMACRYP_SCHEME, &sea);
+	if (!sinf) sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_OMADRM_SCHEME, &sea);
+	if (!sinf) sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ADOBE_SCHEME, &sea);
+	if (!sinf) return GF_OK;
 
 	sea->type = sinf->original_format->data_format;
 	gf_isom_box_array_del(sea->protections);
@@ -371,9 +375,8 @@
 }
 
 
-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)
+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;
@@ -385,6 +388,8 @@
 	e = Media_GetSampleDesc(trak->Media, desc_index, &sea, NULL);
 	if (e) return e;
 
+	original_format = sea->type;
+
 	/* Replacing the Media Type */
 	switch (sea->type) {
 	case GF_ISOM_BOX_TYPE_MP4A:
@@ -393,12 +398,10 @@
 	case GF_ISOM_BOX_TYPE_DQCP:
 	case GF_ISOM_BOX_TYPE_DSMV:
 	case GF_ISOM_BOX_TYPE_AC3:
-		original_format = sea->type;
 		sea->type = GF_ISOM_BOX_TYPE_ENCA;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4V:
 	case GF_ISOM_BOX_TYPE_D263:
-		original_format = sea->type;
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	/*special case for AVC1*/
@@ -407,21 +410,27 @@
 	case GF_ISOM_BOX_TYPE_AVC3: 
 	case GF_ISOM_BOX_TYPE_AVC4: 
 	case GF_ISOM_BOX_TYPE_SVC1:
-		original_format = GF_4CC('2','6','4','b');
+		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: 
-		original_format = GF_4CC('2','6','5','b');
+	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) 
+			original_format = GF_4CC('2','6','5','b');
 		sea->type = GF_ISOM_BOX_TYPE_ENCV;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4S:
 	case GF_ISOM_BOX_TYPE_LSR1:
-		original_format = sea->type;
 		sea->type = GF_ISOM_BOX_TYPE_ENCS;
 		break;
+	case GF_ISOM_BOX_TYPE_STSE:
 	case GF_ISOM_BOX_TYPE_WVTT:
-		original_format = sea->type;
+	case GF_ISOM_BOX_TYPE_STPP:
 		sea->type = GF_ISOM_BOX_TYPE_ENCT;
 		break;
 	default:
@@ -432,16 +441,41 @@
 	gf_list_add(sea->protections, sinf);
 
 	sinf->scheme_type = (GF_SchemeTypeBox *)schm_New();
+	sinf->scheme_type->version = version;
+	sinf->scheme_type->flags = flags;
 	sinf->scheme_type->scheme_type = scheme_type;
 	sinf->scheme_type->scheme_version = scheme_version;
-	if (scheme_uri) {
-		sinf->scheme_type->flags |= 0x000001;
-		sinf->scheme_type->URI = gf_strdup(scheme_uri);
+	if (sinf->scheme_type->flags == 1) {
+		sinf->scheme_type->URI = (char *)gf_malloc(sizeof(char)*strlen(scheme_uri));
+		memmove(sinf->scheme_type->URI, scheme_uri, strlen(scheme_uri));
 	}
+
 	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();
 
+	*out_sinf = sinf;
+	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 e;
+	GF_ProtectionInfoBox *sinf;
+
+	//setup generic protection
+	e = gf_isom_set_protected_entry(the_file, trackNumber, desc_index, 0, 0, scheme_type, scheme_version, NULL, GF_TRUE, &sinf);
+	if (e) return e;
+
+	if (scheme_uri) {
+		sinf->scheme_type->flags |= 0x000001;
+		sinf->scheme_type->URI = gf_strdup(scheme_uri);
+	}
+
 	sinf->info->ikms = (GF_ISMAKMSBox *)iKMS_New();
 	sinf->info->ikms->URI = gf_strdup(kms_URI);
 
@@ -456,61 +490,13 @@
 						   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)
 {
-	u32 original_format;
 	GF_ProtectionInfoBox *sinf;
 	GF_Err e;
-	GF_SampleEntryBox *sea;
-	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
-	if (!trak) return GF_BAD_PARAM;
 
-	e = Media_GetSampleDesc(trak->Media, desc_index, &sea, NULL);
+	//setup generic protection
+	e = gf_isom_set_protected_entry(the_file, trackNumber, desc_index, 0, 0, GF_ISOM_OMADRM_SCHEME, 0x00000200, NULL, GF_FALSE, &sinf);
 	if (e) return e;
 
-	/* Replacing the Media Type */
-	switch (sea->type) {
-	case GF_ISOM_BOX_TYPE_MP4A:
-	case GF_ISOM_BOX_TYPE_DAMR:
-	case GF_ISOM_BOX_TYPE_DEVC:
-	case GF_ISOM_BOX_TYPE_DQCP:
-	case GF_ISOM_BOX_TYPE_DSMV:
-		original_format = sea->type;
-		sea->type = GF_ISOM_BOX_TYPE_ENCA;
-		break;
-	case GF_ISOM_BOX_TYPE_MP4V:
-	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_D263:
-	case GF_ISOM_BOX_TYPE_HVC1: 
-	case GF_ISOM_BOX_TYPE_HEV1: 
-		original_format = sea->type;
-		sea->type = GF_ISOM_BOX_TYPE_ENCV;
-		break;
-	case GF_ISOM_BOX_TYPE_MP4S:
-	case GF_ISOM_BOX_TYPE_LSR1:
-		original_format = sea->type;
-		sea->type = GF_ISOM_BOX_TYPE_ENCS;
-		break;
-	case GF_ISOM_BOX_TYPE_WVTT:
-		original_format = sea->type;
-		sea->type = GF_ISOM_BOX_TYPE_ENCT;
-		break;
-	default:
-		return GF_BAD_PARAM;
-	}
-	
-	sinf = (GF_ProtectionInfoBox *)sinf_New();
-	gf_list_add(sea->protections, sinf);
-	sinf->scheme_type = (GF_SchemeTypeBox *)schm_New();
-	sinf->scheme_type->scheme_type = GF_4CC('o','d','k','m');
-	sinf->scheme_type->scheme_version = 0x00000200;
-
-	sinf->original_format = (GF_OriginalFormatBox *)frma_New();
-	sinf->original_format->data_format = original_format;
-	sinf->info = (GF_SchemeInformationBox *)schi_New();
-
 	sinf->info->okms = (GF_OMADRMKMSBox *)odkm_New();
 	sinf->info->okms->fmt = (GF_OMADRMAUFormatBox*)gf_isom_box_new(GF_ISOM_BOX_TYPE_ODAF);
 	sinf->info->okms->fmt->selective_encryption = selective_encryption;
@@ -531,99 +517,789 @@
 	return GF_OK;
 }
 
+
+GF_EXPORT
+GF_Err gf_isom_get_original_format_type(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat)
+{
+	GF_TrackBox *trak;
+	GF_SampleEntryBox *sea;
+	GF_ProtectionInfoBox *sinf;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	Media_GetSampleDesc(trak->Media, sampleDescriptionIndex, &sea, NULL);
+	if (!sea) return GF_BAD_PARAM;
+
+	sinf = gf_list_get(sea->protections, 0);
+	if (outOriginalFormat && sinf->original_format) {
+		*outOriginalFormat = sinf->original_format->data_format;
+	}
+	return GF_OK;
+}
+
+
+/* Common Encryption*/
+GF_EXPORT
+Bool gf_isom_is_cenc_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_ProtectionInfoBox *sinf;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_FALSE;
+
+	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENC_SCHEME, NULL);
+	if (!sinf) sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBC_SCHEME, NULL);
+
+	if (!sinf) return GF_FALSE;
+
+	/*non-encrypted or non-CENC*/
+	if (!sinf->info || !sinf->info->tenc) 
+		return GF_FALSE;
+
+	return GF_TRUE;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_cenc_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion, u32 *outIVLength)
+{
+	GF_TrackBox *trak;
+	GF_ProtectionInfoBox *sinf;
+	
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENC_SCHEME, NULL);
+	if (!sinf) sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBC_SCHEME, NULL);
+
+	if (!sinf) return GF_BAD_PARAM;
+
+	if (outOriginalFormat) {
+		*outOriginalFormat = sinf->original_format->data_format;
+		if (IsMP4Description(sinf->original_format->data_format)) *outOriginalFormat = GF_ISOM_SUBTYPE_MPEG4;
+	}
+	if (outSchemeType) *outSchemeType = sinf->scheme_type->scheme_type;
+	if (outSchemeVersion) *outSchemeVersion = sinf->scheme_type->scheme_version;
+
+	if (outIVLength) {
+		if (sinf->info && sinf->info->tenc)
+			*outIVLength = sinf->info->tenc->IV_size;
+		else
+			*outIVLength = 0;
+	}
+
+	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)
+{
+	GF_Err e;
+	GF_ProtectionInfoBox *sinf;
+
+	//setup generic protection
+	e = gf_isom_set_protected_entry(the_file, trackNumber, desc_index, 0, 0, scheme_type, scheme_version, NULL, GF_FALSE, &sinf);
+	if (e) return e;
+
+	sinf->info->tenc = (GF_TrackEncryptionBox *)tenc_New();
+	sinf->info->tenc->IsEncrypted = default_IsEncrypted;
+	sinf->info->tenc->IV_size = default_IV_size;
+	memcpy(sinf->info->tenc->KID, default_KID, 16*sizeof(char));
+
+	return GF_OK;
+}
+
+#if 0
+
+GF_Err gf_isom_set_cenc_saio(GF_ISOFile *the_file, u32 trackNumber)
+{
+	GF_SampleTableBox *stbl;
+	GF_SampleAuxiliaryInfoOffsetBox *saio;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl)
+		return GF_BAD_PARAM;
+
+	saio = (GF_SampleAuxiliaryInfoOffsetBox *)saio_New();
+	saio->aux_info_type = GF_4CC('c', 'e', 'n', 'c');
+	saio->aux_info_type_parameter = 0;
+
+	if (!stbl->sai_offsets) stbl->sai_offsets = gf_list_new();
+	gf_list_add(stbl->sai_offsets, saio);
+
+	return GF_OK;
+}
+#endif
+
+GF_Err gf_isom_remove_cenc_saiz(GF_ISOFile *the_file, u32 trackNumber)
+{
+	u32 i;
+	GF_SampleTableBox *stbl;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl)
+		return GF_BAD_PARAM;
+
+	for (i = 0; i < gf_list_count(stbl->sai_sizes); i++) {
+		GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(stbl->sai_sizes, i);
+		if (saiz->aux_info_type != GF_4CC('c', 'e', 'n', 'c'))
+			continue;
+		saiz_del((GF_Box *)saiz);
+		gf_list_rem(stbl->sai_sizes, i);
+		i--;
+	}
+
+	if (!gf_list_count(stbl->sai_sizes)) {
+		gf_list_del(stbl->sai_sizes);
+		stbl->sai_sizes = NULL;
+	}
+
+	return GF_OK;
+}
+
+GF_Err gf_isom_remove_cenc_saio(GF_ISOFile *the_file, u32 trackNumber)
+{
+	u32 i;
+	GF_SampleTableBox *stbl;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl)
+		return GF_BAD_PARAM;
+
+	for (i = 0; i < gf_list_count(stbl->sai_offsets); i++) {
+		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(stbl->sai_offsets, i);
+		if (saio->aux_info_type != GF_4CC('c', 'e', 'n', 'c'))
+			continue;
+		saiz_del((GF_Box *)saio);
+		gf_list_rem(stbl->sai_offsets, i);
+		i--;
+	}
+
+	if (!gf_list_count(stbl->sai_offsets)) {
+		gf_list_del(stbl->sai_offsets);
+		stbl->sai_offsets = NULL;
+	}
+
+	return GF_OK;
+}
+
+GF_Err gf_cenc_set_pssh(GF_ISOFile *mp4, bin128 systemID, u32 version, u32 KID_count, bin128 *KIDs, char *data, u32 len) {
+	GF_ProtectionSystemHeaderBox *pssh;
+
+	pssh = (GF_ProtectionSystemHeaderBox *)pssh_New();
+	if (!pssh)
+		return GF_IO_ERR;
+	memmove((char *)pssh->SystemID, systemID, 16);
+	pssh->version = version;
+	if (version) {
+		pssh->KID_count = KID_count;
+		if (KID_count) {
+			if (!pssh->KIDs) pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
+			memmove(pssh->KIDs, KIDs, pssh->KID_count*sizeof(bin128));
+		}
+	}
+	pssh->private_data_size = len;
+	if (!pssh->private_data)
+		pssh->private_data = (u8 *)gf_malloc(pssh->private_data_size*sizeof(char));
+	memmove((char *)pssh->private_data, data, pssh->private_data_size);
+
+	if (!mp4->moov->other_boxes) mp4->moov->other_boxes = gf_list_new();
+	gf_list_add(mp4->moov->other_boxes, pssh);
+
+	return GF_OK;
+}
+
+
+
+GF_Err gf_isom_remove_samp_enc_box(GF_ISOFile *the_file, u32 trackNumber)
+{
+	u32 i;
+	GF_SampleTableBox *stbl;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl)
+		return GF_BAD_PARAM;
+
+	for (i = 0; i < gf_list_count(stbl->other_boxes); i++) {
+		GF_Box *a = (GF_Box *)gf_list_get(stbl->other_boxes, i);
+		if ((a->type ==GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
+			piff_psec_del(a);
+			gf_list_rem(stbl->other_boxes, i);
+			i--;
+		}
+		else if (a->type == GF_ISOM_BOX_TYPE_SENC){
+			senc_del(a);
+			gf_list_rem(stbl->other_boxes, i);
+			i--;
+		}
+	}
+
+	if (!gf_list_count(stbl->other_boxes)) {
+		gf_list_del(stbl->other_boxes);
+		stbl->other_boxes = NULL;
+	}
+
+	return GF_OK;
+}
+
+GF_Err gf_isom_remove_samp_group_box(GF_ISOFile *the_file, u32 trackNumber)
+{
+	u32 i;
+	GF_SampleTableBox *stbl;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl)
+		return GF_BAD_PARAM;
+
+	for (i = 0; i < gf_list_count(stbl->sampleGroupsDescription); i++) {
+		GF_SampleGroupDescriptionBox *a = (GF_SampleGroupDescriptionBox *)gf_list_get(stbl->sampleGroupsDescription, i);
+		if (a->grouping_type == GF_4CC( 's', 'e', 'i', 'g' )) {
+			gf_list_rem(stbl->sampleGroupsDescription, i);
+			sgpd_del((GF_Box *) a);
+			i--;
+		}
+	}
+	if (!gf_list_count(stbl->sampleGroupsDescription)) {
+		gf_list_del(stbl->sampleGroupsDescription);
+		stbl->sampleGroupsDescription = NULL;
+	}
+
+	for (i = 0; i < gf_list_count(stbl->sampleGroups); i++) {
+		GF_SampleGroupBox *a = (GF_SampleGroupBox *)gf_list_get(stbl->sampleGroups, i);
+		if (a->grouping_type == GF_4CC( 's', 'e', 'i', 'g' )) {
+			gf_list_rem(stbl->sampleGroups, i);
+			sbgp_del((GF_Box *) a);
+			i--;
+		}
+	}
+	if (!gf_list_count(stbl->sampleGroups)) {
+		gf_list_del(stbl->sampleGroups);
+		stbl->sampleGroups = NULL;
+	}
+
+	return GF_OK;
+}
+
+GF_Err gf_isom_remove_pssh_box(GF_ISOFile *the_file)
+{
+	u32 i;
+	for (i = 0; i < gf_list_count(the_file->moov->other_boxes); i++) {
+		GF_Box *a = (GF_Box *)gf_list_get(the_file->moov->other_boxes, i);
+		if (a->type == GF_4CC('p', 's', 's', 'h')) {
+			gf_list_rem(the_file->moov->other_boxes, i);
+			pssh_del(a);
+			i--;
+		}
+	}
+
+	if (!gf_list_count(the_file->moov->other_boxes)) {
+		gf_list_del(the_file->moov->other_boxes);
+		the_file->moov->other_boxes = NULL;
+	}
+
+	return GF_OK;
+}
+
 #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 *psec;
+
+	psec = (GF_PIFFSampleEncryptionBox *) piff_psec_New();
+	if (!psec)
+		return NULL;
+	psec->version = version;
+	psec->flags = flags;
+	if (psec->flags & 0x1) {
+		psec->AlgorithmID = AlgorithmID;
+		psec->IV_size = IV_size;
+		strcpy((char *)psec->KID, (const char *)KID);
+	}
+	psec->samp_aux_info = gf_list_new();
 
+	return psec;
+}
 
-#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+GF_SampleEncryptionBox * gf_isom_create_samp_enc_box(u8 version, u32 flags) 
+{
+	GF_SampleEncryptionBox *senc;
+
+	senc = (GF_SampleEncryptionBox *) senc_New();
+	if (!senc)
+		return NULL;
+	senc->version = version;
+	senc->flags = flags;
+	senc->samp_aux_info = gf_list_new();
+
+	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_SampleTableBox *stbl;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl) return GF_BAD_PARAM;
+	if (!stbl) return GF_BAD_PARAM;
+
+	switch (container_type) {
+	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: 
+		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
+		return gf_isom_box_add_default((GF_Box *) stbl, stbl->senc);
+	}
+	return GF_NOT_SUPPORTED;
+}
 
 
-void gf_isom_cenc_sample_del(GF_CENCSampleInfo *samp)
+void gf_isom_cenc_set_saiz_saio(GF_SampleEncryptionBox *senc, GF_SampleTableBox *stbl, GF_TrackFragmentBox  *traf, 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) 
+			stbl_AddBox(stbl, (GF_Box *)senc->cenc_saiz);
+		else
+			traf_AddBox((GF_Box*)traf, (GF_Box *)senc->cenc_saiz);
+	}
+	if (!senc->cenc_saio) {
+		senc->cenc_saio = (GF_SampleAuxiliaryInfoOffsetBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_SAIO);
+		senc->cenc_saio->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) 
+			stbl_AddBox(stbl, (GF_Box *)senc->cenc_saio);
+		else
+			traf_AddBox((GF_Box*)traf, (GF_Box *)senc->cenc_saio);
+	}
+
+	if (!senc->cenc_saiz->sample_count || ((senc->cenc_saiz->default_sample_info_size==len) && len) ) {
+		senc->cenc_saiz->sample_count ++;
+		senc->cenc_saiz->default_sample_info_size = len;
+	} else {
+		senc->cenc_saiz->sample_info_size = gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_count+1));
+
+		if (senc->cenc_saiz->default_sample_info_size) {
+			for (i=0; i<senc->cenc_saiz->sample_count; i++)
+				senc->cenc_saiz->sample_info_size[i] = senc->cenc_saiz->default_sample_info_size;
+			senc->cenc_saiz->default_sample_info_size = 0;
+		}
+		senc->cenc_saiz->sample_info_size[senc->cenc_saiz->sample_count] = len;
+		senc->cenc_saiz->sample_count++;
+	}
+}
+
+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) 
+			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) 
+			stbl_AddBox(stbl, (GF_Box *)senc->cenc_saio);
+	}
+
+	if (!senc->cenc_saiz->sample_count || (senc->cenc_saiz->default_sample_info_size==len)) {
+		senc->cenc_saiz->sample_count ++;
+		senc->cenc_saiz->default_sample_info_size = len;
+	} else {
+		senc->cenc_saiz->sample_info_size = gf_realloc(senc->cenc_saiz->sample_info_size, sizeof(u8)*(senc->cenc_saiz->sample_count+1));
+
+		if (senc->cenc_saiz->default_sample_info_size) {
+			for (i=0; i<senc->cenc_saiz->sample_count; i++)
+				senc->cenc_saiz->sample_info_size[i] = senc->cenc_saiz->default_sample_info_size;
+			senc->cenc_saiz->default_sample_info_size = 0;
+		}
+		senc->cenc_saiz->sample_info_size[senc->cenc_saiz->sample_count] = len;
+		senc->cenc_saiz->sample_count++;
+	}
+
+	if (!senc->cenc_saio->entry_count) {
+		senc->cenc_saio->offsets = (u32 *)gf_malloc(sizeof(u32));
+		senc->cenc_saio->offsets[0] = offset;
+		senc->cenc_saio->entry_count ++;
+	} else {
+		senc->cenc_saio->offsets = gf_realloc(senc->cenc_saio->offsets, sizeof(u32)*(senc->cenc_saio->entry_count+1));
+		senc->cenc_saio->offsets[senc->cenc_saio->entry_count] = offset;
+		senc->cenc_saio->entry_count++;
+	}
+}
+
+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)
+{
+	u32 i;
+	GF_SampleEncryptionBox *senc;
+	GF_CENCSampleAuxInfo *sai;
+	GF_SampleTableBox *stbl;
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl) return GF_BAD_PARAM;
+
+	switch (container_type) {
+	case GF_ISOM_BOX_UUID_PSEC:
+		senc = (GF_SampleEncryptionBox *) stbl->piff_psec;
+		break;
+	case GF_ISOM_BOX_TYPE_SENC:
+		senc = (GF_SampleEncryptionBox *)stbl->senc;
+		break;
+	default:
+		return GF_NOT_SUPPORTED;
+	}
+
+
+	sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
+	if (!sai) return GF_OUT_OF_MEM;
+	memset(sai, 0, sizeof(GF_CENCSampleAuxInfo));
+	if (len) {
+		GF_BitStream *bs = gf_bs_new(buf, len, GF_BITSTREAM_READ);
+		sai->IV_size = IV_size;
+		gf_bs_read_data(bs, (char *)sai->IV, IV_size);
+		sai->subsample_count = gf_bs_read_u16(bs);
+		if (sai->subsample_count) senc->flags = 0x00000002;
+		sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
+		for (i = 0; i < sai->subsample_count; i++) {
+			sai->subsamples[i].bytes_clear_data = gf_bs_read_u16(bs);
+			sai->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(bs);
+		}
+		gf_bs_del(bs);	
+	}
+
+	gf_list_add(senc->samp_aux_info, sai);
+	gf_isom_cenc_set_saiz_saio(senc, stbl, NULL, len);
+
+	return GF_OK;
+}
+
+
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+GF_EXPORT
+void gf_isom_cenc_samp_aux_info_del(GF_CENCSampleAuxInfo *samp)
+{
+	//if (samp->IV) gf_free(samp->IV);
 	if (samp->subsamples) gf_free(samp->subsamples);
 	gf_free(samp);
 }
 
-static GF_Err gf_isom_cenc_parse_sample(GF_CENCSampleInfo *cenc_sample, GF_BitStream *bs, u32 sample_number, Bool use_subsample)
+Bool gf_isom_cenc_has_saiz_saio(GF_SampleTableBox *stbl, GF_TrackFragmentBox *traf)
 {
-	u32 i=0, k;
-	if ((cenc_sample->IV_size!=0) && (cenc_sample->IV_size!=8) && (cenc_sample->IV_size!=16) ) return GF_ISOM_INVALID_FILE;
+	u32 i;
+	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;
+	}
+	else if (traf) {
+		sai_sizes = traf->sai_sizes;
+		sai_offsets = traf->sai_offsets;
+	}
+	else return GF_FALSE;
 
-	while (gf_bs_available(bs)) {
-		i++;
-		if (i == sample_number) {
-			gf_bs_read_data(bs, (char *) cenc_sample->IV, cenc_sample->IV_size);
+	for (i = 0; i < gf_list_count(sai_sizes); i++) {
+		GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(sai_sizes, i);
+		if (saiz->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
+			has_saiz = GF_TRUE;
+			break;
+		}
+	}
 
-			if (use_subsample) {
-				cenc_sample->subsample_count = gf_bs_read_u16(bs);
-				cenc_sample->subsamples = gf_malloc(sizeof(GF_CENCSubSampleEntry)* cenc_sample->subsample_count);
-				for (k=0; k<cenc_sample->subsample_count; k++) {
-					cenc_sample->subsamples[k].bytes_clear_data = gf_bs_read_u16(bs);
-					cenc_sample->subsamples[k].bytes_encrypted_data = gf_bs_read_u32(bs);
-				}
-			}
-			return GF_OK;
-		} else {
-			gf_bs_skip_bytes(bs, cenc_sample->IV_size);
-			if (use_subsample) {
-				u32 subcount = gf_bs_read_u16(bs);
-				gf_bs_skip_bytes(bs, subcount * 6);
-			}
+	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;
+		}			
+	}
+	
+	return (has_saiz && has_saio);
+}
+
+static GF_Err gf_isom_cenc_get_sai_by_saiz_saio(GF_MediaBox *mdia, u32 sampleNumber, u8 IV_size, GF_CENCSampleAuxInfo **sai)
+{
+	GF_BitStream *bs;
+	u32 offset, prev_sai_size, size, i, j, nb_saio;
+	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++) {
+		GF_SampleAuxiliaryInfoOffsetBox *saio = (GF_SampleAuxiliaryInfoOffsetBox *)gf_list_get(mdia->information->sampleTable->sai_offsets, i);
+		if (saio->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
+			if (saio->entry_count == 1)
+				offset = saio->offsets[0];
+			else
+				offset = saio->offsets[sampleNumber-1];
+			nb_saio = saio->entry_count;
+			break;
+		}			
+	}
+
+	for (i = 0; i < gf_list_count(mdia->information->sampleTable->sai_sizes); i++) {
+		GF_SampleAuxiliaryInfoSizeBox *saiz = (GF_SampleAuxiliaryInfoSizeBox *)gf_list_get(mdia->information->sampleTable->sai_sizes, i);
+		if (saiz->aux_info_type == GF_4CC('c', 'e', 'n', 'c')) {
+			for (j = 0; j < sampleNumber-1; j++)
+				prev_sai_size += saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[j];
+			size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[sampleNumber-1];
+			break;
+		}
+	}
+
+	offset += (nb_saio == 1) ? prev_sai_size : 0;
+	cur_position = gf_bs_get_position(mdia->information->dataHandler->bs);
+	gf_bs_seek(mdia->information->dataHandler->bs, offset);
+	buffer = (char *)gf_malloc(size);
+	gf_bs_read_data(mdia->information->dataHandler->bs, buffer, size);
+	gf_bs_seek(mdia->information->dataHandler->bs, cur_position);
+
+	*sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
+	memset(*sai, 0, sizeof(GF_CENCSampleAuxInfo)); 
+	bs = gf_bs_new(buffer, size, GF_BITSTREAM_READ);
+	gf_bs_read_data(bs, (char *)(*sai)->IV, IV_size);
+	if (size > IV_size) {
+		(*sai)->subsample_count = gf_bs_read_u16(bs);
+		(*sai)->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
+		for (i = 0; i < (*sai)->subsample_count; i++) {
+			(*sai)->subsamples[i].bytes_clear_data = gf_bs_read_u16(bs);
+			(*sai)->subsamples[i].bytes_encrypted_data = gf_bs_read_u32(bs);
+		}
+	}
+	gf_bs_del(bs);
+	
+	return e;
+}
+
+GF_EXPORT
+GF_Err gf_isom_cenc_get_sample_aux_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber, GF_CENCSampleAuxInfo **sai, u32 *container_type)
+{
+	GF_TrackBox *trak;
+	GF_SampleTableBox *stbl;
+	GF_Box *a_box = NULL;
+	u32 i, type;
+	GF_CENCSampleAuxInfo *a_sai;
+	u8 IV_size;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+	stbl = trak->Media->information->sampleTable;
+	if (!stbl)
+		return GF_BAD_PARAM;
+
+	type = 0;
+	for (i = 0; i < gf_list_count(stbl->other_boxes); i++) {
+		a_box = (GF_Box *)gf_list_get(stbl->other_boxes, i++);
+		if ((a_box->type == GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)a_box)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
+			type = GF_ISOM_BOX_UUID_PSEC;
+			break;
+		}
+		else if (a_box->type == GF_ISOM_BOX_TYPE_SENC) {
+			type = GF_ISOM_BOX_TYPE_SENC;
+			break;
 		}
 	}
-	return GF_ISOM_INVALID_FILE;
+
+	if (container_type) *container_type = type;
+
+	if (!sai) return GF_OK; /*we need only container_type*/
+
+	if (*sai) {
+		gf_isom_cenc_samp_aux_info_del(*sai);
+		*sai = NULL;
+	}
+
+	gf_isom_get_sample_cenc_info_ex(trak, NULL, sampleNumber, NULL, &IV_size, NULL);
+	if (!IV_size) {
+		GF_SAFEALLOC( (*sai),  GF_CENCSampleAuxInfo);
+		return GF_OK;
+	}
+
+	/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
+	if (gf_isom_cenc_has_saiz_saio(stbl, NULL)) {
+		return gf_isom_cenc_get_sai_by_saiz_saio(trak->Media, sampleNumber, IV_size, sai);
+	}
+
+	a_sai = NULL;
+	switch (type) {
+	case GF_ISOM_BOX_UUID_PSEC:
+		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) 
+			a_sai = (GF_CENCSampleAuxInfo *)gf_list_get(((GF_SampleEncryptionBox *)a_box)->samp_aux_info, sampleNumber-1);
+		break;
+	}
+	if (!a_sai)
+		return GF_NOT_SUPPORTED;
+
+	GF_SAFEALLOC( (*sai),  GF_CENCSampleAuxInfo);
+	if (a_box) {
+		memmove((*sai)->IV, a_sai->IV, 16);
+		(*sai)->subsample_count = a_sai->subsample_count;
+		(*sai)->subsamples = gf_malloc(sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
+		memmove((*sai)->subsamples, a_sai->subsamples, sizeof(GF_CENCSubSampleEntry)*(*sai)->subsample_count);
+	}
+
+	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) 
+{
+	GF_ProtectionInfoBox *sinf;
+
+	if (default_IsEncrypted) *default_IsEncrypted = 0;
+	if (default_IV_size) *default_IV_size = 0;
+	if (default_KID) memset(*default_KID, 0, 16);
+
+
+	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CENC_SCHEME, NULL);
+	if (!sinf) sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_CBC_SCHEME, NULL);
+
+	if (sinf && sinf->info && sinf->info->tenc) {
+		if (default_IsEncrypted) *default_IsEncrypted = sinf->info->tenc->IsEncrypted;
+		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)
+{
+	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return;
+	gf_isom_cenc_get_default_info_ex(trak, sampleDescriptionIndex, default_IsEncrypted, default_IV_size, default_KID);
 }
 
-GF_CENCSampleInfo *gf_isom_cenc_get_sample(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u32 sample_number)
+/*
+	Adobe'protection scheme
+*/
+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;
-	Bool use_subsample = 0;
-	GF_CENCSampleInfo *cenc_sample;
 	GF_ProtectionInfoBox *sinf;
-	GF_SampleEntryBox *sentry;
-	u32 sample_desc_idx;
-	GF_BitStream *bs;
 
-	if (!sample_number) return NULL;
+	//setup generic protection
+	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;
 
-	sample_desc_idx = traf->tfhd->sample_desc_index;
-	if (!sample_desc_idx) sample_desc_idx = traf->trex->def_sample_desc_index;
+	sinf->info->adkm = (GF_AdobeDRMKeyManagementSystemBox *)adkm_New();
 
-	sentry = gf_list_get(trak->Media->information->sampleTable->SampleDescription->other_boxes, sample_desc_idx - 1);
-	sinf = sentry ? gf_list_get(sentry->protections, 0) : NULL;
+	sinf->info->adkm->header = (GF_AdobeDRMHeaderBox *)ahdr_New();
 
-	/*PIFF*/
-	if (sinf && sinf->scheme_type && sinf->info->piff_tenc) {
-		/*TODO !!*/
-		if (!traf->piff_sample_encryption) return NULL;
+	sinf->info->adkm->header->std_enc_params = (GF_AdobeStdEncryptionParamsBox *)aprm_New();
 
-		GF_SAFEALLOC(cenc_sample, GF_CENCSampleInfo);
-		memcpy(cenc_sample->keyID, sinf->info->piff_tenc->KID, 16);
-		cenc_sample->IV_size = sinf->info->piff_tenc->IV_size;
-		cenc_sample->algo_id = sinf->info->piff_tenc->AlgorithmID;
-		
-		if (traf->piff_sample_encryption->flags & 1) {
-			memcpy(cenc_sample->keyID, traf->piff_sample_encryption->KID, 16);
-			cenc_sample->IV_size = traf->piff_sample_encryption->IV_size;
-			cenc_sample->algo_id = traf->piff_sample_encryption->AlgorithmID;
-			cenc_sample->is_alt_info = 1;
-		}
+	sinf->info->adkm->header->std_enc_params->enc_info = (GF_AdobeEncryptionInfoBox *)aeib_New();
+	if (sinf->info->adkm->header->std_enc_params->enc_info->enc_algo)
+		gf_free(sinf->info->adkm->header->std_enc_params->enc_info->enc_algo);
+	sinf->info->adkm->header->std_enc_params->enc_info->enc_algo = (char *)gf_malloc(8*sizeof(char));
+	strncpy(sinf->info->adkm->header->std_enc_params->enc_info->enc_algo, "AES-CBC", 7);
+	sinf->info->adkm->header->std_enc_params->enc_info->enc_algo[7] = 0;
+	sinf->info->adkm->header->std_enc_params->enc_info->key_length = 16;
 
-		use_subsample = (traf->piff_sample_encryption->flags & 2) ? 1 : 0;
+	sinf->info->adkm->header->std_enc_params->key_info = (GF_AdobeKeyInfoBox *)akey_New();
 
-		bs = gf_bs_new(traf->piff_sample_encryption->cenc_data, traf->piff_sample_encryption->cenc_data_size, GF_BITSTREAM_READ);
-		e = gf_isom_cenc_parse_sample(cenc_sample, bs, sample_number, use_subsample);
-		gf_bs_del(bs);
-		if (e) {
-			gf_isom_cenc_sample_del(cenc_sample);
-			return NULL;
-		}
-		return cenc_sample;
+	sinf->info->adkm->header->std_enc_params->key_info->params = (GF_AdobeFlashAccessParamsBox *)flxs_New();
+	if (metadata && len) {
+		if (sinf->info->adkm->header->std_enc_params->key_info->params->metadata)
+			gf_free(sinf->info->adkm->header->std_enc_params->key_info->params->metadata);
+		sinf->info->adkm->header->std_enc_params->key_info->params->metadata = (char *)gf_malloc((len+1)*sizeof(char));
+		strncpy(sinf->info->adkm->header->std_enc_params->key_info->params->metadata, metadata, len);
+		sinf->info->adkm->header->std_enc_params->key_info->params->metadata[len] = 0;
 	}
-	return NULL;
+
+	sinf->info->adkm->au_format = (GF_AdobeDRMAUFormatBox *)adaf_New();
+	sinf->info->adkm->au_format->selective_enc = is_selective_enc ? 0x10 : 0x00;
+	sinf->info->adkm->au_format->IV_length = 16;
+
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_isom_is_adobe_protection_media(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex)
+{
+	GF_TrackBox *trak;
+	GF_ProtectionInfoBox *sinf;
+
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_FALSE;
+
+	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ADOBE_SCHEME, NULL);
+
+	if (!sinf) return GF_FALSE;
+
+	/*non-encrypted or non-ADOBE*/
+	if (!sinf->info || !sinf->info->adkm) 
+		return GF_FALSE;
+
+	return GF_TRUE;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_adobe_protection_info(GF_ISOFile *the_file, u32 trackNumber, u32 sampleDescriptionIndex, u32 *outOriginalFormat, u32 *outSchemeType, u32 *outSchemeVersion)
+{
+	GF_TrackBox *trak;
+	GF_ProtectionInfoBox *sinf;
+	
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return GF_BAD_PARAM;
+
+	sinf = gf_isom_get_sinf_entry(trak, sampleDescriptionIndex, GF_ISOM_ADOBE_SCHEME, NULL);
+
+	if (!sinf) return GF_BAD_PARAM;
+
+	if (outOriginalFormat) {
+		*outOriginalFormat = sinf->original_format->data_format;
+		if (IsMP4Description(sinf->original_format->data_format)) *outOriginalFormat = GF_ISOM_SUBTYPE_MPEG4;
+	}
+	if (outSchemeType) *outSchemeType = sinf->scheme_type->scheme_type;
+	if (outSchemeVersion) *outSchemeVersion = sinf->scheme_type->scheme_version;
+
+	return GF_OK;
 }
 
 #endif //	GPAC_DISABLE_ISOM_FRAGMENTS
 
 
+void gf_isom_ipmpx_remove_tool_list(GF_ISOFile *the_file)
+{
+		/*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);
+		iod->IPMPToolList = NULL;
+	}
+}
+
 #endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/isom_intern.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/isom_intern.c Changed

@@ -80,6 +80,8 @@
 		e = MergeTrack(trak, traf, mov->current_top_box_start, !trak->first_traf_merged);
 		if (e) return e;
 
+		trak->present_in_scalable_segment = 1;
+
 		//update trak duration
 		SetTrackDuration(trak);
 		if (trak->Header->duration > MaxDur) 
@@ -88,6 +90,26 @@
 		trak->first_traf_merged = 1;
 	}
 
+	if (moof->other_boxes) {
+		GF_Box *a;	
+		i = 0;
+		while ((a = (GF_Box *)gf_list_enum(moof->other_boxes, &i))) {
+			if (a->type == GF_ISOM_BOX_TYPE_PSSH) {
+				GF_ProtectionSystemHeaderBox *pssh = (GF_ProtectionSystemHeaderBox *)pssh_New();
+				memmove(pssh->SystemID, ((GF_ProtectionSystemHeaderBox *)a)->SystemID, 16);
+				pssh->KID_count = ((GF_ProtectionSystemHeaderBox *)a)->KID_count;
+				pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
+				memmove(pssh->KIDs, ((GF_ProtectionSystemHeaderBox *)a)->KIDs, pssh->KID_count*sizeof(bin128));
+				pssh->private_data_size = ((GF_ProtectionSystemHeaderBox *)a)->private_data_size;
+				pssh->private_data = (u8 *)gf_malloc(pssh->private_data_size*sizeof(char));
+				memmove(pssh->private_data, ((GF_ProtectionSystemHeaderBox *)a)->private_data, pssh->private_data_size);
+
+				if (!mov->moov->other_boxes) mov->moov->other_boxes = gf_list_new();
+				gf_list_add(mov->moov->other_boxes, pssh);
+			}
+		}
+	}
+
 	mov->NextMoofNumber = moof->mfhd->sequence_number;
 	//update movie duration
 	if (mov->moov->mvhd->duration < MaxDur) mov->moov->mvhd->duration = MaxDur;
@@ -96,7 +118,6 @@
 
 #endif
 
-
 GF_Err gf_isom_parse_movie_boxes(GF_ISOFile *mov, u64 *bytesMissing, Bool progressive_mode)
 {
 	GF_Box *a;
@@ -107,9 +128,14 @@
 
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (mov->single_moof_mode && mov->single_moof_state == 2) {
+		return e;
+	}
+
 	/*restart from where we stopped last*/
 	totSize = mov->current_top_box_start;
 	gf_bs_seek(mov->movieFileMap->bs, mov->current_top_box_start);
+
 #endif
 
 
@@ -128,6 +154,7 @@
 		} else if (e == GF_ISOM_INCOMPLETE_FILE) {
 			/*our mdat is uncomplete, only valid for READ ONLY files...*/
 			if (mov->openMode != GF_ISOM_OPEN_READ) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Incomplete MDAT while file is not read-only\n"));
 				return GF_ISOM_INVALID_FILE;
 			}
 			return e;
@@ -138,7 +165,10 @@
 		switch (a->type) {
 		/*MOOV box*/
 		case GF_ISOM_BOX_TYPE_MOOV:
-			if (mov->moov) return GF_ISOM_INVALID_FILE;
+			if (mov->moov) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate MOOV detected!\n"));
+				return GF_ISOM_INVALID_FILE;
+			}
 			mov->moov = (GF_MovieBox *)a;
 			/*set our pointer to the movie*/
 			mov->moov->mov = mov;
@@ -146,16 +176,23 @@
             if (mov->moov->mvex) mov->moov->mvex->mov = mov;
 #endif
             e = gf_list_add(mov->TopBoxes, a);
-			if (e) return e;
+			if (e) {
+				return e;
+			}
 			totSize += a->size;
 			break;
 
 		/*META box*/
 		case GF_ISOM_BOX_TYPE_META:
-			if (mov->meta) return GF_ISOM_INVALID_FILE;
+			if (mov->meta) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate META detected!\n"));
+				return GF_ISOM_INVALID_FILE;
+			}
 			mov->meta = (GF_MetaBox *)a;
 			e = gf_list_add(mov->TopBoxes, a);
-			if (e) return e;
+			if (e) {
+				return e;
+			}
 			totSize += a->size;
 			break;
 
@@ -166,7 +203,9 @@
 				if (!mov->mdat) {
 					mov->mdat = (GF_MediaDataBox *) a;
 					e = gf_list_add(mov->TopBoxes, mov->mdat);
-					if (e) return e;
+					if (e) {
+						return e;
+					}
 				}
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 				else if (mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG) gf_list_add(mov->TopBoxes, a);
@@ -180,7 +219,9 @@
 				gf_isom_box_del(a);
 				mov->mdat = (GF_MediaDataBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_MDAT);
 				e = gf_list_add(mov->TopBoxes, mov->mdat);
-				if (e) return e;
+				if (e) {
+					return e;
+				}
 			} else {
 				gf_isom_box_del(a);
 			}
@@ -189,6 +230,7 @@
 			/*ONE AND ONLY ONE FTYP*/
 			if (mov->brand) {
 				gf_isom_box_del(a);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate FTYP detected!\n"));
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->brand = (GF_FileTypeBox *)a;
@@ -200,6 +242,7 @@
 			/*ONE AND ONLY ONE PDIN*/
 			if (mov->pdin) {
 				gf_isom_box_del(a);
+				GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Duplicate PDIN detected!\n"));
 				return GF_ISOM_INVALID_FILE;
 			}
 			mov->pdin = (GF_ProgressiveDownloadBox *) a;
@@ -234,6 +277,13 @@
 			break;
 
 		case GF_ISOM_BOX_TYPE_MOOF:
+			if (mov->single_moof_mode) {
+				mov->single_moof_state++;
+				if (mov->single_moof_state > 1) {
+					gf_isom_box_del(a);
+					return GF_OK;
+				}
+			}
 			((GF_MovieFragmentBox *)a)->mov = mov;
 
 			totSize += a->size;
@@ -257,6 +307,11 @@
 								traf->trex = NULL;
 							}
 						}
+						//we should only parse senc/psec when no saiz/saio is present, otherwise we fetch the info directly
+						if (traf->trex && traf->trex->track && (traf->piff_sample_encryption || traf->sample_encryption)) {
+							GF_TrackBox *trak = GetTrackbyID(mov->moov, traf->tfhd->trackID);
+							e = senc_Parse(mov->movieFileMap->bs, trak, traf, traf->piff_sample_encryption ? (GF_SampleEncryptionBox *) traf->piff_sample_encryption : traf->sample_encryption);
+						}
 					}
 				}
 			} else if (mov->openMode==GF_ISOM_OPEN_CAT_FRAGMENTS) {
@@ -282,6 +337,18 @@
 		}
 			break;
 
+		case GF_ISOM_BOX_TYPE_PRFT:
+			if (!(mov->FragmentsFlags & GF_ISOM_FRAG_READ_DEBUG)) {
+				//keep the last one read
+				if (mov->last_producer_ref_time)
+					gf_isom_box_del(a);
+				else
+					mov->last_producer_ref_time = (GF_ProducerReferenceTimeBox *)a;
+				break;
+			}
+			//fallthrough
+
+
 		default:
 			totSize += a->size;
 			e = gf_list_add(mov->TopBoxes, a);
@@ -299,11 +366,19 @@
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
         && !mov->moof && !mov->is_index_segment
 #endif
-        ) return GF_ISOM_INVALID_FILE;
+        ) {
+			return GF_ISOM_INCOMPLETE_FILE;
+	}
 	/*we MUST have movie header*/
-	if (mov->moov && !mov->moov->mvhd) return GF_ISOM_INVALID_FILE;
+	if (mov->moov && !mov->moov->mvhd) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing MVHD in MOOV!\n"));
+		return GF_ISOM_INVALID_FILE;
+	}
 	/*we MUST have meta handler*/
-	if (mov->meta && !mov->meta->handler) return GF_ISOM_INVALID_FILE;
+	if (mov->meta && !mov->meta->handler) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[iso file] Missing handler in META!\n"));
+		return GF_ISOM_INVALID_FILE;
+	}
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
@@ -508,14 +583,14 @@
 
 
 //WARNING: MOVIETIME IS EXPRESSED IN MEDIA TS
-GF_Err GetMediaTime(GF_TrackBox *trak, Bool force_non_empty, u64 movieTime, u64 *MediaTime, s64 *SegmentStartTime, s64 *MediaOffset, u8 *useEdit)
+GF_Err GetMediaTime(GF_TrackBox *trak, Bool force_non_empty, u64 movieTime, u64 *MediaTime, s64 *SegmentStartTime, s64 *MediaOffset, u8 *useEdit, u64 *next_edit_start_plus_one)
 {
 #if 0
 	GF_Err e;
 	u32 sampleNumber, prevSampleNumber;
 	u64 firstDTS;
 #endif
-	u32 i;
+	u32 i, count;
 	Bool last_is_empty = 0;
 	u64 time, lastSampleTime;
 	s64 mtime;
@@ -523,6 +598,7 @@
 	Double scale_ts;
 	GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
 
+	if (next_edit_start_plus_one) *next_edit_start_plus_one = 0;
 	*useEdit = 1;
 	*MediaTime = 0;
 	//no segment yet...
@@ -545,7 +621,7 @@
 		//check this is in our media time line
 		if ((*MediaTime > lastSampleTime)
 #ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-			&& !trak->moov->mov->use_segments
+			&& !trak->moov->mov->moof
 #endif
 		   ) {
 			*MediaTime = lastSampleTime;
@@ -559,11 +635,14 @@
 
 	time = 0;
 	ent = NULL;
-	i=0;
-	while ((ent = (GF_EdtsEntry *)gf_list_enum(trak->editBox->editList->entryList, &i))) {
+	count=gf_list_count(trak->editBox->editList->entryList);
+	for (i=0; i<count; i++) {
+		ent = (GF_EdtsEntry *)gf_list_get(trak->editBox->editList->entryList, i);
 		if ( (time + ent->segmentDuration) * scale_ts > movieTime) {
-			if (!force_non_empty || (ent->mediaTime >= 0)) 
+			if (!force_non_empty || (ent->mediaTime >= 0)) {
+				if (next_edit_start_plus_one) *next_edit_start_plus_one = 1 + (u64) ((time + ent->segmentDuration) * scale_ts);
 				goto ent_found;
+			}
 		}
 		time += ent->segmentDuration;
 		last_is_empty = ent->segmentDuration ? 0 : 1;
@@ -738,7 +817,8 @@
 	now = gf_isom_get_mp4time();
 	mvhd = (GF_MovieHeaderBox *) mvhd_New();
 	mvhd->creationTime = now;
-	mvhd->modificationTime = now;
+	if (!file->keep_utc)
+		mvhd->modificationTime = now;
 	mvhd->nextTrackID = 1;
 	//600 is our default movie TimeScale
 	mvhd->timeScale = 600;

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/isom_read.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/isom_read.c Changed

@@ -90,7 +90,7 @@
 }
 
 GF_EXPORT
-Bool gf_isom_probe_file(const char *fileName)
+u32 gf_isom_probe_file(const char *fileName)
 {
 	u32 type = 0;
 
@@ -98,7 +98,7 @@
 		u32 size;
 		u8 *mem_address;
 		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return GF_URL_ERROR;
+			return 0;
 		} 
 		if (size>8)
 			type = GF_4CC(mem_address[4], mem_address[5], mem_address[6], mem_address[7]);
@@ -115,18 +115,20 @@
 		fclose(f);
 	}
 	switch (type) {
-	case GF_ISOM_BOX_TYPE_MOOV:
-	case GF_ISOM_BOX_TYPE_MDAT:
 	case GF_ISOM_BOX_TYPE_FTYP:
+	case GF_ISOM_BOX_TYPE_MOOV:
+		return 2;
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 	case GF_ISOM_BOX_TYPE_MOOF:
 	case GF_ISOM_BOX_TYPE_STYP:
+		return 3;
 #ifndef GPAC_DISABLE_ISOM_ADOBE
 	/*Adobe specific*/
 	case GF_ISOM_BOX_TYPE_AFRA:
 	case GF_ISOM_BOX_TYPE_ABST:
 #endif
 #endif
+	case GF_ISOM_BOX_TYPE_MDAT:
 	case GF_ISOM_BOX_TYPE_FREE:
 	case GF_ISOM_BOX_TYPE_SKIP:
 	case GF_ISOM_BOX_TYPE_UDTA:
@@ -255,6 +257,18 @@
 	}
 
 #endif /*GPAC_DISABLE_ISOM_WRITE*/
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	if (movie->moov) {
+		u32 i;
+
+		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)) 
+				gf_isom_datamap_del(trak->Media->information->scalableDataHandler);
+		}
+	}
+#endif
 
 	//free and return;
 	gf_isom_delete_movie(movie);
@@ -455,6 +469,67 @@
 #endif
 	return 0;
 }
+
+GF_EXPORT
+u32 gf_isom_segment_get_fragment_count(GF_ISOFile *file)
+{
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+    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);
+			if (a->type==GF_ISOM_BOX_TYPE_MOOF) count++;
+		}
+		return count;
+	}
+#endif
+	return 0;
+}
+
+static GF_MovieFragmentBox *gf_isom_get_moof(GF_ISOFile *file, u32 moof_index)
+{
+	u32 i;
+	for (i=0; i<gf_list_count(file->TopBoxes); i++) {
+		GF_Box *a = gf_list_get(file->TopBoxes, i);
+		if (a->type==GF_ISOM_BOX_TYPE_MOOF) {
+			moof_index--;
+			if (!moof_index) return (GF_MovieFragmentBox *) a;
+		}
+	}
+	return NULL;
+}
+
+GF_EXPORT
+u32 gf_isom_segment_get_track_fragment_count(GF_ISOFile *file, u32 moof_index)
+{
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_MovieFragmentBox *moof;
+    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;
+#endif
+	return 0;
+}
+
+GF_EXPORT
+u32 gf_isom_segment_get_track_fragment_decode_time(GF_ISOFile *file, u32 moof_index, u32 traf_index, u64 *decode_time)
+{
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	GF_MovieFragmentBox *moof;
+	GF_TrackFragmentBox *traf;
+    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;
+	if (!traf) return 0;
+	if (decode_time) {
+		*decode_time = traf->tfdt ? traf->tfdt->baseMediaDecodeTime : 0;
+	}
+	return traf->tfhd->trackID;
+#endif
+	return 0;
+}
 #endif
 
 //return the timescale of the movie, 0 if error
@@ -702,7 +777,7 @@
 	if (!trak || !MediaTime) return GF_BAD_PARAM;;
 
 	SegmentStartTime = 0;
-	return GetMediaTime(trak, 0, movieTime, MediaTime, &SegmentStartTime, &mediaOffset, &useEdit);
+	return GetMediaTime(trak, 0, movieTime, MediaTime, &SegmentStartTime, &mediaOffset, &useEdit, NULL);
 }
 
 
@@ -1169,18 +1244,17 @@
 GF_EXPORT
 u32 gf_isom_get_sample_duration(GF_ISOFile *the_file, u32 trackNumber, u32 sampleNumber)
 {
-	u64 dur;
+	u32 dur;
 	u64 dts;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !sampleNumber) return 0;
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sampleNumber<=trak->sample_count_at_seg_start) return 0;
+	sampleNumber -= trak->sample_count_at_seg_start;
+#endif
 
-	stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, sampleNumber, &dur);
-	if (sampleNumber == trak->Media->information->sampleTable->SampleSize->sampleCount) {
-		return (u32) (trak->Media->mediaHeader->duration - dur);
-	}
-
-	stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, sampleNumber+1, &dts);
-	return (u32) (dts - dur);
+	stbl_GetSampleDTS_and_Duration(trak->Media->information->sampleTable->TimeToSample, sampleNumber, &dts, &dur);
+	return dur;
 }
 
 
@@ -1190,7 +1264,10 @@
 	u32 size = 0;
 	GF_TrackBox *trak = gf_isom_get_track_from_file(the_file, trackNumber);
 	if (!trak || !sampleNumber) return 0;
-
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sampleNumber<=trak->sample_count_at_seg_start) return 0;
+	sampleNumber -= trak->sample_count_at_seg_start;
+#endif
 	stbl_GetSampleSize(trak->Media->information->sampleTable->SampleSize, sampleNumber, &size);
 	return size;
 }
@@ -1204,6 +1281,10 @@
 	if (!trak || !sampleNumber) return 0;
 
 	if (! trak->Media->information->sampleTable->SyncSample) return 1;
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sampleNumber<=trak->sample_count_at_seg_start) return 0;
+	sampleNumber -= trak->sample_count_at_seg_start;
+#endif
 	e = stbl_GetSampleRAP(trak->Media->information->sampleTable->SyncSample, sampleNumber, &is_rap, NULL, NULL);
 	if (e) return 0;
 	return is_rap;
@@ -1220,6 +1301,10 @@
 	if (!trak) return NULL;
 
 	if (!sampleNumber) return NULL;
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sampleNumber<=trak->sample_count_at_seg_start) return NULL;
+	sampleNumber -= trak->sample_count_at_seg_start;
+#endif
 	samp = gf_isom_sample_new();
 	if (!samp) return NULL;
 	e = Media_GetSample(trak->Media, sampleNumber, &samp, sampleDescriptionIndex, 1, data_offset);
@@ -1228,6 +1313,9 @@
 		gf_isom_sample_del(&samp);
 		return NULL;
 	}
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (samp) samp->DTS += trak->dts_at_seg_start;
+#endif
 	return samp;
 }
 
@@ -1241,6 +1329,10 @@
 	if (!trak) return 0;
 
 	if (!sampleNumber) return 0;
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	if (sampleNumber<=trak->sample_count_at_seg_start) return 0;
+	sampleNumber -= trak->sample_count_at_seg_start;
+#endif
 	if (stbl_GetSampleDTS(trak->Media->information->sampleTable->TimeToSample, sampleNumber, &dts) != GF_OK) return 0;
 	return dts;
 }
@@ -1437,7 +1529,7 @@
 	Double tsscale;
 	GF_Err e;
 	GF_TrackBox *trak;
-	u64 mediaTime;
+	u64 mediaTime, nextMediaTime;
 	s64 segStartTime, mediaOffset;
 	u32 sampNum;
 	u8 useEdit;
@@ -1469,10 +1561,11 @@
 	//get the media time for this movie time...
 	mediaTime = segStartTime = 0;
 	*StreamDescriptionIndex = 0;
+	nextMediaTime = 0;
 
-	e = GetMediaTime(trak, (SearchMode==GF_ISOM_SEARCH_SYNC_FORWARD) ? 1 : 0, movieTime, &mediaTime, &segStartTime, &mediaOffset, &useEdit);
+	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)) {
@@ -1508,7 +1601,12 @@
 
 	//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) return e;
+	if (e) {
+		if ((e==GF_EOS) && nextMediaTime) {
+			return gf_isom_get_sample_for_movie_time(the_file, trackNumber, nextMediaTime-1, StreamDescriptionIndex, SearchMode, sample, sampleNumber);
+		}
+		return e;
+	}
 
 	//OK, now the trick: we have to rebuild the time stamps, according
 	//to the media time scale (used by SLConfig) - add the edit start time but stay in
@@ -1567,18 +1665,16 @@
 	*mediaOffset = 0;
 	if (!trak->editBox || !trak->editBox->editList) return 0;
 
-	ent = gf_list_last(trak->editBox->editList->entryList);
-	if (!ent || ent->segmentDuration) return 1;
-
 	count = gf_list_count(trak->editBox->editList->entryList);
+	ent = gf_list_get(trak->editBox->editList->entryList, 0);
+	if (!ent) return 1;
 	/*mediaRate>0, the track playback shall start at media time>0 -> mediaOffset is < 0 */
 	if ((count==1) && (ent->mediaRate==1)) {
 		*mediaOffset = - ent->mediaTime;
 		return 0;
 	} else if (count==2) {
-		ent = gf_list_get(trak->editBox->editList->entryList, 0);
 		/*mediaRate==-1, the track playback shall be empty for segmentDuration -> mediaOffset is > 0 */
-		if (ent->mediaRate==-1) {
+		if ((ent->mediaRate==-1) || (ent->mediaTime==-1)) {
 			Double time = (Double) ent->segmentDuration;
 			time /= trak->moov->mvhd->timeScale;
 			time *= trak->Media->mediaHeader->timeScale;
@@ -2031,12 +2127,27 @@
 	size = gf_bs_get_size(movie->movieFileMap->bs);
 
 	if (new_location) {
-		GF_Err e = gf_isom_datamap_new(new_location, NULL, GF_ISOM_DATA_MAP_READ_ONLY, &movie->movieFileMap);
-		if (e) return e;
-	
+		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;
+
+		delete_map = (previous_movie_fileMap_address != NULL ? GF_TRUE: GF_FALSE);
 		for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
-			GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
-			trak->Media->information->dataHandler = movie->movieFileMap;
+			GF_TrackBox *trak = (GF_TrackBox *)gf_list_get(movie->moov->trackList, i);
+			if (trak->Media->information->dataHandler == previous_movie_fileMap_address) {
+				//reaasign for later destruction
+				trak->Media->information->scalableDataHandler = movie->movieFileMap;
+				//reassign for Media_GetSample function
+				trak->Media->information->dataHandler = movie->movieFileMap;
+			} else if (trak->Media->information->scalableDataHandler == previous_movie_fileMap_address) {
+				delete_map = GF_FALSE;
+			}
+		}
+		if (delete_map) {
+			gf_isom_datamap_del(previous_movie_fileMap_address);
 		}
 	}
 
@@ -2044,28 +2155,114 @@
 	if (prevsize==size) return GF_OK;
 
 	//ok parse root boxes
-	return gf_isom_parse_movie_boxes(movie, MissingBytes, 1);
+	return gf_isom_parse_movie_boxes(movie, MissingBytes, GF_TRUE);
 #endif
 }
 
 GF_EXPORT
-GF_Err gf_isom_release_segment(GF_ISOFile *movie, Bool reset_tables)
+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) 
 {
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
-	u32 i;
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
+	*top_box_start = movie->current_top_box_start;
+	movie->current_top_box_start = 0;
+	if (movie->single_moof_mode) {
+		movie->single_moof_state = 0;
+	}
+#endif
+	return GF_OK;
+}
 
+
+GF_EXPORT
+GF_Err gf_isom_reset_tables(GF_ISOFile *movie, Bool reset_sample_count) 
+{
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+    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);
+
+		u32 type, dur;
+		u64 dts;
+		GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
+
+		trak->sample_count_at_seg_start += 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);
+			if (e == GF_OK) {
+				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 *));
+		RECREATE_BOX(stbl->PaddingBits, (GF_PaddingBitsBox *));
+		RECREATE_BOX(stbl->SampleDep, (GF_SampleDependencyTypeBox *));
+		RECREATE_BOX(stbl->SampleSize, (GF_SampleSizeBox *));
+		RECREATE_BOX(stbl->SampleToChunk, (GF_SampleToChunkBox *));
+		RECREATE_BOX(stbl->ShadowSync, (GF_ShadowSyncBox *));
+		RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
+		RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
+
+		if (reset_sample_count) {
+			trak->Media->information->sampleTable->SampleSize->sampleCount = 0;
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+			trak->sample_count_at_seg_start = 0;
+#endif
+		}
+	}
+
+#endif
+	return GF_OK;
+
+}
+
+GF_EXPORT
+GF_Err gf_isom_release_segment(GF_ISOFile *movie, Bool reset_tables)
+{
+#ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
+	u32 i, j, base_track_sample_count;
+	Bool has_scalable;
+	GF_Box *a;
+	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
+	has_scalable = gf_isom_has_scalable_layer(movie);
+	base_track_sample_count = 0;
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
 		trak->first_traf_merged = 0;
 		if (trak->Media->information->dataHandler == movie->movieFileMap) {
 			trak->Media->information->dataHandler = NULL;
 		}
+		if (trak->Media->information->scalableDataHandler == movie->movieFileMap) {
+			trak->Media->information->scalableDataHandler = NULL;
+		} else {
+			gf_isom_datamap_del(trak->Media->information->scalableDataHandler);
+			trak->Media->information->scalableDataHandler = NULL;
+		}
+
+
 		if (reset_tables) {
 			u32 type, dur;
 			u64 dts;
 			GF_SampleTableBox *stbl = trak->Media->information->sampleTable;
-			trak->sample_count_at_seg_start += stbl->SampleSize->sampleCount;
+			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 (trak->sample_count_at_seg_start) {
 				GF_Err e;
 				e = stbl_GetSampleDTS_and_Duration(stbl->TimeToSample, stbl->SampleSize->sampleCount, &dts, &dur);
@@ -2091,6 +2288,16 @@
 			RECREATE_BOX(stbl->SyncSample, (GF_SyncSampleBox *));
 			RECREATE_BOX(stbl->TimeToSample, (GF_TimeToSampleBox *));
 		}
+
+
+		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);
+				j--;
+				gf_list_rem(movie->moov->other_boxes, j);
+			}
+		}
 	}
 
 	gf_isom_datamap_del(movie->movieFileMap);
@@ -2100,7 +2307,7 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_open_segment(GF_ISOFile *movie, const char *fileName, u64 start_range, u64 end_range)
+GF_Err gf_isom_open_segment(GF_ISOFile *movie, const char *fileName, u64 start_range, u64 end_range, Bool is_scalable_segment)
 {
 #ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
 	return GF_NOT_SUPPORTED;
@@ -2108,15 +2315,27 @@
 	u64 MissingBytes;
 	GF_Err e;
 	u32 i;
+	Bool segment_map_assigned = 0;
+	GF_DataMap *tmp = NULL;
+	GF_DataMap *orig_file_map = NULL;
 	if (!movie || !movie->moov || !movie->moov->mvex) return GF_BAD_PARAM;
 	if (movie->openMode != GF_ISOM_OPEN_READ) return GF_BAD_PARAM;
 
-	if (movie->movieFileMap)
-		gf_isom_release_segment(movie, 0);
+	/*this is a scalable segment - use a temp data map for the associated track(s) but do NOT touch the movie file map*/
+	if (is_scalable_segment) {
+		tmp = NULL;
+		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_READ_ONLY, &tmp);
+		if (e) return e;
 
-	e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_READ_ONLY, &movie->movieFileMap);
-	if (e) return e;
+		orig_file_map = movie->movieFileMap;
+		movie->movieFileMap = tmp;
+	} else {
+		if (movie->movieFileMap)
+			gf_isom_release_segment(movie, 0);
 
+		e = gf_isom_datamap_new(fileName, NULL, GF_ISOM_DATA_MAP_READ_ONLY, &movie->movieFileMap);
+		if (e) return e;
+	}
 	movie->current_top_box_start = 0;
 
 	if (end_range > start_range) {
@@ -2128,13 +2347,73 @@
 	
 	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
 		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
-		if (trak->Media->information->dataHandler == NULL) {
-			trak->Media->information->dataHandler = movie->movieFileMap;
+
+		if (!is_scalable_segment) {
+			/*reset data handler to new segment*/
+			if (trak->Media->information->dataHandler == NULL) {
+				trak->Media->information->dataHandler = movie->movieFileMap;
+			}
+		} else {
+			trak->present_in_scalable_segment = 0;
 		}
 	}
 
+
 	//ok parse root boxes
-	return gf_isom_parse_movie_boxes(movie, &MissingBytes, 1);
+	e = gf_isom_parse_movie_boxes(movie, &MissingBytes, 1);
+	
+	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 
+			if we append another representation - destruction of this data handler is done in release_segment*/
+			trak->Media->information->scalableDataHandler = tmp;
+			if (!segment_map_assigned) {
+				trak->Media->information->scalableDataHandler = tmp;
+				segment_map_assigned = 1;
+			}
+			//and update the regular dataHandler for the Media_GetSample function
+			trak->Media->information->dataHandler = tmp;
+		}
+	}
+	movie->movieFileMap = 	orig_file_map;
+	return e;
+#endif
+}
+
+GF_EXPORT
+u32 gf_isom_get_highest_track_in_scalable_segment(GF_ISOFile *movie, u32 for_base_track)
+{
+#ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
+	return 0;
+#else
+	s32 max_ref;
+	u32 i, j, track_id;
+	
+	max_ref = 0;
+	track_id = 0;
+	for (i=0; i<gf_list_count(movie->moov->trackList); i++) {
+		s32 ref;
+		GF_TrackBox *trak = gf_list_get(movie->moov->trackList, i);
+		if (! trak->present_in_scalable_segment) continue;
+
+		ref = gf_isom_get_reference_count(movie, i+1, GF_ISOM_REF_SCAL);
+		if (ref<=0) continue;
+		if (ref<=max_ref) continue;
+
+		for (j=0; j< (u32) ref; j++) {
+			u32 on_track=0;
+			gf_isom_get_reference(movie, i+1, GF_ISOM_REF_SCAL, j+1, &on_track);
+			if (on_track==for_base_track) {
+				max_ref = ref;
+				track_id = trak->Header->trackID;
+			}
+		}
+	}
+	return track_id;
 #endif
 }
 
@@ -2265,6 +2544,10 @@
 	case GF_ISOM_BOX_TYPE_GNRV:
 	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:
 		*Width = ((GF_VisualSampleEntryBox*)entry)->Width;
 		*Height = ((GF_VisualSampleEntryBox*)entry)->Height;
 		return GF_OK;
@@ -2345,6 +2628,10 @@
 	case GF_ISOM_BOX_TYPE_GNRV:
 	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:
 		*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;
@@ -2796,6 +3083,10 @@
 	case GF_ISOM_BOX_TYPE_ENCV:
 	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:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -2823,7 +3114,7 @@
 }
 
 GF_EXPORT
-void gf_isom_reset_fragment_info(GF_ISOFile *movie)
+void gf_isom_reset_fragment_info(GF_ISOFile *movie, Bool keep_sample_count)
 {
 	u32 i;
 	if (!movie) return;
@@ -2834,7 +3125,8 @@
 	}
 #else
 		trak->dts_at_seg_start = 0;
-		trak->sample_count_at_seg_start = 0;
+		if (!keep_sample_count)
+			trak->sample_count_at_seg_start = 0;
 	}
 	movie->NextMoofNumber = 0;
 #endif
@@ -2956,6 +3248,43 @@
 	return nb_frags;
 }
 
+GF_EXPORT
+GF_Err gf_isom_get_fragmented_samples_info(GF_ISOFile *movie, u32 trackID, u32 *nb_samples, u64 *duration)
+{
+	u32 i=0;
+	u32 k, l;
+	u64 def_duration, samp_dur;
+	GF_MovieFragmentBox *moof;
+	GF_TrackFragmentBox *traf;
+	
+	*nb_samples = 0;
+	*duration = 0;
+	while ((moof=gf_list_enum(movie->TopBoxes, &i))) {
+		if (moof->type==GF_ISOM_BOX_TYPE_MOOF) {
+			u32 j=0;
+			while ((traf=gf_list_enum( moof->TrackList, &j))) {
+				if (traf->tfhd->trackID != trackID)
+					continue;
+
+				def_duration = (traf->tfhd->flags & GF_ISOM_TRAF_SAMPLE_DUR) ? traf->tfhd->def_sample_duration : traf->trex->def_sample_duration;
+
+				for (k=0; k<gf_list_count(traf->TrackRuns); k++) {
+					GF_TrackFragmentRunBox *trun = gf_list_get(traf->TrackRuns, k);
+					*nb_samples += gf_list_count(trun->entries);
+
+					for (l=0; l<gf_list_count(trun->entries); l++) {
+						GF_TrunEntry *ent = gf_list_get(trun->entries, l);
+
+						samp_dur = def_duration;
+						if (trun->flags & GF_ISOM_TRUN_DURATION) samp_dur = ent->Duration;
+						*duration += samp_dur;
+					}
+				}
+			}
+		}
+	}
+	return GF_OK;
+}
 #endif
 
 GF_EXPORT
@@ -2993,5 +3322,203 @@
 	return trak->Media->information->sampleTable->CompositionToDecode->compositionToDTSShift;
 }
 
+GF_EXPORT
+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)
+			return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+void gf_isom_keep_utc_times(GF_ISOFile *file, Bool keep_utc)
+{
+	if (!file) return;
+	file->keep_utc = keep_utc;
+}
+
+
+GF_EXPORT
+u32 gf_isom_get_pssh_count(GF_ISOFile *file) 
+{
+	u32 count=0;
+	u32 i=0;
+	GF_Box *a_box;
+	while ((a_box = (GF_Box*)gf_list_enum(file->moov->other_boxes, &i))) {
+		if (a_box->type != GF_ISOM_BOX_TYPE_PSSH) continue;
+		count++;
+	}
+	return count;
+}
+
+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) 
+{
+	u32 count=1;
+	u32 i=0;
+	GF_ProtectionSystemHeaderBox *pssh;
+	while ((pssh = (GF_ProtectionSystemHeaderBox *)gf_list_enum(file->moov->other_boxes, &i))) {
+		if (pssh->type != GF_ISOM_BOX_TYPE_PSSH) continue;
+		if (count == pssh_index) break;
+		count++;
+	}
+	if (!pssh) return GF_BAD_PARAM;
+
+	memcpy(SystemID, pssh->SystemID, 16);
+	*KID_count = pssh->KID_count;
+	*KIDs = (const bin128 *) pssh->KIDs;
+	*private_data_size = pssh->private_data_size;
+	*private_data = pssh->private_data;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_sample_cenc_info_ex(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID)
+{
+	GF_SampleGroupBox *sample_group;
+	u32 j, group_desc_index;
+	GF_SampleGroupDescriptionBox *sgdesc;
+	u32 i, count;
+	u32 descIndex, chunkNum;
+	u64 offset;
+	u8 edit;
+	u32 first_sample_in_entry, last_sample_in_entry;
+	GF_CENCSampleEncryptionGroupEntry *entry;
+
+	if (IsEncrypted) *IsEncrypted = 0;
+	if (IV_size) *IV_size = 0;
+	if (KID) memset(*KID, 0, 16);
+
+	stbl_GetSampleInfos(trak->Media->information->sampleTable, sample_number, &offset, &chunkNum, &descIndex, &edit);
+	gf_isom_cenc_get_default_info_ex(trak, descIndex, IsEncrypted, IV_size, KID);
+
+
+	sample_group = NULL;
+	group_desc_index = 0;
+	if (trak->Media->information->sampleTable->sampleGroups) {
+		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' )) 
+				break;
+			sample_group = NULL;
+		}
+		if (sample_group) {
+			first_sample_in_entry = 1;
+			for (j=0; j<sample_group->entry_count; j++) {
+				last_sample_in_entry = first_sample_in_entry + sample_group->sample_entries[j].sample_count - 1;
+				if ((sample_number<first_sample_in_entry) || (sample_number>last_sample_in_entry)) {
+					first_sample_in_entry = last_sample_in_entry+1;
+					continue;
+				}
+				/*we found our sample*/
+				group_desc_index = sample_group->sample_entries[j].group_description_index;
+				break;
+			}
+		}
+	}
+	if (!group_desc_index && traf && traf->sampleGroups) {
+		count = gf_list_count(traf->sampleGroups);
+		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' )) 
+				break;
+			sample_group = NULL;
+		} 
+		if (sample_group) {
+			first_sample_in_entry = 1;
+			for (j=0; j<sample_group->entry_count; j++) {
+				last_sample_in_entry = first_sample_in_entry + sample_group->sample_entries[j].sample_count - 1;
+				if ((sample_number<first_sample_in_entry) || (sample_number>last_sample_in_entry)) {
+					first_sample_in_entry = last_sample_in_entry+1;
+					continue;
+				}
+				/*we found our sample*/
+				group_desc_index = sample_group->sample_entries[j].group_description_index;
+				break;
+			}
+		}
+	}
+	/*no sampleGroup info associated*/
+	if (!group_desc_index) return GF_OK;
+
+	sgdesc = NULL;
+
+	if (group_desc_index<=0x10000) {
+		for (j=0; j<gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription); j++) {
+			sgdesc = gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, j);
+			if (sgdesc->grouping_type==sample_group->grouping_type) break;
+			sgdesc = NULL;
+		}
+	} else if (traf) {
+		group_desc_index -= 0x10000;
+		for (j=0; j<gf_list_count(traf->sampleGroupsDescription); j++) {
+			sgdesc = gf_list_get(traf->sampleGroupsDescription, j);
+			if (sgdesc->grouping_type==sample_group->grouping_type) break;
+			sgdesc = NULL;
+		}
+	}
+	/*no sampleGroup description found for this group (invalid file)*/
+	if (!sgdesc) return GF_ISOM_INVALID_FILE;
+
+	entry = (GF_CENCSampleEncryptionGroupEntry *) gf_list_get(sgdesc->group_descriptions, group_desc_index - 1);
+	if (!entry) return GF_ISOM_INVALID_FILE;
+
+	if (IsEncrypted) *IsEncrypted = entry->IsEncrypted;
+	if (IV_size) *IV_size = entry->IV_size;
+	if (KID) memmove(*KID, entry->KID, 16);
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_get_sample_cenc_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 *IsEncrypted, u8 *IV_size, bin128 *KID)
+{
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(movie, track);
+	return gf_isom_get_sample_cenc_info_ex(trak, NULL, sample_number, IsEncrypted, IV_size, KID);
+}
+
+GF_EXPORT
+Bool gf_isom_get_last_producer_time_box(GF_ISOFile *file, u32 *refTrackID, u64 *ntp, u64 *timestamp, Bool reset_info)
+{
+	if (!file) return GF_FALSE;
+	if (refTrackID) *refTrackID = 0;
+	if (ntp) *ntp = 0;
+	if (timestamp) *timestamp = 0;
+
+	if (file->last_producer_ref_time) {
+		if (refTrackID) *refTrackID = file->last_producer_ref_time->refTrackID;
+		if (ntp) *ntp = file->last_producer_ref_time->ntp;
+		if (timestamp) *timestamp = file->last_producer_ref_time->timestamp;
+
+		if (reset_info) {
+			file->last_producer_ref_time = NULL;
+		}
+		return GF_TRUE;
+	}
+	return GF_FALSE;
+}
+
+GF_EXPORT
+u64 gf_isom_get_current_tfdt(GF_ISOFile *the_file, u32 trackNumber)
+{
+#ifdef	GPAC_DISABLE_ISOM_FRAGMENTS
+	return 0;
+#else
+	GF_TrackBox *trak;
+	trak = gf_isom_get_track_from_file(the_file, trackNumber);
+	if (!trak) return 0;
+	return trak->dts_at_seg_start;
+#endif
+}
 
 #endif /*GPAC_DISABLE_ISOM*/
+

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/isom_write.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/isom_write.c Changed

@@ -245,7 +245,8 @@
 	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
 	if (e) return e;
 	memcpy(trak->Media->mediaHeader->packedLanguage, three_char_code, sizeof(char)*3);
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	return GF_OK;
 }
 
@@ -487,7 +488,8 @@
 	}
 	now = gf_isom_get_mp4time();
 	tkhd->creationTime = now;
-	tkhd->modificationTime = now;
+	if (!movie->keep_utc)
+		tkhd->modificationTime = now;
 	//OK, set up the media trak
 	e = NewMedia(&mdia, MediaType, TimeScale);
 	if (e) {
@@ -570,8 +572,9 @@
 	}
 	//duplicate our desc
 	e = gf_odf_desc_copy((GF_Descriptor *)esd, (GF_Descriptor **)&new_esd);
-	if (e) return e;;
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (e) return e;
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	e = Track_SetStreamDescriptor(trak, 0, dataRefIndex, new_esd, outDescriptionIndex);
 	if (e) {
 		gf_odf_desc_del((GF_Descriptor *)new_esd);
@@ -645,7 +648,8 @@
 	}
 	if (e) return e;
 
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	return SetTrackDuration(trak);
 }
 
@@ -718,7 +722,8 @@
 	//OK, update duration
 	e = Media_SetDuration(trak);
 	if (e) return e;
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	return SetTrackDuration(trak);
 }
 
@@ -828,7 +833,8 @@
 	e = Media_AddSample(trak->Media, dataOffset, sample, descIndex, 0);
 	if (e) return e;
 
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	//OK, update duration
 	e = Media_SetDuration(trak);
 	if (e) return e;
@@ -879,7 +885,8 @@
 		//and update the write cache
 		stts->w_currentSampleNum = trak->Media->information->sampleTable->SampleSize->sampleCount;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	trak->Media->mediaHeader->duration = mdur;
 	return SetTrackDuration(trak);
 }
@@ -912,7 +919,8 @@
 		e = Media_UpdateSample(trak->Media, sampleNumber, sample, data_only);
 	}
 	if (e) return e;
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	return GF_OK;
 }
 
@@ -945,7 +953,8 @@
 	e = Media_UpdateSampleReference(trak->Media, sampleNumber, sample, data_offset);
 	if (e) return e;
 
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	return GF_OK;
 }
 
@@ -1056,7 +1065,8 @@
 	if (e) return e;
 
 	//and add it to the ESD EXCEPT IPI PTR (we need to translate from ES_ID to TrackID!!!
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	switch (desc->tag) {
 	case GF_ODF_IPI_PTR_TAG:
 		goto insertIPI;
@@ -1134,13 +1144,15 @@
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
 	if (entry == NULL) return GF_BAD_PARAM;
 
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	//duplicate our desc
 	e = gf_odf_desc_copy((GF_Descriptor *)newESD, (GF_Descriptor **)&esd);
 	if (e) return e;
 	return Track_SetStreamDescriptor(trak, StreamDescriptionIndex, entry->dataReferenceIndex, esd, NULL);
 }
 
+GF_EXPORT
 GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 Width, u32 Height)
 {
 	GF_Err e;
@@ -1163,7 +1175,8 @@
 	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
 	if (entry == NULL) return GF_BAD_PARAM;
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	//valid for MPEG visual, JPG and 3GPP H263
 	switch (entry->type) {
@@ -1176,6 +1189,10 @@
 	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:
 		((GF_VisualSampleEntryBox*)entry)->Width = Width;
 		((GF_VisualSampleEntryBox*)entry)->Height = Height;
 		trak->Header->width = Width<<16;
@@ -1213,7 +1230,8 @@
 	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
 	if (entry == NULL) return GF_BAD_PARAM;
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	switch (entry->type) {
 	case GF_ISOM_BOX_TYPE_MP4V:
 	case GF_ISOM_SUBTYPE_3GP_H263:
@@ -1224,6 +1242,10 @@
 	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:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -1264,7 +1286,8 @@
 	entry = (GF_SampleEntryBox *)gf_list_get(stsd->other_boxes, StreamDescriptionIndex - 1);
 	//no support for generic sample entries (eg, no MPEG4 descriptor)
 	if (entry == NULL) return GF_BAD_PARAM;
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	switch (entry->type) {
 	case GF_ISOM_BOX_TYPE_MP4A:
@@ -2369,7 +2392,8 @@
 	gf_free(data);
 	return e;
 }
-GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks)
+
+GF_Err gf_isom_clone_movie(GF_ISOFile *orig_file, GF_ISOFile *dest_file, Bool clone_tracks, Bool keep_hint_tracks, Bool keep_pssh)
 {
 	GF_Err e;
 	u32 i;
@@ -2408,6 +2432,11 @@
 		orig_file->moov->iods = (GF_ObjectDescriptorBox*)iods;
 		gf_list_add(dest_file->TopBoxes, dest_file->moov);
 
+		if (dest_file->moov->mvex) {
+			gf_isom_box_del((GF_Box *)dest_file->moov->mvex);
+			dest_file->moov->mvex = NULL;
+		}
+
 		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);
@@ -2426,6 +2455,17 @@
 		dest_file->moov->mov = dest_file;
 	}
 
+	if (!keep_pssh) {
+		i=0;
+		while ((box = (GF_Box*)gf_list_get(dest_file->moov->other_boxes, i++))) {
+			if (box->type == GF_ISOM_BOX_TYPE_PSSH) {
+				i--;
+				gf_list_rem(dest_file->moov->other_boxes, i);
+				gf_isom_box_del(box);
+			}
+		}
+	}
+
 	//duplicate other boxes
 	i=0;
 	while ((box = (GF_Box*)gf_list_get(orig_file->TopBoxes, i++))) {
@@ -2442,6 +2482,11 @@
 #endif
 			case GF_4CC('j','P',' ',' '):
 				break;
+
+			case GF_ISOM_BOX_TYPE_PSSH:
+				if (!keep_pssh)
+					break;
+
 			default:
 				{
 					GF_Box *box2 = NULL;
@@ -2631,7 +2676,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) goto exit;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 	/*overwrite dref*/
 	((GF_SampleEntryBox *)entry)->dataReferenceIndex = dataRefIndex;
 	e = gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, entry);
@@ -2668,7 +2714,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	if (trak->Media->handler->handlerType==GF_ISOM_MEDIA_VISUAL) {
 		GF_GenericVisualSampleEntryBox *entry;
@@ -3312,20 +3359,34 @@
 		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:
 		{
 			GF_MPEGVisualSampleEntryBox *avc1 = (GF_MPEGVisualSampleEntryBox *)ent1;
 			GF_MPEGVisualSampleEntryBox *avc2 = (GF_MPEGVisualSampleEntryBox *)ent2;
 			data1 = data2 = NULL;
 
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			a = avc1->hevc_config ? (GF_Box *) avc1->hevc_config : (GF_Box *) avc1->avc_config;
+			if (avc1->hevc_config)
+				a = (GF_Box *) avc1->hevc_config;
+			else if (avc1->svc_config)
+				a = (GF_Box *) avc1->svc_config;
+			else
+				a = (GF_Box *) avc1->avc_config;
 			gf_isom_box_size(a);
 			gf_isom_box_write(a, bs);
 			gf_bs_get_content(bs, &data1, &data1_size);
 			gf_bs_del(bs);
 
 			bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-			a = avc2->hevc_config ? (GF_Box *) avc2->hevc_config : (GF_Box *) avc2->avc_config;
+			if (avc2->hevc_config)
+				a = (GF_Box *) avc2->hevc_config;
+			else if (avc2->svc_config)
+				a = (GF_Box *) avc2->svc_config;
+			else
+				a = (GF_Box *) avc2->avc_config;
 			gf_isom_box_size(a);
 			gf_isom_box_write(a, bs);
 			gf_bs_get_content(bs, &data2, &data2_size);
@@ -3355,8 +3416,43 @@
 		}
 			break;
 		case GF_ISOM_BOX_TYPE_WVTT:
-            /* TODO */
-            assert(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;
+				}
+				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;
+			}
+            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;
+			}
             break;
 		}
 
@@ -4096,7 +4192,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	metad = (GF_MetaDataSampleEntryBox*) gf_isom_box_new(is_xml ? GF_ISOM_BOX_TYPE_METX : GF_ISOM_BOX_TYPE_METT);
 	if (!metad) return GF_OUT_OF_MEM;
@@ -4162,6 +4259,10 @@
 	case GF_ISOM_BOX_TYPE_ENCV:
 	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:
 		break;
 	default:
 		return GF_BAD_PARAM;
@@ -4180,15 +4281,16 @@
 		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);		
-		e = gf_isom_add_meta_item_memory(movie, 0, track, "rvcconfig.xml", mime, NULL, data, size);
+		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);
 	}
 	return GF_OK;
 }
 
-
-GF_Err gf_isom_add_sample_group_entry(GF_List *sampleGroups, u32 sample_number, u32 grouping_type, u32 sampleGroupDescriptionIndex)
+/*for now not exported*/
+/*expands sampleGroup table for the given grouping type and sample_number. If sample_number is 0, just appends an entry at the end of the table*/
+static GF_Err gf_isom_add_sample_group_entry(GF_List *sampleGroups, u32 sample_number, u32 grouping_type, u32 sampleGroupDescriptionIndex)
 {
 	GF_SampleGroupBox *sgroup = NULL;
 	u32 i, count, last_sample_in_entry;
@@ -4248,10 +4350,10 @@
 		return GF_OK;
 	}
 	/*we are adding a sample with no desc, add entry at the end*/
-	if (!sampleGroupDescriptionIndex) {
+	if (!sampleGroupDescriptionIndex || (sample_number - 1 - last_sample_in_entry==0) ) {
 		sgroup->sample_entries = gf_realloc(sgroup->sample_entries, sizeof(GF_SampleGroupEntry) * (sgroup->entry_count + 1) );
 		sgroup->sample_entries[sgroup->entry_count].sample_count = 1;
-		sgroup->sample_entries[sgroup->entry_count].group_description_index = 0;
+		sgroup->sample_entries[sgroup->entry_count].group_description_index = sampleGroupDescriptionIndex;
 		sgroup->entry_count++;
 		return GF_OK;
 	}
@@ -4267,27 +4369,27 @@
 	return GF_OK;
 }
 
-/*for now not exported*/
-static GF_Err gf_isom_set_sample_group_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
+
+static GF_Err gf_isom_set_sample_group_info_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_Err e;
-	GF_TrackBox *trak;
 	GF_List *groupList;
 	void *entry;
 	GF_SampleGroupDescriptionBox *sgdesc = NULL;
 	u32 i, count, entry_idx;
 
-	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 (!stbl && !traf) return GF_BAD_PARAM;
 
-	/*look in stbl for sample sampleGroupsDescription*/
-	if (!trak->Media->information->sampleTable->sampleGroupsDescription)
-		trak->Media->information->sampleTable->sampleGroupsDescription = gf_list_new();
+	/*look in stbl or traf for sample sampleGroupsDescription*/
+	if (traf) {
+		if (!traf->sampleGroupsDescription)
+			traf->sampleGroupsDescription = gf_list_new();
+		groupList = traf->sampleGroupsDescription;
+	} else {
+		if (!stbl->sampleGroupsDescription)
+			stbl->sampleGroupsDescription = gf_list_new();
+		groupList = stbl->sampleGroupsDescription;
+	}
 
-	groupList = trak->Media->information->sampleTable->sampleGroupsDescription;
 	count = gf_list_count(groupList);
 	for (i=0; i<count; i++) {
 		sgdesc = gf_list_get(groupList, i);
@@ -4313,13 +4415,34 @@
 
 	entry_idx = 1 + gf_list_find(sgdesc->group_descriptions, entry);
 
-	/*look in stbl for sample sampleGroups*/
-	if (!trak->Media->information->sampleTable->sampleGroups)
-		trak->Media->information->sampleTable->sampleGroups = gf_list_new();
+	/*look in stbl or traf for sample sampleGroups*/
+	if (traf) {
+		if (!traf->sampleGroups)
+			traf->sampleGroups = gf_list_new();
+		groupList = traf->sampleGroups;
+		entry_idx |= 0x10000;
+	} else {
+		if (!stbl->sampleGroups)
+			stbl->sampleGroups = gf_list_new();
+		groupList = stbl->sampleGroups;
+	}
+
+	return gf_isom_add_sample_group_entry(groupList, sample_number, grouping_type, entry_idx);
+}
+
+/*for now not exported*/
+static GF_Err gf_isom_set_sample_group_info(GF_ISOFile *movie, u32 track, u32 sample_number, u32 grouping_type, void *udta, void *(*sg_create_entry)(void *udta), Bool (*sg_compare_entry)(void *udta, void *entry))
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(movie, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
 
-	groupList = trak->Media->information->sampleTable->sampleGroups;
+	trak = gf_isom_get_track_from_file(movie, track);
+	if (!trak) return GF_BAD_PARAM;
 
-	return gf_isom_add_sample_group_entry(trak->Media->information->sampleTable->sampleGroups, sample_number, grouping_type, entry_idx);
+	return gf_isom_set_sample_group_info_ex(trak->Media->information->sampleTable, NULL, sample_number, grouping_type, udta, sg_create_entry, sg_compare_entry);
 }
 
 void *sg_rap_create_entry(void *udta)
@@ -4368,6 +4491,108 @@
 	return gf_isom_set_sample_group_info(movie, track, sample_number, GF_4CC( 'r', 'o', 'l', 'l' ), &roll_distance, sg_roll_create_entry, sg_roll_compare_entry);
 }
 
+void *sg_encryption_create_entry(void *udta)
+{
+	GF_CENCSampleEncryptionGroupEntry *entry;
+	GF_BitStream *bs;
+	GF_SAFEALLOC(entry, GF_CENCSampleEncryptionGroupEntry);
+	bs = gf_bs_new((char *) udta, sizeof(GF_CENCSampleEncryptionGroupEntry), GF_BITSTREAM_READ);
+	entry->IsEncrypted = gf_bs_read_u24(bs);
+	entry->IV_size = gf_bs_read_u8(bs);
+	gf_bs_read_data(bs, (char *)entry->KID, 16);
+	gf_bs_del(bs);
+	return entry;
+}
+
+Bool sg_encryption_compare_entry(void *udta, void *entry)
+{
+	u32 isEncrypted;
+	u8 IV_size;
+	bin128 KID;
+	GF_BitStream *bs;
+	GF_CENCSampleEncryptionGroupEntry *seig = (GF_CENCSampleEncryptionGroupEntry *)entry;
+	bs = gf_bs_new((char *) udta, sizeof(GF_CENCSampleEncryptionGroupEntry), GF_BITSTREAM_READ);
+	isEncrypted = gf_bs_read_u24(bs);
+	IV_size = gf_bs_read_u8(bs);
+	gf_bs_read_data(bs, (char *)KID, 16);
+	gf_bs_del(bs);
+	if ((isEncrypted == seig->IsEncrypted) && (IV_size == seig->IV_size) && (!strncmp((const char *)KID, (const char *)seig->KID, 16))) return 1;
+	return 0;
+}
+
+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; 
+		u32 i, count;
+		GF_SampleGroupDescriptionBox *sgdesc = NULL;
+		GF_BitStream *bs;
+
+		count = gf_list_count(stbl->sampleGroupsDescription);
+		for (i = 0; i < count; i++) {
+			sgdesc = (GF_SampleGroupDescriptionBox *)gf_list_get(stbl->sampleGroupsDescription, i);
+			if (sgdesc->grouping_type == grouping_type)
+				break;
+			sgdesc = NULL;
+		}
+		if (!sgdesc)
+			return GF_BAD_PARAM;
+
+		entry = gf_list_get(sgdesc->group_descriptions, sampleGroupDescriptionIndex-1);
+		if (!entry)
+			return GF_BAD_PARAM;
+		
+		switch (grouping_type) {
+			case GF_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;
+		}
+	}
+
+	return gf_isom_add_sample_group_entry(traf->sampleGroups, 0, grouping_type, sampleGroupDescriptionIndex);
+}
+
+/*sample encryption information group can be in stbl or traf*/
+GF_EXPORT
+GF_Err gf_isom_set_sample_cenc_group(GF_ISOFile *movie, u32 track, u32 sample_number, Bool isEncrypted, u8 IV_size, bin128 KeyID)
+{
+	char seig[20];
+	if ((IV_size!=0) && (IV_size!=8) && (IV_size!=16)) return GF_BAD_PARAM;
+
+	memset(seig, 0, sizeof(char)*20);
+	seig[0] = seig[1] = 0;
+	seig[2] = isEncrypted ? 1 : 0;
+	seig[3] = IV_size;
+	if (KeyID && IV_size)
+		memcpy(seig + 4, KeyID, sizeof(bin128));
+
+	return gf_isom_set_sample_group_info(movie, track, sample_number, GF_4CC( 's', 'e', 'i', 'g' ), seig, sg_encryption_create_entry, sg_encryption_compare_entry);
+}
+
 static GF_Err gf_isom_set_ctts_v1(GF_ISOFile *file, u32 track, GF_TrackBox *trak)
 {
 	u32 i, shift;
@@ -4470,6 +4695,22 @@
 	}
 }
 
+GF_EXPORT
+GF_Err gf_isom_set_sync_table(GF_ISOFile *file, u32 track)
+{
+	GF_Err e;
+	GF_TrackBox *trak;
+
+	e = CanAccessMovie(file, GF_ISOM_OPEN_WRITE);
+	if (e) return e;
+
+	trak = gf_isom_get_track_from_file(file, track);
+	if (!trak) return GF_BAD_PARAM;
+
+	trak->Media->information->sampleTable->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSS);
+	return GF_OK;
+}
+
 #endif	/*!defined(GPAC_DISABLE_ISOM) && !defined(GPAC_DISABLE_ISOM_WRITE)*/

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/media.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/media.c Changed

@@ -175,9 +175,21 @@
 	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:
+		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);
+		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);
 		esd = ((GF_MPEGVisualSampleEntryBox*) entry)->emul_esd;
 		break;
 	case GF_ISOM_BOX_TYPE_MP4A:
@@ -198,6 +210,46 @@
 			break;
 		}
 		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;
+	case GF_ISOM_BOX_TYPE_STPP:
+		{
+			/* 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;
+#endif
 
 	case GF_ISOM_SUBTYPE_3GP_AMR:
 	case GF_ISOM_SUBTYPE_3GP_AMR_WB:
@@ -338,10 +390,12 @@
 	//divided into the original and the edition files
 	if (mdia->mediaTrack->moov->mov->openMode == GF_ISOM_OPEN_READ) {	
 		//same as last call in read mode
-		if (!mdia->information->dataHandler || (mdia->information->dataEntryIndex != dataRefIndex)) {
+		if (!mdia->information->dataHandler) {
 			e = gf_isom_datamap_open(mdia, dataRefIndex, isEdited);
 			if (e) return e;
 		}
+		if (mdia->information->dataEntryIndex != dataRefIndex)
+			mdia->information->dataEntryIndex = dataRefIndex;
 	} else {
 		e = gf_isom_datamap_open(mdia, dataRefIndex, isEdited);
 		if (e) return e;
@@ -377,12 +431,16 @@
 		e = Media_RewriteODFrame(mdia, *samp);
 		if (e) return e;
 	}
-	else if (gf_isom_is_nalu_based_entry(mdia, entry)) {
+	/*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))
+	) {
 		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) 
 	) {
 		u64 dur;
 		if (sampleNumber == mdia->information->sampleTable->SampleSize->sampleCount) {

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/meta.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/meta.c Changed

@@ -457,7 +457,7 @@
 	return GF_OK;
 }
 
-GF_Err gf_isom_add_meta_item_extended(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, const char *mime_type, const char *content_encoding, const char *URL, const char *URN, char *data, u32 data_len)
+GF_Err gf_isom_add_meta_item_extended(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, const char *URL, const char *URN, char *data, u32 data_len)
 {
 	GF_Err e;
 	GF_ItemLocationEntry *location_entry;
@@ -490,11 +490,19 @@
 		for (i = 0; i < item_count; i++) {
 			GF_ItemInfoEntryBox *e= (GF_ItemInfoEntryBox *)gf_list_get(meta->item_infos->item_infos, i);
 			if (e->item_ID > lastItemID) lastItemID = e->item_ID;
+			if (item_id == e->item_ID) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[IsoMedia] Item with id %d already exists, ignoring\n", item_id));
+				item_id = 0;
+			}
 		}
 	}
 
 	infe = (GF_ItemInfoEntryBox *)infe_New();
-	infe->item_ID = ++lastItemID;
+	if (item_id) {
+		infe->item_ID = item_id;
+	} else {
+		infe->item_ID = ++lastItemID;
+	}
 
 	/*get relative name*/
 	if (item_name) {
@@ -532,7 +540,11 @@
 	/*Creation an ItemLocation Box if it does not exist*/
 	if (!meta->item_locations) meta->item_locations = (GF_ItemLocationBox *)iloc_New();
 	gf_list_add(meta->item_locations->location_entries, location_entry);
-	location_entry->item_ID = lastItemID;
+	if (item_id) {
+		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);
@@ -623,14 +635,14 @@
 }
 
 GF_EXPORT
-GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, const char *mime_type, const char *content_encoding, const char *URL, const char *URN)
+GF_Err gf_isom_add_meta_item(GF_ISOFile *file, Bool root_meta, u32 track_num, Bool self_reference, char *resource_path, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, const char *URL, const char *URN)
 {
-	return gf_isom_add_meta_item_extended(file, root_meta, track_num, self_reference, resource_path, item_name, mime_type, content_encoding, URL, URN, NULL, 0);
+	return gf_isom_add_meta_item_extended(file, root_meta, track_num, self_reference, resource_path, item_name, item_id, mime_type, content_encoding, URL, URN, NULL, 0);
 }
 
-GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, const char *mime_type, const char *content_encoding, char *data, u32 data_len)
+GF_Err gf_isom_add_meta_item_memory(GF_ISOFile *file, Bool root_meta, u32 track_num, const char *item_name, u32 item_id, const char *mime_type, const char *content_encoding, char *data, u32 data_len)
 {
-	return gf_isom_add_meta_item_extended(file, root_meta, track_num, 0, NULL, item_name, mime_type, content_encoding, NULL, NULL, data, data_len);
+	return gf_isom_add_meta_item_extended(file, root_meta, track_num, 0, NULL, item_name, item_id, mime_type, content_encoding, NULL, NULL, data, data_len);
 }
 
 GF_EXPORT

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/movie_fragments.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/movie_fragments.c Changed

@@ -684,7 +684,7 @@
 GF_Err StoreFragment(GF_ISOFile *movie, Bool load_mdat_only, s32 data_offset_diff, u32 *moof_size)
 {
 	GF_Err e;
-	u64 moof_start;
+	u64 moof_start, pos;
 	u32 size, i, s_count, mdat_size;
 	s32 offset;
 	char *buffer;
@@ -721,7 +721,6 @@
 		//we assume we never write large MDATs in fragment mode which should always be true
 		movie->moof->mdat_size = (u32) (pos - movie->moof->fragment_offset);
 
-
 		if (movie->segment_bs) {
 			gf_bs_seek(bs, 0);
 			/*write mdat size*/
@@ -751,8 +750,12 @@
 		return GF_OK;
 	}
 
-
 	moof_start = gf_bs_get_position(bs);
+
+	if (movie->moof->ntp) {
+		moof_start += 8*4;
+	}
+
 	//2- update MOOF MDAT header
 	if (!movie->moof->mdat) {
 		gf_bs_seek(bs, movie->moof->fragment_offset);
@@ -829,6 +832,23 @@
 	}
 #endif
 
+
+	if (movie->moof->ntp) {
+		gf_bs_write_u32(bs, 8*4);
+		gf_bs_write_u32(bs, GF_4CC('p','r','f','t') );
+		gf_bs_write_u8(bs, 1);
+		gf_bs_write_u24(bs, 0);
+		gf_bs_write_u32(bs, movie->moof->reference_track_ID);
+		gf_bs_write_u64(bs, movie->moof->ntp);
+		gf_bs_write_u64(bs, movie->moof->timestamp);
+	}
+
+	pos = gf_bs_get_position(bs);
+	i=0;
+	while ((traf = gf_list_enum(movie->moof->TrackList, &i))) {
+		traf->moof_start_in_bs = pos;
+	}
+
 	e = gf_isom_box_write((GF_Box *) movie->moof, bs);
 	if (e) return e;
 
@@ -983,8 +1003,12 @@
 			gf_bs_write_data(movie->movieFileMap->bs, bloc, size);
 			seg_size -= size;
 		}
+		gf_isom_datamap_flush(movie->movieFileMap);
+
 		gf_isom_datamap_del(movie->editFileMap);
 		movie->editFileMap = gf_isom_fdm_new_temp(NULL);
+	} else {
+		gf_isom_datamap_flush(movie->editFileMap);
 	}
 	movie->segment_start = gf_bs_get_position(movie->editFileMap->bs);
 
@@ -1001,8 +1025,18 @@
 	u64 start_offset, end_offset;
 } SIDXEntry;
 
+static u64 get_presentation_time(u64 media_time, s32 ts_shift)
+{
+	if ((ts_shift<0) && (media_time < -ts_shift)) {
+		media_time = 0;
+	} else {
+		media_time += ts_shift;
+	}
+	return media_time ;
+}
+
 GF_EXPORT
-GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegments_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool last_segment, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range)
+GF_Err gf_isom_close_segment(GF_ISOFile *movie, s32 subsegments_per_sidx, u32 referenceTrackID, u64 ref_track_decode_time, s32 ts_shift, u64 ref_track_next_cts, Bool daisy_chain_sidx, Bool last_segment, u32 segment_marker_4cc, u64 *index_start_range, u64 *index_end_range)
 {
 	GF_SegmentIndexBox *sidx=NULL;
 	GF_SegmentIndexBox *root_sidx=NULL;
@@ -1093,7 +1127,7 @@
 	if (referenceTrackID) {
 		Bool is_root_sidx=0;
 
-		prev_earliest_cts = ref_track_decode_time + moof_get_earliest_cts(gf_list_get(movie->moof_list, 0), referenceTrackID);
+		prev_earliest_cts = get_presentation_time( ref_track_decode_time + moof_get_earliest_cts(gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
 
 		if (movie->root_sidx) {
 			sidx = movie->root_sidx;
@@ -1222,7 +1256,7 @@
 			sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
 			sidx->reference_ID = referenceTrackID;
 			sidx->timescale = trak->Media->mediaHeader->timeScale;
-			sidx->earliest_presentation_time = ref_track_decode_time + sidx_dur + moof_get_earliest_cts(movie->moof, referenceTrackID);
+			sidx->earliest_presentation_time = get_presentation_time( ref_track_decode_time + sidx_dur + moof_get_earliest_cts(movie->moof, referenceTrackID), ts_shift);
 
 			frag_count = frags_per_subsidx;
 
@@ -1279,7 +1313,7 @@
 
 				/*do not compute earliest CTS if single segment sidx since we only have set the info for one subsegment*/
 				if (!movie->root_sidx && first_frag_in_subseg) {
-					u64 first_cts = ref_track_decode_time + sidx_dur + cur_dur +  moof_get_earliest_cts(movie->moof, referenceTrackID);
+					u64 first_cts = get_presentation_time( ref_track_decode_time + sidx_dur + cur_dur +  moof_get_earliest_cts(movie->moof, referenceTrackID), ts_shift);
 					u32 subseg_dur = (u32) (first_cts - prev_earliest_cts);
 					if (cur_index) {
 						sidx->refs[cur_index-1].subsegment_duration = subseg_dur;
@@ -1325,9 +1359,9 @@
 					u64 next_cts;
 					/*update last ref duration*/
 					if (gf_list_count(movie->moof_list)) {
-						next_cts = ref_track_decode_time + sidx_dur + cur_dur + moof_get_earliest_cts(gf_list_get(movie->moof_list, 0), referenceTrackID);
+						next_cts = get_presentation_time( ref_track_decode_time + sidx_dur + cur_dur + moof_get_earliest_cts(gf_list_get(movie->moof_list, 0), referenceTrackID), ts_shift);
 					} else {
-						next_cts = ref_track_next_cts;
+						next_cts = get_presentation_time( ref_track_next_cts, ts_shift);
 					}
 					subseg_dur = (u32) (next_cts - prev_earliest_cts);
 					if (movie->root_sidx) {
@@ -1453,7 +1487,7 @@
 GF_Err gf_isom_close_fragments(GF_ISOFile *movie)
 {
 	if (movie->use_segments) {
-		return gf_isom_close_segment(movie, 0, 0, 0, 0, 0, 1, 0, NULL, NULL);
+		return gf_isom_close_segment(movie, 0, 0, 0, 0, 0, 0, 1, 0, NULL, NULL);
 	} else {
 		return StoreFragment(movie, 0, 0, NULL);
 	}
@@ -1496,6 +1530,16 @@
 }
 
 GF_EXPORT
+GF_Err gf_isom_set_fragment_reference_time(GF_ISOFile *movie, u32 reference_track_ID, u64 ntp, u64 timestamp)
+{
+	if (!movie->moof) return GF_BAD_PARAM;
+	movie->moof->reference_track_ID = reference_track_ID;
+	movie->moof->ntp = ntp;
+	movie->moof->timestamp = timestamp;
+	return GF_OK;
+}
+
+GF_EXPORT
 GF_Err gf_isom_start_fragment(GF_ISOFile *movie, Bool moof_first)
 {
 	u32 i, count;
@@ -1547,6 +1591,30 @@
 		traf->tfhd->base_data_offset = movie->moof->fragment_offset + 8;
 		gf_list_add(movie->moof->TrackList, traf);
 	}
+
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_isom_clone_pssh(GF_ISOFile *output, GF_ISOFile *input, Bool in_moof) {
+	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();
+			memmove(pssh->SystemID, ((GF_ProtectionSystemHeaderBox *)a)->SystemID, 16);
+			pssh->KID_count = ((GF_ProtectionSystemHeaderBox *)a)->KID_count;
+			pssh->KIDs = (bin128 *)gf_malloc(pssh->KID_count*sizeof(bin128));
+			memmove(pssh->KIDs, ((GF_ProtectionSystemHeaderBox *)a)->KIDs, pssh->KID_count*sizeof(bin128));
+			pssh->private_data_size = ((GF_ProtectionSystemHeaderBox *)a)->private_data_size;
+			pssh->private_data = (u8 *)gf_malloc(pssh->private_data_size*sizeof(char));
+			memmove(pssh->private_data, ((GF_ProtectionSystemHeaderBox *)a)->private_data, pssh->private_data_size);
+
+			gf_isom_box_add_default(in_moof ? (GF_Box*)output->moof : (GF_Box*)output->moov, (GF_Box*)pssh);
+		}
+	}
 	return GF_OK;
 }
 
@@ -1617,7 +1685,6 @@
 		traf = traf_2;
 	}
 
-
 	pos = gf_bs_get_position(movie->editFileMap->bs);
 	//add TRUN entry
 	count = gf_list_count(traf->TrackRuns);
@@ -1678,9 +1745,15 @@
 
 	//finally write the data
 	if (!traf->DataCache) {
-		gf_bs_write_data(movie->editFileMap->bs, sample->data, sample->dataLength);
+		if (!gf_bs_write_data(movie->editFileMap->bs, sample->data, sample->dataLength)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] Could not add a sample with a size if %u bytes (no DataCache)\n", sample->dataLength));
+			return GF_OUT_OF_MEM;
+		}
 	} else if (trun->cache) {
-		gf_bs_write_data(trun->cache, sample->data, sample->dataLength);
+		if (!gf_bs_write_data(trun->cache, sample->data, sample->dataLength)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso fragment] Could not add a sample with a size if %u bytes (with cache)\n", sample->dataLength));
+			return GF_OUT_OF_MEM;
+		}
 	} else {
 		return GF_BAD_PARAM;
 	}
@@ -1688,6 +1761,68 @@
 	return GF_OK;
 }
 
+GF_EXPORT
+GF_Err gf_isom_fragment_add_sai(GF_ISOFile *output, GF_ISOFile *input, u32 TrackID, u32 SampleNum)
+{
+	u32 trackNum;
+	GF_Err e = GF_OK;
+
+	trackNum = gf_isom_get_track_by_id(input, TrackID);
+	if (gf_isom_is_cenc_media(input, trackNum, 1)) {
+		GF_CENCSampleAuxInfo *sai;
+		GF_TrackFragmentBox  *traf = GetTraf(output, TrackID);
+		GF_TrackBox  *src_trak = gf_isom_get_track_from_file(input, TrackID);
+		u32 boxType;
+		GF_SampleEncryptionBox *senc;
+		u8 IV_size;
+		u32 IsEncrypted;
+
+		if (!traf)  return GF_BAD_PARAM;
+
+		sai = NULL;
+		gf_isom_get_sample_cenc_info(input, trackNum, SampleNum, &IsEncrypted, &IV_size, NULL);
+		e = gf_isom_cenc_get_sample_aux_info(input, trackNum, SampleNum, &sai, &boxType);
+		if (e) return e;
+		sai->IV_size = IV_size;
+
+		switch (boxType) {
+		case GF_ISOM_BOX_UUID_PSEC:
+			if (!traf->piff_sample_encryption) {
+				GF_PIFFSampleEncryptionBox *psec = (GF_PIFFSampleEncryptionBox *) src_trak->Media->information->sampleTable->piff_psec;
+				if (!psec) return GF_ISOM_INVALID_FILE;
+				traf->piff_sample_encryption = gf_isom_create_piff_psec_box(1, 0, psec->AlgorithmID, psec->IV_size, psec->KID);
+				traf->piff_sample_encryption->traf = traf;
+			}
+
+			if (!traf->piff_sample_encryption) {
+				return GF_IO_ERR;
+			}
+			senc = (GF_SampleEncryptionBox *) traf->piff_sample_encryption;
+			break;
+		case GF_ISOM_BOX_TYPE_SENC:
+			if (!traf->sample_encryption) {
+				traf->sample_encryption = gf_isom_create_samp_enc_box(0, 0);
+				traf->sample_encryption->traf = traf;
+			}
+
+			if (!traf->sample_encryption) {
+				return GF_IO_ERR;
+			}
+			senc = (GF_SampleEncryptionBox *) traf->sample_encryption;
+			break;
+		default:
+			return GF_NOT_SUPPORTED;
+		}
+
+		gf_list_add(senc->samp_aux_info, sai);
+		if (sai->subsample_count) senc->flags = 0x00000002;
+
+		gf_isom_cenc_set_saiz_saio(senc, NULL, traf, IsEncrypted ? IV_size+2+6*sai->subsample_count : 0);
+
+	}
+
+	return GF_OK;
+}
 
 
 GF_Err gf_isom_fragment_append_data(GF_ISOFile *movie, u32 TrackID, char *data, u32 data_size, u8 PaddingBits)
@@ -1752,7 +1887,7 @@
 	return gf_isom_add_subsample_info(traf->subs, last_sample, subSampleSize, priority, reserved, discardable);
 }
 
-GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber)
+GF_Err gf_isom_fragment_copy_subsample(GF_ISOFile *dest, u32 TrackID, GF_ISOFile *orig, u32 track, u32 sampleNumber, Bool sgpd_in_traf)
 {
 	u32 i, count, last_sample;
 	GF_SubSampleInfoEntry *sub_sample;
@@ -1830,11 +1965,12 @@
 					first_sample_in_entry = last_sample_in_entry+1;
 					continue;
 				}
-				/*found our sample, add it to trak->sampleGroups*/
+
 				if (!traf->sampleGroups)
 					traf->sampleGroups = gf_list_new();
 
-				e = gf_isom_add_sample_group_entry(traf->sampleGroups, 0, sg->grouping_type, sg->sample_entries[j].group_description_index);
+				/*found our sample, add it to trak->sampleGroups*/
+				e = gf_isom_copy_sample_group_entry_to_traf(traf, trak->Media->information->sampleTable, sg->grouping_type, sg->sample_entries[j].group_description_index, sgpd_in_traf);
 				break;
 			}
 		}

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/sample_descs.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/sample_descs.c Changed

@@ -73,7 +73,6 @@
 #ifndef GPAC_DISABLE_ISOM_WRITE
 void gf_isom_video_sample_entry_write(GF_VisualSampleEntryBox *ptr, GF_BitStream *bs)
 {
-
 	gf_bs_write_data(bs, ptr->reserved, 6);
 	gf_bs_write_u16(bs, ptr->dataReferenceIndex);
 	
@@ -279,7 +278,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!the_file->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	switch (cfg->type) {
 	case GF_ISOM_SUBTYPE_3GP_AMR:
@@ -377,7 +377,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	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;
@@ -449,7 +450,8 @@
 		e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
 		if (e) return e;
 	}
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	dims = (GF_DIMSSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_DIMS);
 	dims->dataReferenceIndex = dataRefIndex;
@@ -493,7 +495,8 @@
 	if (!dims->config)
 		dims->config = (GF_DIMSSceneConfigBox*) gf_isom_box_new(GF_ISOM_BOX_TYPE_DIMC);
 
-	trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
 	dims->config->profile = desc->profile;
 	dims->config->level = desc->level;

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/stbl_read.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/stbl_read.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/stbl_write.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/stbl_write.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/track.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/track.c Changed

@@ -252,8 +252,14 @@
 	// a little optimization here: if all our samples are sync, 
 	//set the RAPOnly to true... for external users...
 	if (! stbl->SyncSample) {
-		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
-		esd->slConfig->useRandomAccessPointFlag = 0;
+		if (moov->mvex && (esd->decoderConfig->streamType==GF_STREAM_VISUAL)) {
+			esd->slConfig->hasRandomAccessUnitsOnlyFlag = 0;
+			esd->slConfig->useRandomAccessPointFlag = 1;
+			stbl->SyncSample = (GF_SyncSampleBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STSS);
+		} else {
+			esd->slConfig->hasRandomAccessUnitsOnlyFlag = 1;
+			esd->slConfig->useRandomAccessPointFlag = 0;
+		}
 	} else {
 		esd->slConfig->hasRandomAccessUnitsOnlyFlag = 0;
 		//signal we are NOT using sync points if no info is present in the table
@@ -382,13 +388,52 @@
 		trackDuration = (trak->Media->mediaHeader->duration * trak->moov->mvhd->timeScale) / trak->Media->mediaHeader->timeScale;
 	}
 	trak->Header->duration = trackDuration;
-	trak->Header->modificationTime = gf_isom_get_mp4time();
+	if (!trak->moov->mov->keep_utc)
+		trak->Header->modificationTime = gf_isom_get_mp4time();
 	return GF_OK;
 }
 
 
 #ifndef	GPAC_DISABLE_ISOM_FRAGMENTS
 
+Bool gf_isom_is_identical_sgpd(void *ptr1, void *ptr2, u32 grouping_type)
+{
+	GF_BitStream *bs1, *bs2;
+	char *buf1, *buf2;
+	u32 len1, len2;
+	Bool res = GF_FALSE;
+
+	if (!ptr1 || !ptr2)
+		return GF_FALSE;
+
+	bs1 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (grouping_type) {
+		sgpd_write_entry(grouping_type, ptr1, bs1);
+	} else {
+		sgpd_Write((GF_Box *)ptr1, bs1);
+	}
+	gf_bs_get_content(bs1, &buf1, &len1);
+	gf_bs_del(bs1);
+
+	bs2 = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (grouping_type) {
+		sgpd_write_entry(grouping_type, ptr2, bs2);
+	} else {
+		sgpd_Write((GF_Box *)ptr2, bs2);
+	}
+	gf_bs_get_content(bs2, &buf2, &len2);
+	gf_bs_del(bs2);	
+
+
+	if ((len1==len2) && !memcmp(buf1, buf2, len1))
+		res = GF_TRUE;
+
+	gf_free(buf1);
+	gf_free(buf2);
+
+	return res;
+}
+
 GF_Err MergeTrack(GF_TrackBox *trak, GF_TrackFragmentBox *traf, u64 moof_offset, Bool is_first_merge)
 {
 	u32 i, j, chunk_size;
@@ -426,11 +471,12 @@
 	/*in playback mode*/
 	if (traf->tfdt && is_first_merge) {
 #ifndef GPAC_DISABLE_LOG
-		if (trak->sample_count_at_seg_start && (trak->dts_at_seg_start != traf->tfdt->baseMediaDecodeTime)) {
-			s32 drift = (s32) ((s64)trak->dts_at_seg_start - (s64) traf->tfdt->baseMediaDecodeTime);
-			if (drift<0) drift = -drift;
-			if (drift > 1) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Error: TFDT timing "LLD" different from track cumulated timing "LLD" - using tfdt\n", traf->tfdt->baseMediaDecodeTime, trak->dts_at_seg_start ));
+		if (trak->present_in_scalable_segment && trak->sample_count_at_seg_start && (trak->dts_at_seg_start != traf->tfdt->baseMediaDecodeTime)) {
+			s32 drift = (s32) ((s64) traf->tfdt->baseMediaDecodeTime - (s64)trak->dts_at_seg_start);
+			if (drift<0)  {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[iso file] Warning: TFDT timing "LLD" less than cumulated timing "LLD" - using tfdt\n", traf->tfdt->baseMediaDecodeTime, trak->dts_at_seg_start ));
+			} else {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[iso file] TFDT timing "LLD" higher than cumulated timing "LLD" (last sample got extended in duration)\n", traf->tfdt->baseMediaDecodeTime, trak->dts_at_seg_start ));
 			}
 		}
 #endif
@@ -490,6 +536,9 @@
 			
 			//flags
 			sync = GF_ISOM_GET_FRAG_SYNC(flags);
+			if (trak->Media->information->sampleTable->no_sync_found && sync) {
+				trak->Media->information->sampleTable->no_sync_found = 0;
+			}
 			stbl_AppendRAP(trak->Media->information->sampleTable, sync);
 			pad = GF_ISOM_GET_FRAG_PAD(flags);
 			if (pad) stbl_AppendPadding(trak->Media->information->sampleTable, pad);
@@ -501,6 +550,9 @@
 	if (traf->sampleGroups) {
 		GF_List *groups;
 		GF_List *groupDescs;
+		Bool is_identical_sgpd = GF_TRUE;
+		u32 *new_idx = NULL;
+
 		if (!trak->Media->information->sampleTable->sampleGroups)
 			trak->Media->information->sampleTable->sampleGroups = gf_list_new();
 
@@ -524,14 +576,36 @@
 			}
 			/*merge descriptions*/
 			else {
-				u32 idx = gf_list_count(new_sgdesc->group_descriptions);
-				for (j=idx; j<gf_list_count(sgdesc->group_descriptions); j++) {
-					void *ptr = gf_list_get(sgdesc->group_descriptions, j);
-					if (ptr) {
-						gf_list_add(new_sgdesc->group_descriptions, ptr);
-						gf_list_rem(sgdesc->group_descriptions, j);
-						j--;
+				u32 count;
+
+				is_identical_sgpd = gf_isom_is_identical_sgpd(new_sgdesc, sgdesc, 0);
+				if (is_identical_sgpd)
+					continue;
+
+				new_idx = (u32 *)gf_malloc(gf_list_count(sgdesc->group_descriptions)*sizeof(u32));
+				count = 0;
+				while (gf_list_count(sgdesc->group_descriptions)) {
+					void *sgpd_entry = gf_list_get(sgdesc->group_descriptions, 0);
+					Bool new_entry = GF_TRUE;
+
+					for (j = 0; j < gf_list_count(new_sgdesc->group_descriptions); j++) {
+						void *ptr = gf_list_get(new_sgdesc->group_descriptions, j);
+						if (gf_isom_is_identical_sgpd(sgpd_entry, ptr, new_sgdesc->grouping_type)) {
+							new_idx[count] = j + 1;
+							count ++;
+							new_entry = GF_FALSE;
+							gf_free(sgpd_entry);
+							break;
+						}
+					}
+
+					if (new_entry) {
+						gf_list_add(new_sgdesc->group_descriptions, sgpd_entry);
+						new_idx[count] = gf_list_count(new_sgdesc->group_descriptions);
+						count ++;
 					}
+
+					gf_list_rem(sgdesc->group_descriptions, 0);
 				}
 			}
 		}
@@ -555,21 +629,149 @@
 				stbl_group->version = frag_group->version;
 				gf_list_add(groups, stbl_group);
 			}
-			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));
-					memcpy(&stbl_group->sample_entries[stbl_group->entry_count], &frag_group->sample_entries[1], sizeof(GF_SampleGroupEntry) * (frag_group->entry_count - 1));
-					stbl_group->entry_count += frag_group->entry_count - 1;
+
+			if (is_identical_sgpd) {
+				//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) 
+				) {
+					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));
+						memcpy(&stbl_group->sample_entries[stbl_group->entry_count], &frag_group->sample_entries[1], sizeof(GF_SampleGroupEntry) * (frag_group->entry_count - 1));
+						stbl_group->entry_count += frag_group->entry_count - 1;
+					}
+				} else {
+					stbl_group->sample_entries = gf_realloc(stbl_group->sample_entries, sizeof(GF_SampleGroupEntry) * (stbl_group->entry_count + frag_group->entry_count));
+					memcpy(&stbl_group->sample_entries[stbl_group->entry_count], &frag_group->sample_entries[0], sizeof(GF_SampleGroupEntry) * frag_group->entry_count);
+					stbl_group->entry_count += frag_group->entry_count;
 				}
 			} else {
 				stbl_group->sample_entries = gf_realloc(stbl_group->sample_entries, sizeof(GF_SampleGroupEntry) * (stbl_group->entry_count + frag_group->entry_count));
+				//adjust sgpd index
+				for (j = 0; j < frag_group->entry_count; j++)
+					frag_group->sample_entries[j].group_description_index = new_idx[j];
 				memcpy(&stbl_group->sample_entries[stbl_group->entry_count], &frag_group->sample_entries[0], sizeof(GF_SampleGroupEntry) * frag_group->entry_count);
 				stbl_group->entry_count += frag_group->entry_count;
 			}
 		}
+
+		if (new_idx) gf_free(new_idx);
+	}
+
+	if (gf_isom_is_cenc_media(trak->moov->mov, gf_isom_get_tracknum_from_id(trak->moov, trak->Header->trackID), 1)) {
+		/*Merge sample auxiliary encryption information*/
+		GF_SampleEncryptionBox *senc = NULL;
+		GF_List *sais = NULL;
+
+		if (traf->piff_sample_encryption) {
+			for (i = 0; i < gf_list_count(trak->Media->information->sampleTable->other_boxes); i++) {
+				GF_Box *a = (GF_Box *)gf_list_get(trak->Media->information->sampleTable->other_boxes, i);
+				if ((a->type ==GF_ISOM_BOX_TYPE_UUID) && (((GF_UUIDBox *)a)->internal_4cc == GF_ISOM_BOX_UUID_PSEC)) {
+					senc = (GF_SampleEncryptionBox *)a;
+					break;
+				}
+			}
+			if (!senc) {
+				senc = (GF_SampleEncryptionBox *)gf_isom_create_piff_psec_box(1, 0x2, 0, 0, NULL);
+				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) {
+			for (i = 0; i < gf_list_count(trak->Media->information->sampleTable->other_boxes); i++) {
+				GF_Box *a = (GF_Box *)gf_list_get(trak->Media->information->sampleTable->other_boxes, i);
+				if (a->type ==GF_ISOM_BOX_TYPE_SENC) {
+					senc = (GF_SampleEncryptionBox *)a;
+					break;
+				}
+			}
+			if (!senc) {
+				senc = gf_isom_create_samp_enc_box(1, 0x2);
+				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->sample_encryption->samp_aux_info;
+		}
+
+		/*get sample auxiliary information by saiz/saio rather than by parsing senc box*/
+		if (gf_isom_cenc_has_saiz_saio(NULL, traf)) {
+			//GF_BitStream *bs;
+			u32 size, nb_saio;
+			u64 offset;
+			GF_SampleAuxiliaryInfoOffsetBox *saio = NULL;
+			GF_SampleAuxiliaryInfoSizeBox *saiz = NULL;
+			//GF_CENCSampleAuxInfo *sai;
+			//char *buffer;
+
+			offset = nb_saio = 0;
+
+			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')) {
+					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')) {
+					break;
+				}
+			}
+			if (saiz) {
+				for (i = 0; i < saiz->sample_count; i++) {
+					if (nb_saio != 1) 
+						offset = saio->offsets[i] + moof_offset;
+					size = saiz->default_sample_info_size ? saiz->default_sample_info_size : saiz->sample_info_size[i];
+
+					/*cur_position = gf_bs_get_position(trak->moov->mov->movieFileMap->bs);
+					gf_bs_seek(trak->moov->mov->movieFileMap->bs, offset);
+					buffer = (char *)gf_malloc(size);
+					gf_bs_read_data(trak->moov->mov->movieFileMap->bs, buffer, size);
+					gf_bs_seek(trak->moov->mov->movieFileMap->bs, cur_position);
+
+					sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
+					bs = gf_bs_new(buffer, size, GF_BITSTREAM_READ);
+					gf_bs_read_data(bs, (char *)sai->IV, 16);
+					if (size > 16) {
+						sai->subsample_count = gf_bs_read_u16(bs);
+						sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry)*sai->subsample_count);
+						for (j = 0; j < sai->subsample_count; j++) {
+							sai->subsamples[j].bytes_clear_data = gf_bs_read_u16(bs);
+							sai->subsamples[j].bytes_encrypted_data = gf_bs_read_u32(bs);
+						}
+						gf_bs_del(bs);
+					}
+					gf_list_add(senc->samp_aux_info, sai);
+					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;				
+				}
+			}
+		} else if (sais) {
+			for (i = 0; i < gf_list_count(sais); i++) {
+				GF_CENCSampleAuxInfo *sai, *new_sai;
+
+				sai = (GF_CENCSampleAuxInfo *)gf_list_get(sais, i);
+
+				new_sai = (GF_CENCSampleAuxInfo *)gf_malloc(sizeof(GF_CENCSampleAuxInfo));
+				memmove((char *)new_sai->IV, (const char*)sai->IV, 16);
+				new_sai->subsample_count = sai->subsample_count;
+				new_sai->subsamples = (GF_CENCSubSampleEntry *)gf_malloc(new_sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
+				memmove(new_sai->subsamples, sai->subsamples, new_sai->subsample_count*sizeof(GF_CENCSubSampleEntry));
+
+				gf_list_add(senc->samp_aux_info, new_sai);
+				if (sai->subsample_count) senc->flags = 0x00000002;
+			}
+		}
 	}
 	return GF_OK;
 }
@@ -693,6 +895,10 @@
 		mediaInfo = gf_isom_box_new(GF_ISOM_BOX_TYPE_NMHD);
 		str = "GPAC Streaming Text Handler";
 		break;
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+		mediaInfo = gf_isom_box_new(GF_ISOM_BOX_TYPE_STHD);
+		str = "GPAC MPEG Subtitle Handler";
+		break;
 	case GF_ISOM_MEDIA_DIMS:
 		mediaInfo = gf_isom_box_new(GF_ISOM_BOX_TYPE_VMHD);
 		MediaType = GF_ISOM_MEDIA_SCENE;
@@ -880,6 +1086,10 @@
 		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:
 			e = AVC_HEVC_UpdateESD((GF_MPEGVisualSampleEntryBox*)entry, esd);
 			if (e) return e;
 			break;
@@ -887,7 +1097,9 @@
 			e = LSR_UpdateESD((GF_LASeRSampleEntryBox*)entry, esd);
 			if (e) return e;
 			break;
+		case GF_ISOM_BOX_TYPE_STSE:
 		case GF_ISOM_BOX_TYPE_WVTT:
+		case GF_ISOM_BOX_TYPE_STPP:
             /* TODO */
             assert(0);
 			break;

gpac-0.5.0.svn5178.tar.bz2/src/isomedia/ttml.c Added

@@ -0,0 +1,372 @@
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato
+ *          Copyright (c) Telecom ParisTech 2000-2012
+ *                  All rights reserved
+ *
+ *  This file is part of GPAC / ISO Media File Format sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/internal/isomedia_dev.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/constants.h>
+
+#ifndef GPAC_DISABLE_ISOM
+
+#ifndef GPAC_DISABLE_TTML
+
+GF_Box *stpp_New() 
+{
+    ISOM_DECL_BOX_ALLOC(GF_XMLSubtitleSampleEntryBox, GF_ISOM_BOX_TYPE_STPP);
+	gf_isom_sample_entry_init((GF_SampleEntryBox*)tmp);
+    return (GF_Box *)tmp;
+}
+
+void stpp_del(GF_Box *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);
+}
+
+static GF_Err stpp_Add(GF_Box *s, GF_Box *a)
+{
+    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;
+		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;
+}
+
+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);
+
+	size = (u32) stpp->size - 8;
+	str = (char *)gf_malloc(sizeof(char)*size);
+
+	i=0;
+	while (size) {
+		str[i] = gf_bs_read_u8(bs);
+		size--;
+		if (!str[i])
+			break;
+		i++;
+	}
+	if (i) stpp->xmlnamespace = gf_strdup(str);
+
+	i=0;
+	while (size) {
+		str[i] = gf_bs_read_u8(bs);
+		size--;
+		if (!str[i])
+			break;
+		i++;
+	}
+	if (i) stpp->schema_location = gf_strdup(str);
+
+	i=0;
+	while (size) {
+		str[i] = gf_bs_read_u8(bs);
+		size--;
+		if (!str[i])
+			break;
+		i++;
+	}
+	if (i) stpp->auxiliary_mime_types = gf_strdup(str);
+
+	stpp->size = size;
+	gf_free(str);
+    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_bs_write_data(bs, stpp->xmlnamespace, (u32) strlen(stpp->xmlnamespace));
+	gf_bs_write_u8(bs, 0);
+
+	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) 
+		gf_bs_write_data(bs, stpp->auxiliary_mime_types, (u32) strlen(stpp->auxiliary_mime_types));
+	gf_bs_write_u8(bs, 0);
+
+	e = gf_isom_box_write((GF_Box *)stpp->bitrate, bs);
+	if (e) return e;
+
+	return gf_isom_box_array_write(s, stpp->protections, bs);
+}
+
+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
+
+	stpp->size += strlen(stpp->xmlnamespace);
+	stpp->size++;
+
+	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++;
+
+	e = gf_isom_box_size((GF_Box *)stpp->bitrate);
+	if (e) return e;
+	stpp->size += stpp->bitrate->size;
+
+	return gf_isom_box_array_size(s, stpp->protections);
+}
+
+#endif /*GPAC_DISABLE_ISOM_WRITE*/
+
+#ifndef GPAC_DISABLE_ISOM_DUMP
+GF_Err DumpBox(GF_Box *a, FILE * trace);
+void gf_box_dump_done(char *name, GF_Box *ptr, FILE *trace);
+
+GF_Err stpp_dump(GF_Box *a, FILE * trace)
+{
+    GF_XMLSubtitleSampleEntryBox *stpp = (GF_XMLSubtitleSampleEntryBox *)a;
+	const char *name = "XMLSubtitleSampleEntryBox";
+
+	fprintf(trace, "<%s ", name);
+	fprintf(trace, "namespace=\"%s\" ", stpp->xmlnamespace);
+	if (stpp->schema_location) fprintf(trace, "schema_location=\"%s\" ", stpp->schema_location);
+	if (stpp->auxiliary_mime_types) fprintf(trace, "auxiliary_mime_types=\"%s\" ", stpp->auxiliary_mime_types);
+	fprintf(trace, ">\n");
+	DumpBox(a, trace);
+
+	gf_box_dump(stpp->bitrate, trace);
+
+	gf_box_dump_done(NULL, a, trace);
+	fprintf(trace, "</%s>\n", name);
+	return GF_OK;
+}
+
+#endif /* GPAC_DISABLE_ISOM_DUMP */
+
+GF_Err gf_isom_update_xml_subtitle_description( GF_ISOFile                          *movie, 
+                                                u32                                 trackNumber, 
+                                                u32                                 descriptionIndex, 
+                                                GF_GenericSubtitleSampleDescriptor  *desc)
+{
+	GF_TrackBox *trak;
+	GF_Err      e;
+
+	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;
+
+	switch (trak->Media->handler->handlerType) {
+	case GF_ISOM_MEDIA_MPEG_SUBT:
+		break;
+	default:
+		return GF_BAD_PARAM;
+	}
+
+	if (!movie->keep_utc)
+		trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+
+	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_TrackBox                 *trak;
+	GF_Err                      e;
+	u32                         dataRefIndex;
+	GF_XMLSubtitleSampleEntryBox *stpp;
+	char *URLname = NULL;
+	char *URNname = NULL;
+
+	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_MPEG_SUBT:
+		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();
+
+	stpp = (GF_XMLSubtitleSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_STPP);
+	stpp->dataReferenceIndex = dataRefIndex;
+	gf_list_add(trak->Media->information->sampleTable->SampleDescription->other_boxes, stpp);
+	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);
+	return e;
+}
+
+
+/* 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)
+{
+	if (!samp) return GF_BAD_PARAM;
+	if (!text_len) return GF_OK;
+	samp->text = (char*)gf_realloc(samp->text, sizeof(char) * (samp->len + text_len) );
+	memcpy(samp->text + samp->len, text_data, sizeof(char) * text_len);
+	samp->len += text_len;
+	return GF_OK;
+}
+
+/* 
+ * Writing the xml sample structure into a sample buffer 
+ * - putting the text or XML in the sample directly
+ * - optionally handle secondary resources (TODO)
+*/
+GF_ISOSample *gf_isom_xml_subtitle_to_sample(GF_GenericSubtitleSample *samp)
+{
+	GF_ISOSample *res;
+	GF_BitStream *bs;
+	if (!samp) return NULL;
+
+	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);
+
+	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_GenericSubtitleSample *gf_isom_new_xml_subtitle_sample()
+{
+	GF_GenericSubtitleSample *res;
+	GF_SAFEALLOC(res, GF_GenericSubtitleSample);
+	if (!res) return NULL;
+	return res;
+}
+
+GF_Err gf_isom_xml_subtitle_reset(GF_GenericSubtitleSample *samp)
+{
+	if (!samp) return GF_BAD_PARAM;
+	if (samp->text) gf_free(samp->text);
+	samp->text = NULL;
+	samp->len = 0;
+	return GF_OK;
+}
+
+GF_EXPORT
+void gf_isom_delete_xml_subtitle_sample(GF_GenericSubtitleSample * samp)
+{
+	gf_isom_xml_subtitle_reset(samp);
+	gf_free(samp);
+}
+
+GF_EXPORT
+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 
+		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;
+		gf_bs_read_data(bs, s->text, s->len);
+	}
+	return s;
+}
+
+GF_GenericSubtitleSample *gf_isom_parse_xml_subtitle_sample_from_data(char *data, u32 dataLength)
+{
+	GF_GenericSubtitleSample *s;
+	GF_BitStream *bs;
+	/*empty text sample*/
+	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);
+	return s;
+}
+
+
+#endif /* GPAC_DISABLE_TTML */
+
+#endif /*GPAC_DISABLE_ISOM*/

gpac-0.5.0.svn4668.tar.bz2/src/isomedia/tx3g.c -> gpac-0.5.0.svn5178.tar.bz2/src/isomedia/tx3g.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/laser/lsr_dec.c -> gpac-0.5.0.svn5178.tar.bz2/src/laser/lsr_dec.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/laser/lsr_enc.c -> gpac-0.5.0.svn5178.tar.bz2/src/laser/lsr_enc.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/mcrypt/cbc.c -> gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/cbc.c Changed

@@ -19,7 +19,7 @@
 
 #include <gpac/internal/crypt_dev.h>
 
-#if !defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)
+#if !defined(GPAC_DISABLE_MCRYPT)
 
 typedef struct cbc_buf {
 	u32 *previous_ciphertext;
@@ -30,8 +30,9 @@
 /* CBC MODE */
 
 
-static GF_Err _init_mcrypt( CBC_BUFFER* buf,void *key, int lenofkey, void *IV, int size)
+static GF_Err _init_mcrypt( void* _buf,void *key, int lenofkey, void *IV, int size)
 {
+    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 /* For cbc */
 	buf->previous_ciphertext =
 	buf->previous_cipher = NULL;
@@ -58,9 +59,10 @@
 		return GF_OUT_OF_MEM;
 }
 
-static GF_Err _mcrypt_set_state( CBC_BUFFER* buf, void *IV, int size)
+static GF_Err _mcrypt_set_state( void* _buf, void *IV, int size)
 {
 /* For cbc */
+    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 
 	memcpy(buf->previous_ciphertext, IV, size);
 	memcpy(buf->previous_cipher, IV, size);
@@ -68,8 +70,9 @@
 	return GF_OK;
 }
 
-static GF_Err _mcrypt_get_state( CBC_BUFFER* buf, void *IV, int *size)
+static GF_Err _mcrypt_get_state( void* _buf, void *IV, int *size)
 {
+    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 	if (*size < buf->blocksize) {
 		*size = buf->blocksize;
 		return GF_BAD_PARAM;
@@ -82,13 +85,15 @@
 }
 
 
-static void _end_mcrypt( CBC_BUFFER* buf) {
+static void _end_mcrypt( void* _buf) {
+    CBC_BUFFER* buf = (CBC_BUFFER* )_buf;
 	gf_free(buf->previous_ciphertext);
 	gf_free(buf->previous_cipher);
 }
 
-static GF_Err _mcrypt( CBC_BUFFER* buf, void *plaintext, int len, int blocksize, void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
+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;
 	u32 *fplain = plaintext;
 	u32 *plain;
 	int dblock, dlen, i, j; 
@@ -117,8 +122,9 @@
 
 
 
-static GF_Err _mdecrypt( CBC_BUFFER* buf, void *ciphertext, int len, int blocksize,void* akey, void (*func)(void*,void*), void (*func2)(void*,void*))
+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;
 	u32 *cipher;
 	u32 *fcipher = ciphertext;
 	int i, j, dlen, dblock; 
@@ -164,4 +170,4 @@
 	td->mode_version = 20010801;
 }
 
-#endif /*!defined(GPAC_CRYPT_ISMA_ONLY) && !defined(GPAC_DISABLE_MCRYPT)*/
+#endif /*!defined(GPAC_CRYPT_ISMA_ONLY) */

gpac-0.5.0.svn4668.tar.bz2/src/mcrypt/g_crypt.c -> gpac-0.5.0.svn5178.tar.bz2/src/mcrypt/g_crypt.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/ait.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/ait.c Changed

@@ -1,792 +1,792 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jonathan Sillan
- *			Copyright (c) Telecom ParisTech 2011-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / media tools sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-#include <gpac/ait.h>
-
-#ifdef GPAC_ENABLE_DSMCC
-
-/* static functions */
-static Bool check_ait_already_received(GF_List* ChannelAppList,u32 pid,char* data);
-static void gf_ait_application_decode_destroy(GF_M2TS_AIT_APPLICATION_DECODE* application_decode);
-static GF_Err gf_m2ts_decode_ait(GF_M2TS_AIT *ait, char  *data, u32 data_size, u32 table_id);
-static Bool gf_m2ts_is_dmscc_app(GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo);
-static void gf_m2ts_free_ait_application(GF_M2TS_AIT_APPLICATION* application);
-static void gf_ait_destroy(GF_M2TS_AIT* ait);
-static void gf_m2ts_process_ait(GF_M2TS_Demuxer *ts, GF_M2TS_AIT* ait);
-
-GF_M2TS_ES *gf_ait_section_new(u32 service_id)
-{
-	GF_M2TS_ES *es;
-	GF_M2TS_AIT_CARRY *ses;
-	GF_SAFEALLOC(ses, GF_M2TS_AIT_CARRY);
-	es = (GF_M2TS_ES *)ses;
-	es->flags = GF_M2TS_ES_IS_SECTION;
-	ses->service_id = service_id;
-	return es;
-}
-
-
-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);			
-			u32_data_size = pck->data_len;
-			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);
-			gf_m2ts_process_ait(ts,ait);
-			gf_ait_destroy(ait);
-			if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_AIT_FOUND, pck->stream);
-		}
-		
-	}
-}
-
-static GF_Err gf_m2ts_decode_ait(GF_M2TS_AIT *ait, char  *data, u32 data_size, u32 table_id)
-{
-
-	GF_BitStream *bs;
-	u8 temp_descriptor_tag;
-	u32 data_shift, app_desc_data_shift, ait_app_data_shift;
-	u32 nb_of_protocol;
-
-	data_shift = 0;
-	temp_descriptor_tag = 0;
-	ait_app_data_shift = 0;
-	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
-
-	ait->common_descriptors = gf_list_new();
-	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){
-		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->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){
-		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){
-		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){
-		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){
-		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){
-		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);	
-	gf_bs_read_int(bs,4);/* bit shifting */
-	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 */	
-	ait->application_loop_length = gf_bs_read_int(bs,12);
-
-	data_shift = (u32)(gf_bs_get_position(bs)) + ait->common_descriptors_length/8;
-
-	while (ait_app_data_shift < ait->application_loop_length) {
-
-		GF_M2TS_AIT_APPLICATION_DECODE* application;
-		GF_SAFEALLOC(application,GF_M2TS_AIT_APPLICATION_DECODE);
-		application->application_descriptors = gf_list_new();
-		application->index_app_desc_id = 0;
-
-		/* application loop */
-		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);		
-
-		ait_app_data_shift += 9;
-		app_desc_data_shift = 0;
-		nb_of_protocol = 0;
-
-		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 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;
-					}
-				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;
-							}
-						}
-						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_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;
-								}
-							}
-						}
-						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);
-							}
-							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);		
-	}
-
-	data_shift +=ait->application_loop_length;
-	ait->CRC_32 = gf_bs_read_int(bs,32);
-	data_shift += 4;
-
-
-	if (data_shift != data_size) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] AIT processed length error. Difference between byte shifting %d and data size %d \n",data_shift,data_size));
-		return GF_CORRUPTED_DATA;
-	}
-
-	return GF_OK;
-}
-
-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;
-	char *url_base, *url_appli_path;
-
-	nb_of_app = gf_list_count(ait->application_decoded);
-	url_base = NULL;
-	url_appli_path = NULL;
-	j=0;
-
-	/* Link the AIT and the channel */
-	ChanAppInfo = gf_m2ts_get_channel_application_info(ts->ChannelAppList,ait->service_id);	
-
-	if(!ChanAppInfo){
-		GF_SAFEALLOC(ChanAppInfo,GF_M2TS_CHANNEL_APPLICATION_INFO);
-		ChanAppInfo->service_id = ait->service_id;
-		ChanAppInfo->Application = gf_list_new();
-		ChanAppInfo->ait_pid = ait->pid;
-		gf_list_add(ts->ChannelAppList,ChanAppInfo);
-	}
-
-	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++){
-		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);			
-		Application->http_url = NULL;
-		Application->carousel_url = NULL;
-
-		application_decoded = (GF_M2TS_AIT_APPLICATION_DECODE*)gf_list_get(ait->application_decoded,j);
-		nb_app_desc = gf_list_count(application_decoded->application_descriptors);
-		Application->application_control_code = application_decoded->application_control_code;
-		Application->application_id = application_decoded->application_id;
-		Application->broadband = 0;
-		Application->broadcast = 0;
-		ChanAppInfo->version_number = ait->version_number;
-		
-		k=0;
-		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));
-								}
-			}
-
-			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);
-				Application->http_url[url_length]=0;
-				Application->url_received = 1;
-				url_base = NULL;
-				url_appli_path = NULL;
-				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Process AIT] SERVICE ID %d  URL %s  \n",ChanAppInfo->service_id,Application->http_url));
-			}
-
-		}
-	}
-	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)){			
-			gf_cleanup_dir(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){
-	
-	u32 nb_app,i;
-
-	nb_app = gf_list_count(ChanAppInfo->Application);
-	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){
-			return 1;
-		}
-	}
-	return 0;
-}
-
-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++){	
-		GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo = (GF_M2TS_CHANNEL_APPLICATION_INFO*)gf_list_get(ChannelAppList,i);
-		if(ChanAppInfo->service_id == ait_service_id){
-			return ChanAppInfo;
-		}
-	}
-
-	return NULL;
-
-}
-
-static Bool check_ait_already_received(GF_List* ChannelAppList,u32 pid,char* data)
-{
-    u32 nb_of_ait;
-	u32 version_number;
-
-	nb_of_ait = 0;
-
-	nb_of_ait = gf_list_count(ChannelAppList);
-
-	if(nb_of_ait){
-		u32 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){
-				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"));	
-					return 1;
-				}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);
-						ChanAppInfo->nb_application = gf_list_count(ChanAppInfo->Application);
-					}
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] Discard old applications - New AIT received \n"));
-					return 0;
-				}
-			}
-		}
-	}else{
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] No AIT received \n"));
-	}
-
-	return 0;
-}
-
-static void gf_ait_destroy(GF_M2TS_AIT* ait)
-{
-	u32 common_descr_numb, app_numb;
-
-	/* delete de Elementary Stream part of the AIT structure */ 	
-	common_descr_numb = 0;
-	app_numb = 0;
-
-	/* delete the common descriptors */ 
-	common_descr_numb = gf_list_count(ait->common_descriptors);
-	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){
-		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);
-		app_numb = gf_list_count(ait->application_decoded);
-	}
-	gf_list_del(ait->application_decoded);
-	gf_free(ait);
-}
-
-static void gf_ait_application_decode_destroy(GF_M2TS_AIT_APPLICATION_DECODE* application_decode)
-{
-
-	u32 app_desc_num,i,app_descr_index;
-
-	app_desc_num = app_descr_index = i = 0; 
-	app_desc_num = gf_list_count(application_decode->application_descriptors);
-
-	while (app_desc_num != 0) {
-		u32 descr_tag;
-		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 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;
-				}
-			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);
-					}
-					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_free(boundary_descriptor);
-					break;					
-				}
-			default:
-				{
-				}
-		}
-		gf_list_rem(application_decode->application_descriptors,0);
-		app_desc_num = gf_list_count(application_decode->application_descriptors);
-		i++;
-	}
-	gf_list_del(application_decode->application_descriptors);
-	gf_free(application_decode);
-}
-
-static void gf_m2ts_free_ait_application(GF_M2TS_AIT_APPLICATION* Application){
-
-	if(Application->http_url){
-		gf_free(Application->http_url);
-	}
-	if(Application->carousel_url){
-		gf_free(Application->carousel_url);
-	}
-
-	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){
-
-	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);
-	}
-
-	gf_list_del(ChannelApp->Application);
-	gf_free(ChannelApp);
-}
-
-#endif //GPAC_ENABLE_DSMCC
-
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jonathan Sillan
+ *			Copyright (c) Telecom ParisTech 2011-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / media tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+#include <gpac/ait.h>
+
+#ifdef GPAC_ENABLE_DSMCC
+
+/* static functions */
+static Bool check_ait_already_received(GF_List* ChannelAppList,u32 pid,char* data);
+static void gf_ait_application_decode_destroy(GF_M2TS_AIT_APPLICATION_DECODE* application_decode);
+static GF_Err gf_m2ts_decode_ait(GF_M2TS_AIT *ait, char  *data, u32 data_size, u32 table_id);
+static Bool gf_m2ts_is_dmscc_app(GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo);
+static void gf_m2ts_free_ait_application(GF_M2TS_AIT_APPLICATION* application);
+static void gf_ait_destroy(GF_M2TS_AIT* ait);
+static void gf_m2ts_process_ait(GF_M2TS_Demuxer *ts, GF_M2TS_AIT* ait);
+
+GF_M2TS_ES *gf_ait_section_new(u32 service_id)
+{
+	GF_M2TS_ES *es;
+	GF_M2TS_AIT_CARRY *ses;
+	GF_SAFEALLOC(ses, GF_M2TS_AIT_CARRY);
+	es = (GF_M2TS_ES *)ses;
+	es->flags = GF_M2TS_ES_IS_SECTION;
+	ses->service_id = service_id;
+	return es;
+}
+
+
+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);			
+			u32_data_size = pck->data_len;
+			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);
+			gf_m2ts_process_ait(ts,ait);
+			gf_ait_destroy(ait);
+			if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_AIT_FOUND, pck->stream);
+		}
+		
+	}
+}
+
+static GF_Err gf_m2ts_decode_ait(GF_M2TS_AIT *ait, char  *data, u32 data_size, u32 table_id)
+{
+
+	GF_BitStream *bs;
+	u8 temp_descriptor_tag;
+	u32 data_shift, app_desc_data_shift, ait_app_data_shift;
+	u32 nb_of_protocol;
+
+	data_shift = 0;
+	temp_descriptor_tag = 0;
+	ait_app_data_shift = 0;
+	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
+
+	ait->common_descriptors = gf_list_new();
+	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){
+		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->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){
+		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){
+		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){
+		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){
+		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){
+		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);	
+	gf_bs_read_int(bs,4);/* bit shifting */
+	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 */	
+	ait->application_loop_length = gf_bs_read_int(bs,12);
+
+	data_shift = (u32)(gf_bs_get_position(bs)) + ait->common_descriptors_length/8;
+
+	while (ait_app_data_shift < ait->application_loop_length) {
+
+		GF_M2TS_AIT_APPLICATION_DECODE* application;
+		GF_SAFEALLOC(application,GF_M2TS_AIT_APPLICATION_DECODE);
+		application->application_descriptors = gf_list_new();
+		application->index_app_desc_id = 0;
+
+		/* application loop */
+		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);		
+
+		ait_app_data_shift += 9;
+		app_desc_data_shift = 0;
+		nb_of_protocol = 0;
+
+		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 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;
+					}
+				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;
+							}
+						}
+						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_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;
+								}
+							}
+						}
+						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);
+							}
+							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);		
+	}
+
+	data_shift +=ait->application_loop_length;
+	ait->CRC_32 = gf_bs_read_int(bs,32);
+	data_shift += 4;
+
+
+	if (data_shift != data_size) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] AIT processed length error. Difference between byte shifting %d and data size %d \n",data_shift,data_size));
+		return GF_CORRUPTED_DATA;
+	}
+
+	return GF_OK;
+}
+
+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;
+	char *url_base, *url_appli_path;
+
+	nb_of_app = gf_list_count(ait->application_decoded);
+	url_base = NULL;
+	url_appli_path = NULL;
+	j=0;
+
+	/* Link the AIT and the channel */
+	ChanAppInfo = gf_m2ts_get_channel_application_info(ts->ChannelAppList,ait->service_id);	
+
+	if(!ChanAppInfo){
+		GF_SAFEALLOC(ChanAppInfo,GF_M2TS_CHANNEL_APPLICATION_INFO);
+		ChanAppInfo->service_id = ait->service_id;
+		ChanAppInfo->Application = gf_list_new();
+		ChanAppInfo->ait_pid = ait->pid;
+		gf_list_add(ts->ChannelAppList,ChanAppInfo);
+	}
+
+	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++){
+		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);			
+		Application->http_url = NULL;
+		Application->carousel_url = NULL;
+
+		application_decoded = (GF_M2TS_AIT_APPLICATION_DECODE*)gf_list_get(ait->application_decoded,j);
+		nb_app_desc = gf_list_count(application_decoded->application_descriptors);
+		Application->application_control_code = application_decoded->application_control_code;
+		Application->application_id = application_decoded->application_id;
+		Application->broadband = 0;
+		Application->broadcast = 0;
+		ChanAppInfo->version_number = ait->version_number;
+		
+		k=0;
+		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));
+								}
+			}
+
+			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);
+				Application->http_url[url_length]=0;
+				Application->url_received = 1;
+				url_base = NULL;
+				url_appli_path = NULL;
+				GF_LOG(GF_LOG_INFO, GF_LOG_MODULE, ("[Process AIT] SERVICE ID %d  URL %s  \n",ChanAppInfo->service_id,Application->http_url));
+			}
+
+		}
+	}
+	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)){			
+			gf_cleanup_dir(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){
+	
+	u32 nb_app,i;
+
+	nb_app = gf_list_count(ChanAppInfo->Application);
+	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){
+			return 1;
+		}
+	}
+	return 0;
+}
+
+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++){	
+		GF_M2TS_CHANNEL_APPLICATION_INFO* ChanAppInfo = (GF_M2TS_CHANNEL_APPLICATION_INFO*)gf_list_get(ChannelAppList,i);
+		if(ChanAppInfo->service_id == ait_service_id){
+			return ChanAppInfo;
+		}
+	}
+
+	return NULL;
+
+}
+
+static Bool check_ait_already_received(GF_List* ChannelAppList,u32 pid,char* data)
+{
+    u32 nb_of_ait;
+	u32 version_number;
+
+	nb_of_ait = 0;
+
+	nb_of_ait = gf_list_count(ChannelAppList);
+
+	if(nb_of_ait){
+		u32 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){
+				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"));	
+					return 1;
+				}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);
+						ChanAppInfo->nb_application = gf_list_count(ChanAppInfo->Application);
+					}
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] Discard old applications - New AIT received \n"));
+					return 0;
+				}
+			}
+		}
+	}else{
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_MODULE, ("[Process AIT] No AIT received \n"));
+	}
+
+	return 0;
+}
+
+static void gf_ait_destroy(GF_M2TS_AIT* ait)
+{
+	u32 common_descr_numb, app_numb;
+
+	/* delete de Elementary Stream part of the AIT structure */ 	
+	common_descr_numb = 0;
+	app_numb = 0;
+
+	/* delete the common descriptors */ 
+	common_descr_numb = gf_list_count(ait->common_descriptors);
+	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){
+		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);
+		app_numb = gf_list_count(ait->application_decoded);
+	}
+	gf_list_del(ait->application_decoded);
+	gf_free(ait);
+}
+
+static void gf_ait_application_decode_destroy(GF_M2TS_AIT_APPLICATION_DECODE* application_decode)
+{
+
+	u32 app_desc_num,i,app_descr_index;
+
+	app_desc_num = app_descr_index = i = 0; 
+	app_desc_num = gf_list_count(application_decode->application_descriptors);
+
+	while (app_desc_num != 0) {
+		u32 descr_tag;
+		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 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;
+				}
+			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);
+					}
+					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_free(boundary_descriptor);
+					break;					
+				}
+			default:
+				{
+				}
+		}
+		gf_list_rem(application_decode->application_descriptors,0);
+		app_desc_num = gf_list_count(application_decode->application_descriptors);
+		i++;
+	}
+	gf_list_del(application_decode->application_descriptors);
+	gf_free(application_decode);
+}
+
+static void gf_m2ts_free_ait_application(GF_M2TS_AIT_APPLICATION* Application){
+
+	if(Application->http_url){
+		gf_free(Application->http_url);
+	}
+	if(Application->carousel_url){
+		gf_free(Application->carousel_url);
+	}
+
+	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){
+
+	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);
+	}
+
+	gf_list_del(ChannelApp->Application);
+	gf_free(ChannelApp);
+}
+
+#endif //GPAC_ENABLE_DSMCC
+
+

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/av_parsers.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/av_parsers.c Changed

@@ -25,6 +25,7 @@
 
 #include <gpac/internal/media_dev.h>
 #include <gpac/constants.h>
+#include <gpac/mpeg4_odf.h>
 
 #ifndef GPAC_DISABLE_OGG
 #include <gpac/internal/ogg.h>
@@ -1041,6 +1042,18 @@
 	return GF_OK;
 }
 
+u32 gf_latm_get_value(GF_BitStream *bs)
+{
+	u32 i, tmp, value = 0;
+	u32 bytesForValue = gf_bs_read_int(bs, 2);
+	for (i=0; i <= bytesForValue; i++) {
+		value <<= 8;
+		tmp = gf_bs_read_int(bs, 8);
+		value += tmp;
+	}
+	return value;
+}
+
 GF_EXPORT
 GF_Err gf_m4a_write_config_bs(GF_BitStream *bs, GF_M4ADecSpecInfo *cfg)
 {
@@ -1440,6 +1453,17 @@
 	}
 }
 
+GF_EXPORT
+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";
+	}
+}
+
 #ifndef GPAC_DISABLE_AV_PARSERS
 
 
@@ -1467,9 +1491,13 @@
 	u8 coded;
 	u32 bits = 0, read = 0;
 	while (1) {
-		if (!gf_bs_available(bs)) break;
 		read = gf_bs_peek_bits(bs, 8, 0);
 		if (read) break;
+		//check whether we still have bits once the peek is done since we may have less than 8 bits available
+		if (!gf_bs_available(bs)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CODING, ("[AVC/HEVC] Not enough bits in bitstream !!\n"));
+			return 0;
+		}
 		gf_bs_read_int(bs, 8);
 		bits += 8;
 	}
@@ -1507,6 +1535,7 @@
 
 /*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)
 {
 	u32 v, bpos;
@@ -1678,6 +1707,8 @@
 			num_zero = 0;
 			buffer_dst[i+emulation_bytes_count] = 0x03;
 			emulation_bytes_count++;
+			if (!buffer_src[i])
+				num_zero = 1;
 		} else {
 			if (!buffer_src[i])
 				num_zero++;
@@ -1767,6 +1798,7 @@
 	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)
 {
 	AVC_SPS *sps;
@@ -2037,6 +2069,7 @@
 	return sps_id;
 }
 
+GF_EXPORT
 s32 gf_media_avc_read_pps(const char *pps_data, u32 pps_size, AVCState *avc)
 {
 	GF_BitStream *bs;
@@ -2418,6 +2451,7 @@
 		si->poc = field_poc[1];
 }
 
+GF_EXPORT
 s32 gf_media_avc_parse_nalu(GF_BitStream *bs, u32 nal_hdr, AVCState *avc)
 {
 	u8 idr_flag;
@@ -2523,6 +2557,7 @@
 	case GF_AVC_NALU_SEQ_PARAM:
 	case GF_AVC_NALU_PIC_PARAM:
 	case GF_AVC_NALU_SVC_SUBSEQ_PARAM:
+	case GF_AVC_NALU_FILLER_DATA:
 		return 0;
 	default:
 		if (avc->s_info.nal_unit_type <= GF_AVC_NALU_IDR_SLICE) ret = 1;
@@ -3237,18 +3272,20 @@
 		ptl->general_interlaced_source_flag = gf_bs_read_int(bs, 1);
 		ptl->general_non_packed_constraint_flag = gf_bs_read_int(bs, 1);
 		ptl->general_frame_only_constraint_flag = gf_bs_read_int(bs, 1);
-
 		ptl->general_reserved_44bits = gf_bs_read_long_int(bs, 44);
-#if 0
-		/* XXX_reserved_zero_48bits[0..15] = */ gf_bs_read_int(bs, 16);
-		/* XXX_reserved_zero_48bits[16..31] = */ gf_bs_read_int(bs, 16);
-		/* XXX_reserved_zero_48bits[32..43] = */ gf_bs_read_int(bs, 12);
-#endif
 	}
 	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].level_present_flag = gf_bs_read_int(bs, 1);
+	}
+	if (MaxNumSubLayersMinus1>0) {
+		for (i=MaxNumSubLayersMinus1; i<8; i++) {
+			/*reserved_zero_2bits*/gf_bs_read_int(bs, 2);
+		}
+	}
+
+	for (i=0; i<MaxNumSubLayersMinus1; i++) {
 		if (ProfilePresentFlag && ptl->sub_ptl[i].profile_present_flag) {
 			ptl->sub_ptl[i].profile_space = gf_bs_read_int(bs, 2);
 			ptl->sub_ptl[i].tier_flag = gf_bs_read_int(bs, 1);
@@ -3261,28 +3298,192 @@
 	}
 }
 
-void bit_rate_pic_rate_info(GF_BitStream *bs, u8 level_low, u8 level_high, HEVC_VPS *vps)
+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;
+}
+
+#define SHVC_VIEW_ORDER_INDEX  1
+#define SHVC_SCALABILITY_INDEX	2
+
+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;
+	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);
+}
+
+static u32 shvc_get_num_views(HEVC_VPS *vps)
+{
+    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;
+}
+
+static void shvc_parse_rep_format(HEVC_RepFormat *fmt, GF_BitStream *bs)
 {
-	u8 i;
-	for (i=level_low; i<=level_high; i++) {
-		Bool bit_rate_info_present_flag = gf_bs_read_int(bs, 1);
-		Bool pic_rate_info_present_flag = gf_bs_read_int(bs, 1);
-		if (bit_rate_info_present_flag) {
-			vps->rates[i].avg_bit_rate = gf_bs_read_int(bs, 16);
-			vps->rates[i].max_bit_rate = gf_bs_read_int(bs, 16);
-		}
-		if (pic_rate_info_present_flag) {
-			vps->rates[i].constand_pic_rate_idc = gf_bs_read_int(bs, 2);
-			vps->rates[i].avg_pic_rate = gf_bs_read_int(bs, 16);
+	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) {
+		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);
+		fmt->bit_depth_chroma = 1 + gf_bs_read_int(bs, 4);
+	}
+}
+
+static void hevc_parse_vps_extension(HEVC_VPS *vps, GF_BitStream *bs)
+{
+	u8 splitting_flag, vps_nuh_layer_id_present_flag, view_id_len;
+	u32 i, j, NumScalabilityTypes, num_profile_tier_level, num_add_output_layer_sets, NumOutputLayerSets;
+	u8 dimension_id_len[62];
+	u8 direct_dependency_flag[62][62];
+	u8 /*avc_base_layer_flag, */vps_number_layer_sets, /*default_one_target_output_layer_flag, */rep_format_idx_present_flag;
+
+	/*avc_base_layer_flag = */gf_bs_read_int(bs, 1);
+	splitting_flag = gf_bs_read_int(bs, 1);
+	NumScalabilityTypes =0;
+	for (i=0; i<16; i++) {
+		vps->scalability_mask[i] = gf_bs_read_int(bs, 1);
+		NumScalabilityTypes += vps->scalability_mask[i];
+	}
+	dimension_id_len[0] = 0;
+	for (i=0; i<(NumScalabilityTypes - splitting_flag); i++) {
+		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_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_vps[vps->layer_id_in_nuh[i]] = i;
+
+		if (!splitting_flag) {
+			for (j=0; j<NumScalabilityTypes; j++) {
+				vps->dimension_id[i][j] = gf_bs_read_int(bs, dimension_id_len[j]);
+			}
 		}
 	}
+
+	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=1; i<vps->max_layers; i++) {
+		for (j=0; j<i; j++) {
+			direct_dependency_flag[i][j] = gf_bs_read_int(bs, 1);
+		}
+	}
+
+	if (/*vps_sub_layers_max_minus1_present_flag*/gf_bs_read_int(bs, 1)) {
+		for (i=0; i < vps->max_layers - 1; i++) {
+			/*sub_layers_vps_max_minus1[ i ]*/gf_bs_read_int(bs, 3);
+		}
+	}
+
+	if (/*max_tid_ref_present_flag = */gf_bs_read_int(bs, 1)) {
+		for (i=0; i<vps->max_layers ; i++) {
+			for (j= i+1; j < vps->max_layers; j++) {
+				if (direct_dependency_flag[j][i])
+					/*max_tid_il_ref_pics_plus1[ i ][ j ]*/gf_bs_read_int(bs, 3);
+			}
+		}
+	}
+	/*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);
+		}
+		profile_tier_level(bs, vps_profile_present_flag, vps->max_sub_layers-1, &vps->ext_ptl[i-1] );
+	}
+	NumOutputLayerSets = vps_number_layer_sets;
+	if (/*more_output_layer_sets_than_default_flag */gf_bs_read_int(bs, 1)) {
+		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++) { 
+		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);
+	}
+
+	if (vps->max_layers - 1 > 0 )
+		/*alt_output_layer_flag*/gf_bs_read_int(bs, 1);
+
+	rep_format_idx_present_flag = gf_bs_read_int(bs, 1);
+	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;
+	}
+	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) {
+			if (vps->num_rep_formats > 1) {
+				vps->rep_format_idx[i] = gf_bs_read_int(bs, 8);
+			} else {
+				vps->rep_format_idx[i] = 0; 
+			}
+		} else {
+			vps->rep_format_idx[i] = i; 
+		}
+    }    
+	//TODO - we don't use the rest ...
+
 }
 
+GF_EXPORT
 s32 gf_media_hevc_read_vps(char *data, u32 size, HEVCState *hevc)
 {
 	GF_BitStream *bs;
+	u8 vps_sub_layer_ordering_info_present_flag, vps_extension_flag;
 	char *data_without_emulation_bytes = NULL;
 	u32 data_without_emulation_bytes_size = 0;
+	u32 i, j;
 	s32 vps_id = -1;
 	HEVC_VPS *vps;
 
@@ -3298,65 +3499,116 @@
 
 	if (vps_id>=16) goto exit;
 
-	vps = &hevc->vps[vps_id];   
+	vps = &hevc->vps[vps_id];
 	if (!vps->state) {
 		vps->id = vps_id;
 		vps->state = 1;
 	}
 
 	/* vps_reserved_three_2bits = */ gf_bs_read_int(bs, 2);
-	/* vps_reserved_zero_6bits = */ gf_bs_read_int(bs, 6);
-	vps->max_sub_layer = gf_bs_read_int(bs, 3) + 1;
+	vps->max_layers = 1 + gf_bs_read_int(bs, 6);
+	vps->max_sub_layers = gf_bs_read_int(bs, 3) + 1;
 	vps->temporal_id_nesting = gf_bs_read_int(bs, 1);
 	/* vps_reserved_ffff_16bits = */ gf_bs_read_int(bs, 16);
-	profile_tier_level(bs, 1, vps->max_sub_layer-1, &vps->ptl);
-	bit_rate_pic_rate_info(bs, 0, vps->max_sub_layer-1, vps);
+	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++) {
+		/*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 (j=0; j <= vps->max_layer_id; j++) {
+			/*layer_id_included_flag[ i ][ j ]*/gf_bs_read_int(bs, 1);
+		}
+	}
+	if (/*vps_timing_info_present_flag*/gf_bs_read_int(bs, 1)) {
+		u32 vps_num_hrd_parameters;
+		/*u32 vps_num_units_in_tick = */gf_bs_read_int(bs, 32);
+		/*u32 vps_time_scale = */gf_bs_read_int(bs, 32);
+		if (/*vps_poc_proportional_to_timing_flag*/gf_bs_read_int(bs, 1)) {
+			/*vps_num_ticks_poc_diff_one_minus1*/bs_get_ue(bs);
+		}
+		vps_num_hrd_parameters = bs_get_ue(bs);
+		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) ;
+			// hevc_parse_hrd_parameters(cprms_present_flag, vps->max_sub_layers - 1);
+		}
+	}
+	vps_extension_flag = gf_bs_read_int(bs, 1);
+	if (vps_extension_flag ) {
+		gf_bs_align(bs);
+		hevc_parse_vps_extension(vps, bs);
+		vps_extension_flag = gf_bs_read_int(bs, 1);
+	}
 
-	//and we don't care about the rest for now
 exit:
 	gf_bs_del(bs);
 	gf_free(data_without_emulation_bytes);
 	return vps_id;
 }
 
+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 },
+	{ 32, 11 }, { 80, 33 }, { 18, 11 }, { 15, 11 },
+	{ 64, 33 }, { 160,99 }, { 4,3}, { 3,2}, { 2,1}
+};
 
-
-
-GF_EXPORT
-s32 gf_media_hevc_read_sps(char *data, u32 size, HEVCState *hevc)
+static s32 gf_media_hevc_read_sps_ex(char *data, u32 size, HEVCState *hevc, u32 *vui_flag_pos)
 {
 	GF_BitStream *bs;
 	char *data_without_emulation_bytes = NULL;
 	u32 data_without_emulation_bytes_size = 0;
 	s32 vps_id, sps_id = -1;
-	u8 max_sub_layers_minus1, flag;
+	u8 max_sub_layers_minus1, update_rep_format_flag, flag;
+	u8 layer_id/*, temporal_id, sps_rep_format_idx*/;
+	Bool scaling_list_enable_flag;
 	u32 i, nb_CTUs, depth;
 	u32 log2_diff_max_min_luma_coding_block_size;
 	u32 log2_min_transform_block_size, log2_min_luma_coding_block_size;
-
 	Bool sps_sub_layer_ordering_info_present_flag;
 	HEVC_SPS *sps;
+	HEVC_VPS *vps;
 	HEVC_ProfileTierLevel ptl;
 
+	if (vui_flag_pos) *vui_flag_pos = 0;
+
 	/*still contains emulation bytes*/
 	data_without_emulation_bytes = gf_malloc(size*sizeof(char));
 	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);
-
+	gf_bs_read_int(bs, 7);
+	layer_id = gf_bs_read_int(bs, 6);
+	/*temporal_id = */gf_bs_read_int(bs, 3);
 	vps_id = gf_bs_read_int(bs, 4);
-	if (vps_id>=16) goto exit;
+	if (vps_id>=16) {
+		sps_id = -1;
+		goto exit;
+	}
 
-	max_sub_layers_minus1 = gf_bs_read_int(bs, 3);
-	/*temporal_id_nesting_flag = */gf_bs_read_int(bs, 1);
 	memset(&ptl, 0, sizeof(ptl));
-	profile_tier_level(bs, 1, max_sub_layers_minus1, &ptl);
+    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);
+		profile_tier_level(bs, 1, max_sub_layers_minus1, &ptl);
+	}
 
 	sps_id = bs_get_ue(bs);
-	if (sps_id>=16) goto exit;
+	if (sps_id>=16) {
+		sps_id = -1;
+		goto exit;
+	}
+
 	sps = &hevc->sps[sps_id];
 	if (!sps->state) {
 		sps->state = 1;
@@ -3364,28 +3616,54 @@
 		sps->vps_id = vps_id;
 	}
 	sps->ptl = ptl;
+	vps = &hevc->vps[vps_id];
+
+	//sps_rep_format_idx = 0;
+	update_rep_format_flag = 0;
+	if (layer_id > 0) {
+		update_rep_format_flag = gf_bs_read_int(bs, 1);
+		if (update_rep_format_flag) {
+			sps->rep_format_idx = gf_bs_read_int(bs, 8);
+		} else {
+			sps->rep_format_idx = vps->rep_format_idx[layer_id];
+		}
+		sps->width = vps->rep_formats[sps->rep_format_idx].pic_width_luma_samples;
+		sps->height = vps->rep_formats[sps->rep_format_idx].pic_height_luma_samples;
+		sps->chroma_format_idc = vps->rep_formats[sps->rep_format_idx].chroma_format_idc;
+		sps->bit_depth_luma = vps->rep_formats[sps->rep_format_idx].bit_depth_luma;
+		sps->bit_depth_chroma = vps->rep_formats[sps->rep_format_idx].bit_depth_chroma;
+		sps->separate_colour_plane_flag = vps->rep_formats[sps->rep_format_idx].separate_colour_plane_flag;
+
+		//TODO this is crude ...
+		sps->ptl = vps->ext_ptl[0];
+	} else {
+		sps->chroma_format_idc = bs_get_ue(bs);
+		if (sps->chroma_format_idc==3)
+			sps->separate_colour_plane_flag = gf_bs_read_int(bs, 1);
+		sps->width = bs_get_ue(bs);
+		sps->height = bs_get_ue(bs);
+	}
 
-	sps->chroma_format_idc = bs_get_ue(bs);
-	if (sps->chroma_format_idc==3)
-		sps->separate_colour_plane_flag = gf_bs_read_int(bs, 1);
-	sps->width = bs_get_ue(bs);
-	sps->height = bs_get_ue(bs);
 	if (gf_bs_read_int(bs, 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->bit_depth_luma = 8 + bs_get_ue(bs);
-	sps->bit_depth_chroma = 8 + bs_get_ue(bs);
+	if (layer_id == 0) {
+		sps->bit_depth_luma = 8 + bs_get_ue(bs);
+		sps->bit_depth_chroma = 8 + bs_get_ue(bs);
+	}
 
 	sps->log2_max_pic_order_cnt_lsb = 4 + bs_get_ue(bs);
 
-	sps_sub_layer_ordering_info_present_flag = gf_bs_read_int(bs, 1);
-	for(i= sps_sub_layer_ordering_info_present_flag ? 0 : max_sub_layers_minus1; i<=max_sub_layers_minus1; i++) {
-		/*max_dec_pic_buffering = */ bs_get_ue(bs);
-		/*num_reorder_pics = */ bs_get_ue(bs);
-		/*max_latency_increase = */ bs_get_ue(bs);
+	if (layer_id == 0) {
+		sps_sub_layer_ordering_info_present_flag = gf_bs_read_int(bs, 1);
+		for(i=sps_sub_layer_ordering_info_present_flag ? 0 : max_sub_layers_minus1; i<=max_sub_layers_minus1; i++) {
+			/*max_dec_pic_buffering = */ bs_get_ue(bs);
+			/*num_reorder_pics = */ bs_get_ue(bs);
+			/*max_latency_increase = */ bs_get_ue(bs);
+		}
 	}
 
 	log2_min_luma_coding_block_size = 3 + bs_get_ue(bs);
@@ -3411,9 +3689,20 @@
 		sps->bitsSliceSegmentAddress++;
 	}
 
-	if (/*scaling_list_enable_flag = */ gf_bs_read_int(bs, 1)) { 
-		if (/*sps_scaling_list_data_present_flag=*/gf_bs_read_int(bs, 1) ) {
-			//scaling_list_data( )
+	scaling_list_enable_flag = gf_bs_read_int(bs, 1);
+	if (scaling_list_enable_flag) { 
+		Bool sps_infer_scaling_list_flag = 0;
+		/*u8 sps_scaling_list_ref_layer_id = 0;*/
+		if (layer_id>0) {
+			sps_infer_scaling_list_flag = gf_bs_read_int(bs, 1);
+		}
+
+		if (sps_infer_scaling_list_flag) {
+			/*sps_scaling_list_ref_layer_id = */gf_bs_read_int(bs, 6);
+		} else {
+			if (/*sps_scaling_list_data_present_flag=*/gf_bs_read_int(bs, 1) ) {
+				//scaling_list_data( )
+			}
 		}
 	}
 	/*asymmetric_motion_partitions_enabled_flag= */ gf_bs_read_int(bs, 1);
@@ -3440,6 +3729,13 @@
 	}
 	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) 
+		*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);
@@ -3448,6 +3744,9 @@
 			if (sps->sar_idc == 255) {
 				sps->sar_width = gf_bs_read_int(bs, 16);
 				sps->sar_height = gf_bs_read_int(bs, 16);
+			} else if (sps->sar_idc<17) {
+				sps->sar_width = hevc_sar[sps->sar_idc].w;
+				sps->sar_height = hevc_sar[sps->sar_idc].h;
 			}
 		}
 
@@ -3456,7 +3755,7 @@
 
 		/*video_signal_type_present_flag = */flag = gf_bs_read_int(bs, 1);
 		if (flag) {
-			/*video_format = */gf_bs_read_int(bs, 1);
+			/*video_format = */gf_bs_read_int(bs, 3);
 			/*video_full_range_flag = */gf_bs_read_int(bs, 1);
 			if (/*colour_description_present_flag = */gf_bs_read_int(bs, 1)) {
 				/*colour_primaries = */ gf_bs_read_int(bs, 8);
@@ -3489,7 +3788,8 @@
 			if (sps->poc_proportional_to_timing_flag)
 				sps->num_ticks_poc_diff_one_minus1 = bs_get_ue(bs);
 			if (/*hrd_parameters_present_flag=*/gf_bs_read_int(bs, 1) ) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[hehv] HRD param parsing not implemented\n"));
+				goto exit;
+//				GF_LOG(GF_LOG_INFO, GF_LOG_CODING, ("[HEVC] HRD param parsing not implemented\n"));
 			}
 		}
 
@@ -3517,6 +3817,14 @@
 	return sps_id;
 }
 
+
+GF_EXPORT
+s32 gf_media_hevc_read_sps(char *data, u32 size, HEVCState *hevc)
+{
+	return gf_media_hevc_read_sps_ex(data, size, hevc, NULL);
+}
+
+
 GF_EXPORT
 s32 gf_media_hevc_read_pps(char *data, u32 size, HEVCState *hevc)
 {
@@ -3611,7 +3919,7 @@
 }
 
 
-s32 gf_media_hevc_parse_nalu(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id)
+s32 gf_media_hevc_parse_nalu(GF_BitStream *bs, HEVCState *hevc, u8 *nal_unit_type, u8 *temporal_id, u8 *layer_id)
 {
 	u32 reserved;
 	s32 slice, ret;
@@ -3624,9 +3932,7 @@
 	if (reserved) return -1;
 
 	*nal_unit_type = n_state.nal_unit_type = gf_bs_read_int(bs, 6);
-	reserved = gf_bs_read_int(bs, 6);
-//	if (reserved) return -1;
-
+	*layer_id = gf_bs_read_int(bs, 6);
 	*temporal_id = n_state.temporal_id = gf_bs_read_int(bs, 3);
 
 	ret = 0;
@@ -3641,11 +3947,11 @@
 	/*slice_layer_rbsp*/
 //	case GF_HEVC_NALU_SLICE_STSA_N:
 //	case GF_HEVC_NALU_SLICE_STSA_R:
-	case GF_HEVC_NALU_SLICE_RADL_N:
+//	case GF_HEVC_NALU_SLICE_RADL_N:
 //	case GF_HEVC_NALU_SLICE_RADL_R:
-	case GF_HEVC_NALU_SLICE_RASL_N:
+//	case GF_HEVC_NALU_SLICE_RASL_N:
 //	case GF_HEVC_NALU_SLICE_RASL_R:
-		break;
+//		break;
 
 	/*slice_segment_layer_rbsp*/
 	case GF_HEVC_NALU_SLICE_TRAIL_N:
@@ -3661,9 +3967,14 @@
 	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_N:
 	case GF_HEVC_NALU_SLICE_RADL_R:
+	case GF_HEVC_NALU_SLICE_RASL_N:
 	case GF_HEVC_NALU_SLICE_RASL_R:
 		slice = 1;
+		//fixme with latest SHVC syntax
+		if (*layer_id) return 0;
+
 		/* slice - read the info and compare.*/
 		ret = hevc_parse_slice_segment(bs, hevc, &n_state);
 		if (ret<0) return ret;
@@ -3698,6 +4009,156 @@
 	return ret;
 }
 
+static u8 hevc_get_sar_idx(u32 w, u32 h)
+{
+	u32 i;
+	for (i=0; i<14; i++) {
+		if ((avc_sar[i].w==w) && (avc_sar[i].h==h)) return i;
+	}
+	return 0xFF;
+}
+
+GF_Err gf_media_hevc_change_par(GF_HEVCConfig *hvcc, s32 ar_n, s32 ar_d)
+{
+	GF_BitStream *orig, *mod;
+	HEVCState hevc;
+	u32 i, bit_offset, flag, nal_hdr_size;
+	s32 idx;
+	GF_HEVCParamArray *spss;
+	GF_AVCConfigSlot *slc;
+	orig = NULL;
+
+	memset(&hevc, 0, sizeof(HEVCState));
+	hevc.sps_active_idx = -1;
+
+	nal_hdr_size=2;
+
+	i=0;
+	spss = NULL;
+	while ((spss = (GF_HEVCParamArray *)gf_list_enum(hvcc->param_array, &i))) {
+		if (spss->type==GF_HEVC_NALU_SEQ_PARAM) 
+			break;
+		spss = NULL;
+	}
+	if (!spss) return GF_NON_COMPLIANT_BITSTREAM;
+
+	i=0;
+	while ((slc = (GF_AVCConfigSlot *)gf_list_enum(spss->nalus, &i))) {
+		char *no_emulation_buf = NULL;
+		u32 no_emulation_buf_size = 0, emulation_bytes = 0;
+		idx = gf_media_hevc_read_sps_ex(slc->data, slc->size, &hevc, &bit_offset);
+		if (idx<0) {
+			if ( orig )
+				gf_bs_del(orig);
+			continue;
+		}
+
+		/*SPS still contains emulation bytes*/
+		no_emulation_buf = gf_malloc((slc->size - nal_hdr_size)*sizeof(char));
+		no_emulation_buf_size = avc_remove_emulation_bytes(slc->data + nal_hdr_size, no_emulation_buf, slc->size - nal_hdr_size);
+
+		orig = gf_bs_new(no_emulation_buf, no_emulation_buf_size, GF_BITSTREAM_READ);
+		gf_bs_read_data(orig, no_emulation_buf, no_emulation_buf_size);
+		gf_bs_seek(orig, 0);
+		mod = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		/*copy over till vui flag*/
+		assert(bit_offset >= 8 * nal_hdr_size);
+		while (bit_offset - 8 * nal_hdr_size/*bit_offset doesn't take care of the first two byte (NALU hdr)*/) {
+			flag = gf_bs_read_int(orig, 1);
+			gf_bs_write_int(mod, flag, 1);
+			bit_offset--;
+		}
+		/*check VUI*/
+		flag = gf_bs_read_int(orig, 1);
+		gf_bs_write_int(mod, 1, 1); /*vui_parameters_present_flag*/
+		if (flag) {
+			/*aspect_ratio_info_present_flag*/
+			if (gf_bs_read_int(orig, 1)) {
+				s32 aspect_ratio_idc = gf_bs_read_int(orig, 8);
+				if (aspect_ratio_idc == 255) {
+					gf_bs_read_int(orig, 16); /*AR num*/
+					gf_bs_read_int(orig, 16); /*AR den*/
+				}
+			}
+		}
+		if ((ar_d<0) || (ar_n<0)) {
+			/*no AR signaled*/
+			gf_bs_write_int(mod, 0, 1);
+		} else {
+			u32 sarx;
+			gf_bs_write_int(mod, 1, 1);
+			sarx = hevc_get_sar_idx((u32) ar_n, (u32) ar_d);
+			gf_bs_write_int(mod, sarx, 8);
+			if (sarx==0xFF) {
+				gf_bs_write_int(mod, ar_n, 16);
+				gf_bs_write_int(mod, ar_d, 16);
+			}
+		}
+		/*no VUI in input bitstream, set all vui flags to 0*/
+		if (!flag) {
+			gf_bs_write_int(mod, 0, 1);		/*overscan_info_present_flag */
+			gf_bs_write_int(mod, 0, 1);		/*video_signal_type_present_flag */
+			gf_bs_write_int(mod, 0, 1);		/*chroma_location_info_present_flag */
+
+			gf_bs_write_int(mod, 0, 1); /*neutra_chroma_indication_flag */;
+			gf_bs_write_int(mod, 0, 1); /*field_seq_flag */;
+			gf_bs_write_int(mod, 0, 1); /*frame_field_info_present_flag*/;
+			gf_bs_write_int(mod, 0, 1); /*default_display_window_flag*/;
+
+			gf_bs_write_int(mod, 0, 1);		/*timing_info_present_flag*/
+			gf_bs_write_int(mod, 0, 1);		/*bitstream_restriction*/
+		}
+
+		/*finally copy over remaining*/
+		while (gf_bs_bits_available(orig)) {
+			flag = gf_bs_read_int(orig, 1);
+			gf_bs_write_int(mod, flag, 1);
+		}
+		gf_bs_del(orig);
+		orig = NULL;
+		gf_free(no_emulation_buf);
+
+		/*set anti-emulation*/
+		gf_bs_get_content(mod, (char **) &no_emulation_buf, &no_emulation_buf_size);
+		emulation_bytes = avc_emulation_bytes_add_count(no_emulation_buf, no_emulation_buf_size);
+		if (no_emulation_buf_size + emulation_bytes + nal_hdr_size > slc->size)
+			slc->data = (char*)gf_realloc(slc->data, no_emulation_buf_size + emulation_bytes + nal_hdr_size);
+
+		slc->size = avc_add_emulation_bytes(no_emulation_buf, slc->data + nal_hdr_size, no_emulation_buf_size) + nal_hdr_size;
+
+		gf_bs_del(mod);
+		gf_free(no_emulation_buf);
+	}
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_hevc_get_sps_info_with_state(HEVCState *hevc, char *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d)
+{
+	s32 idx;
+	idx = gf_media_hevc_read_sps(sps_data, sps_size, hevc);
+	if (idx<0) {
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	if (sps_id) *sps_id = idx;
+
+	if (width) *width = hevc->sps[idx].width;
+	if (height) *height = hevc->sps[idx].height;
+	if (par_n) *par_n = hevc->sps[idx].aspect_ratio_info_present_flag ? hevc->sps[idx].sar_width : (u32) -1;
+	if (par_d) *par_d = hevc->sps[idx].aspect_ratio_info_present_flag ? hevc->sps[idx].sar_height : (u32) -1;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_hevc_get_sps_info(char *sps_data, u32 sps_size, u32 *sps_id, u32 *width, u32 *height, s32 *par_n, s32 *par_d)
+{
+	HEVCState hevc;
+	memset(&hevc, 0, sizeof(HEVCState));
+	hevc.sps_active_idx = -1;
+	return gf_hevc_get_sps_info_with_state(&hevc, sps_data, sps_size, sps_id, width, height, par_n, par_d);
+}
+
 #endif //GPAC_DISABLE_HEVC
 
 static u32 AC3_FindSyncCode(u8 *buf, u32 buflen)

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/dash_client.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/dash_client.c Changed

@@ -1,4140 +1,5104 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
-*			Authors: Jean Le Feuvre, Cyril Concolato
-*			Copyright (c) Telecom ParisTech 2010-
-*					All rights reserved
-*
-*  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
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*
-*  GPAC is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU Lesser General Public License for more details.
-*
-*  You should have received a copy of the GNU Lesser General Public
-*  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*/
-
-#include <gpac/thread.h>
-#include <gpac/network.h>
-#include <gpac/dash.h>
-#include <gpac/internal/mpd.h>
-#include <gpac/internal/m3u8.h>
-#include <gpac/internal/isomedia_dev.h>
-#include <string.h>
-
-#ifdef _WIN32_WCE
-#include <winbase.h>
-#else
-#include <time.h>
-#endif
-
-#ifndef GPAC_DISABLE_DASH_CLIENT
-
-/*set to 1 if you want MPD to use SegmentTemplate if possible instead of SegmentList*/
-#define M3U8_TO_MPD_USE_TEMPLATE	0
-
-/*uncomment to only play the first representation set*/
-//#define DEBUG_FIRST_SET_ONLY
-
-typedef enum {
-	GF_DASH_STATE_STOPPED = 0,
-	/*period setup and playback chain creation*/
-	GF_DASH_STATE_SETUP,
-	/*request to start playback chain*/
-	GF_DASH_STATE_CONNECTING,
-	GF_DASH_STATE_RUNNING,
-} GF_DASH_STATE;
-
-
-typedef struct __dash_group GF_DASH_Group;
-
-struct __dash_client
-{
-	GF_DASHFileIO *dash_io;
-
-	/*interface to mpd parser - get rid of this and use the DASHIO instead ?*/
-	GF_FileDownload getter;
-
-	char *base_url;
-
-	u32 max_cache_duration;
-	u32 auto_switch_count;
-	Bool keep_files, disable_switching, allow_local_mpd_update, enable_buffering;
-	Bool is_m3u8;
-
-	u64 mpd_fetch_time;
-	GF_DASHInitialSelectionMode first_select_mode;
-
-	/* MPD downloader*/
-	GF_DASHFileIOSession mpd_dnload;
-	/* MPD */
-	GF_MPD *mpd;
-	/* 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];
-	/*mime type of media segments (m3u8)*/
-	char *mimeTypeForM3U8Segments;
-
-	/* active period in MPD (only one currently supported) */
-	u32 active_period_index;
-	u32 request_period_switch;
-
-	u64 start_time_in_active_period;
-
-	Bool ignore_mpd_duration;
-	u32 initial_time_shift_percent;
-
-	/*list of groups in the active period*/
-	GF_List *groups;
-
-	/*Main Thread handling segment downloads and MPD/M3U8 update*/
-	GF_Thread *dash_thread;
-	/*mutex for group->cache file name access and MPD update*/
-	GF_Mutex *dl_mutex;
-
-	/* one of the above state*/
-	GF_DASH_STATE dash_state;
-	Bool mpd_stop_request;
-	Bool in_period_setup;
-
-	u32 nb_buffering;
-
-	/* TODO - handle playback status for SPEED/SEEK through SIDX */
-	Double playback_start_range;
-	Double start_range_in_segment_at_next_period;
-};
-
-static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group);
-
-
-typedef struct
-{
-	char *cache;
-	char *url;
-	u64 start_range, end_range;
-	/*representation index in adaptation_set->representations*/
-	u32 representation_index;
-	Bool do_not_delete;
-	u32 duration;
-} segment_cache_entry;
-
-typedef enum
-{
-	/*set if group cannot be selected (wrong MPD)*/
-	GF_DASH_GROUP_NOT_SELECTABLE = 0,
-	GF_DASH_GROUP_NOT_SELECTED,
-	GF_DASH_GROUP_SELECTED,
-} GF_DASHGroupSelection;
-
-/*this structure Group is the implementation of the adaptationSet element of the MPD.*/
-struct __dash_group
-{
-	GF_DashClient *dash;
-
-	/*pointer to adaptation set*/
-	GF_MPD_AdaptationSet *adaptation_set;
-	/*pointer to active period*/
-	GF_MPD_Period *period;
-
-	/*active representation index in adaptation_set->representations*/
-	u32 active_rep_index;
-
-	u32 prev_active_rep_index;
-
-	Bool timeline_setup;
-
-	GF_DASHGroupSelection selection;
-
-	/*may be mpd@time_shift_buffer_depth or rep@time_shift_buffer_depth*/
-	u32 time_shift_buffer_depth;
-
-	Bool bitstream_switching, dont_delete_first_segment;
-
-	Bool done;
-	Bool force_switch_bandwidth, min_bandwidth_selected;
-	u32 nb_bw_check;
-	u32 active_bitrate, max_bitrate, min_bitrate;
-
-	u32 nb_segments_in_rep;
-	Double segment_duration;
-
-	/*for debug purpose of templates only*/
-	u32 start_number;
-
-	Bool was_segment_base;
-	/*local file playback, do not delete them*/
-	Bool local_files;
-	/*next segment to download for this group*/
-	u32 download_segment_index;
-	/*number of segments pruged since the start of the period*/
-	u32 nb_segments_purged;
-
-	u32 nb_retry_on_last_segment;
-	u32 start_number_at_last_ast;
-	u64 ast_at_init;
-
-	/*next file (cached) to delete at next GF_NET_SERVICE_QUERY_NEXT for this group*/
-	char * urlToDeleteNext;
-	volatile u32 max_cached_segments, nb_cached_segments, max_buffer_segments;
-	segment_cache_entry *cached;
-
-	GF_DASHFileIOSession segment_download;
-
-	const char *segment_local_url;
-	/*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;
-
-	u32 nb_segments_done;
-	u32 last_segment_time;
-
-	Bool segment_must_be_streamed;
-	Bool broken_timing;
-	Bool buffering;
-	Bool maybe_end_of_stream;
-	u32 cache_duration;
-	u32 time_at_first_reload_required;
-	
-	u32 force_representation_idx_plus_one;
-
-	Bool force_segment_switch;
-	Bool is_downloading;
-
-	/*set when switching segment, indicates the current downloaded segment duration*/
-	u64 current_downloaded_segment_duration;
-
-	char *service_mime;
-
-	void *udta;
-};
-
-static const char *gf_dash_get_mime_type(GF_MPD_SubRepresentation *subrep, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set)
-{
-	if (subrep && subrep->mime_type) return subrep->mime_type;
-	if (rep && rep->mime_type) return rep->mime_type;
-	if (set && set->mime_type) return set->mime_type;
-	return NULL;
-}
-
-static void gf_dash_buffer_off(GF_DASH_Group *group, GF_DashClient *dash) 
-{
-	if (!dash->enable_buffering) return;
-	if (group->buffering) { 
-		assert(dash->nb_buffering); 
-		dash->nb_buffering--;	
-		if (!dash->nb_buffering) {
-			dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_BUFFER_DONE, 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, GF_DashClient *dash) 
-{
-	if (!dash->enable_buffering) return;
-	if ((group->selection==GF_DASH_GROUP_SELECTED) && !group->buffering) {
-		if (!dash->nb_buffering) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Starting session buffering\n"));
-		}
-		dash->nb_buffering++; 
-		group->buffering = 1;
-	}
-}
-
-GF_EXPORT
-void gf_dash_get_buffer_info_buffering(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered)
-{
-	if (dash->nb_buffering) {
-		u32 i, j, nb_groups;
-		*total_buffer = 0;
-		*media_buffered = 0;
-		nb_groups = gf_list_count(dash->groups);
-		for (i=0; i<nb_groups; i++) {
-			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-			if (group->buffering) {
-				u32 buffer = 0;
-				*total_buffer += (u32) (group->segment_duration*group->max_buffer_segments*1000);
-				for (j=0; j<group->nb_cached_segments; j++) {
-					buffer += group->cached[j].duration;
-				}
-				*media_buffered += buffer;
-			}
-		}
-		if (*media_buffered > *total_buffer) *media_buffered  = *total_buffer;
-		*total_buffer /= dash->nb_buffering;
-		*media_buffered /= dash->nb_buffering;
-	}
-}
-
-static void gf_dash_update_buffering(GF_DASH_Group *group, GF_DashClient *dash)
-{
-	if (dash->nb_buffering) {
-		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_BUFFERING, GF_OK);
-
-		if (group->cached[0].duration && group->nb_cached_segments>=group->max_buffer_segments) 
-			gf_dash_buffer_off(group, dash);
-	}
-}
-
-
-GF_EXPORT
-Bool gf_dash_check_mpd_root_type(const char *local_url)
-{
-	if (local_url) {
-		char *rtype = gf_xml_get_root_type(local_url, NULL);
-		if (rtype) {
-			Bool handled = 0;
-			if (!strcmp(rtype, "MPD")) {
-				handled = 1;
-			}
-			gf_free(rtype);
-			return handled;
-		}
-	}
-	return 0;
-}
-
-static void gf_dash_group_timeline_setup(GF_MPD *mpd, GF_DASH_Group *group, u64 fetch_time)
-{
-	GF_MPD_SegmentTimeline *timeline = NULL;
-	GF_MPD_Representation *rep = NULL;
-	u32 shift, timescale;
-	u64 current_time;
-	u32 ast_diff, start_number;
-	
-	if (mpd->type==GF_MPD_TYPE_STATIC) 
-		return;
-	
-	/*M3U8 does not use NTP sync */
-	if (group->dash->is_m3u8)
-		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;
-	
-	ast_diff = (u32) (mpd->availabilityStartTime - group->dash->mpd->availabilityStartTime);
-	if (!fetch_time) fetch_time = group->dash->mpd_fetch_time;
-	current_time = fetch_time;
-
-	if (current_time < mpd->availabilityStartTime) {
-#ifndef _WIN32_WCE
-		time_t gtime;
-		struct tm t1, t2;
-		gtime = current_time;
-		t1 = * gmtime(&gtime);
-		gtime = mpd->availabilityStartTime / 1000;
-		t2 = * gmtime(&gtime);
-		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!\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
-		));		
-#endif
-		current_time = 0;
-		group->broken_timing = 1;
-		return;
-	}
-	else current_time -= mpd->availabilityStartTime;	
-
-	if (current_time < group->period->start) current_time = 0;
-	else current_time -= group->period->start;
-
-#if 0
-	{
-		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;
-	}
-#endif
-
-	if ( ((s32) mpd->time_shift_buffer_depth>=0)) {
-		shift = mpd->time_shift_buffer_depth;
-		shift *= group->dash->initial_time_shift_percent;
-		shift /= 100;
-
-		if (current_time < shift) current_time = 0;
-		else current_time -= shift;
-	}
-
-	timeline = NULL;
-	timescale=1;
-	start_number=0;
-	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-
-	if (group->period->segment_list) {
-		if (group->period->segment_list->segment_timeline) timeline = group->period->segment_list->segment_timeline;
-		if (group->period->segment_list->timescale) timescale = group->period->segment_list->timescale;
-		if (group->period->segment_list->start_number) start_number = group->period->segment_list->start_number;
-	}
-	if (group->adaptation_set->segment_list) {
-		if (group->adaptation_set->segment_list->segment_timeline) timeline = group->adaptation_set->segment_list->segment_timeline;
-		if (group->adaptation_set->segment_list->timescale) timescale = group->adaptation_set->segment_list->timescale;
-		if (group->adaptation_set->segment_list->start_number) start_number = group->adaptation_set->segment_list->start_number;
-	}
-	if (rep->segment_list) {
-		if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
-		if (rep->segment_list->timescale) timescale = rep->segment_list->timescale;
-		if (rep->segment_list->start_number) start_number = rep->segment_list->start_number;
-	}
-
-	if (group->period->segment_template) {
-		if (group->period->segment_template->segment_timeline) timeline = group->period->segment_template->segment_timeline;
-		if (group->period->segment_template->timescale) timescale = group->period->segment_template->timescale;
-		if (group->period->segment_template->start_number) start_number = group->period->segment_template->start_number;
-	}
-	if (group->adaptation_set->segment_template) {
-		if (group->adaptation_set->segment_template->segment_timeline) timeline = group->adaptation_set->segment_template->segment_timeline;
-		if (group->adaptation_set->segment_template->timescale) timescale = group->adaptation_set->segment_template->timescale;
-		if (group->adaptation_set->segment_template->start_number) start_number = group->adaptation_set->segment_template->start_number;
-	}
-	if (rep->segment_template) {
-		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
-		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
-		if (rep->segment_template->start_number) start_number = rep->segment_template->start_number;
-	}
-
-	if (timeline) {
-		u64 start_segtime = 0;
-		u64 segtime = 0;
-		u32 i, seg_idx = 0;
-		current_time /= 1000;
-		current_time *= timescale;
-		for (i=0; i<gf_list_count(timeline->entries); i++) {
-			u32 repeat;
-			GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, i);
-			if (!segtime) start_segtime = segtime = ent->start_time;
-
-			repeat = 1+ent->repeat_count;
-			while (repeat) {
-				if ((current_time >= segtime) && (current_time < segtime + ent->duration)) {
-					group->download_segment_index = seg_idx;
-					group->nb_segments_in_rep = seg_idx + 10;
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Found segment %d for current time "LLU" is in SegmentTimeline ["LLU"-"LLU"] - cannot estimate current startNumber, default to 0 ...\n", current_time, segtime, segtime + ent->duration));
-					return;
-				}
-				segtime += ent->duration;
-				repeat--;
-				seg_idx++;
-			}
-		}
-		//NOT FOUND !!
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] current time "LLU" is NOT in SegmentTimeline ["LLU"-"LLU"] - cannot estimate current startNumber, default to 0 ...\n", current_time, start_segtime, segtime));
-		group->download_segment_index = 0;
-		group->nb_segments_in_rep = 10;
-		group->broken_timing = 1;
-		return;
-	}
-
-	if (group->segment_duration) {
-		u32 nb_segs_in_update = (u32) (mpd->minimum_update_period / (1000*group->segment_duration) );
-		Double nb_seg = (Double) current_time;
-		nb_seg /= 1000;
-		nb_seg /= group->segment_duration;
-		shift = (u32) nb_seg;
-		if (!group->start_number_at_last_ast) {
-			group->download_segment_index = shift;
-			group->start_number_at_last_ast = start_number;
-			group->ast_at_init = mpd->availabilityStartTime;
-
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At current time %d ms: Initializing Timeline: startNumber=%d segmentNumber=%d segmentDuration=%g\n", current_time, start_number, shift, group->segment_duration));
-		} else {
-			group->download_segment_index += start_number;
-			if (group->download_segment_index > group->start_number_at_last_ast) {
-				group->download_segment_index -= group->start_number_at_last_ast;
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At current time %d ms: Updating Timeline: startNumber=%d segmentNumber=%d downloadSegmentIndex=%d segmentDuration=%g AST_diff=%d\n", current_time, start_number, shift, group->download_segment_index, group->segment_duration, ast_diff));
-			} else {
-				group->download_segment_index = shift;
-				group->ast_at_init = mpd->availabilityStartTime;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] At current time %d ms: Re-Initializing Timeline: startNumber=%d segmentNumber=%d segmentDuration=%g AST_diff=%d\n", current_time, start_number, shift, group->segment_duration, ast_diff));
-			}
-			group->start_number_at_last_ast = start_number;
-
-
-		}
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] UTC time indicates first segment in period is %d, MPD indicates %d segments are available ...\n", group->download_segment_index , group->nb_segments_in_rep));
-
-		if (group->nb_segments_in_rep && (group->download_segment_index + nb_segs_in_update > group->nb_segments_in_rep)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Not enough segments (%d needed vs %d indicated) to reach period endTime indicated in MPD - ignoring MPD duration\n", nb_segs_in_update, group->nb_segments_in_rep - group->download_segment_index ));
-			group->nb_segments_in_rep = shift + nb_segs_in_update;
-			group->dash->ignore_mpd_duration = 1;
-		}
-	} else {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment duration unknown - cannot estimate current startNumber\n"));
-	}
-}
-//old code
-#if 0
-static void gf_dash_group_check_switch(GF_DASHFileIO *dash_io, GF_DASH_Group *group, Bool download_active)
-{
-	u32 download_rate;
-
-	if (group->dash->disable_switching) return;
-
-/*	if (group->min_bandwidth_selected && group->buffering)
-		return;
-*/
-	download_rate = dash_io->get_bytes_per_sec(dash_io, group->segment_download);
-	if (!download_rate) return;
-
-	download_rate *= 8;
-	if (download_rate<group->min_bitrate) group->min_bitrate = download_rate;
-	if (download_rate>group->max_bitrate) group->max_bitrate = download_rate;
-
-	if (download_rate && (download_rate < group->active_bitrate)) {
-		u32 set_idx = gf_list_find(group->period->adaptation_sets, group->adaptation_set)+1;
-		group->nb_bw_check ++;
-		if (group->min_bandwidth_selected) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is %d kbps - no lower bitrate available ...\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
-		} else if (group->nb_bw_check>2) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is %d kbps - switching\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
-			group->force_switch_bandwidth = 1;
-			if (download_active) 
-				if (group->segment_download) dash_io->abort(dash_io, group->segment_download);
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but media bitrate is %d kbps\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
-		}
-	} else {
-		group->nb_bw_check = 0;
-	}
-}
-#endif
-
-
-
-/*!
-* Returns true if given mime type is a MPD file
-* \param mime the mime-type to check
-* \return true if mime-type if MPD-OK
-*/
-static Bool gf_dash_is_dash_mime(const char * mime) {
-	u32 i;
-	if (!mime)
-		return 0;
-	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i] ; i++){
-		if ( !stricmp(mime, GF_DASH_MPD_MIME_TYPES[i]))
-			return 1;
-	}
-	return 0;
-}
-
-/*!
-* Returns true if mime type is an M3U8 mime-type
-* \param mime The mime-type to check
-* \return true if mime-type is OK for M3U8
-*/
-static Bool gf_dash_is_m3u8_mime(const char *url, const char * mime) {
-	u32 i;
-	if (!url || !mime)
-		return 0;
-	if (strstr(url, ".mpd") || strstr(url, ".MPD"))
-		return 0;
-
-	for (i = 0 ; GF_DASH_M3U8_MIME_TYPES[i] ; i++) {
-		if ( !stricmp(mime, GF_DASH_M3U8_MIME_TYPES[i]))
-			return 1;
-	}
-	return 0;
-}
-
-
-/*!
-* 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()
-*/
-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)
-{
-	s32 group_idx = -1;
-	Bool had_sess = 0;
-	Bool retry = 1;
-	GF_Err e;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading %s starting at UTC "LLU" ms\n", url, gf_net_get_utc() ));
-
-	if (group) {
-		group_idx = gf_list_find(group->dash->groups, group);
-	}
-
-	if (! *sess) {
-		*sess = dash_io->create(dash_io, persistent_mode ? 1 : 0, url, group_idx);
-		if (!(*sess)){
-			assert(0);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot try to download %s... OUT of memory ?\n", url));
-			return GF_OUT_OF_MEM;
-		}
-	} else {
-		had_sess = 1;
-		if (persistent_mode!=2) {
-			e = dash_io->setup_from_url(dash_io, *sess, url, group_idx);
-			if (e) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup session for url %s: %s\n", url, gf_error_to_string(e) ));
-				return e;
-			}
-		}
-	}
-	if (group)
-		group->is_downloading = 1;
-
-retry:
-
-	if (end_range) {
-		e = dash_io->set_range(dash_io, *sess, start_range, end_range, (persistent_mode==2) ? 0 : 1);
-		if (e) {
-			if (had_sess) {
-				dash_io->del(dash_io, *sess);
-				*sess = NULL;
-				return gf_dash_download_resource(dash_io, sess, url, start_range, end_range, persistent_mode ? 1 : 0, group);
-			}
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot setup byte-range download for %s: %s\n", url, gf_error_to_string(e) ));
-			if (group)
-				group->is_downloading = 0;
-			return e;
-		}
-	}
-		assert(*sess);
-
-	/*issue HTTP GET for headers only*/
-	e = dash_io->init(dash_io, *sess);
-
-	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);
-			if (mime && !group->service_mime) {
-				group->service_mime = gf_strdup(mime);
-			} 
-			/*we allow servers to give us broken mim types for the representation served ...*/
-#if 0
-			else if (mime && stricmp(group->service_mime, mime)) {
-				GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-				if (! gf_dash_get_mime_type(NULL, rep, group->adaptation_set) ) 
-					rep->mime_type = gf_strdup(mime);
-				rep->disabled = 1;
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Disabling representation since mime does not match: expected %s, but had %s for %s!\n", group->service_mime, mime, url));
-				group->force_switch_bandwidth = 1;
-				if (group->segment_download) dash_io->abort(dash_io, group->segment_download);
-				group->is_downloading = 0;
-				return GF_OK;
-			}
-#endif
-		}
-
-		/*file cannot be cached on disk !*/
-		if (group) {
-			if (dash_io->get_cache_name(dash_io, group->segment_download) == NULL) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Segment %s cannot be cached on disk, will use direct streaming\n", url));
-				group->segment_must_be_streamed = 1;
-				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);
-	}
-	switch (e) {
-	case GF_IP_CONNECTION_FAILURE:
-	case GF_IP_NETWORK_FAILURE:
-	{
-		dash_io->del(dash_io, *sess);
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] failed to download, retrying once with %s...\n", url));
-		*sess = dash_io->create(dash_io, 0, url, group_idx);
-		if (! (*sess)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retry to download %s... OUT of memory ?\n", url));
-			if (group)
-				group->is_downloading = 0;
-			return GF_OUT_OF_MEM;
-		}
-
-		if (retry) {
-			retry = 0;
-			goto retry;
-		}
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] two consecutive failures, aborting the download %s.\n", url));
-		break;
-	}
-	case GF_OK:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Download %s complete at UTC "LLU" ms\n", url, gf_net_get_utc() ));
-		break;
-	default:
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] FAILED to download %s = %s...\n", url, gf_error_to_string(e)));
-		break;
-	}
-	if (group)
-		group->is_downloading = 0;
-	return e;
-}
-
-static void gf_dash_get_timeline_duration(GF_MPD_SegmentTimeline *timeline, u32 *nb_segments, Double *max_seg_duration)
-{
-	u32 i, count;
-
-	*nb_segments = 0;
-	if (max_seg_duration) *max_seg_duration = 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 (max_seg_duration && (*max_seg_duration < ent->duration)) *max_seg_duration = ent->duration;
-	}
-}
-
-static void gf_dash_get_segment_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, GF_MPD *mpd, u32 *nb_segments, Double *max_seg_duration)
-{
-	Double mediaDuration;
-	Bool single_segment = 0;
-	u32 timescale;
-	u64 duration;
-	GF_MPD_SegmentTimeline *timeline = NULL;
-	*nb_segments = timescale = 0;
-	duration = 0;
-
-	if (rep->segment_list || set->segment_list || period->segment_list) {
-		GF_List *segments = NULL;
-		if (period->segment_list) {
-			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_URLs) segments = period->segment_list->segment_URLs;
-			if (period->segment_list->segment_timeline) timeline = period->segment_list->segment_timeline;
-		}
-		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_URLs) segments = set->segment_list->segment_URLs;
-			if (set->segment_list->segment_timeline) timeline = set->segment_list->segment_timeline;
-		}
-		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_URLs) segments = rep->segment_list->segment_URLs;
-			if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
-		}
-		if (! timescale) timescale=1;
-
-		if (timeline) {
-			gf_dash_get_timeline_duration(timeline, nb_segments, max_seg_duration);
-			if (max_seg_duration) *max_seg_duration /= timescale;
-		} else {
-			if (segments) 
-				*nb_segments = gf_list_count(segments);
-			if (max_seg_duration) {
-				*max_seg_duration = (Double) duration;
-				*max_seg_duration /= timescale;
-			}
-		}
-		return;
-	}
-
-	/*single segment*/
-	if (rep->segment_base || set->segment_base || period->segment_base) {
-		*max_seg_duration = mpd->media_presentation_duration;
-		*max_seg_duration /= 1000;
-		*nb_segments = 1;
-		return;
-	}
-
-	single_segment = 1;
-	if (period->segment_template) {
-		single_segment = 0;
-		if (period->segment_template->duration) duration = period->segment_template->duration;
-		if (period->segment_template->timescale) timescale = period->segment_template->timescale;
-		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
-	}
-	if (set->segment_template) {
-		single_segment = 0;
-		if (set->segment_template->duration) duration = set->segment_template->duration;
-		if (set->segment_template->timescale) timescale = set->segment_template->timescale;
-		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
-	}
-	if (rep->segment_template) {
-		single_segment = 0;
-		if (rep->segment_template->duration) duration = rep->segment_template->duration;
-		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
-		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
-	}
-	if (!timescale) timescale=1;
-
-	/*if no SegmentXXX is found, this is a single segment representation (onDemand profile)*/
-	if (single_segment) {
-		*max_seg_duration = mpd->media_presentation_duration;
-		*max_seg_duration /= 1000;
-		*nb_segments = 1;
-		return;
-	}
-
-	if (timeline) {
-		gf_dash_get_timeline_duration(timeline, nb_segments, max_seg_duration);
-		if (max_seg_duration) *max_seg_duration /= timescale;
-	} else {
-		if (max_seg_duration) {
-			*max_seg_duration = (Double) duration;
-			*max_seg_duration /= timescale;
-		}
-		mediaDuration = period->duration;
-		if (!mediaDuration) mediaDuration = mpd->media_presentation_duration;
-		if (mediaDuration && duration) {
-			Double nb_seg = (Double) mediaDuration;
-			/*duration is given in ms*/
-			nb_seg /= 1000;
-			nb_seg *= timescale;
-			nb_seg /= duration;
-			*nb_segments = (u32) nb_seg;
-			if (*nb_segments < nb_seg) (*nb_segments)++;
-		}
-	}
-}
-
-static u64 gf_dash_segment_timeline_start(GF_MPD_SegmentTimeline *timeline, u32 segment_index, u64 *segment_duration)
-{
-	u64 start_time = 0;
-	u32 i, idx, k;
-	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;		
-		for (k=0; k<ent->repeat_count+1; k++) {
-			if (idx==segment_index) {
-				if (segment_duration) 
-					*segment_duration = ent->duration;
-				return start_time;
-			}
-			idx ++;
-			start_time += ent->duration;
-		}
-	}
-	return start_time;
-}
-
-static Double gf_dash_get_segment_start_time(GF_DASH_Group *group, Double *segment_duration)
-{
-	GF_MPD_Representation *rep;
-	GF_MPD_AdaptationSet *set;
-	GF_MPD_Period *period;
-	Double start_time;
-	u32 timescale, segment_index;
-	u64 duration;
-	GF_MPD_SegmentTimeline *timeline = NULL;
-	timescale = 0;
-	duration = 0;
-	start_time = 0;
-
-	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-	set = group->adaptation_set;
-	period = group->period;
-	segment_index = 0;
-	if (group->download_segment_index >= group->nb_cached_segments) {
-//		segment_index = group->download_segment_index - group->nb_cached_segments;
-		segment_index = group->download_segment_index;
-	}
-
-	/*single segment: return nothing*/
-	if (rep->segment_base || set->segment_base || period->segment_base) {
-		return start_time;
-	}
-	if (rep->segment_list || set->segment_list || period->segment_list) {
-		if (period->segment_list) {
-			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 (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 (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 (! timescale) timescale=1;
-
-		if (timeline) {
-			start_time = (Double) gf_dash_segment_timeline_start(timeline, segment_index, &duration);
-		} else {
-			start_time = segment_index * (Double) duration;
-		}
-		start_time /= timescale;
-		if (segment_duration) {
-			*segment_duration = (Double) duration; 
-			*segment_duration /= timescale; 
-		}
-		return start_time;
-	}
-
-	if (period->segment_template) {
-		if (period->segment_template->duration) duration = period->segment_template->duration;
-		if (period->segment_template->timescale) timescale = period->segment_template->timescale;
-		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
-		if (period->segment_template->start_number) group->start_number = period->segment_template->start_number;
-	}
-	if (set->segment_template) {
-		if (set->segment_template->duration) duration = set->segment_template->duration;
-		if (set->segment_template->timescale) timescale = set->segment_template->timescale;
-		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
-		if (set->segment_template->start_number) group->start_number = set->segment_template->start_number;
-	}
-	if (rep->segment_template) {
-		if (rep->segment_template->duration) duration = rep->segment_template->duration;
-		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
-		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
-		if (rep->segment_template->start_number) group->start_number = rep->segment_template->start_number;
-	}
-	if (!timescale) timescale=1;
-
-	if (timeline) {
-		start_time = (Double) gf_dash_segment_timeline_start(timeline, segment_index, &duration);
-	} else {
-		start_time = segment_index * (Double) duration;
-	}
-	start_time /= timescale;
-	if (segment_duration) {
-		*segment_duration = (Double) duration; 
-		*segment_duration /= timescale; 
-	}
-
-	return start_time;
-}
-
-u64 gf_dash_get_segment_availability_start_time(GF_MPD *mpd, GF_DASH_Group *group, u32 segment_index, u32 *seg_dur_ms)
-{
-	Double seg_ast, seg_dur;
-	seg_ast = gf_dash_get_segment_start_time(group, &seg_dur);
-	if (seg_dur_ms) *seg_dur_ms = (u32) (seg_dur * 1000);
-
-	seg_ast += seg_dur;
-	seg_ast *= 1000;
-	seg_ast += group->period->start + group->ast_at_init;
-	return (u64) seg_ast;
-}
-
-static void gf_dash_resolve_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, u64 *out_duration, u32 *out_timescale, u64 *out_pts_offset, GF_MPD_SegmentTimeline **out_segment_timeline)
-{
-	u32 timescale = 0;
-	u64 pts_offset = 0;
-	GF_MPD_SegmentTimeline *segment_timeline;
-	GF_MPD_MultipleSegmentBase *mbase_rep, *mbase_set, *mbase_period;
-
-	if (out_segment_timeline) *out_segment_timeline = NULL;
-	if (out_pts_offset) *out_pts_offset = 0;
-
-	/*single media segment - duration is not known unless indicated in period*/
-	if (rep->segment_base || set->segment_base || period->segment_base) {
-		*out_duration = period ? period->duration : 0;
-		timescale = 0;
-		if (rep->segment_base && rep->segment_base->presentation_time_offset) pts_offset = rep->segment_base->presentation_time_offset;
-		if (rep->segment_base && rep->segment_base->timescale) timescale = rep->segment_base->timescale;
-		if (!pts_offset && set->segment_base && set->segment_base->presentation_time_offset) pts_offset = set->segment_base->presentation_time_offset;
-		if (!timescale && set->segment_base && set->segment_base->timescale) timescale = set->segment_base->timescale;
-		if (!pts_offset && period->segment_base && period->segment_base->presentation_time_offset) pts_offset = period->segment_base->presentation_time_offset;
-		if (!timescale && period->segment_base && period->segment_base->timescale) timescale = period->segment_base->timescale;
-
-		if (out_pts_offset) *out_pts_offset = pts_offset;
-		*out_timescale = timescale ? timescale : 1;
-		return;
-	}
-	/*we have a segment template list or template*/
-	mbase_rep = rep->segment_list ? (GF_MPD_MultipleSegmentBase *) rep->segment_list : (GF_MPD_MultipleSegmentBase *) rep->segment_template;
-	mbase_set = set->segment_list ? (GF_MPD_MultipleSegmentBase *)set->segment_list : (GF_MPD_MultipleSegmentBase *)set->segment_template;
-	mbase_period = period->segment_list ? (GF_MPD_MultipleSegmentBase *)period->segment_list : (GF_MPD_MultipleSegmentBase *)period->segment_template;
-
-	segment_timeline = NULL;
-	if (mbase_period) segment_timeline =  mbase_period->segment_timeline;
-	if (mbase_set && mbase_set->segment_timeline) segment_timeline =  mbase_set->segment_timeline;
-	if (mbase_rep && mbase_rep->segment_timeline) segment_timeline =  mbase_rep->segment_timeline;
-
-	timescale = mbase_rep ? mbase_rep->timescale : 0;
-	if (!timescale && mbase_set && mbase_set->timescale) timescale = mbase_set->timescale;
-	if (!timescale && mbase_period && mbase_period->timescale) timescale  = mbase_period->timescale;
-	if (!timescale) timescale = 1;
-	*out_timescale = timescale;
-
-	if (out_pts_offset) {
-		pts_offset = mbase_rep ? mbase_rep->presentation_time_offset : 0;
-		if (!pts_offset && mbase_set && mbase_set->presentation_time_offset) pts_offset = mbase_set->presentation_time_offset;
-		if (!pts_offset && mbase_period && mbase_period->presentation_time_offset) pts_offset = mbase_period->presentation_time_offset;
-		*out_pts_offset = pts_offset;
-	}
-
-	if (mbase_rep && mbase_rep->duration) *out_duration = mbase_rep->duration;
-	else if (mbase_set && mbase_set->duration) *out_duration = mbase_set->duration;
-	else if (mbase_period && mbase_period->duration) *out_duration = mbase_period->duration;
-
-	if (out_segment_timeline) *out_segment_timeline = segment_timeline;
-
-	/*for SegmentTimeline, just pick the first one as an indication (exact timeline solving is not done here)*/
-	if (segment_timeline) {
-		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(segment_timeline->entries, 0);
-		if (ent) *out_duration = ent->duration;
-	}
-	else if (rep->segment_list) {
-		GF_MPD_SegmentURL *url = gf_list_get(rep->segment_list->segment_URLs, 0);
-		if (url && url->duration) *out_duration = url->duration;
-	}
-}
-
-static GF_Err gf_dash_merge_segment_timeline(GF_MPD_SegmentList *old_list, GF_MPD_SegmentTemplate *old_template, GF_MPD_SegmentList *new_list, GF_MPD_SegmentTemplate *new_template, Double min_start_time)
-{
-	GF_MPD_SegmentTimeline *old_timeline, *new_timeline;
-	u32 idx;
-	u64 start_time;
-	GF_MPD_SegmentTimelineEntry *first_new_entry;
-
-	old_timeline = new_timeline = NULL;
-	if (old_list && old_list->segment_timeline) {
-		if (!new_list || !new_list->segment_timeline) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: segment timeline not present in new MPD segmentList\n"));
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		old_timeline = old_list->segment_timeline;
-		new_timeline = new_list->segment_timeline;
-	} else if (old_template && old_template->segment_timeline) {
-		if (!new_template || !new_template->segment_timeline) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: segment timeline not present in new MPD segmentTemplate\n"));
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		old_timeline = old_template->segment_timeline;
-		new_timeline = new_template->segment_timeline;
-	}
-	if (!old_timeline && !new_timeline) return GF_OK;
-
-	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) 
-			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)
-			break;
-
-		/*if entry overlaps first entry in new timeline, remove segments*/
-		while (start_time + ent->duration * (1 + ent->repeat_count) > first_new_entry->start_time) {
-			ent->repeat_count--;
-		}
-		/*we will insert the first entry in the new timeline, make sure we have a start*/
-		if (!idx && !ent->start_time) 
-			ent->start_time = start_time;
-
-		start_time += ent->duration * (1 + ent->repeat_count);
-
-		gf_list_insert(new_timeline->entries, ent, idx);
-		idx ++;
-		gf_list_rem(old_timeline->entries, 0);
-
-	}
-	return GF_OK;
-}
-
-static u32 gf_dash_purge_segment_timeline(GF_DASH_Group *group, Double min_start_time)
-{
-	u32 nb_removed, time_scale;
-	u64 start_time, min_start, duration;
-	GF_MPD_SegmentTimeline *timeline=NULL;
-	GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-
-	if (!min_start_time) return 0;
-	gf_dash_resolve_duration(rep, group->adaptation_set, group->period, &duration, &time_scale, NULL, &timeline);
-	if (!timeline) return 0;
-
-	min_start = (u64) (min_start_time*time_scale);
-	start_time = 0;
-	nb_removed=0;
-	while (1) {
-		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, 0);
-		if (!ent) break;
-		if (ent->start_time) start_time = ent->start_time;
-
-		while (start_time + ent->duration < min_start) {
-			if (! ent->repeat_count) break;
-			ent->repeat_count--;
-			nb_removed++;
-			start_time += ent->duration;
-		}
-		/*this entry is in our range, keep it and make sure it has a start time*/
-		if (start_time + ent->duration >= min_start) {
-			if (!ent->start_time) ent->start_time = start_time;
-			break;
-		}
-		start_time += ent->duration;
-		gf_list_rem(timeline->entries, 0);
-		gf_free(ent);
-		nb_removed++;
-	}
-	if (nb_removed) {
-		GF_MPD_SegmentList *segment_list;
-		/*update next download index*/
-		group->download_segment_index -= nb_removed;
-		/*clean segmentList*/
-		segment_list = NULL;
-		if (group->period && group->period->segment_list) segment_list = group->period->segment_list;
-		if (group->adaptation_set && group->adaptation_set->segment_list) segment_list = group->adaptation_set->segment_list;
-		if (rep && rep->segment_list) segment_list = rep->segment_list;
-
-		if (segment_list) {
-			u32 i = nb_removed;
-			while (i) {
-				GF_MPD_SegmentURL *seg_url = gf_list_get(segment_list->segment_URLs, 0);
-				gf_list_rem(segment_list->segment_URLs, 0);
-				gf_mpd_segment_url_free(seg_url);
-			}
-		}
-		group->nb_segments_purged += nb_removed;
-	}
-	return nb_removed;
-}
-
-static GF_Err gf_dash_update_manifest(GF_DashClient *dash)
-{
-	GF_Err e;
-	u32 group_idx, rep_idx, i, j;
-	u64 fetch_time=0;
-	GF_DOMParser *mpd_parser;
-	u8 signature[sizeof(dash->lastMPDSignature)];
-	GF_MPD_Period *period, *new_period;
-	const char *local_url;
-	char mime[128];
-	char * purl;
-	Double timeline_start_time;
-	GF_MPD *new_mpd;
-
-	if (!dash->mpd_dnload) {
-		local_url = purl = NULL;
-		if (!gf_list_count(dash->mpd->locations)) {
-			FILE *t = fopen(dash->base_url, "rt");
-			if (t) {
-				local_url = dash->base_url;
-				fclose(t);
-			}
-			if (!local_url) {
-				/*we will no longer attempt to update the MPD ...*/
-				dash->mpd->minimum_update_period = 0;
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: no HTTP source for MPD could be found\n"));
-				return GF_BAD_PARAM;
-			}
-		}
-		if (!local_url) {
-			purl = gf_strdup(gf_list_get(dash->mpd->locations, 0));
-
-			/*if no absolute URL, use <Location> to get MPD in case baseURL is relative...*/
-			if (!strstr(dash->base_url, "://")) {
-				gf_free(dash->base_url);
-				dash->base_url = gf_strdup(purl);
-			} 
-		}
-	} else {
-		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
-		if (!local_url) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: wrong cache file %s\n", local_url));
-			return GF_IO_ERR;
-		}
-		gf_delete_file(local_url);
-		purl = gf_strdup( dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload) );
-	}
-
-	/*if update location is specified, update - spec does not say whether location is a relative or absoute URL*/
-	if (gf_list_count(dash->mpd->locations)) {
-		char *update_loc = gf_list_get(dash->mpd->locations, 0);
-		char *update_url = gf_url_concatenate(purl, update_loc);
-		if (update_url) {
-			gf_free(purl);
-			purl = update_url;
-		}
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updating Playlist %s...\n", purl ? purl : local_url));
-	if (purl) {
-		const char *mime_type;
-		/*use non-persistent connection for MPD*/
-		e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), purl, 0, 0, 0, NULL);
-		if (e!=GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: download problem %s for MPD file\n", gf_error_to_string(e)));
-			gf_free(purl);
-			return e;
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playlist %s updated with success\n", purl));
-		}
-		mime_type = dash->dash_io->get_mime(dash->dash_io, dash->mpd_dnload) ;
-		strcpy(mime, mime_type ? mime_type : "");
-		strlwr(mime);
-
-		/*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);
-
-		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
-		if (gf_dash_is_m3u8_mime(purl, mime) || strstr(purl, ".m3u8")) {
-			gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
-		} else if (!gf_dash_is_dash_mime(mime)) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] mime '%s' should be m3u8 or mpd\n", mime));
-		}
-
-		gf_free(purl);
-		purl = NULL;
-	}
-	fetch_time = gf_net_get_utc();
-
-	if (!gf_dash_check_mpd_root_type(local_url)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: MPD file type is not correct %s\n", local_url));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-	if (gf_sha1_file( local_url, signature)) {
-		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))) {
-
-		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 
-		low latencies as we could miss a segment*/
-
-		if (dash->is_m3u8) {
-			dash->last_update_time += dash->mpd->minimum_update_period/2;
-		} else {
-			dash->last_update_time = gf_sys_clock();
-		}
-		return GF_OK;
-	} 
-
-	dash->reload_count = 0;
-	memccpy(dash->lastMPDSignature, signature, sizeof(char), sizeof(dash->lastMPDSignature));
-
-	/* It means we have to reparse the file ... */
-	/* parse the MPD */
-	mpd_parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
-	if (e != GF_OK) {
-		gf_xml_dom_del(mpd_parser);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in XML parsing %s\n", gf_error_to_string(e)));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-	new_mpd = gf_mpd_new();
-	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
-	gf_xml_dom_del(mpd_parser);
-	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in MPD creation %s\n", gf_error_to_string(e)));
-		gf_mpd_del(new_mpd);
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-	/*TODO - check periods are the same !!*/
-	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	new_period = gf_list_get(new_mpd->periods, dash->active_period_index);
-	if (!new_period) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing period\n"));
-		gf_mpd_del(new_mpd);
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-	if (gf_list_count(period->adaptation_sets) != gf_list_count(new_period->adaptation_sets)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing AdaptationSet\n"));
-		gf_mpd_del(new_mpd);
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-	timeline_start_time = 0;
-	/*if not infinity for timeShift, compute min media time before merge and adjust it*/
-	if (dash->mpd->time_shift_buffer_depth != (u32) -1) {
-		Double timeshift = dash->mpd->time_shift_buffer_depth;
-		timeshift /= 1000;
-
-		for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
-			GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
-			Double group_start = gf_dash_get_segment_start_time(group, NULL);
-			if (!group_idx || (timeline_start_time > group_start) ) timeline_start_time = group_start;
-		}
-		/*we can rewind our segments from timeshift*/
-		if (timeline_start_time > timeshift) timeline_start_time -= timeshift;
-		/*we can rewind all segments*/
-		else timeline_start_time = 0;
-	}
-
-	/*update segmentTimeline at Period level*/
-	e = gf_dash_merge_segment_timeline(period->segment_list, period->segment_template, new_period->segment_list, new_period->segment_template, timeline_start_time);
-	if (e) {
-		gf_mpd_del(new_mpd);
-		return e;
-	}
-
-	for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
-		Double seg_dur;
-		Bool reset_segment_count;
-		GF_MPD_AdaptationSet *set, *new_set;
-		GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
-
-		/*update info even if the group is not selected !*/
-
-
-		set = group->adaptation_set;
-		new_set = gf_list_get(new_period->adaptation_sets, group_idx);
-
-		if (gf_list_count(new_set->representations) != gf_list_count(group->adaptation_set->representations)) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing representation in adaptation set\n"));
-			gf_mpd_del(new_mpd);
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-
-		/*get all representations in both periods*/
-		for (rep_idx = 0; rep_idx <gf_list_count(group->adaptation_set->representations); rep_idx++) {
-			GF_List *segments, *new_segments;
-			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_idx);
-			GF_MPD_Representation *new_rep = gf_list_get(new_set->representations, rep_idx);
-
-			if (rep->segment_base || group->adaptation_set->segment_base || period->segment_base) {
-				if (!new_rep->segment_base && !new_set->segment_base && !new_period->segment_base) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment base as previous version\n"));
-					gf_mpd_del(new_mpd);
-					return GF_NON_COMPLIANT_BITSTREAM;
-				}
-				/*what else should we check ??*/
-
-				/*OK, this rep is fine*/
-			}
-
-			else if (rep->segment_template || group->adaptation_set->segment_template || period->segment_template) {
-				u32 start;
-				if (!new_rep->segment_template && !new_set->segment_template && !new_period->segment_template) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment template as previous version\n"));
-					gf_mpd_del(new_mpd);
-					return GF_NON_COMPLIANT_BITSTREAM;
-				}
-				start = 0;
-				/*override new startNum with old one - otherwise we would need to get rid of the entries before the start number in the MPD ...*/
-				if (period->segment_template && (period->segment_template->start_number != (u32) -1) ) start = period->segment_template->start_number;
-				if (set->segment_template && (set->segment_template->start_number != (u32) -1) ) start = set->segment_template->start_number;
-				if (rep->segment_template && (rep->segment_template->start_number != (u32) -1) ) start = rep->segment_template->start_number;
-
-				if (new_period->segment_template && (new_period->segment_template->start_number != (u32) -1) ) new_period->segment_template->start_number = start;
-				if (new_set->segment_template && (new_set->segment_template->start_number != (u32) -1) ) new_set->segment_template->start_number = start;
-				if (new_rep->segment_template && (new_rep->segment_template->start_number != (u32) -1) ) new_rep->segment_template->start_number = start;
-
-				/*OK, this rep is fine*/
-			}
-			else {
-				/*we're using segment list*/
-				assert(rep->segment_list || group->adaptation_set->segment_list || period->segment_list);
-
-				if (!new_rep->segment_list && !new_set->segment_list && !new_period->segment_list) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment list as previous version\n"));
-					gf_mpd_del(new_mpd);
-					return GF_NON_COMPLIANT_BITSTREAM;
-				}
-				/*get the segment list*/
-				segments = new_segments = NULL;
-				if (period->segment_list && period->segment_list->segment_URLs) segments = period->segment_list->segment_URLs;
-				if (set->segment_list && set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
-				if (rep->segment_list && rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
-
-				if (new_period->segment_list && new_period->segment_list->segment_URLs) new_segments = new_period->segment_list->segment_URLs;
-				if (new_set->segment_list && new_set->segment_list->segment_URLs) new_segments = new_set->segment_list->segment_URLs;
-				if (new_rep->segment_list && new_rep->segment_list->segment_URLs) new_segments = new_rep->segment_list->segment_URLs;
-
-
-				for (i=0; i<gf_list_count(new_segments); i++) {
-					GF_MPD_SegmentURL *new_seg = gf_list_get(new_segments, i);
-					Bool found = 0;
-					for (j=0; j<gf_list_count(segments); j++) {
-						GF_MPD_SegmentURL *seg = gf_list_get(segments, j);
-						if (seg->media && new_seg->media && !strcmp(seg->media, new_seg->media)) {
-							found=1;
-							break;
-						}
-						if (seg->media_range && new_seg->media_range && (seg->media_range->start_range==new_seg->media_range->start_range) && (seg->media_range->end_range==new_seg->media_range->end_range) ) {
-							found=1;
-							break;
-						}
-					}
-					/*this is a new segment, merge it: we remove from new list and push to old one, before doing a final swap
-					this ensures that indexing in the segment_list is still correct after merging*/
-					if (!found) {
-						gf_list_rem(new_segments, i);
-						i--;
-						gf_list_add(segments, new_seg);
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation #%d: Adding new segment %s\n", rep_idx+1, new_seg->media));
-					}
-				}
-
-				/*what else should we check ?*/
-
-				/*swap segment list content*/
-				gf_list_swap(new_segments, segments);
-
-				/*current representation is the active one in the group - update the number of segments*/
-				if (group->active_rep_index==rep_idx) {
-					group->nb_segments_in_rep = gf_list_count(new_segments);
-				}
-			}
-
-			e = gf_dash_merge_segment_timeline(rep->segment_list, rep->segment_template, new_rep->segment_list, new_rep->segment_template, timeline_start_time);
-			if (e) {
-				gf_mpd_del(new_mpd);
-				return e;
-			}
-
-			/*what else should we check ??*/
-
-
-			/*switch all intertnal GPAC stuff*/
-			memcpy(&new_rep->playback, &rep->playback, sizeof(GF_DASH_RepresentationPlayback));
-			if (rep->playback.cached_init_segment_url) rep->playback.cached_init_segment_url = NULL;
-
-			if (!new_rep->mime_type) {
-				new_rep->mime_type = rep->mime_type;
-				rep->mime_type = NULL;
-			}
-		}
-		/*update group/period to new period*/
-		j = gf_list_find(group->period->adaptation_sets, group->adaptation_set);
-		group->adaptation_set = gf_list_get(new_period->adaptation_sets, j);
-		group->period = new_period;
-
-		j = gf_list_count(group->adaptation_set->representations);
-		assert(j);
-
-		/*update segmentTimeline at AdaptationSet level*/
-		e = gf_dash_merge_segment_timeline(set->segment_list, set->segment_template, new_set->segment_list, new_set->segment_template, timeline_start_time);
-		if (e) {
-			gf_mpd_del(new_mpd);
-			return e;
-		}
-
-		/*now that all possible SegmentXXX have been updated, purge them if needed: all segments ending before timeline_start_time
-		will be removed from MPD*/
-		if (timeline_start_time) {
-			u32 nb_segments_removed = gf_dash_purge_segment_timeline(group, timeline_start_time);
-			if (nb_segments_removed) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AdaptationSet %d - removed %d segments from timeline (%d since start of the period)\n", group_idx+1, nb_segments_removed, group->nb_segments_purged));
-			}
-		}
-
-		if (new_mpd->availabilityStartTime != dash->mpd->availabilityStartTime) {
-			gf_dash_group_timeline_setup(new_mpd, group, fetch_time);
-		}
-
-		group->maybe_end_of_stream = 0;
-		reset_segment_count = 0;
-		/*compute fetchTime + minUpdatePeriod and check period end time*/
-		if (new_mpd->minimum_update_period && new_mpd->media_presentation_duration) {
-			u32 endTime = (u32) (fetch_time - new_mpd->availabilityStartTime - period->start);
-			if (endTime > new_mpd->media_presentation_duration) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period EndTime is signaled to %d, less than fetch time %d ! Ignoring mediaPresentationDuration\n", new_mpd->media_presentation_duration, endTime));
-				new_mpd->media_presentation_duration = 0;
-				reset_segment_count = 1;
-			} else {
-				endTime += new_mpd->minimum_update_period;
-				if (endTime > new_mpd->media_presentation_duration) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period EndTime is signaled to %d, less than fetch time + next update - maybe end of stream ?\n", new_mpd->availabilityStartTime, endTime));
-					group->maybe_end_of_stream = 1;
-				}
-			}
-		}
-
-		/*update number of segments in active rep*/
-		gf_dash_get_segment_duration(gf_list_get(group->adaptation_set->representations, group->active_rep_index), group->adaptation_set, group->period, new_mpd, &group->nb_segments_in_rep, &seg_dur);
-
-		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) );
-
-			if (group->download_segment_index + nb_segs_in_mpd_period >= group->nb_segments_in_rep) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period has %d segments but %d are needed until next refresh. Maybe end of stream is near ?\n", group->nb_segments_in_rep, group->download_segment_index + nb_segs_in_mpd_period));
-				group->maybe_end_of_stream = 1;
-			}
-		}
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated AdaptationSet %d - %d segments\n", group_idx+1, group->nb_segments_in_rep));
-
-	}
-	/*swap representations - we don't need to update download_segment_index as it still points to the right entry in the merged list*/
-	if (dash->mpd)
-		gf_mpd_del(dash->mpd);
-	dash->mpd = new_mpd;
-	dash->last_update_time = gf_sys_clock();
-	dash->mpd_fetch_time = fetch_time;
-	return GF_OK;
-}
-
-
-static void gf_dash_set_group_representation(GF_DASH_Group *group, GF_MPD_Representation *rep)
-{
-#ifndef GPAC_DISABLE_LOG
-	u32 width=0, height=0, samplerate=0;
-	GF_MPD_Fractional *framerate=NULL;
-#endif
-	u32 k;
-	s32 timeshift;
-	GF_MPD_AdaptationSet *set;
-	GF_MPD_Period *period;
-	u32 nb_segs;
-	u32 i = gf_list_find(group->adaptation_set->representations, rep);
-	assert((s32) i >= 0);
-
-	group->active_rep_index = i;
-	group->active_bitrate = rep->bandwidth;
-	nb_segs = group->nb_segments_in_rep;
-
-	group->min_bandwidth_selected = 1;
-	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 (group->active_bitrate > arep->bandwidth) {
-			group->min_bandwidth_selected = 0;
-			break;
-		}
-	}
-
-	set = group->adaptation_set;
-	period = group->period;
-
-#ifndef GPAC_DISABLE_LOG
-
-#define GET_REP_ATTR(_a)	_a = rep->_a; if (!_a) _a = set->_a;
-
-	GET_REP_ATTR(width);
-	GET_REP_ATTR(height);
-	GET_REP_ATTR(samplerate);
-	GET_REP_ATTR(framerate);
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Switched to representation bandwidth %d kbps\n", rep->bandwidth/1024));
-	if (group->max_bitrate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tmax download bandwidth: %d kbps\n", group->max_bitrate/1024));
-	if (width&&height) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tWidth %d Height %d", width, height));
-		if (framerate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, (" framerate %d/%d", framerate->num, framerate->den));
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
-	} else if (samplerate) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tsamplerate %d\n", samplerate));
-	}
-#endif
-
-	gf_dash_get_segment_duration(rep, set, period, group->dash->mpd, &group->nb_segments_in_rep, &group->segment_duration);
-
-	/*if broken indication in duration restore previous seg count*/
-	if (group->dash->ignore_mpd_duration)
-		group->nb_segments_in_rep = nb_segs;
-
-
-	timeshift = -1;
-	timeshift = (s32) (rep->segment_base ? rep->segment_base->time_shift_buffer_depth : (rep->segment_list ? rep->segment_list->time_shift_buffer_depth : (rep->segment_template ? rep->segment_template->time_shift_buffer_depth : -1) ) );
-	if (timeshift == -1) timeshift = (s32) (set->segment_base ? set->segment_base->time_shift_buffer_depth : (set->segment_list ? set->segment_list->time_shift_buffer_depth : (set->segment_template ? set->segment_template->time_shift_buffer_depth : -1) ) );
-	if (timeshift == -1) timeshift = (s32) (period->segment_base ? period->segment_base->time_shift_buffer_depth : (period->segment_list ? period->segment_list->time_shift_buffer_depth : (period->segment_template ? period->segment_template->time_shift_buffer_depth : -1) ) );
-
-	if (timeshift == -1) timeshift = (s32) group->dash->mpd->time_shift_buffer_depth;
-	group->time_shift_buffer_depth = (u32) timeshift;
-}
-
-static void gf_dash_switch_group_representation(GF_DashClient *mpd, GF_DASH_Group *group)
-{
-	u32 i, bandwidth, min_bandwidth;
-	GF_MPD_Representation *rep_sel = NULL;
-	GF_MPD_Representation *min_rep_sel = NULL;
-	Bool min_bandwidth_selected = 0;
-	bandwidth = 0;
-	min_bandwidth = (u32) -1;
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Checking representations between %d and %d kbps\n", group->min_bitrate/1024, group->max_bitrate/1024));
-
-	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++) {
-			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, i);
-			if (rep->playback.disabled) continue;
-			if ((rep->bandwidth > bandwidth) && (rep->bandwidth < group->max_bitrate )) {
-				rep_sel = rep;
-				bandwidth = rep->bandwidth;
-			}
-			if (rep->bandwidth < min_bandwidth) {
-				min_rep_sel = rep;
-				min_bandwidth = rep->bandwidth;
-			}
-		}
-	}
-
-	if (!rep_sel) {
-		if (!min_rep_sel) {
-			min_rep_sel = gf_list_get(group->adaptation_set->representations, 0);
-		}
-		rep_sel = min_rep_sel;
-		min_bandwidth_selected = 1;
-	}
-	assert(rep_sel);
-	i = gf_list_find(group->adaptation_set->representations, rep_sel);
-
-	assert((s32) i >= 0);
-
-	group->force_switch_bandwidth = 0;
-	group->max_bitrate = 0;
-	group->min_bitrate = (u32) -1;
-
-	if (i != group->active_rep_index) {
-		if (min_bandwidth_selected) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No representation found with bandwidth below %d kbps - using representation @ %d kbps\n", group->max_bitrate/1024, rep_sel->bandwidth/1024));
-		}
-		gf_dash_set_group_representation(group, rep_sel);
-	}
-}
-
-
-
-typedef enum
-{
-	GF_DASH_RESOLVE_URL_MEDIA,
-	GF_DASH_RESOLVE_URL_INIT,
-	GF_DASH_RESOLVE_URL_INDEX,
-} GF_DASHURLResolveType;
-
-
-
-GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_DASHURLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url)
-{
-	GF_MPD_BaseURL *url_child;
-	GF_MPD_SegmentTimeline *timeline = NULL;
-	u32 start_number = 1;
-	GF_MPD_AdaptationSet *set = group->adaptation_set;
-	GF_MPD_Period *period = group->period;
-	u32 timescale;
-	char *url;
-	char *url_to_solve, *solved_template, *first_sep, *media_url;
-	char *init_template, *index_template;
-
-	*out_range_start = *out_range_end = 0;
-	*out_url = NULL;
-
-
-	if (!group->timeline_setup) {
-		gf_dash_group_timeline_setup(mpd, group, 0);
-		group->timeline_setup = 1;
-	}
-
-
-
-
-	/*resolve base URLs from document base (download location) to representation (media)*/
-	url = gf_strdup(mpd_url);
-
-	url_child = gf_list_get(mpd->base_URLs, 0);
-	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
-	}
-
-	url_child = gf_list_get(period->base_URLs, 0);
-	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
-	}
-
-	url_child = gf_list_get(set->base_URLs, 0);
-	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
-	}
-
-	url_child = gf_list_get(rep->base_URLs, 0);
-	if (url_child) {
-		char *t_url = gf_url_concatenate(url, url_child->URL);
-		gf_free(url);
-		url = t_url;
-	}
-
-	gf_dash_resolve_duration(rep, set, period, segment_duration, &timescale, NULL, NULL);
-	*segment_duration = (resolve_type==GF_DASH_RESOLVE_URL_MEDIA) ? (u32) ((Double) (*segment_duration) * 1000.0 / timescale) : 0;
-
-	/*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) {	
-		GF_MPD_URL *res_url;
-		GF_MPD_SegmentBase *base_seg = NULL;
-		if (item_index>0) return GF_EOS;
-		switch (resolve_type) {
-		case GF_DASH_RESOLVE_URL_MEDIA:
-			if (!url) return GF_NON_COMPLIANT_BITSTREAM;
-			*out_url = url;
-			return GF_OK;
-		case GF_DASH_RESOLVE_URL_INIT:
-		case GF_DASH_RESOLVE_URL_INDEX:
-			res_url = NULL;
-			base_seg = rep->segment_base;
-			if (!base_seg) base_seg = set->segment_base;
-			if (!base_seg) base_seg = period->segment_base;
-
-			if (base_seg) {
-				if (resolve_type == GF_DASH_RESOLVE_URL_INDEX) {
-					res_url = base_seg->representation_index;
-				} else {
-					res_url = base_seg->initialization_segment;
-				}
-			}
-			if (is_in_base_url) *is_in_base_url = 0;
-			/*no initialization segment / index, use base URL*/
-			if (res_url && res_url->sourceURL) {
-				*out_url = gf_url_concatenate(url, res_url->sourceURL);
-				gf_free(url);
-			} else {
-				*out_url = url;
-				if (is_in_base_url) *is_in_base_url = 1;
-			}
-			if (res_url && res_url->byte_range) {
-				*out_range_start = res_url->byte_range->start_range;
-				*out_range_end = res_url->byte_range->end_range;
-			} else if (base_seg && base_seg->index_range && (resolve_type == GF_DASH_RESOLVE_URL_INDEX)) {
-				*out_range_start = base_seg->index_range->start_range;
-				*out_range_end = base_seg->index_range->end_range;
-			}
-			return GF_OK;
-		default:
-			break;
-		}
-		gf_free(url);
-		return GF_BAD_PARAM;
-	}
-
-	/*segmentList*/
-	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;
-		u32 segment_count;
-
-		init_url = index_url = NULL;
-
-		/*apply inheritance of attributes, lowest level having preceedence*/
-		if (period->segment_list) {
-			if (period->segment_list->initialization_segment) init_url = period->segment_list->initialization_segment;
-			if (period->segment_list->representation_index) index_url = period->segment_list->representation_index;
-			if (period->segment_list->segment_URLs) segments = period->segment_list->segment_URLs;
-			if (period->segment_list->start_number != (u32) -1) start_number = period->segment_list->start_number;
-			if (period->segment_list->segment_timeline) timeline = period->segment_list->segment_timeline;
-		}
-		if (set->segment_list) {
-			if (set->segment_list->initialization_segment) init_url = set->segment_list->initialization_segment;
-			if (set->segment_list->representation_index) index_url = set->segment_list->representation_index;
-			if (set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
-			if (set->segment_list->start_number != (u32) -1) start_number = set->segment_list->start_number;
-			if (set->segment_list->segment_timeline) timeline = set->segment_list->segment_timeline;
-		}
-		if (rep->segment_list) {
-			if (rep->segment_list->initialization_segment) init_url = rep->segment_list->initialization_segment;
-			if (rep->segment_list->representation_index) index_url = rep->segment_list->representation_index;
-			if (rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
-			if (rep->segment_list->start_number != (u32) -1) start_number = rep->segment_list->start_number;
-			if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
-		}
-
-
-		segment_count = gf_list_count(segments);
-
-		switch (resolve_type) {
-		case GF_DASH_RESOLVE_URL_INIT:
-			if (init_url) {
-				if (init_url->sourceURL) {
-					*out_url = gf_url_concatenate(url, init_url->sourceURL);
-					gf_free(url);
-				} else {
-					*out_url = url;
-				}
-				if (init_url->byte_range) {
-					*out_range_start = init_url->byte_range->start_range;
-					*out_range_end = init_url->byte_range->end_range;
-				}
-			} else {
-				gf_free(url);
-			}
-			return GF_OK;
-		case GF_DASH_RESOLVE_URL_MEDIA:
-			if (!url) {
-				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) {
-				gf_free(url);
-				return GF_EOS;
-			}
-			*out_url = url;
-			segment = gf_list_get(segments, item_index);
-			if (segment->media) {
-				*out_url = gf_url_concatenate(url, segment->media);
-				gf_free(url);
-			}
-			if (segment->media_range) {
-				*out_range_start = segment->media_range->start_range;
-				*out_range_end = segment->media_range->end_range;
-			}
-			if (segment->duration) {
-				*segment_duration = (u32) ((Double) (segment->duration) * 1000.0 / timescale);
-			}
-			return GF_OK;
-		case GF_DASH_RESOLVE_URL_INDEX:
-			if (item_index >= segment_count) {
-				gf_free(url);
-				return GF_EOS;
-			}
-			*out_url = url;
-			segment = gf_list_get(segments, item_index);
-			if (segment->index) {
-				*out_url = gf_url_concatenate(url, segment->index);
-				gf_free(url);
-			}
-			if (segment->index_range) {
-				*out_range_start = segment->index_range->start_range;
-				*out_range_end = segment->index_range->end_range;
-			}
-			return GF_OK;
-		default:
-			break;
-		}
-		gf_free(url);
-		return GF_BAD_PARAM;
-	}
-
-	/*segmentTemplate*/
-	media_url = init_template = index_template = NULL;
-
-	/*apply inheritance of attributes, lowest level having preceedence*/
-	if (period->segment_template) {
-		if (period->segment_template->initialization) init_template = period->segment_template->initialization;
-		if (period->segment_template->index) index_template = period->segment_template->index;
-		if (period->segment_template->media) media_url = period->segment_template->media;
-		if (period->segment_template->start_number != (u32) -1) start_number = period->segment_template->start_number;
-		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
-	}
-	if (set->segment_template) {
-		if (set->segment_template->initialization) init_template = set->segment_template->initialization;
-		if (set->segment_template->index) index_template = set->segment_template->index;
-		if (set->segment_template->media) media_url = set->segment_template->media;
-		if (set->segment_template->start_number != (u32) -1) start_number = set->segment_template->start_number;
-		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
-	}
-	if (rep->segment_template) {
-		if (rep->segment_template->initialization) init_template = rep->segment_template->initialization;
-		if (rep->segment_template->index) index_template = rep->segment_template->index;
-		if (rep->segment_template->media) media_url = rep->segment_template->media;
-		if (rep->segment_template->start_number != (u32) -1) start_number = rep->segment_template->start_number;
-		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
-	}
-
-	/*offset the start_number with the number of discarded segments (no longer in our lists)*/
-	start_number += group->nb_segments_purged;
-
-	if (!media_url) {
-		GF_MPD_BaseURL *base = gf_list_get(rep->base_URLs, 0);
-		if (!base) return GF_BAD_PARAM;
-		media_url = base->URL;
-	}
-	url_to_solve = NULL;
-	switch (resolve_type) {
-	case GF_DASH_RESOLVE_URL_INIT:
-		url_to_solve = init_template;
-		break;
-	case GF_DASH_RESOLVE_URL_MEDIA:
-		url_to_solve = media_url;
-		break;
-	case GF_DASH_RESOLVE_URL_INDEX:
-		url_to_solve = index_template;
-		break;
-	default:
-		gf_free(url);
-		return GF_BAD_PARAM;
-	}
-	if (!url_to_solve) {
-		gf_free(url);
-		return GF_OK;
-	}
-	/*let's solve the template*/
-	solved_template = gf_malloc(sizeof(char)*strlen(url_to_solve)*2);
-	solved_template[0] = 0;
-	strcpy(solved_template, url_to_solve);
-	first_sep = strchr(solved_template, '$');
-	if (first_sep) first_sep[0] = 0;
-
-	first_sep = strchr(url_to_solve, '$');
-	while (first_sep) {
-		char szPrintFormat[50];
-		char szFormat[100];
-		char *format_tag;
-		char *second_sep = strchr(first_sep+1, '$');
-		if (!second_sep) {
-			gf_free(url);
-			gf_free(solved_template);
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		second_sep[0] = 0;
-		format_tag = strchr(first_sep+1, '%');
-		
-		if (format_tag) {
-			strcpy(szPrintFormat, format_tag);
-			format_tag[0] = 0;
-		} else {
-			strcpy(szPrintFormat, "%d");
-		}
-		/* identifier is $$ -> replace by $*/
-		if (!strlen(first_sep+1)) {
-			strcat(solved_template, "$");
-		}
-		else if (!strcmp(first_sep+1, "RepresentationID")) {
-			strcat(solved_template, rep->id);
-		}
-		else if (!strcmp(first_sep+1, "Number")) {
-			sprintf(szFormat, szPrintFormat, start_number + item_index);
-			strcat(solved_template, szFormat);
-		}
-		else if (!strcmp(first_sep+1, "Index")) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Wrong template identifier Index detected - using Number instead\n\n"));
-			sprintf(szFormat, szPrintFormat, start_number + item_index);
-			strcat(solved_template, szFormat);
-		}
-		else if (!strcmp(first_sep+1, "Bandwidth")) {
-			sprintf(szFormat, szPrintFormat, rep->bandwidth);
-			strcat(solved_template, szFormat);
-		}
-		else if (!strcmp(first_sep+1, "Time")) {
-			if (timeline) {
-				/*uses segment timeline*/
-				u32 k, nb_seg, cur_idx, nb_repeat;
-				u64 time, start_time;
-				nb_seg = gf_list_count(timeline->entries);
-				cur_idx = 0;
-				start_time=0;
-				for (k=0; k<nb_seg; k++) {
-					GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, k);
-					if (item_index>cur_idx+ent->repeat_count) {
-						cur_idx += 1 + ent->repeat_count;
-						if (ent->start_time) start_time = ent->start_time;
-
-						start_time += ent->duration * (1 + ent->repeat_count);
-						continue;
-					}
-					*segment_duration = ent->duration;
-					*segment_duration = (u32) ((Double) (*segment_duration) * 1000.0 / timescale);
-					nb_repeat = item_index - cur_idx;
-					time = ent->start_time ? ent->start_time : start_time;
-					time += nb_repeat * ent->duration;
-
-					/*replace final 'd' with LLD (%lld or I64d)*/
-					szPrintFormat[strlen(szPrintFormat)-1] = 0;
-					strcat(szPrintFormat, &LLD[1]);
-					sprintf(szFormat, szPrintFormat, time);
-					strcat(solved_template, szFormat);
-					break;
-				}
-			}
-		}
-		else {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unknown template identifier %s - disabling rep\n\n", first_sep+1));
-			*out_url = NULL;
-			gf_free(url);
-			gf_free(solved_template);
-			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
-			return GF_NON_COMPLIANT_BITSTREAM;
-		}
-		if (format_tag) format_tag[0] = '%';
-		second_sep[0] = '$';
-		/*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)) 
-			strcat(solved_template, second_sep+1);
-		if (first_sep) first_sep[0] = '$';
-	}
-	*out_url = gf_url_concatenate(url, solved_template);
-	gf_free(url);
-	gf_free(solved_template);
-	return GF_OK;
-}
-
-static GF_Err gf_dash_download_init_segment(GF_DashClient *dash, GF_DASH_Group *group)
-{
-	GF_Err e;
-	char *base_init_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 */
-	u32 nb_segment_read = 0;
-	if (!dash || !group)
-		return GF_BAD_PARAM;
-	gf_mx_p(dash->dl_mutex);
-
-	assert( group->adaptation_set && group->adaptation_set->representations );
-	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-	if (!rep) {
-		gf_mx_v(dash->dl_mutex);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to find any representation, aborting.\n"));
-		return GF_IO_ERR;
-	}
-	start_range = end_range = 0;
-
-	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
-	if (e) {
-		gf_mx_v(dash->dl_mutex);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve initialization URL: %s\n", gf_error_to_string(e) ));
-		return e;
-	}
-
-	/*no error and no init segment, go for media segment*/
-	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);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media URL: %s\n", gf_error_to_string(e) ));
-			return e;
-		}
-		nb_segment_read = 1;
-#endif
-	} else if (!group->bitstream_switching) {
-		group->dont_delete_first_segment = 1;
-	}
-
-	if (!strstr(base_init_url, "://") || !strnicmp(base_init_url, "file://", 7) || !strnicmp(base_init_url, "gmem://", 7) || !strnicmp(base_init_url, "views://", 8)) {
-		assert(!group->nb_cached_segments);
-		group->cached[0].cache = gf_strdup(base_init_url);
-		group->cached[0].url = gf_strdup(base_init_url);
-		group->cached[0].representation_index = group->active_rep_index;
-		group->prev_active_rep_index = group->active_rep_index;
-
-		group->nb_cached_segments = 1;
-		/*do not erase local files*/
-		group->local_files = group->was_segment_base ? 0 : 1;
-		if (group->local_files) {
-			gf_dash_buffer_off(group, dash);
-		}
-
-		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;
-
-
-		/*finally download all init segments if any*/
-		if (!group->bitstream_switching) {
-			u32 k;
-			for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
-				char *a_base_init_url = NULL;
-				u64 a_start, a_end, a_dur;
-				GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
-				if (a_rep==rep) continue;
-				if (a_rep->playback.disabled) continue;
-
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
-				if (!e && a_base_init_url) {
-					a_rep->playback.cached_init_segment_url = a_base_init_url;
-					a_rep->playback.init_start_range = a_start;
-					a_rep->playback.init_end_range =a_end ;
-				} else if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
-					a_rep->playback.disabled = 1;
-				}
-			}
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] First segment is %s \n", group->segment_local_url));
-		gf_mx_v(dash->dl_mutex);
-		gf_free(base_init_url);
-		return GF_OK;
-	}
-
-	group->max_bitrate = 0;
-	group->min_bitrate = (u32)-1;
-	/*use persistent connection for segment downloads*/
-	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_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 */
-		/* It is possible that the first segment has been deleted while we made the first request...
-		* so we try with the next segment on some M3U8 servers */
-
-		gf_free(base_init_url);
-
-		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
-		if (!e) {
-			gf_mx_v(dash->dl_mutex);
-			return e;
-		}
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Download of first segment failed... retrying with second one : %s\n", base_init_url));
-		nb_segment_read = 2;
-		/*use persistent connection for segment downloads*/
-		e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), base_init_url, 0, 0, 1, group);
-	} /* end of 404 */
-
-	if (e!= GF_OK && !group->segment_must_be_streamed) {
-		dash->mpd_stop_request = 1;
-		gf_mx_v(dash->dl_mutex);
-		gf_free(base_init_url);
-		return e;
-	} else {
-		char mime[128];
-		const char *mime_type;
-		if (!group->nb_segments_in_rep) {
-			if (dash->mpd->type==GF_MPD_TYPE_STATIC) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] 0 segments in static representation, aborting\n"));
-				gf_free(base_init_url);
-				gf_mx_v(dash->dl_mutex);
-				return GF_BAD_PARAM;
-			}
-		} else if (group->nb_segments_in_rep < group->max_cached_segments) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resizing to %u max_cached_segments elements instead of %u.\n", group->nb_segments_in_rep, group->max_cached_segments));
-			/* OK, we have a problem, it may ends download */
-			group->max_cached_segments = group->nb_segments_in_rep;
-		}
-
-		/* Mime-Type check */
-		mime_type = dash->dash_io->get_mime(dash->dash_io, group->segment_download) ;
-		strcpy(mime, mime_type ? mime_type : "");
-		strlwr(mime);
-
-		if (dash->mimeTypeForM3U8Segments) 
-			gf_free(dash->mimeTypeForM3U8Segments);
-		dash->mimeTypeForM3U8Segments = gf_strdup( mime );
-		mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
-
-		if (!rep->mime_type) {
-			rep->mime_type = gf_strdup( mime_type ? mime_type : mime );
-			mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
-		}
-
-		if (stricmp(mime, mime_type)) {
-			Bool valid = 0;
-			char *stype1, *stype2;
-			stype1 = strchr(mime_type, '/');
-			stype2 = strchr(mime, '/');
-			if (stype1 && stype2 && !strcmp(stype1, stype2)) valid = 1;
-
-			if (!valid && 0) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Mime '%s' is not correct for '%s', it should be '%s'\n", mime, base_init_url, mime_type));
-				dash->mpd_stop_request = 0;
-				gf_mx_v(dash->dl_mutex);
-				gf_free(base_init_url);
-				base_init_url = NULL;
-				return GF_BAD_PARAM;
-			}
-		}
-
-		if (group->segment_must_be_streamed ) {
-			group->segment_local_url = 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);
-		}
-
-		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));
-			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].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;
-
-		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_mx_v(dash->dl_mutex);
-		gf_free(base_init_url);
-
-		/*finally download all init segments if any*/
-		if (!group->bitstream_switching) {
-			u32 k;
-			for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
-				char *a_base_init_url = NULL;
-				u64 a_start, a_end, a_dur;
-				GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
-				if (a_rep==rep) continue;
-				if (a_rep->playback.disabled) continue;
-
-				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_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_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retrieve initialization segment %s for representation: %s - discarding representation\n", a_base_init_url, gf_error_to_string(e) ));
-						a_rep->playback.disabled = 1;
-					} else {
-						a_rep->playback.cached_init_segment_url = gf_strdup( dash->dash_io->get_cache_name(dash->dash_io, group->segment_download) );
-						a_rep->playback.init_start_range = 0;
-						a_rep->playback.init_end_range = 0;
-					}
-					gf_free(a_base_init_url);
-				} else if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
-					a_rep->playback.disabled = 1;
-				}
-
-			}
-		}
-
-		return GF_OK;
-	}
-}
-
-static void gf_dash_skip_disabled_representation(GF_DASH_Group *group, GF_MPD_Representation *rep)
-{
-	s32 rep_idx = gf_list_find(group->adaptation_set->representations, rep);
-	while (1) {
-		rep_idx++;
-		if (rep_idx==gf_list_count(group->adaptation_set->representations)) rep_idx = 0;
-		rep = gf_list_get(group->adaptation_set->representations, rep_idx);
-		if (!rep->playback.disabled) break;
-	}
-	assert(rep && !rep->playback.disabled);
-	gf_dash_set_group_representation(group, rep);
-}
-
-static void gf_dash_reset_groups(GF_DashClient *dash)
-{
-	/*send playback destroy event*/
-	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_DESTROY_PLAYBACK, GF_OK);
-
-	while (gf_list_count(dash->groups)) {
-		GF_DASH_Group *group = gf_list_last(dash->groups);
-		gf_list_rem_last(dash->groups);
-
-		if (group->urlToDeleteNext) {
-			if (!dash->keep_files && !group->local_files)
-				dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
-
-			gf_free(group->urlToDeleteNext);
-			group->urlToDeleteNext = NULL;
-		}
-		if (group->segment_download) {
-			dash->dash_io->del(dash->dash_io, group->segment_download);
-			group->segment_download = NULL;
-		}
-		while (group->nb_cached_segments) {
-			group->nb_cached_segments --;
-			if (!dash->keep_files && !group->local_files)
-				gf_delete_file(group->cached[group->nb_cached_segments].cache);
-
-			gf_free(group->cached[group->nb_cached_segments].cache);
-			gf_free(group->cached[group->nb_cached_segments].url);
-		}
-		gf_free(group->cached);
-
-		if (group->service_mime) 
-			gf_free(group->service_mime);
-		gf_free(group);
-	}
-	gf_list_del(dash->groups);
-	dash->groups = NULL;
-}
-
-
-/* create groups (implementation of adaptations set) */
-GF_Err gf_dash_setup_groups(GF_DashClient *dash)
-{
-	GF_Err e;
-	u32 i, j, count;
-	GF_MPD_Period *period;
-
-	if (!dash->groups) {
-		dash->groups = gf_list_new();
-		if (!dash->groups) return GF_OUT_OF_MEM;
-	}
-
-	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	if (!period) return GF_BAD_PARAM;
-
-	count = gf_list_count(period->adaptation_sets);
-	for (i=0; i<count; i++) {
-		Double seg_dur;
-		GF_DASH_Group *group;
-		Bool found = 0;
-		GF_MPD_AdaptationSet *set = gf_list_get(period->adaptation_sets, i);
-		for (j=0; j<gf_list_count(dash->groups); j++) {
-			GF_DASH_Group *group = gf_list_get(dash->groups, j);
-			if (group->adaptation_set==set) {
-				found = 1;
-				break;
-			}
-		}
-
-		if (found) continue;
-
-
-		GF_SAFEALLOC(group, GF_DASH_Group);
-		if (!group) return GF_OUT_OF_MEM;
-		group->dash = dash;
-		group->adaptation_set = set;
-		group->period = period;
-
-		group->bitstream_switching = (set->bitstream_switching || period->bitstream_switching) ? 1 : 0;
-
-		seg_dur = 0;
-		for (j=0; j<gf_list_count(set->representations); j++) {
-			Double dur;
-			u32 nb_seg;
-			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 (rep->width>set->max_width) {
-				set->max_width = rep->width;
-				set->max_height = rep->height;
-			}
-		}
-
-		if (!seg_dur) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Cannot compute default segment duration\n"));
-		}
-
-		group->cache_duration = dash->max_cache_duration;
-		if (group->cache_duration < dash->mpd->min_buffer_time)
-			group->cache_duration = dash->mpd->min_buffer_time;
-
-		group->max_cached_segments = 1;
-		if (seg_dur) {
-			while (group->max_cached_segments * seg_dur * 1000 < group->cache_duration)
-				group->max_cached_segments ++;
-
-			group->max_buffer_segments = group->max_cached_segments;
-
-			/*we need one more entry in cache for segment being currently played*/
-			if (group->max_cached_segments<2)
-				group->max_cached_segments ++;
-		}
-
-		group->cached = gf_malloc(sizeof(segment_cache_entry)*group->max_cached_segments);
-		memset(group->cached, 0, sizeof(segment_cache_entry)*group->max_cached_segments);
-		if (!group->cached) {
-			gf_free(group);
-			return GF_OUT_OF_MEM;
-		}
-		e = gf_list_add(dash->groups, group);
-		if (e) {
-			gf_free(group->cached);
-			gf_free(group);
-			return e;
-		}
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_dash_load_sidx(GF_BitStream *bs, GF_MPD_Representation *rep, Bool seperate_index, u64 sidx_offset)
-{
-#ifdef GPAC_DISABLE_ISOM
-	return GF_NOT_SUPPORTED;
-#else
-	u64 anchor_position, prev_pos;
-	GF_SegmentIndexBox *sidx = NULL;
-	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);
-	type = gf_bs_read_u32(bs);
-	if (type != GF_4CC('s','i','d','x')) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error parsing SIDX: type is %s (box start offset "LLD")\n", gf_4cc_to_str(type), gf_bs_get_position(bs)-8 ));
-		return GF_ISOM_INVALID_FILE;
-	}
-
-	gf_bs_seek(bs, sidx_offset);
-
-	anchor_position = sidx_offset + size;
-	if (seperate_index) 
-		anchor_position = 0;
-
-	e = gf_isom_parse_box((GF_Box **) &sidx, bs);
-	if (e) return e;
-
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Loading SIDX - %d entries - Earliest Presentation Time "LLD"\n", sidx->nb_refs, sidx->earliest_presentation_time));
-
-	offset = sidx->first_offset + anchor_position;
-	rep->segment_list->timescale = sidx->timescale;
-	for (i=0; i<sidx->nb_refs; i++) {
-		GF_MPD_SegmentURL *seg;
-		if (sidx->refs[i].reference_type) {
-			e = gf_dash_load_sidx(bs, rep, seperate_index, offset);
-			if (e) {
-				break;
-			}
-		} else {
-			GF_SAFEALLOC(seg, GF_MPD_SegmentURL);
-			GF_SAFEALLOC(seg->media_range, GF_MPD_ByteRange);
-			GF_LOG(GF_LOG_INFO, 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));
-
-			seg->media_range->start_range = offset;
-			offset += sidx->refs[i].reference_size;
-			seg->media_range->end_range = offset - 1;
-			seg->duration = sidx->refs[i].subsegment_duration;
-			gf_list_add(rep->segment_list->segment_URLs, seg);
-		}
-	}
-	gf_isom_box_del((GF_Box*)sidx);
-	gf_bs_seek(bs, prev_pos);
-	return e;
-#endif
-}
-
-static GF_Err gf_dash_load_representation_sidx(GF_DASH_Group *group, GF_MPD_Representation *rep, const char *cache_name, Bool seperate_index, Bool needs_mov_range)
-{
-	GF_Err e;
-	GF_BitStream *bs;
-	FILE *f=NULL;
-	if (!strncmp(cache_name, "gmem://", 7)) {
-		u32 size;
-		char *mem_address;
-		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return GF_IO_ERR;
-		} 
-		bs = gf_bs_new(mem_address, size, GF_BITSTREAM_READ);
-	} else {
-		FILE *f = gf_f64_open(cache_name, "rb");
-		if (!f) return GF_IO_ERR;
-		bs = gf_bs_from_file(f, GF_BITSTREAM_READ);
-	}
-	e = GF_OK;
-	while (gf_bs_available(bs)) {
-		u32 size = gf_bs_read_u32(bs);
-		u32 type = gf_bs_read_u32(bs);
-		if (type != GF_4CC('s','i','d','x')) {
-			gf_bs_skip_bytes(bs, size-8);
-
-			if (needs_mov_range && (type==GF_4CC('m','o','o','v') )) {
-				GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
-				rep->segment_list->initialization_segment->byte_range->end_range = gf_bs_get_position(bs);
-			}
-			continue;
-		}
-		gf_bs_seek(bs, gf_bs_get_position(bs)-8);
-		e = gf_dash_load_sidx(bs, rep, seperate_index, gf_bs_get_position(bs) );
-
-		/*we could also parse the sub sidx*/
-		break;
-	}
-	gf_bs_del(bs);
-	if (f) fclose(f);
-	return e;
-}
-
-static GF_Err dash_load_box_type(const char *cache_name, u32 offset, u32 *box_type, u32 *box_size)
-{
-	*box_type = *box_size = 0;
-	if (!strncmp(cache_name, "gmem://", 7)) {
-		u32 size;
-		u8 *mem_address;
-		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return GF_IO_ERR;
-		} 
-		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]);
-		*box_type = GF_4CC(mem_address[4], mem_address[5], mem_address[6], mem_address[7]);
-	} else {
-		unsigned char data[4];
-		FILE *f = gf_f64_open(cache_name, "rb");
-		if (!f) return GF_IO_ERR;
-		if (gf_f64_seek(f, offset, SEEK_SET))
-			return GF_IO_ERR;
-		if (fread(data, 1, 4, f) == 4) {
-			*box_size = GF_4CC(data[0], data[1], data[2], data[3]);
-			if (fread(data, 1, 4, f) == 4) {
-				*box_type = GF_4CC(data[0], data[1], data[2], data[3]);
-			}
-		}
-		fclose(f);
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_dash_setup_single_index_mode(GF_DASH_Group *group)
-{
-	u32 i;
-	GF_Err e;
-	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;
-
-	/*OK we are in single-file mode, download all required indexes & co*/
-	for (i=0; i<gf_list_count(group->adaptation_set->representations); i++) {
-		char *sidx_file = NULL;
-		u64 duration, index_start_range, index_end_range, init_start_range, init_end_range;
-		Bool index_in_base, init_in_base;
-		Bool init_needs_byte_range = 0;
-		Bool has_seen_sidx = 0;
-		Bool is_isom = 1;
-		rep = gf_list_get(group->adaptation_set->representations, i);
-
-		index_in_base = init_in_base = 0;
-		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base);
-		if (e) goto exit;
-
-		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_DASH_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base);
-		if (e) goto exit;
-
-
-		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();
-
-				if (init_in_base) {
-					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
-					rep->segment_list->initialization_segment->sourceURL = gf_strdup(init_url);
-					/*we don't want to load the entire movie */
-					init_needs_byte_range = 1;
-				}
-				if (index_in_base) {
-					sidx_file = (char *)init_url;
-				}
-			}
-			/*we need to download the init segement, at least partially*/
-			else {
-				u32 offset = 0;
-				u32 box_type=0;
-				u32 box_size=0;
-				const char *cache_name;
-
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloading init segment and SIDX for representation %s\n", init_url));
-
-				/*download first 8 bytes and check if we do have a box starting there*/
-				e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, 7, 1, group);
-				if (e) goto exit;
-				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
-				e = dash_load_box_type(cache_name, offset, &box_type, &box_size);
-				offset=8;
-				while (box_type) {
-					/*we got the moov , stop here */
-					if (!index_in_base && (box_type==GF_4CC('m','o','o','v'))) {
-						e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, offset+box_size-8, 2, group);
-						break;
-					} else {
-						e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, offset+box_size-1, 2, group);
-						offset += box_size;
-						/*we need to refresh the cache name because of our memory astorage thing ...*/
-						cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
-						e = dash_load_box_type(cache_name, offset-8, &box_type, &box_size);
-
-						if (box_type==GF_4CC('s','i','d','x'))
-							has_seen_sidx = 1;
-						else if (has_seen_sidx)
-							break;
-	
-	
-					}
-				}
-				if (e<0) goto exit;
-
-				if (box_type==0) {
-					e = GF_ISOM_INVALID_FILE;
-					goto exit;
-				}
-				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();
-
-				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);
-				}
-				if (index_in_base) {
-					sidx_file = (char *)cache_name;
-				}
-			}
-		}
-		/*we have index url, download it*/
-		if (! index_in_base) {
-			e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), index_url, index_start_range, index_end_range, 1, group);
-			if (e) goto exit;
-			sidx_file = (char *)group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
-		}
-
-		/*load sidx*/
-		e = gf_dash_load_representation_sidx(group, rep, sidx_file, !index_in_base, init_needs_byte_range);
-		if (e) {
-			rep->playback.disabled = 1;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to load segment index for this representation - disabling\n"));
-		}
-
-		/*reset all seg based stuff*/
-		if (rep->segment_base) { 
-			gf_mpd_segment_base_free(rep->segment_base);
-			rep->segment_base = NULL;
-		}
-
-		gf_free(index_url);
-		index_url = NULL;
-		gf_free(init_url);
-		init_url = NULL;
-	}
-	if (group->adaptation_set->segment_base) { 
-		gf_mpd_segment_base_free(group->adaptation_set->segment_base);
-		group->adaptation_set->segment_base = NULL;
-	}
-	group->was_segment_base = 1;
-
-exit:
-	if (init_url) gf_free(init_url);
-	if (index_url) gf_free(index_url);
-	return e;
-}
-
-static GF_Err gf_dash_setup_period(GF_DashClient *dash)
-{
-	GF_MPD_Period *period;
-	u32 rep_i, group_i, nb_groups_ok;
-	/*setup all groups*/
-	gf_dash_setup_groups(dash);
-
-	nb_groups_ok = 0;
-	for (group_i=0; group_i<gf_list_count(dash->groups); group_i++) {
-		GF_MPD_Representation *rep_sel;
-		u32 active_rep, nb_rep;
-		const char *mime_type;
-		u32 nb_rep_ok = 0;
-		GF_DASH_Group *group = gf_list_get(dash->groups, group_i);
-
-		nb_rep = gf_list_count(group->adaptation_set->representations);
-
-		if ((nb_rep>1) && !group->adaptation_set->segment_alignment && !group->adaptation_set->subsegment_alignment) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet without segmentAlignment flag set - ignoring because not supported\n"));
-			continue;
-		}
-		if (group->adaptation_set->xlink_href) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet with xlink:href to %s - ignoring because not supported\n", group->adaptation_set->xlink_href));
-			continue;
-		}
-
-		/*translate from single-indexed file to SegmentList*/
-		gf_dash_setup_single_index_mode(group);
-
-		/* Select the appropriate representation in the given period */
-		active_rep = 0;
-		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
-			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_i);
-			rep_sel = gf_list_get(group->adaptation_set->representations, active_rep);
-
-			if (rep_i) {
-				Bool ok;
-				char *sep;
-				if (rep->codecs && rep_sel->codecs) {
-
-					sep = strchr(rep_sel->codecs, '.');
-					if (sep) sep[0] = 0;
-					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));
-						rep->playback.disabled = 1;
-						continue;
-					}
-					if (rep->dependency_id) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation dependent on representation %d - not supported\n", rep->dependency_id));
-						rep->playback.disabled = 1;
-						continue;
-					}
-					if (rep->segment_list && rep->segment_list->xlink_href) {
-						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation SegmentList uses xlink:href to %s - disabling because not supported\n", rep->segment_list->xlink_href));
-						rep->playback.disabled = 1;
-						continue;
-					}
-				}
-			}
-
-			switch (dash->first_select_mode) {
-			case GF_DASH_SELECT_QUALITY_LOWEST:
-				if (rep->quality_ranking && (rep->quality_ranking < rep_sel->quality_ranking)) {
-					active_rep = rep_i;
-					break;
-				}/*fallthrough if quality is not indicated*/
-			case GF_DASH_SELECT_BANDWIDTH_LOWEST:
-				if (rep->bandwidth < rep_sel->bandwidth) {
-					active_rep = rep_i;
-				}
-				break;
-			case GF_DASH_SELECT_QUALITY_HIGHEST:
-				/*fallthrough if quality is not indicated*/
-				if (rep->quality_ranking > rep_sel->quality_ranking) {
-					active_rep = rep_i;
-					break;
-				}
-			case GF_DASH_SELECT_BANDWIDTH_HIGHEST:
-				if (rep->bandwidth > rep_sel->bandwidth) {
-					active_rep = rep_i;
-				}
-				break;
-			default:
-				break;
-			}
-		}
-		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) 
-				nb_rep_ok++;
-		}
-
-		if (! nb_rep_ok) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No valid representation in this group - disabling\n"));
-			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
-			continue;
-		}
-
-		rep_sel = gf_list_get(group->adaptation_set->representations, active_rep);
-
-		gf_dash_set_group_representation(group, rep_sel);
-
-		if (dash->playback_start_range>=0) 
-			gf_dash_seek_group(dash, group);
-
-		mime_type = gf_dash_get_mime_type(NULL, rep_sel, group->adaptation_set);
-
-		if (!mime_type) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Missing MIME type for AdaptationSet - skipping\n"));
-			continue;
-		}
-
-		/* 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->selection = GF_DASH_GROUP_NOT_SELECTED;
-		nb_groups_ok++;
-
-#ifdef DEBUG_FIRST_SET_ONLY
-		break;
-#endif
-	}
-
-	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	
-	if (period->segment_base) { 
-		gf_mpd_segment_base_free(period->segment_base);
-		period->segment_base = NULL;
-	}
-
-	if (!nb_groups_ok) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No AdaptationSet could be selected in the MPD - Cannot play\n"));
-		return GF_NON_COMPLIANT_BITSTREAM;
-	}
-
-	/*and seek if needed*/
-	return GF_OK;
-}
-
-static void dash_do_rate_adaptation(GF_DashClient *dash, GF_DASH_Group *group, GF_MPD_Representation *rep)
-{
-	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);
-	bytes_per_sec = dash->dash_io->get_bytes_per_sec(dash->dash_io, group->segment_download);
-	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;
-		}
-		
-		/*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 (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;
-					}
-				}
-			}
-		}
-
-		if (!dash->disable_switching && new_rep && (new_rep!=rep)) {
-			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);
-		}
-	}
-}
-
-static u32 dash_main_thread_proc(void *par)
-{
-	GF_Err e;
-	GF_DashClient *dash = (GF_DashClient*) par;
-	GF_MPD_Representation *rep;
-	u32 i, group_count, ret = 0;
-	Bool go_on = 1;
-	u32 min_wait = 0;
-	Bool first_period_in_mpd = 1;
-	char *new_base_seg_url;
-	assert(dash);
-	if (!dash->mpd) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Incorrect state, no dash->mpd for URL=%s, already stopped ?\n", dash->base_url));
-		return 1;
-	}
-
-restart_period:
-
-	/* Setting the download status in exclusive code */
-	gf_mx_p(dash->dl_mutex);
-	dash->dash_state = GF_DASH_STATE_SETUP;
-	gf_mx_v(dash->dl_mutex);
-
-	dash->in_period_setup = 1;
-
-	/*setup period*/
-	e = gf_dash_setup_period(dash);
-	if (e) {
-		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, e);
-		ret = 1;
-		goto exit;
-	}
-	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SELECT_GROUPS, GF_OK);
-
-	e = GF_OK;
-	group_count = gf_list_count(dash->groups);
-	for (i=0; i<group_count; i++) {
-		GF_DASH_Group *group = gf_list_get(dash->groups, i);
-		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
-		if (first_period_in_mpd) {
-			gf_dash_buffer_on(group, dash);
-		}
-		e = gf_dash_download_init_segment(dash, group);
-		if (e) break;
-	}
-	dash->mpd_stop_request=0;
-	first_period_in_mpd = 0;
-
-	/*if error signal to the user*/
-	if (e != GF_OK) {
-		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, e);
-		ret = 1;
-		goto exit;
-	}
-
-
-	dash->last_update_time = gf_sys_clock();
-
-	gf_mx_p(dash->dl_mutex);
-	dash->dash_state = GF_DASH_STATE_CONNECTING;
-	gf_mx_v(dash->dl_mutex);
-
-
-	/*ask the user to connect to desired groups*/
-	e = dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CREATE_PLAYBACK, GF_OK);
-	if (e) {
-		ret = 1;
-		goto exit;
-	}
-	if (dash->mpd_stop_request) {
-		ret = 1;
-		goto exit;
-	}
-
-	gf_mx_p(dash->dl_mutex);
-	dash->in_period_setup = 0;
-	dash->dash_state = GF_DASH_STATE_RUNNING;
-	gf_mx_v(dash->dl_mutex);
-
-	min_wait = 0;
-	while (go_on) {
-		const char *local_file_name = NULL;
-		const char *resource_name = NULL;
-
-		/*wait until next segment is needed*/
-		while (!dash->mpd_stop_request) {
-			u32 timer = gf_sys_clock() - dash->last_update_time;
-
-			/*refresh MPD*/
-			if (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period)) {
-				u32 diff = gf_sys_clock();
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Time to update the playlist (%u ms elapsed since last refresh and min reoad rate is %u)\n", gf_sys_clock() , timer, dash->mpd->minimum_update_period));
-				e = gf_dash_update_manifest(dash);
-				group_count = gf_list_count(dash->groups);
-				diff = gf_sys_clock() - diff;
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
-				} else {
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Updated MPD in %d ms\n", diff));
-				}
-			} else {
-				Bool all_groups_done = 1;
-				Bool cache_full = 1;
-
-				/*wait if nothing is ready to be downloaded*/
-				if (min_wait>2) {
-					u32 sleep_for = MIN(min_wait, 100) /2;
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] No segments available on the server until %d ms - going to sleep\n", sleep_for));
-					gf_sleep(sleep_for);
-				}
-
-				/*check if cache is not full*/
-				gf_mx_p(dash->dl_mutex);
-				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 (group->nb_cached_segments<group->max_cached_segments) {
-						cache_full = 0;
-						break;
-					}
-				}
-				gf_mx_v(dash->dl_mutex);
-
-				if (!cache_full) break;
-
-				if (dash->request_period_switch==2) all_groups_done = 1;
-
-				if (all_groups_done && dash->request_period_switch) {
-					gf_dash_reset_groups(dash);
-					if (dash->request_period_switch == 1) 
-						dash->active_period_index++;
-
-					dash->request_period_switch = 0;
-
-					goto restart_period;
-				}
-				gf_sleep(30);
-			}
-		}
-
-		/* stop the thread if requested */
-		if (dash->mpd_stop_request) {
-			go_on = 0;
-			break;
-		}
-
-		min_wait = 0;
-
-		/*for each selected groups*/
-		for (i=0; i<group_count; i++) {		
-			Bool in_segment_avail_time;
-			u64 start_range, end_range;
-			Bool use_byterange;
-			u32 representation_index;
-			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-			if (group->selection != GF_DASH_GROUP_SELECTED) continue;
-			if (group->done) continue;
-
-
-			if (group->nb_cached_segments>=group->max_cached_segments) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Cache is full for this group - skipping\n", gf_sys_clock() ));
-				continue;
-			}
-
-			/*remember the active rep index, since group->active_rep_index may change because of bandwidth control algorithm*/
-			representation_index = group->active_rep_index;
-			rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-
-			/* if the index of the segment to be downloaded is greater or equal to the last segment (as seen in the playlist),
-			we need to check if a new playlist is ready */
-			if (group->nb_segments_in_rep && (group->download_segment_index>=group->nb_segments_in_rep)) {
-				u32 timer = gf_sys_clock() - dash->last_update_time;
-				Bool update_playlist = 0;
-				/* update of the playlist, only if indicated */
-				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*/
-				else if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->mpd->media_presentation_duration) {
-					if (group->segment_duration && (timer > group->segment_duration*1000))
-						update_playlist = 1;
-				}
-				if (update_playlist) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in current playlist downloaded, checking updates after %u ms\n", timer));
-					e = gf_dash_update_manifest(dash);
-					if (e) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
-					}
-					group_count = gf_list_count(dash->groups);
-					rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-				} else {
-					gf_sleep(16);
-				}
-				/* Now that the playlist is up to date, we can check again */
-				if (group->download_segment_index >= 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) {
-							u32 now = gf_sys_clock();
-							GF_LOG(GF_LOG_INFO, 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));
-							group->done = 1;
-							break;
-						}
-					} else {
-						/* if not, we are really at the end of the playlist, we can quit */
-						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] End of playlist reached... downloading remaining elements..."));
-						group->done = 1;
-						break;
-					}
-				}
-			}
-			group->time_at_first_reload_required = 0;
-			gf_mx_p(dash->dl_mutex);
-
-			if (group->force_switch_bandwidth && !dash->auto_switch_count) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Forcing representation switch, retesting group"));
-				gf_dash_switch_group_representation(dash, group);
-				/*restart*/
-				i--;
-				gf_mx_v(dash->dl_mutex);
-				continue;
-			}
-
-			in_segment_avail_time = 0;
-
-			/*check availablity start time of segment in Live !!*/
-			if (!group->broken_timing && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8) {
-				u32 clock_time = gf_sys_clock();
-				s32 to_wait = 0;
-				u32 seg_dur_ms=0;
-				s64 segment_ast = (s64) gf_dash_get_segment_availability_start_time(dash->mpd, group, group->download_segment_index, &seg_dur_ms);
-				s64 now = (s64) gf_net_get_utc();
-				
-				to_wait = (s32) (segment_ast - now);
-
-				/*if segment AST is greater than now, it is not yet available ...*/
-				if (to_wait > 4) {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD") is not yet available on server - requesting later in %d ms\n", i+1, gf_sys_clock(), group->download_segment_index + group->start_number, segment_ast, to_wait));
-					if (group->last_segment_time) {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
-					}
-					gf_mx_v(dash->dl_mutex);
-					if (!min_wait || ((u32) to_wait < min_wait))
-						min_wait = to_wait;
-					continue;
-				} else {
-					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD") should now be available on server since %d ms - requesting it\n", i+1, gf_sys_clock(), group->download_segment_index + group->start_number, segment_ast, -to_wait));
-
-					if (group->last_segment_time) {
-						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
-					}
-					/*check if we are in the segment availability end time*/
-					if (now < segment_ast + seg_dur_ms + group->time_shift_buffer_depth )
-						in_segment_avail_time = 1;
-				}
-			}
-			min_wait = 0;
-
-			/* At this stage, there are some segments left to be downloaded */
-			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
-			gf_mx_v(dash->dl_mutex);
-			if (e) {
-				/*do something!!*/
-				break;
-			}
-			use_byterange = (start_range || end_range) ? 1 : 0;
-
-			if (use_byterange) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading new segment: %s (range: "LLD"-"LLD")\n", new_base_seg_url, start_range, end_range));
-			}
-
-			/*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; 
-				e = GF_OK;
-				/*do not erase local files*/
-				group->local_files = 1;
-				gf_dash_buffer_off(group, dash);
-				if (group->force_switch_bandwidth && !dash->auto_switch_count) {
-					gf_dash_switch_group_representation(dash, group);
-					/*restart*/
-					i--;
-					continue;
-				}
-
-			} else {
-				group->max_bitrate = 0;
-				group->min_bitrate = (u32)-1;
-				/*use persistent connection for segment downloads*/
-				if (use_byterange) {
-					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), new_base_seg_url, start_range, end_range, 1, group);
-				} else {
-					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), new_base_seg_url, 0, 0, 1, group);
-				}
-
-				/*TODO decide what is the best, fetch from another representation or ignore ...*/
-				if (e != GF_OK) {
-					if (group->maybe_end_of_stream) {
-						if (group->maybe_end_of_stream==2) {
-							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Couldn't get segment %s (error %s) and end of period was guessed during last update - stoping playback\n", new_base_seg_url, gf_error_to_string(e)));
-							group->maybe_end_of_stream = 0;
-							group->done = 1;
-						}
-						group->maybe_end_of_stream++;
-					} else if (in_segment_avail_time) {
-						GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Couldn't get segment %s during its availability period (%s) - retrying\n", new_base_seg_url, gf_error_to_string(e)));
-						min_wait = 30;
-					} else {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s\n", new_base_seg_url, gf_error_to_string(e)));
-						group->download_segment_index++;
-					}
-					continue;
-				}
-
-				if ((e==GF_OK) && group->force_switch_bandwidth) {
-					if (!dash->auto_switch_count) {
-						gf_dash_switch_group_representation(dash, group);
-						/*restart*/
-						i--;
-						continue;
-					}
-					if (rep->playback.disabled) {
-						gf_dash_skip_disabled_representation(group, rep);
-						/*restart*/
-						i--;
-						continue;
-					}
-				}
-
-				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);
-
-				resource_name = dash->dash_io->get_url(dash->dash_io, group->segment_download);
-
-				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 );
-				group->cached[group->nb_cached_segments].cache = gf_strdup(local_file_name);
-				group->cached[group->nb_cached_segments].url = gf_strdup( resource_name );
-				group->cached[group->nb_cached_segments].start_range = 0;
-				group->cached[group->nb_cached_segments].end_range = 0;
-				group->cached[group->nb_cached_segments].representation_index = representation_index;
-				group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
-
-				if (group->local_files && use_byterange) {
-					group->cached[group->nb_cached_segments].start_range = start_range;
-					group->cached[group->nb_cached_segments].end_range = end_range;
-				}
-				if (!group->local_files) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Added file to cache (%u/%u in cache): %s\n", group->nb_cached_segments+1, group->max_cached_segments, group->cached[group->nb_cached_segments].url));
-				}
-				group->nb_cached_segments++;
-				gf_dash_update_buffering(group, dash);
-				group->download_segment_index++;
-				if (dash->auto_switch_count) {
-					group->nb_segments_done++;
-					if (group->nb_segments_done==dash->auto_switch_count) {
-						group->nb_segments_done=0;
-						gf_dash_skip_disabled_representation(group, rep);
-					}
-				}
-				gf_mx_v(dash->dl_mutex);
-			}
-			gf_free(new_base_seg_url);
-			new_base_seg_url = NULL;
-		}
-	}
-
-exit:
-	/* Signal that the download thread has ended */
-	gf_mx_p(dash->dl_mutex);
-
-	/*an error occured during playback chain creation and we couldn't release our plyayback chain in time, do it now*/
-	if (dash->dash_state == GF_DASH_STATE_CONNECTING)
-		gf_dash_reset_groups(dash);
-
-	dash->dash_state = GF_DASH_STATE_STOPPED;
-	gf_mx_v(dash->dl_mutex);
-	return ret;
-}
-
-static u32 gf_dash_period_index_from_time(GF_DashClient *dash, u32 time)
-{
-	u32 i, count, cumul_start=0;
-	GF_MPD_Period *period;
-	count = gf_list_count(dash->mpd->periods);
-	for (i = 0; i<count; i++) {
-		period = gf_list_get(dash->mpd->periods, i);
-		if ((period->start > time) || (cumul_start > time)) {
-			break;
-		}
-		cumul_start+=period->duration;
-	}
-	return (i-1 >= 0 ? (i-1) : 0);
-}
-
-static void gf_dash_download_stop(GF_DashClient *dash)
-{
-	u32 i;
-	assert( dash );
-	if (dash->groups) {
-		for (i=0; i<gf_list_count(dash->groups); i++) {
-			GF_DASH_Group *group = gf_list_get(dash->groups, i);
-			assert( group );
-			if ((group->selection == GF_DASH_GROUP_SELECTED) && group->segment_download) {
-				if (group->segment_download)
-					dash->dash_io->abort(dash->dash_io, group->segment_download);
-				group->done = 1;
-			}
-		}
-	}
-	/* stop the download thread */
-	gf_mx_p(dash->dl_mutex);
-	if (dash->dash_state != GF_DASH_STATE_STOPPED) {
-		dash->mpd_stop_request = 1;
-		gf_mx_v(dash->dl_mutex);
-		while (1) {
-			/* waiting for the download thread to stop */
-			gf_sleep(16);
-			gf_mx_p(dash->dl_mutex);
-			if (dash->dash_state != GF_DASH_STATE_RUNNING) {
-				/* it's stopped we can continue */
-				gf_mx_v(dash->dl_mutex);
-				break;
-			}
-			gf_mx_v(dash->dl_mutex);
-		}
-	} else {
-		gf_mx_v(dash->dl_mutex);
-	}
-}
-
-
-
-Bool gf_dash_seek_periods(GF_DashClient *dash)
-{
-	Double start_time;
-	u32 i, period_idx;
-
-	gf_mx_p(dash->dl_mutex);
-
-	dash->start_range_in_segment_at_next_period = 0;
-	start_time = 0;
-	period_idx = 0;
-	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;
-		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) ) {
-				period_idx = i;
-				break;
-			}
-		}
-		start_time += dur;
-	}
-	if (period_idx != dash->active_period_index) {
-		dash->playback_start_range -= 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;
-			}
-
-		}
-	}
-	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)
-{
-	Double seg_start;
-	u32 first_downloaded, last_downloaded, segment_idx;
-
-	group->force_segment_switch = 0;
-	if (!group->segment_duration) return;
-
-	/*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++;
-	}
-	/*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 >= 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) 
-		dash->dash_io->abort(dash->dash_io, group->segment_download);
-
-	if (group->urlToDeleteNext) {
-		if (!dash->keep_files && !group->local_files)
-			dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
-
-		gf_free(group->urlToDeleteNext);
-		group->urlToDeleteNext = NULL;
-	}
-	if (group->segment_download) {
-		dash->dash_io->del(dash->dash_io, group->segment_download);
-		group->segment_download = NULL;
-	}
-	while (group->nb_cached_segments) {
-		group->nb_cached_segments --;
-		if (!dash->keep_files && !group->local_files && !group->segment_must_be_streamed)
-			gf_delete_file(group->cached[group->nb_cached_segments].cache);
-
-		gf_free(group->cached[group->nb_cached_segments].cache);
-		gf_free(group->cached[group->nb_cached_segments].url);
-		memset(&group->cached[group->nb_cached_segments], 0, sizeof(segment_cache_entry));
-	}
-}
-
-void gf_dash_seek_groups(GF_DashClient *dash)
-{
-	u32 i;
-
-	gf_mx_p(dash->dl_mutex);
-
-	if (dash->active_period_index) {
-		Double dur = 0;
-		u32 i;
-		for (i=0; i<dash->active_period_index; i++) {
-			GF_MPD_Period *period = gf_list_get(dash->mpd->periods, dash->active_period_index-1);
-			dur += period->duration/1000.0;
-		}
-		dash->playback_start_range -= 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_mx_v(dash->dl_mutex);
-}
-
-
-static GF_Err http_ifce_get(GF_FileDownload *getter, char *url)
-{
-	GF_Err e;
-	GF_DashClient *dash = (GF_DashClient*) getter->udta;
-	GF_DASHFileIOSession *sess = dash->dash_io->create(dash->dash_io, 0, url, -1);
-	if (!sess) return GF_IO_ERR;
-	getter->session = sess;
-	e = dash->dash_io->init(dash->dash_io, sess);
-	if (e) return e;
-	return dash->dash_io->run(dash->dash_io, sess);
-}
-
-static void http_ifce_clean(GF_FileDownload *getter)
-{
-	GF_DashClient *dash = (GF_DashClient*) getter->udta;
-	if (getter->session) dash->dash_io->del(dash->dash_io, getter->session);
-	getter->session = NULL;
-}
-
-static const char *http_ifce_cache_name(GF_FileDownload *getter)
-{
-	GF_DashClient *dash = (GF_DashClient*) getter->udta;
-	if (getter->session) return dash->dash_io->get_cache_name(dash->dash_io, getter->session);
-	return NULL;
-}
-
-GF_EXPORT
-GF_Err gf_dash_open(GF_DashClient *dash, const char *manifest_url)
-{
-	char local_path[GF_MAX_PATH];
-	const char *local_url;
-	GF_Err e;
-	GF_MPD_Period *period;
-	GF_DOMParser *mpd_parser;
-	Bool is_local = 0;
-
-	if (!dash || !manifest_url) return GF_BAD_PARAM;
-
-	memset( dash->lastMPDSignature, 0, sizeof(dash->last_update_time));
-	dash->reload_count = 0;
-
-	if (dash->base_url) gf_free(dash->base_url);
-	dash->base_url = gf_strdup(manifest_url);
-
-	dash->getter.udta = dash;
-	dash->getter.new_session = http_ifce_get;
-	dash->getter.del_session = http_ifce_clean;
-	dash->getter.get_cache_name = http_ifce_cache_name;
-	dash->getter.session = NULL;
-
-
-
-	if (dash->mpd_dnload) dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-	dash->mpd_dnload = NULL;
-	local_url = NULL;
-
-	if (!strnicmp(manifest_url, "file://", 7)) {
-		local_url = manifest_url + 7;
-		is_local = 1;
-		if (strstr(manifest_url, ".m3u8")) {
-			dash->is_m3u8 = 1;
-		}
-	} else if (strstr(manifest_url, "://")) {
-		const char *reloc_url, *mtype;
-		char mime[128];
-		e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), manifest_url, 0, 0, 1, NULL);
-		if (e!=GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD downloading problem %s for %s\n", gf_error_to_string(e), manifest_url));
-			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-			dash->mpd_dnload = NULL;
-			return e;
-		}
-
-		mtype = dash->dash_io->get_mime(dash->dash_io, dash->mpd_dnload);
-		strcpy(mime, mtype ? mtype : "");
-		strlwr(mime);
-
-		reloc_url = dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload);
-		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
-		if (gf_dash_is_m3u8_mime(reloc_url, mime) || strstr(reloc_url, ".m3u8") || strstr(reloc_url, ".M3U8")) {
-			dash->is_m3u8 = 1;
-		} else if (!gf_dash_is_dash_mime(mime) && !strstr(reloc_url, ".mpd") && !strstr(reloc_url, ".MPD")) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] mime '%s' for '%s' should be m3u8 or mpd\n", mime, reloc_url));
-			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-			dash->mpd_dnload = NULL;
-			return GF_REMOTE_SERVICE_ERROR;
-		}
-
-		/*if relocated use new URL as base URL for all requests*/
-		if (strcmp(reloc_url, manifest_url)) {
-			gf_free(dash->base_url);
-			dash->base_url = gf_strdup(reloc_url);
-		}
-
-		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
-		if (!local_url) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: cache problem %s\n", local_url));
-			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-			dash->mpd_dnload = NULL;
-			return GF_IO_ERR;
-		}
-	} else {
-		local_url = manifest_url;
-		is_local = 1;
-		if (strstr(manifest_url, ".m3u8"))
-			dash->is_m3u8 = 1;
-	}
-
-	if (is_local) {
-		FILE *f = fopen(local_url, "rt");
-		if (!f) return GF_URL_ERROR;
-		fclose(f);
-	}
-	dash->mpd_fetch_time = gf_net_get_utc();
-
-	if (dash->is_m3u8) {
-		if (is_local) {
-			char *sep;
-			strcpy(local_path, local_url);
-			sep = strrchr(local_path, '.');
-			if (sep) sep[0]=0;
-			strcat(local_path, ".mpd");
-
-			gf_m3u8_to_mpd(local_url, manifest_url, local_path, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
-			local_url = local_path;
-		} else {
-			gf_m3u8_to_mpd(local_url, manifest_url, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
-		}
-	}
-
-	if (!gf_dash_check_mpd_root_type(local_url)) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: wrong file type %s\n", local_url));
-		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-		dash->mpd_dnload = NULL;
-		return GF_URL_ERROR;
-	}
-
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] parsing MPD %s\n", local_url));
-
-	/* parse the MPD */
-	mpd_parser = gf_xml_dom_new();
-	e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
-	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);
-		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-		dash->mpd_dnload = NULL;
-		return GF_URL_ERROR;
-	}
-	if (dash->mpd)
-		gf_mpd_del(dash->mpd);
-
-	dash->mpd = gf_mpd_new();
-	if (!dash->mpd) {
-		e = GF_OUT_OF_MEM;
-	} else {
-		e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), dash->mpd, manifest_url);
-	}
-	gf_xml_dom_del(mpd_parser);
-
-	if (e != GF_OK) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD creation problem %s\n", gf_error_to_string(e)));
-		goto exit;
-	}
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH client initialized from MPD\n"));
-	if (is_local && dash->mpd->minimum_update_period) {
-		e = gf_dash_update_manifest(dash);
-		if (e != GF_OK) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update MPD: %s\n", gf_error_to_string(e)));
-			goto exit;
-		}
-	}
-
-	/* Get the right period from the given time */
-	dash->active_period_index = gf_dash_period_index_from_time(dash, 0);
-	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
-	if (!period || !gf_list_count(period->adaptation_sets) ) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot start: not enough periods or representations in MPD\n"));
-		e = GF_URL_ERROR;
-		goto exit;
-	}
-
-	e = gf_th_run(dash->dash_thread, dash_main_thread_proc, dash);
-
-	return e;
-exit:
-	dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-	dash->mpd_dnload = NULL;
-
-	if (dash->mpd)
-		gf_mpd_del(dash->mpd);
-	dash->mpd = NULL;
-	return e;
-}
-
-GF_EXPORT
-void gf_dash_close(GF_DashClient *dash)
-{
-	assert( dash );
-
-	gf_dash_download_stop(dash);
-
-	gf_mx_p(dash->dl_mutex);
-	if (dash->mpd_dnload) {
-		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
-		dash->mpd_dnload = NULL;
-	}
-	if (dash->mpd)
-		gf_mpd_del(dash->mpd);
-	dash->mpd = NULL;
-
-	gf_mx_v(dash->dl_mutex);
-
-	if (dash->dash_state != GF_DASH_STATE_CONNECTING)
-		gf_dash_reset_groups(dash);
-}
-
-GF_EXPORT
-GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, u32 max_cache_duration, u32 auto_switch_count, Bool keep_files, Bool disable_switching, GF_DASHInitialSelectionMode first_select_mode, Bool enable_buffering, u32 initial_time_shift_percent)
-{
-	GF_DashClient *dash;
-	GF_SAFEALLOC(dash, GF_DashClient);
-	dash->dash_io = dash_io;
-
-	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->auto_switch_count = auto_switch_count;
-	dash->keep_files = keep_files;
-	dash->disable_switching = disable_switching;
-	dash->first_select_mode = first_select_mode;	
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Client created\n"));
-	return dash;
-}
-
-GF_EXPORT
-void gf_dash_del(GF_DashClient *dash)
-{
-	gf_dash_close(dash);
-
-	gf_th_del(dash->dash_thread);
-	gf_mx_del(dash->dl_mutex);	
-
-	if (dash->mimeTypeForM3U8Segments) gf_free(dash->mimeTypeForM3U8Segments);
-	if (dash->base_url) gf_free(dash->base_url);
-
-	gf_free(dash);
-}
-
-GF_EXPORT
-u32 gf_dash_get_group_count(GF_DashClient *dash)
-{
-	return gf_list_count(dash->groups);
-}
-
-
-GF_EXPORT
-void *gf_dash_get_group_udta(GF_DashClient *dash, u32 idx)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group) return NULL;
-	return group->udta;
-}
-
-GF_EXPORT
-GF_Err gf_dash_set_group_udta(GF_DashClient *dash, u32 idx, void *udta)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group) return GF_BAD_PARAM;
-	group->udta = udta;
-	return GF_OK;
-}
-
-GF_EXPORT
-Bool gf_dash_is_group_selected(GF_DashClient *dash, u32 idx)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group) return 0;
-	return (group->selection == GF_DASH_GROUP_SELECTED) ? 1 : 0;
-}
-
-GF_EXPORT
-void gf_dash_get_info(GF_DashClient *dash, const char **title, const char **source)
-{
-	GF_MPD_ProgramInfo *info = gf_list_get(dash->mpd->program_infos, 0);
-	if (info) {
-		*title = info->title;
-		*source = info->source;
-	}
-}
-
-GF_EXPORT
-void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool immediate_switch)
-{
-	u32 i;
-	for (i=0; i<gf_list_count(dash->groups); i++) {
-		u32 switch_to_rep_idx = 0;
-		u32 bandwidth, quality, k;
-		GF_MPD_Representation *rep, *active_rep;
-		GF_DASH_Group *group = gf_list_get(dash->groups, i);
-		u32 current_idx = group->active_rep_index;
-		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
-
-		if (group->force_representation_idx_plus_one) current_idx = group->force_representation_idx_plus_one - 1;
-
-		active_rep = gf_list_get(group->adaptation_set->representations, current_idx);
-		if (!active_rep) continue;
-		bandwidth = switch_up ? (u32) -1 : 0;
-		quality = switch_up ? (u32) -1 : 0;
-
-		for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
-			rep = gf_list_get(group->adaptation_set->representations, k);
-			if (switch_up) {
-				if ((rep->quality_ranking>active_rep->quality_ranking) || (rep->bandwidth>active_rep->bandwidth)) {
-					if ((rep->quality_ranking < quality) || (rep->bandwidth < bandwidth)) {
-						bandwidth = rep->bandwidth;
-						quality = rep->quality_ranking;
-						switch_to_rep_idx = k+1;
-					}
-				}
-			} else {
-				if ((rep->quality_ranking < active_rep->quality_ranking) || (rep->bandwidth < active_rep->bandwidth)) {
-					if ((rep->quality_ranking > quality) || (rep->bandwidth > bandwidth)) {
-						bandwidth = rep->bandwidth;
-						quality = rep->quality_ranking;
-						switch_to_rep_idx = k+1;
-					}
-				}
-			}
-		}
-		if (switch_to_rep_idx && (switch_to_rep_idx-1 != current_idx) ) {
-			gf_mx_p(dash->dl_mutex);
-			group->force_switch_bandwidth = 1;
-			group->force_representation_idx_plus_one = switch_to_rep_idx;
-
-			if (group->local_files || immediate_switch) {
-				/*in local playback just switch at the end of the current segment
-				for remote, we should let the user decide*/
-				while (group->nb_cached_segments>1) {
-					group->nb_cached_segments--;
-					gf_dash_update_buffering(group, dash);
-
-					gf_free(group->cached[group->nb_cached_segments].url);
-					group->cached[group->nb_cached_segments].url = NULL;
-					if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
-						gf_delete_file( group->cached[group->nb_cached_segments].cache );
-						gf_free(group->cached[group->nb_cached_segments].cache);
-						group->cached[group->nb_cached_segments].cache = NULL;
-					}
-					group->cached[group->nb_cached_segments].representation_index = 0;
-					group->cached[group->nb_cached_segments].start_range = 0;
-					group->cached[group->nb_cached_segments].end_range = 0;
-					group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
-					if (group->download_segment_index>1)
-						group->download_segment_index--;
-				}
-			}
-			gf_mx_v(dash->dl_mutex);
-		}
-	}
-}
-
-GF_EXPORT
-Double gf_dash_get_duration(GF_DashClient *dash)
-{
-	Double duration;
-	duration = (Double)dash->mpd->media_presentation_duration;
-	if (!duration) {
-		u32 i;
-		for (i=0; i<gf_list_count(dash->mpd->periods); i++) {
-			GF_MPD_Period *period = gf_list_get(dash->mpd->periods, i);
-			duration += (Double)period->duration;
-		}
-	}
-	duration /= 1000;
-	return duration;
-}
-
-GF_EXPORT
-const char *gf_dash_get_url(GF_DashClient *dash)
-{
-	return dash->base_url;
-}
-
-GF_EXPORT
-const char *gf_dash_group_get_segment_mime(GF_DashClient *dash, u32 idx)
-{
-	GF_MPD_Representation *rep;
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group) return NULL;
-
-	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-	return gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
-}
-
-GF_EXPORT
-const char *gf_dash_group_get_segment_init_url(GF_DashClient *dash, u32 idx, u64 *start_range, u64 *end_range)
-{
-	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;
-}
-
-GF_EXPORT
-void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group) return;
-	if (group->selection == GF_DASH_GROUP_NOT_SELECTABLE)
-		return;
-
-	group->selection = select ? GF_DASH_GROUP_SELECTED : GF_DASH_GROUP_NOT_SELECTED;
-	/*this set is part of a group, make sure no all other sets from the indicated group are unselected*/
-	if (select && (group->adaptation_set->group>=0)) {
-		u32 i;
-		for (i=0; i<gf_dash_get_group_count(dash); i++) {
-			GF_DASH_Group *agroup = gf_list_get(dash->groups, i);
-			if (agroup==group) continue;
-
-			/*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;
-			}
-		}
-	}
-}
-
-GF_EXPORT
-void gf_dash_groups_set_language(GF_DashClient *dash, const char *lang_3cc)
-{
-	u32 i;
-	if (!lang_3cc) return;
-	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)) {
-			gf_dash_group_select(dash, i, 1);
-		}
-	}
-}
-
-GF_EXPORT
-Bool gf_dash_is_running(GF_DashClient *dash) 
-{
-	return dash->dash_state;
-}
-
-GF_EXPORT
-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)
-{
-	dash->request_period_switch = 1;
-}
-GF_EXPORT
-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) 
-{
-	return dash->in_period_setup;
-}
-
-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);
-	return group->max_cached_segments;
-}
-
-
-GF_EXPORT
-u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 idx, Bool *group_is_done)
-{
-	u32 res = 0;
-	GF_DASH_Group *group;
-
-	gf_mx_p(dash->dl_mutex);
-	group = gf_list_get(dash->groups, idx);
-
-	*group_is_done = 0;
-	if (!group) {
-		*group_is_done = 1;
-	} else {
-		*group_is_done = group->done;
-		res = group->nb_cached_segments;
-
-		if (group->buffering) {
-			res = 0;
-		}
-	}
-	gf_mx_v(dash->dl_mutex);
-	return res;
-}
-
-GF_EXPORT
-void gf_dash_group_discard_segment(GF_DashClient *dash, u32 idx)
-{
-	GF_DASH_Group *group;
-
-	gf_mx_p(dash->dl_mutex);
-	group = gf_list_get(dash->groups, idx);
-
-	if (!group->nb_cached_segments) {
-		gf_mx_v(dash->dl_mutex);	
-		return;
-	}
-	if (group->cached[0].cache) {
-		if (group->urlToDeleteNext) {
-			if (!group->local_files && !dash->keep_files)
-				dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
-
-			gf_free( group->urlToDeleteNext);
-			group->urlToDeleteNext = NULL;
-		}
-		assert( group->cached[0].url );
-
-		if (group->dont_delete_first_segment) {
-			group->dont_delete_first_segment = 0;
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MPD_IN] deleting cache file %s : %s\n", group->cached[0].url, group->cached[0].cache));
-			group->urlToDeleteNext = gf_strdup( group->cached[0].url );
-		}
-
-		gf_free(group->cached[0].cache);
-		gf_free(group->cached[0].url);
-		group->cached[0].url = NULL;
-		group->cached[0].cache = NULL;
-		group->cached[0].representation_index = 0;
-		group->cached[0].duration = 0;
-	}
-	memmove(&group->cached[0], &group->cached[1], sizeof(segment_cache_entry)*(group->nb_cached_segments-1));
-	memset(&(group->cached[group->nb_cached_segments-1]), 0, sizeof(segment_cache_entry));
-	group->nb_cached_segments--;
-
-	gf_mx_v(dash->dl_mutex);
-}
-
-GF_EXPORT
-void gf_dash_set_group_done(GF_DashClient *dash, u32 idx, Bool done)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (group) {
-		group->done = done;
-		if (done && group->segment_download) dash->dash_io->abort(dash->dash_io, group->segment_download);
-	}
-}
-
-GF_EXPORT
-GF_Err gf_dash_group_get_presentation_time_offset(GF_DashClient *dash, u32 idx, u64 *presentation_time_offset, u32 *timescale)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (group) {
-		u64 duration;
-		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-		gf_dash_resolve_duration(rep, group->adaptation_set, group->period, &duration, timescale, presentation_time_offset, NULL);
-		return GF_OK;
-	}
-	return GF_BAD_PARAM;
-}
-
-GF_EXPORT
-GF_Err gf_dash_group_get_next_segment_location(GF_DashClient *dash, u32 idx, 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)
-{
-	GF_DASH_Group *group;
-
-	*url = NULL;
-	if (switching_url) *switching_url = NULL;
-	if (start_range) *start_range = 0;
-	if (end_range) *end_range = 0;
-	if (switching_start_range) *switching_start_range = 0;
-	if (switching_end_range) *switching_end_range = 0;
-	if (original_url) *original_url = NULL;
-	if (switching_index) *switching_index = -1;
-
-	gf_mx_p(dash->dl_mutex);	
-	group = gf_list_get(dash->groups, idx);
-	if (!group->nb_cached_segments) {
-		gf_mx_v(dash->dl_mutex);	
-		return GF_BAD_PARAM;
-	}
-	*url = group->cached[0].cache;
-	if (start_range) 
-		*start_range = group->cached[0].start_range;
-	if (end_range)
-		*end_range = group->cached[0].end_range;
-	if (original_url) *original_url = group->cached[0].url;
-
-	if (group->cached[0].representation_index != group->prev_active_rep_index) {
-		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[0].representation_index);
-		if (switching_index)
-			*switching_index = group->cached[0].representation_index;
-		if (switching_start_range)
-			*switching_start_range = rep->playback.init_start_range;
-		if (switching_end_range)
-			*switching_end_range = rep->playback.init_end_range;
-		if (switching_url)
-			*switching_url = rep->playback.cached_init_segment_url;
-	}
-	group->force_segment_switch = 0;
-	group->prev_active_rep_index = group->cached[0].representation_index;
-	gf_mx_v(dash->dl_mutex);	
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_dash_group_probe_current_download_segment_location(GF_DashClient *dash, u32 idx, const char **url, s32 *switching_index, const char **switching_url, const char **original_url)
-{
-	GF_DASH_Group *group;
-
-	*url = NULL;
-	if (switching_url) *switching_url = NULL;
-	if (original_url) *original_url = NULL;
-	if (switching_index) *switching_index = -1;
-
-	gf_mx_p(dash->dl_mutex);	
-	group = gf_list_get(dash->groups, idx);
-	if (!group) {
-		gf_mx_v(dash->dl_mutex);	
-		return GF_BAD_PARAM;
-	}
-
-	if (!group->is_downloading) {
-		gf_mx_v(dash->dl_mutex);
-		return GF_OK;
-	}
-
-	*url = dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
-	if (original_url) *original_url = dash->dash_io->get_url(dash->dash_io, group->segment_download);
-
-	if (group->active_rep_index != group->prev_active_rep_index) {
-		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
-		if (switching_index)
-			*switching_index = group->active_rep_index;
-		if (switching_url)
-			*switching_url = rep->playback.cached_init_segment_url;
-	}
-	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;
-	/*first check if we seek to another period*/
-	if (! gf_dash_seek_periods(dash)) {
-		/*if no, seek in group*/
-		gf_dash_seek_groups(dash);
-	}
-	gf_mx_v(dash->dl_mutex);	
-}
-
-GF_EXPORT
-Double gf_dash_get_playback_start_range(GF_DashClient *dash)
-{
-	return dash->playback_start_range;
-}
-
-GF_EXPORT
-Bool gf_dash_group_segment_switch_forced(GF_DashClient *dash, u32 idx)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	return group->force_segment_switch;
-}
-
-GF_EXPORT
-Double gf_dash_group_current_segment_start_time(GF_DashClient *dash, u32 idx)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	return gf_dash_get_segment_start_time(group, NULL);
-}
-
-GF_EXPORT
-GF_Err gf_dash_group_get_video_info(GF_DashClient *dash, u32 idx, u32 *max_width, u32 *max_height)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	if (!group || !max_width || !max_height) return GF_BAD_PARAM;
-
-	*max_width = group->adaptation_set->max_width;
-	*max_height = group->adaptation_set->max_height;
-	return GF_OK;
-}
-
-GF_EXPORT
-GF_Err gf_dash_group_get_representation_info(GF_DashClient *dash, u32 idx, u32 representation_idx, u32 *width, u32 *height, u32 *audio_samplerate, u32 *bandwidth, const char **codecs)
-{
-	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
-	GF_MPD_Representation *rep;
-	if (!group) return GF_BAD_PARAM;
-	rep = gf_list_get(group->adaptation_set->representations, representation_idx);
-	if (!rep) return GF_BAD_PARAM;
-
-	if (width) *width = rep->width ? rep->width : group->adaptation_set->width;
-	if (height) *width = rep->height ? rep->height : group->adaptation_set->height;
-	if (codecs) *codecs = rep->codecs ? rep->codecs : group->adaptation_set->codecs;
-	if (bandwidth) *bandwidth = rep->bandwidth;
-	if (audio_samplerate) *audio_samplerate = rep->samplerate ? rep->samplerate : group->adaptation_set->samplerate;
-
-	return GF_OK;
-}
-
-
-#endif //GPAC_DISABLE_DASH_CLIENT
-
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+*			Authors: Jean Le Feuvre, Cyril Concolato
+*			Copyright (c) Telecom ParisTech 2010-
+*					All rights reserved
+*
+*  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
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*
+*  GPAC is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU Lesser General Public License for more details.
+*
+*  You should have received a copy of the GNU Lesser General Public
+*  License along with this library; see the file COPYING.  If not, write to
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
+
+#include <gpac/thread.h>
+#include <gpac/network.h>
+#include <gpac/dash.h>
+#include <gpac/internal/mpd.h>
+#include <gpac/internal/m3u8.h>
+#include <gpac/internal/isomedia_dev.h>
+#include <string.h>
+
+#ifdef _WIN32_WCE
+#include <winbase.h>
+#else
+#include <time.h>
+#endif
+
+#ifndef GPAC_DISABLE_DASH_CLIENT
+
+/*set to 1 if you want MPD to use SegmentTemplate if possible instead of SegmentList*/
+#define M3U8_TO_MPD_USE_TEMPLATE	0
+
+typedef enum {
+	GF_DASH_STATE_STOPPED = 0,
+	/*period setup and playback chain creation*/
+	GF_DASH_STATE_SETUP,
+	/*request to start playback chain*/
+	GF_DASH_STATE_CONNECTING,
+	GF_DASH_STATE_RUNNING,
+} GF_DASH_STATE;
+
+
+//shifts AST in the past(>0) or future (<0)  so that client starts request in the future or in the past
+//#define FORCE_DESYNC	4000
+
+
+typedef struct __dash_group GF_DASH_Group;
+
+struct __dash_client
+{
+	GF_DASHFileIO *dash_io;
+
+	/*interface to mpd parser - get rid of this and use the DASHIO instead ?*/
+	GF_FileDownload getter;
+
+	char *base_url;
+
+	u32 max_cache_duration, max_width, max_height;
+	u8 max_bit_per_pixel;
+	u32 auto_switch_count;
+	Bool keep_files, disable_switching, allow_local_mpd_update, enable_buffering, estimate_utc_drift;
+	Bool is_m3u8;
+
+	u64 mpd_fetch_time;
+	GF_DASHInitialSelectionMode first_select_mode;
+
+	/* MPD downloader*/
+	GF_DASHFileIOSession mpd_dnload;
+	/* MPD */
+	GF_MPD *mpd;
+	/* 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];
+	/*mime type of media segments (m3u8)*/
+	char *mimeTypeForM3U8Segments;
+
+	/* active period in MPD (only one currently supported) */
+	u32 active_period_index;
+	u32 request_period_switch;
+
+	u64 start_time_in_active_period;
+
+	Bool ignore_mpd_duration;
+	u32 initial_time_shift_percent;
+
+	/*list of groups in the active period*/
+	GF_List *groups;
+
+	/*Main Thread handling segment downloads and MPD/M3U8 update*/
+	GF_Thread *dash_thread;
+	/*mutex for group->cache file name access and MPD update*/
+	GF_Mutex *dl_mutex;
+
+	/* one of the above state*/
+	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;
+
+	Bool force_mpd_update;
+
+	u32 user_buffer_ms;
+
+	u32 min_timeout_between_404, segment_lost_after_ms;
+
+	s32 debug_group_index;
+};
+
+static void gf_dash_seek_group(GF_DashClient *dash, GF_DASH_Group *group);
+
+
+typedef struct
+{
+	char *cache;
+	char *url;
+	u64 start_range, end_range;
+	/*representation index in adaptation_set->representations*/
+	u32 representation_index;
+	Bool loop_detected;
+	u32 duration;
+} segment_cache_entry;
+
+typedef enum
+{
+	/*set if group cannot be selected (wrong MPD)*/
+	GF_DASH_GROUP_NOT_SELECTABLE = 0,
+	GF_DASH_GROUP_NOT_SELECTED,
+	GF_DASH_GROUP_SELECTED,
+} GF_DASHGroupSelection;
+
+/*this structure Group is the implementation of the adaptationSet element of the MPD.*/
+struct __dash_group
+{
+	GF_DashClient *dash;
+
+	/*pointer to adaptation set*/
+	GF_MPD_AdaptationSet *adaptation_set;
+	/*pointer to active period*/
+	GF_MPD_Period *period;
+
+	/*active representation index in adaptation_set->representations*/
+	u32 active_rep_index;
+
+	u32 prev_active_rep_index;
+
+	Bool timeline_setup;
+
+	GF_DASHGroupSelection selection;
+
+	/*may be mpd@time_shift_buffer_depth or rep@time_shift_buffer_depth*/
+	u32 time_shift_buffer_depth;
+
+	Bool bitstream_switching, dont_delete_first_segment;
+
+	Bool done;
+	//if set, will redownload the last segment partially downloaded
+	Bool force_switch_bandwidth;
+	Bool min_bandwidth_selected;
+	u32 download_start_time;
+	u32 active_bitrate, max_bitrate, min_bitrate;
+	u32 min_representation_bitrate;
+
+	u32 nb_segments_in_rep;
+	Double segment_duration;
+
+	Double start_playback_range;
+
+	Bool was_segment_base;
+	/*local file playback, do not delete them*/
+	Bool local_files;
+	/*next segment to download for this group - negative number to take into account SN wrapping*/
+	s32 download_segment_index;
+	/*number of segments pruged since the start of the period*/
+	u32 nb_segments_purged;
+
+	u32 nb_retry_on_last_segment;
+	s32 start_number_at_last_ast;
+	u64 ast_at_init;
+
+	/*next file (cached) to delete at next GF_NET_SERVICE_QUERY_NEXT for this group*/
+	char * urlToDeleteNext;
+	volatile u32 max_cached_segments, nb_cached_segments, max_buffer_segments;
+	segment_cache_entry *cached;
+
+	GF_DASHFileIOSession segment_download;
+
+	const char *segment_local_url;
+	/*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;
+
+	u32 nb_segments_done;
+	u32 last_segment_time;
+
+	Bool segment_must_be_streamed;
+	Bool broken_timing;
+	Bool buffering;
+	u32 maybe_end_of_stream;
+	u32 cache_duration;
+	u32 time_at_first_reload_required;	
+	u32 force_representation_idx_plus_one;
+
+	Bool force_segment_switch;
+	Bool is_downloading, download_aborted;
+	Bool loop_detected;
+
+	u32 time_at_first_failure;
+	Bool prev_segment_ok, segment_in_valid_range;
+	//this is the number of 404
+	u32 nb_consecutive_fail;
+	u64 retry_after_utc;
+	/*set when switching segment, indicates the current downloaded segment duration*/
+	u64 current_downloaded_segment_duration;
+
+	char *service_mime;
+
+	/* base representation index of this group plus one, or 0 if all representations in this group are independent*/
+	u32 base_rep_index_plus_one;
+
+	/* maximum representation index we want to download*/
+	u32 force_max_rep_index;
+	//start time of currently downloaded segment - for now only used for merging SegmentTimeline, but we should use this to resync across representations ...
+	u64 current_start_time;
+	u32 current_timescale;
+
+	void *udta;
+};
+
+static const char *gf_dash_get_mime_type(GF_MPD_SubRepresentation *subrep, GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set)
+{
+	if (subrep && subrep->mime_type) return subrep->mime_type;
+	if (rep && rep->mime_type) return rep->mime_type;
+	if (set && set->mime_type) return set->mime_type;
+	return NULL;
+}
+
+static void gf_dash_buffer_off(GF_DASH_Group *group) 
+{
+	if (!group->dash->enable_buffering) return;
+	if (group->buffering) { 
+		assert(group->dash->nb_buffering); 
+		group->dash->nb_buffering--;	
+		if (!group->dash->nb_buffering) {
+			group->dash->dash_io->on_dash_event(group->dash->dash_io, GF_DASH_EVENT_BUFFER_DONE, -1, GF_OK); 
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Session buffering done\n"));
+		}
+		group->buffering = 0;
+	} 
+}
+
+static void gf_dash_buffer_on(GF_DASH_Group *group) 
+{
+	if (!group->dash->enable_buffering) return;
+
+	if (!group->buffering) {
+		if (!group->dash->nb_buffering) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Starting session buffering\n"));
+		}
+		group->dash->nb_buffering++; 
+		group->buffering = 1;
+	}
+}
+
+static u64 dash_get_fetch_time(GF_DashClient *dash)
+{
+	u64 utc = 0;
+
+	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) 
+		utc = gf_net_get_utc();
+	return utc;
+}
+
+
+static u32 gf_dash_group_count_rep_needed(GF_DASH_Group *group)
+{
+	u32 count, nb_rep_need, next_rep_index_plus_one;
+	GF_MPD_Representation *rep;
+	count  = gf_list_count(group->adaptation_set->representations);
+	nb_rep_need = 1;
+	if (!group->base_rep_index_plus_one || (group->base_rep_index_plus_one == group->force_max_rep_index+1))
+		return nb_rep_need; // we need to download only one representation
+	rep = gf_list_get(group->adaptation_set->representations, group->base_rep_index_plus_one-1);
+	next_rep_index_plus_one = rep->enhancement_rep_index_plus_one;
+	while ((nb_rep_need < count) && rep->enhancement_rep_index_plus_one) {
+		nb_rep_need++;
+		if (next_rep_index_plus_one == group->force_max_rep_index+1)
+			break;
+		rep = gf_list_get(group->adaptation_set->representations, next_rep_index_plus_one-1);
+		next_rep_index_plus_one = rep->enhancement_rep_index_plus_one;
+	}
+
+	assert(nb_rep_need <= count);
+
+	return nb_rep_need;
+}
+
+GF_EXPORT
+void gf_dash_get_buffer_info_buffering(GF_DashClient *dash, u32 *total_buffer, u32 *media_buffered)
+{
+	u32 nb_buffering = 0;
+	if (dash->nb_buffering) {
+		u32 i, j, nb_groups;
+		*total_buffer = 0;
+		*media_buffered = 0;
+		nb_groups = gf_list_count(dash->groups);
+		for (i=0; i<nb_groups; i++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, i);
+			if (group->buffering) {
+				u32 buffer = 0;
+				*total_buffer += (u32) (group->segment_duration*group->max_buffer_segments*1000);
+				for (j=0; j<group->nb_cached_segments; j++) {
+					buffer += group->cached[j].duration;
+				}
+				*media_buffered += buffer;
+				nb_buffering += gf_dash_group_count_rep_needed(group);
+			}
+		}
+		if (*media_buffered > *total_buffer) 
+			*media_buffered  = *total_buffer;
+		*total_buffer /= nb_buffering;
+		*media_buffered /= nb_buffering;
+	}
+}
+
+static void gf_dash_update_buffering(GF_DASH_Group *group, GF_DashClient *dash)
+{
+	if (dash->nb_buffering) {
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_BUFFERING, -1, GF_OK);
+
+		if (group->cached[0].duration && group->nb_cached_segments>=group->max_buffer_segments) 
+			gf_dash_buffer_off(group);
+	}
+}
+
+
+GF_EXPORT
+Bool gf_dash_check_mpd_root_type(const char *local_url)
+{
+	if (local_url) {
+		char *rtype = gf_xml_get_root_type(local_url, NULL);
+		if (rtype) {
+			Bool handled = 0;
+			if (!strcmp(rtype, "MPD")) {
+				handled = 1;
+			}
+			gf_free(rtype);
+			return handled;
+		}
+	}
+	return 0;
+}
+
+
+static void gf_dash_group_timeline_setup(GF_MPD *mpd, GF_DASH_Group *group, u64 fetch_time)
+{
+	GF_MPD_SegmentTimeline *timeline = NULL;
+	GF_MPD_Representation *rep = NULL;
+	u32 shift, timescale;
+	u64 current_time, current_time_no_timeshift, availabilityStartTime;
+	u32 ast_diff, start_number;
+	Double ast_offset = 0;
+	
+	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 (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) {
+			u64 utc;
+			sscanf(val, LLU, &utc);
+			group->dash->utc_drift_estimate = (s32) ((s64) fetch_time - (s64) utc);
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff between client and server %d ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime));
+		} else {
+			val = group->dash->dash_io->get_header_value(group->dash->dash_io, group->dash->mpd_dnload, "Date");
+			if (val) {
+				u64 utc = gf_net_parse_date(val);
+				if (utc) {
+					group->dash->utc_drift_estimate = (s32) ((s64) fetch_time - (s64) utc);
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Estimated UTC diff between client and server %d ms (UTC fetch "LLU" - server UTC "LLU" - MPD AST "LLU" - MPD PublishTime "LLU"\n", group->dash->utc_drift_estimate, fetch_time, utc, group->dash->mpd->availabilityStartTime, group->dash->mpd->publishTime));
+				}
+			}
+		}
+	}
+
+
+	availabilityStartTime = mpd->availabilityStartTime + group->dash->utc_shift + group->dash->utc_drift_estimate;
+
+#ifdef FORCE_DESYNC
+	availabilityStartTime -= FORCE_DESYNC;
+#endif
+	
+	ast_diff = (u32) (availabilityStartTime - group->dash->mpd->availabilityStartTime);
+	current_time = fetch_time;
+
+	if (current_time < availabilityStartTime) {
+		//if more than 1 sec consider we have a pb
+		if (availabilityStartTime - current_time >= 1000) {
+			Bool broken_timing = 1;
+#ifndef _WIN32_WCE
+			time_t gtime1, gtime2;
+			struct tm *t1, *t2;
+			gtime1 = current_time / 1000;
+			t1 = gmtime(&gtime1);
+			gtime2 = availabilityStartTime / 1000;
+			t2 = gmtime(&gtime2);
+			if (t1 == t2) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Slight drift in UTC clock at time %d-%02d-%02dT%02d:%02d:%02dZ: diff AST - now %d ms\n", 1900+t1->tm_year, t1->tm_mon+1, t1->tm_mday, t1->tm_hour, t1->tm_min, t1->tm_sec, (s32) (availabilityStartTime - current_time) ));
+				current_time = 0;
+				broken_timing = 0;
+			}
+			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)
+				));
+			} else {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in UTC clock: could not retrieve time!\n"));
+			}
+
+#endif
+			if (broken_timing) {
+				if (group->dash->utc_shift + group->dash->utc_drift_estimate > 0) {
+					availabilityStartTime = current_time;
+				} else {
+					current_time = 0;
+					group->broken_timing = 1;
+					return;
+				}
+			}
+		} else {
+			availabilityStartTime = current_time;
+			current_time = 0;	
+		}
+	}
+	else current_time -= availabilityStartTime;	
+
+	if (current_time < group->period->start) current_time = 0;
+	else current_time -= group->period->start;
+
+#if 0
+	{
+		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;
+	}
+#endif
+
+	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 (current_time < shift) current_time = 0;
+			else current_time -= shift;
+		} else if (group->dash->user_buffer_ms) {
+			shift = MIN(group->dash->user_buffer_ms, mpd->time_shift_buffer_depth);
+
+			if (current_time < shift) current_time = 0;
+			else current_time -= shift;
+		}
+	}
+
+	timeline = NULL;
+	timescale=1;
+	start_number=0;
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+
+	if (group->period->segment_list) {
+		if (group->period->segment_list->segment_timeline) timeline = group->period->segment_list->segment_timeline;
+		if (group->period->segment_list->timescale) timescale = group->period->segment_list->timescale;
+		if (group->period->segment_list->start_number) start_number = group->period->segment_list->start_number;
+		if (group->period->segment_list->availability_time_offset) ast_offset = group->period->segment_list->availability_time_offset;
+	}
+	if (group->adaptation_set->segment_list) {
+		if (group->adaptation_set->segment_list->segment_timeline) timeline = group->adaptation_set->segment_list->segment_timeline;
+		if (group->adaptation_set->segment_list->timescale) timescale = group->adaptation_set->segment_list->timescale;
+		if (group->adaptation_set->segment_list->start_number) start_number = group->adaptation_set->segment_list->start_number;
+		if (group->adaptation_set->segment_list->availability_time_offset) ast_offset = group->adaptation_set->segment_list->availability_time_offset;
+	}
+	if (rep->segment_list) {
+		if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
+		if (rep->segment_list->timescale) timescale = rep->segment_list->timescale;
+		if (rep->segment_list->start_number) start_number = rep->segment_list->start_number;
+		if (rep->segment_list->availability_time_offset) ast_offset = rep->segment_list->availability_time_offset;
+	}
+
+	if (group->period->segment_template) {
+		if (group->period->segment_template->segment_timeline) timeline = group->period->segment_template->segment_timeline;
+		if (group->period->segment_template->timescale) timescale = group->period->segment_template->timescale;
+		if (group->period->segment_template->start_number) start_number = group->period->segment_template->start_number;
+		if (group->period->segment_template->availability_time_offset) ast_offset = group->period->segment_template->availability_time_offset;
+	}
+	if (group->adaptation_set->segment_template) {
+		if (group->adaptation_set->segment_template->segment_timeline) timeline = group->adaptation_set->segment_template->segment_timeline;
+		if (group->adaptation_set->segment_template->timescale) timescale = group->adaptation_set->segment_template->timescale;
+		if (group->adaptation_set->segment_template->start_number) start_number = group->adaptation_set->segment_template->start_number;
+		if (group->adaptation_set->segment_template->availability_time_offset) ast_offset = group->adaptation_set->segment_template->availability_time_offset;
+	}
+	if (rep->segment_template) {
+		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
+		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
+		if (rep->segment_template->start_number) start_number = rep->segment_template->start_number;
+		if (rep->segment_template->availability_time_offset) ast_offset = rep->segment_template->availability_time_offset;
+	}
+
+	if (timeline) {
+		u64 start_segtime = 0;
+		u64 segtime = 0;
+		u64 current_time_rescale;
+		u64 timeline_duration = 0;
+		u32 count;
+		u32 i, seg_idx = 0;
+
+		current_time_rescale = current_time;
+		current_time_rescale /= 1000;
+		current_time_rescale *= timescale;
+
+		count = gf_list_count(timeline->entries);
+		for (i=0; i<count; i++) {
+			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; 
+			}
+			timeline_duration += (1+ent->repeat_count)*ent->duration;
+
+			if (i+1 == count) timeline_duration -= ent->duration;
+		}
+
+		for (i=0; i<count; i++) {
+			u32 repeat;
+			GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, i);
+			if (!segtime) {
+				start_segtime = segtime = ent->start_time;
+
+				//if current time is before the start of the previous segement, consider our timing is broken
+				if (current_time_rescale + ent->duration < segtime) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] current time "LLU" is before start time "LLU" of first segment in timeline (timescale %d) by %g sec - using first segment as starting point\n", current_time_rescale, segtime, timescale, (segtime-current_time_rescale)*1.0/timescale));
+					group->download_segment_index = seg_idx;
+					group->nb_segments_in_rep = count;
+					group->start_playback_range = (segtime)*1.0/timescale;
+					group->ast_at_init = availabilityStartTime - (u32) (ast_offset*1000);
+					group->broken_timing = 1;
+					return;
+				}
+			}
+
+			repeat = 1+ent->repeat_count;
+			while (repeat) {
+				if ((current_time_rescale >= segtime) && (current_time_rescale < segtime + ent->duration)) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Found segment %d for current time "LLU" is in SegmentTimeline ["LLU"-"LLU"] (timecale %d - current index %d)\n", seg_idx, current_time_rescale, start_segtime, segtime + ent->duration, timescale, group->download_segment_index));
+
+					group->download_segment_index = seg_idx;
+					group->nb_segments_in_rep = seg_idx + count - i;
+					group->start_playback_range = (current_time)/1000.0;
+					group->ast_at_init = availabilityStartTime - (u32) (ast_offset*1000);
+
+					//to remove - this is a hack to speedup starting for some strange MPDs which announce the live point as the first segment but have already produced the complete timeline
+					if (group->dash->utc_drift_estimate<0) {
+						group->ast_at_init -= (timeline_duration - (segtime-start_segtime)) *1000/timescale;
+					}
+					return;
+				}
+				segtime += ent->duration;
+				repeat--;
+				seg_idx++;
+			}
+		}
+		//NOT FOUND !!
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] current time "LLU" is NOT in SegmentTimeline ["LLU"-"LLU"] - cannot estimate current startNumber, default to 0 ...\n", current_time_rescale, start_segtime, segtime));
+		group->download_segment_index = 0;
+		group->nb_segments_in_rep = 10;
+		group->broken_timing = 1;
+		return;
+	}
+
+	if (group->segment_duration) {
+		u32 nb_segs_in_update = (u32) (mpd->minimum_update_period / (1000*group->segment_duration) );
+		Double nb_seg = (Double) current_time;
+		nb_seg /= 1000;
+		nb_seg /= group->segment_duration;
+		shift = (u32) nb_seg;
+
+		//when is the next segment available ? if less than 1/3 of a second till now start with next one
+		if (1000 * ( (1+shift /*next segment*/+ 1/*+seg duration for availability time*/) * group->segment_duration - ast_offset /*get exact AST time*/) - current_time < 330) {
+			group->start_playback_range = 0;
+			shift++;
+		} else {
+			group->start_playback_range = (Double) current_time / 1000.0;
+		}
+
+		if (!group->start_number_at_last_ast) {
+			group->download_segment_index = shift;
+			group->start_number_at_last_ast = start_number;
+
+			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));
+		} else {
+			group->download_segment_index += start_number;
+			if (group->download_segment_index > group->start_number_at_last_ast) {
+				group->download_segment_index -= group->start_number_at_last_ast;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At current time %d ms: Updating Timeline: startNumber=%d segmentNumber=%d downloadSegmentIndex=%d segmentDuration=%g AST_diff=%d\n", current_time, start_number, shift, group->download_segment_index, group->segment_duration, ast_diff));
+			} else {
+				group->download_segment_index = shift;
+				group->ast_at_init = availabilityStartTime -  (u32) (ast_offset*1000);
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] At current time "LLU" ms: Re-Initializing Timeline: startNumber=%d segmentNumber=%d segmentDuration=%g AST_diff=%d\n", current_time, start_number, shift, group->segment_duration, ast_diff));
+			}
+			group->start_number_at_last_ast = start_number;
+		}
+		if (group->nb_segments_in_rep) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] UTC time indicates first segment in period is %d, MPD indicates %d segments are available\n", group->download_segment_index , group->nb_segments_in_rep));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] UTC time indicates first segment in period is %d\n", group->download_segment_index));
+		}
+
+		if (group->nb_segments_in_rep && (group->download_segment_index + nb_segs_in_update > group->nb_segments_in_rep)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Not enough segments (%d needed vs %d indicated) to reach period endTime indicated in MPD - ignoring MPD duration\n", nb_segs_in_update, group->nb_segments_in_rep - group->download_segment_index ));
+			group->nb_segments_in_rep = shift + nb_segs_in_update;
+			group->dash->ignore_mpd_duration = 1;
+		}
+		group->prev_segment_ok = GF_TRUE;
+	} else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Segment duration unknown - cannot estimate current startNumber\n"));
+	}
+}
+
+
+
+
+
+/*!
+* Returns true if given mime type is a MPD file
+* \param mime the mime-type to check
+* \return true if mime-type if MPD-OK
+*/
+static Bool gf_dash_is_dash_mime(const char * mime) {
+	u32 i;
+	if (!mime)
+		return 0;
+	for (i = 0 ; GF_DASH_MPD_MIME_TYPES[i] ; i++){
+		if ( !stricmp(mime, GF_DASH_MPD_MIME_TYPES[i]))
+			return 1;
+	}
+	return 0;
+}
+
+/*!
+* Returns true if mime type of a given URL is an M3U8 mime-type
+* \param url The url to check
+* \param mime The mime-type to check
+* \return true if mime-type is OK for M3U8
+*/
+static Bool gf_dash_is_m3u8_mime(const char *url, const char * mime) {
+	u32 i;
+	if (!url || !mime)
+		return 0;
+	if (strstr(url, ".mpd") || strstr(url, ".MPD"))
+		return 0;
+
+	for (i = 0 ; GF_DASH_M3U8_MIME_TYPES[i] ; i++) {
+		if ( !stricmp(mime, GF_DASH_M3U8_MIME_TYPES[i]))
+			return 1;
+	}
+	return 0;
+}
+
+
+GF_EXPORT
+GF_Err gf_dash_group_check_bandwidth(GF_DashClient *dash, u32 idx)
+{
+	Bool default_switch_mode = 0;
+	u32 download_rate, set_idx, time_since_start, done, tot_size, time_until_end;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return GF_BAD_PARAM;
+	if (group->dash->disable_switching) return GF_OK;
+
+	if (group->buffering)
+		return GF_OK;
+
+	download_rate = group->dash->dash_io->get_bytes_per_sec(group->dash->dash_io, group->segment_download);
+	if (!download_rate) return GF_OK;
+
+
+	done = group->dash->dash_io->get_bytes_done(group->dash->dash_io, group->segment_download);
+	tot_size = group->dash->dash_io->get_total_size(group->dash->dash_io, group->segment_download);
+	time_until_end = 0;
+	if (tot_size) {
+		time_until_end = 1000*(tot_size-done) / download_rate;
+	}
+
+	download_rate *= 8;
+	if (download_rate<group->min_bitrate) group->min_bitrate = download_rate;
+	if (download_rate>group->max_bitrate) group->max_bitrate = download_rate;
+
+	if (!download_rate || (download_rate > group->active_bitrate)) {
+		return GF_OK;
+	}
+
+	set_idx = gf_list_find(group->period->adaptation_sets, group->adaptation_set)+1;
+	time_since_start = gf_sys_clock() - group->download_start_time;
+
+	if (group->min_bandwidth_selected) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%d at rate %d kbps but media bitrate is %d kbps - no lower bitrate available ...\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
+		return GF_OK;
+	}
+	
+
+	//TODO - when do we start checking ?
+	if (time_since_start < 200) {
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but media bitrate is %d kbps\n", set_idx, download_rate/1024, group->active_bitrate/1024 ));
+		return GF_OK;
+	}
+
+	if (time_until_end) {
+		u32 i, cache_dur=0;
+		for (i=1; i<group->nb_cached_segments; i++) {
+			cache_dur += group->cached[i].duration;
+		}
+		//we have enough cache data to go until end of this download, perform rate switching at next segment
+		if (time_until_end<cache_dur) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading from set #%ds at rate %d kbps but media bitrate is %d kbps - %d till end of download and %d in cache - going on with download\n", set_idx, download_rate/1024, group->active_bitrate/1024,time_until_end, cache_dur ));
+			return GF_OK;
+		}
+	}
+
+	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->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;
+
+	//if we have time to download from another rep ?
+	if (group->current_downloaded_segment_duration <= time_since_start) {
+		//don't force bandwidth switch (it's too late anyway, consider we lost the segment), let the rate adaptation decide
+		group->force_switch_bandwidth = default_switch_mode;
+
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Download time longer than segment duration - trying to resync on next segment\n"));
+	} else {
+		u32 target_rate;
+		//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. 
+			group->force_switch_bandwidth = default_switch_mode;
+		} else {
+			group->force_switch_bandwidth = 1;
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Attempting to re-download at target rate %d\n", target_rate));
+		}
+		//cap max bitrate for next rate adaptation pass
+		group->max_bitrate = target_rate;
+	}
+	return GF_OK;
+}
+
+/*!
+* 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()
+*/
+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)
+{
+	s32 group_idx = -1;
+	Bool had_sess = 0;
+	Bool retry = 1;
+	GF_Err e;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading %s starting at UTC "LLU" ms\n", url, gf_net_get_utc() ));
+
+	if (group) {
+		group_idx = gf_list_find(group->dash->groups, group);
+	}
+
+	if (! *sess) {
+		*sess = dash_io->create(dash_io, persistent_mode ? 1 : 0, url, group_idx);
+		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;
+		}
+	} else {
+		had_sess = 1;
+		if (persistent_mode!=2) {
+			e = dash_io->setup_from_url(dash_io, *sess, url, group_idx);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot resetup session for url %s: %s\n", url, gf_error_to_string(e) ));
+				return e;
+			}
+		}
+	}
+	if (group) {
+		group->is_downloading = 1;
+		group->download_start_time  = gf_sys_clock();
+	}
+
+retry:
+
+	if (end_range) {
+		e = dash_io->set_range(dash_io, *sess, start_range, end_range, (persistent_mode==2) ? 0 : 1);
+		if (e) {
+			if (had_sess) {
+				dash_io->del(dash_io, *sess);
+				*sess = NULL;
+				return gf_dash_download_resource(dash_io, sess, url, start_range, end_range, persistent_mode ? 1 : 0, group);
+			}
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot setup byte-range download for %s: %s\n", url, gf_error_to_string(e) ));
+			if (group)
+				group->is_downloading = 0;
+			return e;
+		}
+	}
+		assert(*sess);
+
+	/*issue HTTP GET for headers only*/
+	e = dash_io->init(dash_io, *sess);
+
+	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);
+			if (mime && !group->service_mime) {
+				group->service_mime = gf_strdup(mime);
+			} 
+			/*we allow servers to give us broken mim types for the representation served ...*/
+#if 0
+			else if (mime && stricmp(group->service_mime, mime)) {
+				GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+				if (! gf_dash_get_mime_type(NULL, rep, group->adaptation_set) ) 
+					rep->mime_type = gf_strdup(mime);
+				rep->disabled = 1;
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Disabling representation since mime does not match: expected %s, but had %s for %s!\n", group->service_mime, mime, url));
+				group->force_switch_bandwidth = 1;
+				if (group->segment_download) dash_io->abort(dash_io, group->segment_download);
+				group->is_downloading = 0;
+				return GF_OK;
+			}
+#endif
+		}
+
+		/*file cannot be cached on disk !*/
+		if (group) {
+			if (dash_io->get_cache_name(dash_io, group->segment_download) == NULL) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Segment %s cannot be cached on disk, will use direct streaming\n", url));
+				group->segment_must_be_streamed = 1;
+				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);
+	}
+	switch (e) {
+	case GF_IP_CONNECTION_FAILURE:
+	case GF_IP_NETWORK_FAILURE:
+	{
+		dash_io->del(dash_io, *sess);
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] failed to download, retrying once with %s...\n", url));
+		*sess = dash_io->create(dash_io, 0, url, group_idx);
+		if (! (*sess)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retry to download %s... OUT of memory ?\n", url));
+			if (group)
+				group->is_downloading = 0;
+			return GF_OUT_OF_MEM;
+		}
+
+		if (retry) {
+			retry = 0;
+			goto retry;
+		}
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] two consecutive failures, aborting the download %s.\n", url));
+		break;
+	}
+	case GF_OK:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Download %s complete at UTC "LLU" ms\n", url, gf_net_get_utc() ));
+		break;
+	default:
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] FAILED to download %s = %s...\n", url, gf_error_to_string(e)));
+		break;
+	}
+	if (group)
+		group->is_downloading = 0;
+	return e;
+}
+
+static void gf_dash_get_timeline_duration(GF_MPD_SegmentTimeline *timeline, u32 *nb_segments, Double *max_seg_duration)
+{
+	u32 i, count;
+
+	*nb_segments = 0;
+	if (max_seg_duration) *max_seg_duration = 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 (max_seg_duration && (*max_seg_duration < ent->duration)) *max_seg_duration = ent->duration;
+	}
+}
+
+static void gf_dash_get_segment_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, GF_MPD *mpd, u32 *nb_segments, Double *max_seg_duration)
+{
+	Double mediaDuration;
+	Bool single_segment = 0;
+	u32 timescale;
+	u64 duration;
+	GF_MPD_SegmentTimeline *timeline = NULL;
+	*nb_segments = timescale = 0;
+	duration = 0;
+
+	if (rep->segment_list || set->segment_list || period->segment_list) {
+		GF_List *segments = NULL;
+		if (period->segment_list) {
+			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_URLs) segments = period->segment_list->segment_URLs;
+			if (period->segment_list->segment_timeline) timeline = period->segment_list->segment_timeline;
+		}
+		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_URLs) segments = set->segment_list->segment_URLs;
+			if (set->segment_list->segment_timeline) timeline = set->segment_list->segment_timeline;
+		}
+		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_URLs) segments = rep->segment_list->segment_URLs;
+			if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
+		}
+		if (! timescale) timescale=1;
+
+		if (timeline) {
+			gf_dash_get_timeline_duration(timeline, nb_segments, max_seg_duration);
+			if (max_seg_duration) *max_seg_duration /= timescale;
+		} else {
+			if (segments) 
+				*nb_segments = gf_list_count(segments);
+			if (max_seg_duration) {
+				*max_seg_duration = (Double) duration;
+				*max_seg_duration /= timescale;
+			}
+		}
+		return;
+	}
+
+	/*single segment*/
+	if (rep->segment_base || set->segment_base || period->segment_base) {
+		*max_seg_duration = mpd->media_presentation_duration;
+		*max_seg_duration /= 1000;
+		*nb_segments = 1;
+		return;
+	}
+
+	single_segment = 1;
+	if (period->segment_template) {
+		single_segment = 0;
+		if (period->segment_template->duration) duration = period->segment_template->duration;
+		if (period->segment_template->timescale) timescale = period->segment_template->timescale;
+		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
+	}
+	if (set->segment_template) {
+		single_segment = 0;
+		if (set->segment_template->duration) duration = set->segment_template->duration;
+		if (set->segment_template->timescale) timescale = set->segment_template->timescale;
+		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
+	}
+	if (rep->segment_template) {
+		single_segment = 0;
+		if (rep->segment_template->duration) duration = rep->segment_template->duration;
+		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
+		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
+	}
+	if (!timescale) timescale=1;
+
+	/*if no SegmentXXX is found, this is a single segment representation (onDemand profile)*/
+	if (single_segment) {
+		*max_seg_duration = mpd->media_presentation_duration;
+		*max_seg_duration /= 1000;
+		*nb_segments = 1;
+		return;
+	}
+
+	if (timeline) {
+		gf_dash_get_timeline_duration(timeline, nb_segments, max_seg_duration);
+		if (max_seg_duration) *max_seg_duration /= timescale;
+	} else {
+		if (max_seg_duration) {
+			*max_seg_duration = (Double) duration;
+			*max_seg_duration /= timescale;
+		}
+		mediaDuration = period->duration;
+		if (!mediaDuration) mediaDuration = mpd->media_presentation_duration;
+		if (mediaDuration && duration) {
+			Double nb_seg = (Double) mediaDuration;
+			/*duration is given in ms*/
+			nb_seg /= 1000;
+			nb_seg *= timescale;
+			nb_seg /= duration;
+			*nb_segments = (u32) nb_seg;
+			if (*nb_segments < nb_seg) (*nb_segments)++;
+		}
+	}
+}
+
+static u64 gf_dash_segment_timeline_start(GF_MPD_SegmentTimeline *timeline, u32 segment_index, u64 *segment_duration)
+{
+	u64 start_time = 0;
+	u32 i, idx, k;
+	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;		
+		for (k=0; k<ent->repeat_count+1; k++) {
+			if (idx==segment_index) {
+				if (segment_duration) 
+					*segment_duration = ent->duration;
+				return start_time;
+			}
+			idx ++;
+			start_time += ent->duration;
+		}
+	}
+	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;
+	GF_MPD_AdaptationSet *set;
+	GF_MPD_Period *period;
+	u64 start_time;
+	u32 timescale;
+	s32 segment_index;
+	u64 duration;
+	GF_MPD_SegmentTimeline *timeline = NULL;
+	timescale = 0;
+	duration = 0;
+	start_time = 0;
+
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	set = group->adaptation_set;
+	period = group->period;
+	segment_index = group->download_segment_index;
+
+	/*single segment: return nothing*/
+	if (rep->segment_base || set->segment_base || period->segment_base) {
+		return start_time;
+	}
+	if (rep->segment_list || set->segment_list || period->segment_list) {
+		if (period->segment_list) {
+			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 (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 (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 (! timescale) timescale=1;
+
+		if (timeline) {
+			start_time = gf_dash_segment_timeline_start(timeline, segment_index, &duration);
+		} else {
+			start_time = segment_index * duration;
+		}
+		if (segment_duration) *segment_duration = duration; 
+		if (scale) *scale = timescale; 
+		return start_time;
+	}
+
+	if (period->segment_template) {
+		if (period->segment_template->duration) duration = period->segment_template->duration;
+		if (period->segment_template->timescale) timescale = period->segment_template->timescale;
+		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
+
+	}
+	if (set->segment_template) {
+		if (set->segment_template->duration) duration = set->segment_template->duration;
+		if (set->segment_template->timescale) timescale = set->segment_template->timescale;
+		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
+	}
+	if (rep->segment_template) {
+		if (rep->segment_template->duration) duration = rep->segment_template->duration;
+		if (rep->segment_template->timescale) timescale = rep->segment_template->timescale;
+		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
+	}
+	if (!timescale) timescale=1;
+
+	if (timeline) {
+		start_time = gf_dash_segment_timeline_start(timeline, segment_index, &duration);
+	} else {
+		start_time = segment_index * duration;
+	}
+	if (segment_duration) *segment_duration = duration; 
+	if (scale) *scale = timescale; 
+	return start_time;
+}
+
+static Double gf_dash_get_segment_start_time(GF_DASH_Group *group, Double *segment_duration)
+{
+	u64 start, dur;
+	u32 scale;
+
+	start = gf_dash_get_segment_start_time_with_timescale(group, &dur, &scale);
+	if (segment_duration) {
+		*segment_duration = (Double) dur;
+		*segment_duration /= scale;
+	}
+	return ((Double)start)/scale;
+}
+
+u64 gf_dash_get_segment_availability_start_time(GF_MPD *mpd, GF_DASH_Group *group, u32 segment_index, u32 *seg_dur_ms)
+{
+	Double seg_ast, seg_dur=0.0;
+	seg_ast = gf_dash_get_segment_start_time(group, &seg_dur);
+	if (seg_dur_ms) *seg_dur_ms = (u32) (seg_dur * 1000);
+
+	seg_ast += seg_dur;
+	seg_ast *= 1000;
+	seg_ast += group->period->start + group->ast_at_init;
+
+	return (u64) seg_ast;
+}
+
+static void gf_dash_resolve_duration(GF_MPD_Representation *rep, GF_MPD_AdaptationSet *set, GF_MPD_Period *period, u64 *out_duration, u32 *out_timescale, u64 *out_pts_offset, GF_MPD_SegmentTimeline **out_segment_timeline)
+{
+	u32 timescale = 0;
+	u64 pts_offset = 0;
+	GF_MPD_SegmentTimeline *segment_timeline;
+	GF_MPD_MultipleSegmentBase *mbase_rep, *mbase_set, *mbase_period;
+
+	if (out_segment_timeline) *out_segment_timeline = NULL;
+	if (out_pts_offset) *out_pts_offset = 0;
+
+	/*single media segment - duration is not known unless indicated in period*/
+	if (rep->segment_base || set->segment_base || period->segment_base) {
+		*out_duration = period ? period->duration : 0;
+		timescale = 0;
+		if (rep->segment_base && rep->segment_base->presentation_time_offset) pts_offset = rep->segment_base->presentation_time_offset;
+		if (rep->segment_base && rep->segment_base->timescale) timescale = rep->segment_base->timescale;
+		if (!pts_offset && set->segment_base && set->segment_base->presentation_time_offset) pts_offset = set->segment_base->presentation_time_offset;
+		if (!timescale && set->segment_base && set->segment_base->timescale) timescale = set->segment_base->timescale;
+		if (!pts_offset && period->segment_base && period->segment_base->presentation_time_offset) pts_offset = period->segment_base->presentation_time_offset;
+		if (!timescale && period->segment_base && period->segment_base->timescale) timescale = period->segment_base->timescale;
+
+		if (out_pts_offset) *out_pts_offset = pts_offset;
+		*out_timescale = timescale ? timescale : 1;
+		return;
+	}
+	/*we have a segment template list or template*/
+	mbase_rep = rep->segment_list ? (GF_MPD_MultipleSegmentBase *) rep->segment_list : (GF_MPD_MultipleSegmentBase *) rep->segment_template;
+	mbase_set = set->segment_list ? (GF_MPD_MultipleSegmentBase *)set->segment_list : (GF_MPD_MultipleSegmentBase *)set->segment_template;
+	mbase_period = period->segment_list ? (GF_MPD_MultipleSegmentBase *)period->segment_list : (GF_MPD_MultipleSegmentBase *)period->segment_template;
+
+	segment_timeline = NULL;
+	if (mbase_period) segment_timeline =  mbase_period->segment_timeline;
+	if (mbase_set && mbase_set->segment_timeline) segment_timeline =  mbase_set->segment_timeline;
+	if (mbase_rep && mbase_rep->segment_timeline) segment_timeline =  mbase_rep->segment_timeline;
+
+	timescale = mbase_rep ? mbase_rep->timescale : 0;
+	if (!timescale && mbase_set && mbase_set->timescale) timescale = mbase_set->timescale;
+	if (!timescale && mbase_period && mbase_period->timescale) timescale  = mbase_period->timescale;
+	if (!timescale) timescale = 1;
+	*out_timescale = timescale;
+
+	if (out_pts_offset) {
+		pts_offset = mbase_rep ? mbase_rep->presentation_time_offset : 0;
+		if (!pts_offset && mbase_set && mbase_set->presentation_time_offset) pts_offset = mbase_set->presentation_time_offset;
+		if (!pts_offset && mbase_period && mbase_period->presentation_time_offset) pts_offset = mbase_period->presentation_time_offset;
+		*out_pts_offset = pts_offset;
+	}
+
+	if (mbase_rep && mbase_rep->duration) *out_duration = mbase_rep->duration;
+	else if (mbase_set && mbase_set->duration) *out_duration = mbase_set->duration;
+	else if (mbase_period && mbase_period->duration) *out_duration = mbase_period->duration;
+
+	if (out_segment_timeline) *out_segment_timeline = segment_timeline;
+
+	/*for SegmentTimeline, just pick the first one as an indication (exact timeline solving is not done here)*/
+	if (segment_timeline) {
+		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(segment_timeline->entries, 0);
+		if (ent) *out_duration = ent->duration;
+	}
+	else if (rep->segment_list) {
+		GF_MPD_SegmentURL *url = gf_list_get(rep->segment_list->segment_URLs, 0);
+		if (url && url->duration) *out_duration = url->duration;
+	}
+}
+
+
+static u32 gf_dash_get_index_in_timeline(GF_MPD_SegmentTimeline *timeline, u64 start, u64 start_timescale, u64 timescale)
+{
+	u64 start_time = 0;
+	u32 idx = 0;
+	u32 i, count, repeat;
+	count = gf_list_count(timeline->entries);
+	for (i=0; i<count; i++) {
+		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, i);
+
+		if (!i || ent->start_time) start_time = ent->start_time;
+
+		repeat = ent->repeat_count+1;
+		while (repeat) {
+			if (start_timescale==timescale) {
+				if (start_time == start ) return idx;
+			} else {
+				if (start_time*start_timescale == start * timescale) return idx;
+			}
+			start_time+=ent->duration;
+			repeat--;
+			idx++;
+		}
+	}
+	//end of list in regular case: segment was the last one of the previous list and no changes happend
+	if (start_timescale==timescale) {
+		if (start_time == start ) return count;
+	} else {
+		if (start_time*start_timescale == start * timescale) return count;
+	}
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error: could not find previous segment start in current timeline ! seeking to end of timeline\n"));
+	return count;
+}
+
+
+static GF_Err gf_dash_merge_segment_timeline(GF_DASH_Group *group, GF_DashClient *dash, GF_MPD_SegmentList *old_list, GF_MPD_SegmentTemplate *old_template, GF_MPD_SegmentList *new_list, GF_MPD_SegmentTemplate *new_template, Double min_start_time)
+{
+	GF_MPD_SegmentTimeline *old_timeline, *new_timeline;
+	u32 i, idx, prev_count, timescale;
+	u64 start_time;
+	GF_MPD_SegmentTimelineEntry *first_new_entry;
+
+	old_timeline = new_timeline = NULL;
+	if (old_list && old_list->segment_timeline) {
+		if (!new_list || !new_list->segment_timeline) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: segment timeline not present in new MPD segmentList\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		old_timeline = old_list->segment_timeline;
+		new_timeline = new_list->segment_timeline;
+		timescale = new_list->timescale;
+	} else if (old_template && old_template->segment_timeline) {
+		if (!new_template || !new_template->segment_timeline) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: segment timeline not present in new MPD segmentTemplate\n"));
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		old_timeline = old_template->segment_timeline;
+		new_timeline = new_template->segment_timeline;
+		timescale = new_template->timescale;
+	}
+	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 {
+		for (i=0; i<gf_list_count(dash->groups); i++) {
+			GF_DASH_Group *a_group = gf_list_get(dash->groups, i);
+			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) 
+			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)
+			break;
+
+		/*if entry overlaps first entry in new timeline, remove segments*/
+		while (start_time + ent->duration * (1 + ent->repeat_count) > first_new_entry->start_time) {
+			ent->repeat_count--;
+		}
+		/*we will insert the first entry in the new timeline, make sure we have a start*/
+		if (!idx && !ent->start_time) 
+			ent->start_time = start_time;
+
+		start_time += ent->duration * (1 + ent->repeat_count);
+
+		gf_list_insert(new_timeline->entries, ent, idx);
+		idx ++;
+		gf_list_rem(old_timeline->entries, 0);
+	}
+
+	if (group) {
+		group->nb_segments_in_rep = gf_list_count(new_timeline->entries);
+		group->download_segment_index = gf_dash_get_index_in_timeline(new_timeline, group->current_start_time, group->current_timescale, timescale);
+	} else {
+		u32 i;
+		for (i=0; i<gf_list_count(dash->groups); i++) {
+			GF_DASH_Group *a_group = gf_list_get(dash->groups, i);
+			a_group->nb_segments_in_rep = gf_list_count(new_timeline->entries);
+			a_group->download_segment_index = gf_dash_get_index_in_timeline(new_timeline, a_group->current_start_time, a_group->current_timescale, timescale);
+		}
+	}
+
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated SegmentTimeline: %d entries (%d previously)\n", gf_list_count(new_timeline->entries), prev_count));
+#if 0
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("Dumping new merged timeline: \n"));
+	start_time=0;
+	for (idx=0; idx<gf_list_count(new_timeline->entries); idx++) {
+		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(new_timeline->entries, idx);
+		if (!idx) start_time = ent->start_time;
+		assert(!ent->start_time || (ent->start_time >=start_time));
+		start_time += ent->duration*(1+ent->repeat_count);
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("\tt="LLU" d=%d r=%d\n", ent->start_time, ent->duration, ent->repeat_count));
+	}
+#endif
+
+	return GF_OK;
+}
+
+static u32 gf_dash_purge_segment_timeline(GF_DASH_Group *group, Double min_start_time)
+{
+	u32 nb_removed, time_scale;
+	u64 start_time, min_start, duration;
+	GF_MPD_SegmentTimeline *timeline=NULL;
+	GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+
+	if (!min_start_time) return 0;
+	gf_dash_resolve_duration(rep, group->adaptation_set, group->period, &duration, &time_scale, NULL, &timeline);
+	if (!timeline) return 0;
+
+	min_start = (u64) (min_start_time*time_scale);
+	start_time = 0;
+	nb_removed=0;
+	while (1) {
+		GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, 0);
+		if (!ent) break;
+		if (ent->start_time) start_time = ent->start_time;
+
+		while (start_time + ent->duration < min_start) {
+			if (! ent->repeat_count) break;
+			ent->repeat_count--;
+			nb_removed++;
+			start_time += ent->duration;
+		}
+		/*this entry is in our range, keep it and make sure it has a start time*/
+		if (start_time + ent->duration >= min_start) {
+			if (!ent->start_time) ent->start_time = start_time;
+			break;
+		}
+		start_time += ent->duration;
+		gf_list_rem(timeline->entries, 0);
+		gf_free(ent);
+		nb_removed++;
+	}
+	if (nb_removed) {
+		GF_MPD_SegmentList *segment_list;
+		/*update next download index*/
+		group->download_segment_index -= nb_removed;
+		assert(group->nb_segments_in_rep >= nb_removed);
+		group->nb_segments_in_rep -= nb_removed;
+		/*clean segmentList*/
+		segment_list = NULL;
+		if (group->period && group->period->segment_list) segment_list = group->period->segment_list;
+		if (group->adaptation_set && group->adaptation_set->segment_list) segment_list = group->adaptation_set->segment_list;
+		if (rep && rep->segment_list) segment_list = rep->segment_list;
+
+		if (segment_list) {
+			u32 i = nb_removed;
+			while (i) {
+				GF_MPD_SegmentURL *seg_url = gf_list_get(segment_list->segment_URLs, 0);
+				gf_list_rem(segment_list->segment_URLs, 0);
+				gf_mpd_segment_url_free(seg_url);
+			}
+		}
+		group->nb_segments_purged += nb_removed;
+	}
+	return nb_removed;
+}
+
+static GF_Err gf_dash_update_manifest(GF_DashClient *dash)
+{
+	GF_Err e;
+	u32 group_idx, rep_idx, i, j;
+	u64 fetch_time=0;
+	GF_DOMParser *mpd_parser;
+	u8 signature[sizeof(dash->lastMPDSignature)];
+	GF_MPD_Period *period, *new_period;
+	const char *local_url;
+	char mime[128];
+	char * purl;
+	Double timeline_start_time;
+	GF_MPD *new_mpd;
+	Bool fetch_only = 0;
+
+	if (!dash->mpd_dnload) {
+		local_url = purl = NULL;
+		if (!gf_list_count(dash->mpd->locations)) {
+			FILE *t = fopen(dash->base_url, "rt");
+			if (t) {
+				local_url = dash->base_url;
+				fclose(t);
+			}
+			if (!local_url) {
+				/*we will no longer attempt to update the MPD ...*/
+				dash->mpd->minimum_update_period = 0;
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: no HTTP source for MPD could be found\n"));
+				return GF_BAD_PARAM;
+			}
+		}
+		if (!local_url) {
+			purl = gf_strdup(gf_list_get(dash->mpd->locations, 0));
+
+			/*if no absolute URL, use <Location> to get MPD in case baseURL is relative...*/
+			if (!strstr(dash->base_url, "://")) {
+				gf_free(dash->base_url);
+				dash->base_url = gf_strdup(purl);
+			} 
+			fetch_only = 1;
+		}
+	} else {
+		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
+		if (!local_url) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: wrong cache file %s\n", local_url));
+			return GF_IO_ERR;
+		}
+		gf_delete_file(local_url);
+		purl = gf_strdup( dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload) );
+	}
+
+	/*if update location is specified, update - spec does not say whether location is a relative or absoute URL*/
+	if (gf_list_count(dash->mpd->locations)) {
+		char *update_loc = gf_list_get(dash->mpd->locations, 0);
+		char *update_url = gf_url_concatenate(purl, update_loc);
+		if (update_url) {
+			gf_free(purl);
+			purl = update_url;
+		}
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updating Playlist %s...\n", purl ? purl : local_url));
+	if (purl) {
+		const char *mime_type;
+		/*use non-persistent connection for MPD*/
+		e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), purl, 0, 0, 0, NULL);
+		if (e!=GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: download problem %s for MPD file\n", gf_error_to_string(e)));
+			gf_free(purl);
+			return e;
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Playlist %s updated with success\n", purl));
+		}
+		mime_type = dash->dash_io->get_mime(dash->dash_io, dash->mpd_dnload) ;
+		strcpy(mime, mime_type ? mime_type : "");
+		strlwr(mime);
+
+		/*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);
+
+		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
+		if (gf_dash_is_m3u8_mime(purl, mime) || strstr(purl, ".m3u8")) {
+			gf_m3u8_to_mpd(local_url, purl, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
+		} else if (!gf_dash_is_dash_mime(mime)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] mime '%s' should be m3u8 or mpd\n", mime));
+		}
+
+		gf_free(purl);
+		purl = NULL;
+	}
+	fetch_time = dash_get_fetch_time(dash);
+
+	if (!gf_dash_check_mpd_root_type(local_url)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: MPD file type is not correct %s\n", local_url));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (gf_sha1_file( local_url, signature)) {
+		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))) {
+
+		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 
+		low latencies as we could miss a segment*/
+
+		if (dash->is_m3u8) {
+			dash->last_update_time += dash->mpd->minimum_update_period/2;
+		} else {
+			dash->last_update_time = gf_sys_clock();
+		}
+		return GF_OK;
+	} 
+
+	dash->reload_count = 0;
+	memccpy(dash->lastMPDSignature, signature, sizeof(char), sizeof(dash->lastMPDSignature));
+
+	/* It means we have to reparse the file ... */
+	/* parse the MPD */
+	mpd_parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
+	if (e != GF_OK) {
+		gf_xml_dom_del(mpd_parser);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in XML parsing %s\n", gf_error_to_string(e)));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+	new_mpd = gf_mpd_new();
+	e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), new_mpd, purl);
+	gf_xml_dom_del(mpd_parser);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: error in MPD creation %s\n", gf_error_to_string(e)));
+		gf_mpd_del(new_mpd);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	/*TODO - check periods are the same !!*/
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	if (fetch_only  && !period) goto exit;
+
+	new_period = gf_list_get(new_mpd->periods, dash->active_period_index);
+	if (!new_period) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing period\n"));
+		gf_mpd_del(new_mpd);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	if (gf_list_count(period->adaptation_sets) != gf_list_count(new_period->adaptation_sets)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing AdaptationSet\n"));
+		gf_mpd_del(new_mpd);
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updating playlist at UTC time "LLU" - availabilityStartTime "LLU"\n", fetch_time, new_mpd->availabilityStartTime));
+
+	timeline_start_time = 0;
+	/*if not infinity for timeShift, compute min media time before merge and adjust it*/
+	if (dash->mpd->time_shift_buffer_depth != (u32) -1) {
+		Double timeshift = dash->mpd->time_shift_buffer_depth;
+		timeshift /= 1000;
+
+		for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+			if (group->selection!=GF_DASH_GROUP_NOT_SELECTABLE) {
+				Double group_start = gf_dash_get_segment_start_time(group, NULL);
+				if (!group_idx || (timeline_start_time > group_start) ) timeline_start_time = group_start;
+			}
+		}
+		/*we can rewind our segments from timeshift*/
+		if (timeline_start_time > timeshift) timeline_start_time -= timeshift;
+		/*we can rewind all segments*/
+		else timeline_start_time = 0;
+	}
+
+	/*update segmentTimeline at Period level*/
+	e = gf_dash_merge_segment_timeline(NULL, dash, period->segment_list, period->segment_template, new_period->segment_list, new_period->segment_template, timeline_start_time);
+	if (e) {
+		gf_mpd_del(new_mpd);
+		return e;
+	}
+
+	for (group_idx=0; group_idx<gf_list_count(dash->groups); group_idx++) {
+		Double seg_dur;
+		Bool reset_segment_count;
+		GF_MPD_AdaptationSet *set, *new_set;
+		GF_DASH_Group *group = gf_list_get(dash->groups, group_idx);
+
+		/*update info even if the group is not selected !*/
+		if (group->selection==GF_DASH_GROUP_NOT_SELECTABLE)
+			continue;
+
+		set = group->adaptation_set;
+		new_set = gf_list_get(new_period->adaptation_sets, group_idx);
+
+		if (gf_list_count(new_set->representations) != gf_list_count(group->adaptation_set->representations)) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: missing representation in adaptation set\n"));
+			gf_mpd_del(new_mpd);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+
+		/*get all representations in both periods*/
+		for (rep_idx = 0; rep_idx <gf_list_count(group->adaptation_set->representations); rep_idx++) {
+			GF_List *segments, *new_segments;
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_idx);
+			GF_MPD_Representation *new_rep = gf_list_get(new_set->representations, rep_idx);
+
+			if (rep->segment_base || group->adaptation_set->segment_base || period->segment_base) {
+				if (!new_rep->segment_base && !new_set->segment_base && !new_period->segment_base) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment base as previous version\n"));
+					gf_mpd_del(new_mpd);
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+				/*what else should we check ??*/
+
+				/*OK, this rep is fine*/
+			}
+
+			else if (rep->segment_template || group->adaptation_set->segment_template || period->segment_template) {
+				u32 start;
+				if (!new_rep->segment_template && !new_set->segment_template && !new_period->segment_template) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment template as previous version\n"));
+					gf_mpd_del(new_mpd);
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+				start = 0;
+				/*override new startNum with old one - otherwise we would need to get rid of the entries before the start number in the MPD ...*/
+				if (period->segment_template && (period->segment_template->start_number != (u32) -1) ) start = period->segment_template->start_number;
+				if (set->segment_template && (set->segment_template->start_number != (u32) -1) ) start = set->segment_template->start_number;
+				if (rep->segment_template && (rep->segment_template->start_number != (u32) -1) ) start = rep->segment_template->start_number;
+
+				if (new_period->segment_template && (new_period->segment_template->start_number != (u32) -1) ) new_period->segment_template->start_number = start;
+				if (new_set->segment_template && (new_set->segment_template->start_number != (u32) -1) ) new_set->segment_template->start_number = start;
+				if (new_rep->segment_template && (new_rep->segment_template->start_number != (u32) -1) ) new_rep->segment_template->start_number = start;
+
+				/*OK, this rep is fine*/
+			}
+			else {
+				/*we're using segment list*/
+				assert(rep->segment_list || group->adaptation_set->segment_list || period->segment_list);
+
+				if (!new_rep->segment_list && !new_set->segment_list && !new_period->segment_list) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update playlist: representation does not use segment list as previous version\n"));
+					gf_mpd_del(new_mpd);
+					return GF_NON_COMPLIANT_BITSTREAM;
+				}
+				/*get the segment list*/
+				segments = new_segments = NULL;
+				if (period->segment_list && period->segment_list->segment_URLs) segments = period->segment_list->segment_URLs;
+				if (set->segment_list && set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
+				if (rep->segment_list && rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
+
+				if (new_period->segment_list && new_period->segment_list->segment_URLs) new_segments = new_period->segment_list->segment_URLs;
+				if (new_set->segment_list && new_set->segment_list->segment_URLs) new_segments = new_set->segment_list->segment_URLs;
+				if (new_rep->segment_list && new_rep->segment_list->segment_URLs) new_segments = new_rep->segment_list->segment_URLs;
+
+
+				for (i=0; i<gf_list_count(new_segments); i++) {
+					GF_MPD_SegmentURL *new_seg = gf_list_get(new_segments, i);
+					Bool found = 0;
+					for (j=0; j<gf_list_count(segments); j++) {
+						GF_MPD_SegmentURL *seg = gf_list_get(segments, j);
+						if (seg->media && new_seg->media && !strcmp(seg->media, new_seg->media)) {
+							found=1;
+							break;
+						}
+						if (seg->media_range && new_seg->media_range && (seg->media_range->start_range==new_seg->media_range->start_range) && (seg->media_range->end_range==new_seg->media_range->end_range) ) {
+							found=1;
+							break;
+						}
+					}
+					/*this is a new segment, merge it: we remove from new list and push to old one, before doing a final swap
+					this ensures that indexing in the segment_list is still correct after merging*/
+					if (!found) {
+						gf_list_rem(new_segments, i);
+						i--;
+						gf_list_add(segments, new_seg);
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Representation #%d: Adding new segment %s\n", rep_idx+1, new_seg->media));
+					}
+				}
+
+				/*what else should we check ?*/
+
+				/*swap segment list content*/
+				gf_list_swap(new_segments, segments);
+
+				/*current representation is the active one in the group - update the number of segments*/
+				if (group->active_rep_index==rep_idx) {
+					group->nb_segments_in_rep = gf_list_count(new_segments);
+				}
+			}
+
+			e = gf_dash_merge_segment_timeline(group, NULL, rep->segment_list, rep->segment_template, new_rep->segment_list, new_rep->segment_template, timeline_start_time);
+			if (e) {
+				gf_mpd_del(new_mpd);
+				return e;
+			}
+
+			/*what else should we check ??*/
+
+
+			/*switch all intertnal GPAC stuff*/
+			memcpy(&new_rep->playback, &rep->playback, sizeof(GF_DASH_RepresentationPlayback));
+			if (rep->playback.cached_init_segment_url) rep->playback.cached_init_segment_url = NULL;
+
+			if (!new_rep->mime_type) {
+				new_rep->mime_type = rep->mime_type;
+				rep->mime_type = NULL;
+			}
+		}
+
+		/*update segmentTimeline at AdaptationSet level before switching the set (old setup needed to compute current timing of each group) */
+		e = gf_dash_merge_segment_timeline(group, NULL, set->segment_list, set->segment_template, new_set->segment_list, new_set->segment_template, timeline_start_time);
+		if (e) {
+			gf_mpd_del(new_mpd);
+			return e;
+		}
+
+		/*update group/period to new period*/
+		j = gf_list_find(group->period->adaptation_sets, group->adaptation_set);
+		group->adaptation_set = gf_list_get(new_period->adaptation_sets, j);
+		group->period = new_period;
+
+		j = gf_list_count(group->adaptation_set->representations);
+		assert(j);
+
+		/*now that all possible SegmentXXX have been updated, purge them if needed: all segments ending before timeline_start_time
+		will be removed from MPD*/
+		if (timeline_start_time) {
+			u32 nb_segments_removed = gf_dash_purge_segment_timeline(group, timeline_start_time);
+			if (nb_segments_removed) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] AdaptationSet %d - removed %d segments from timeline (%d since start of the period)\n", group_idx+1, nb_segments_removed, group->nb_segments_purged));
+			}
+		}
+
+		if (new_mpd->availabilityStartTime != dash->mpd->availabilityStartTime) {
+			s64 diff = new_mpd->availabilityStartTime;
+			diff -= dash->mpd->availabilityStartTime;
+			if (diff < 0) diff = diff;
+			if (diff>3000)
+				gf_dash_group_timeline_setup(new_mpd, group, fetch_time);
+		}
+
+		group->maybe_end_of_stream = 0;
+		reset_segment_count = 0;
+		/*compute fetchTime + minUpdatePeriod and check period end time*/
+		if (new_mpd->minimum_update_period && new_mpd->media_presentation_duration) {
+			u32 endTime = (u32) (fetch_time - new_mpd->availabilityStartTime - period->start);
+			if (endTime > new_mpd->media_presentation_duration) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period EndTime is signaled to %d, less than fetch time %d ! Ignoring mediaPresentationDuration\n", new_mpd->media_presentation_duration, endTime));
+				new_mpd->media_presentation_duration = 0;
+				reset_segment_count = 1;
+			} else {
+				endTime += new_mpd->minimum_update_period;
+				if (endTime > new_mpd->media_presentation_duration) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period EndTime is signaled to %d, less than fetch time + next update - maybe end of stream ?\n", new_mpd->availabilityStartTime, endTime));
+					group->maybe_end_of_stream = 1;
+				}
+			}
+		}
+
+		/*update number of segments in active rep*/
+		gf_dash_get_segment_duration(gf_list_get(group->adaptation_set->representations, group->active_rep_index), group->adaptation_set, group->period, new_mpd, &group->nb_segments_in_rep, &seg_dur);
+
+		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) );
+
+			if (group->download_segment_index + nb_segs_in_mpd_period >= group->nb_segments_in_rep) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Period has %d segments but %d are needed until next refresh. Maybe end of stream is near ?\n", group->nb_segments_in_rep, group->download_segment_index + nb_segs_in_mpd_period));
+				group->maybe_end_of_stream = 1;
+			}
+		}
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated AdaptationSet %d - %d segments\n", group_idx+1, group->nb_segments_in_rep));
+
+	}
+
+exit:
+	/*swap representations - we don't need to update download_segment_index as it still points to the right entry in the merged list*/
+	if (dash->mpd)
+		gf_mpd_del(dash->mpd);
+	dash->mpd = new_mpd;
+	dash->last_update_time = gf_sys_clock();
+	dash->mpd_fetch_time = fetch_time;
+	return GF_OK;
+}
+
+static void gf_dash_set_group_representation(GF_DASH_Group *group, GF_MPD_Representation *rep)
+{
+#ifndef GPAC_DISABLE_LOG
+	u32 width=0, height=0, samplerate=0;
+	GF_MPD_Fractional *framerate=NULL;
+#endif
+	u32 k;
+	s32 timeshift;
+	GF_MPD_AdaptationSet *set;
+	GF_MPD_Period *period;
+	u32 nb_segs;
+	u32 i = gf_list_find(group->adaptation_set->representations, rep);
+	u32 nb_cached_seg_per_rep = group->max_cached_segments / gf_dash_group_count_rep_needed(group);
+	assert((s32) i >= 0);
+
+	/* in case of dependent representations: we set force_max_rep_index than active_rep_index*/
+	if (group->base_rep_index_plus_one)
+		group->force_max_rep_index = i;
+	else
+		group->active_rep_index = i;
+	group->active_bitrate = rep->bandwidth;
+	group->max_cached_segments = nb_cached_seg_per_rep * gf_dash_group_count_rep_needed(group);
+	nb_segs = group->nb_segments_in_rep;
+
+	group->min_bandwidth_selected = 1;
+	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 (group->active_bitrate > arep->bandwidth) {
+			group->min_bandwidth_selected = 0;
+			break;
+		}
+	}
+
+	set = group->adaptation_set;
+	period = group->period;
+
+#ifndef GPAC_DISABLE_LOG
+
+#define GET_REP_ATTR(_a)	_a = rep->_a; if (!_a) _a = set->_a;
+
+	GET_REP_ATTR(width);
+	GET_REP_ATTR(height);
+	GET_REP_ATTR(samplerate);
+	GET_REP_ATTR(framerate);
+
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Switched to representation bandwidth %d kbps\n", rep->bandwidth/1024));
+	if (group->max_bitrate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tmax download bandwidth: %d kbps\n", group->max_bitrate/1024));
+	if (width&&height) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tWidth %d Height %d", width, height));
+		if (framerate) GF_LOG(GF_LOG_INFO, GF_LOG_DASH, (" framerate %d/%d", framerate->num, framerate->den));
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
+	} else if (samplerate) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\tsamplerate %d\n", samplerate));
+	}
+#endif
+
+	gf_dash_get_segment_duration(rep, set, period, group->dash->mpd, &group->nb_segments_in_rep, &group->segment_duration);
+
+	/*if broken indication in duration restore previous seg count*/
+	if (group->dash->ignore_mpd_duration)
+		group->nb_segments_in_rep = nb_segs;
+
+
+	timeshift = -1;
+	timeshift = (s32) (rep->segment_base ? rep->segment_base->time_shift_buffer_depth : (rep->segment_list ? rep->segment_list->time_shift_buffer_depth : (rep->segment_template ? rep->segment_template->time_shift_buffer_depth : -1) ) );
+	if (timeshift == -1) timeshift = (s32) (set->segment_base ? set->segment_base->time_shift_buffer_depth : (set->segment_list ? set->segment_list->time_shift_buffer_depth : (set->segment_template ? set->segment_template->time_shift_buffer_depth : -1) ) );
+	if (timeshift == -1) timeshift = (s32) (period->segment_base ? period->segment_base->time_shift_buffer_depth : (period->segment_list ? period->segment_list->time_shift_buffer_depth : (period->segment_template ? period->segment_template->time_shift_buffer_depth : -1) ) );
+
+	if (timeshift == -1) timeshift = (s32) group->dash->mpd->time_shift_buffer_depth;
+	group->time_shift_buffer_depth = (u32) timeshift;
+}
+
+static void gf_dash_switch_group_representation(GF_DashClient *mpd, GF_DASH_Group *group)
+{
+	u32 i, bandwidth, min_bandwidth;
+	GF_MPD_Representation *rep_sel = NULL;
+	GF_MPD_Representation *min_rep_sel = NULL;
+	Bool min_bandwidth_selected = 0;
+	bandwidth = 0;
+	min_bandwidth = (u32) -1;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Checking representations between %d and %d kbps\n", group->min_bitrate/1024, group->max_bitrate/1024));
+
+	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++) {
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, i);
+			if (rep->playback.disabled) continue;
+			if ((rep->bandwidth > bandwidth) && (rep->bandwidth < group->max_bitrate )) {
+				rep_sel = rep;
+				bandwidth = rep->bandwidth;
+			}
+			if (rep->bandwidth < min_bandwidth) {
+				min_rep_sel = rep;
+				min_bandwidth = rep->bandwidth;
+			}
+		}
+	}
+
+	if (!rep_sel) {
+		if (!min_rep_sel) {
+			min_rep_sel = gf_list_get(group->adaptation_set->representations, 0);
+		}
+		rep_sel = min_rep_sel;
+		min_bandwidth_selected = 1;
+	}
+	assert(rep_sel);
+	i = gf_list_find(group->adaptation_set->representations, rep_sel);
+
+	assert((s32) i >= 0);
+
+	group->force_switch_bandwidth = 0;
+	group->max_bitrate = 0;
+	group->min_bitrate = (u32) -1;
+
+	if (i != group->active_rep_index) {
+		if (min_bandwidth_selected) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No representation found with bandwidth below %d kbps - using representation @ %d kbps\n", group->max_bitrate/1024, rep_sel->bandwidth/1024));
+		}
+		gf_dash_set_group_representation(group, rep_sel);
+	}
+}
+
+
+
+typedef enum
+{
+	GF_DASH_RESOLVE_URL_MEDIA,
+	GF_DASH_RESOLVE_URL_INIT,
+	GF_DASH_RESOLVE_URL_INDEX,
+	//same as GF_DASH_RESOLVE_URL_MEDIA but does not replace $Time$ and $Number$
+	GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE,
+} GF_DASHURLResolveType;
+
+
+
+static GF_Err gf_dash_resolve_url(GF_MPD *mpd, GF_MPD_Representation *rep, GF_DASH_Group *group, const char *mpd_url, GF_DASHURLResolveType resolve_type, u32 item_index, char **out_url, u64 *out_range_start, u64 *out_range_end, u64 *segment_duration, Bool *is_in_base_url)
+{
+	GF_MPD_BaseURL *url_child;
+	GF_MPD_SegmentTimeline *timeline = NULL;
+	u32 start_number = 1;
+	GF_MPD_AdaptationSet *set = group->adaptation_set;
+	GF_MPD_Period *period = group->period;
+	u32 timescale;
+	char *url;
+	char *url_to_solve, *solved_template, *first_sep, *media_url;
+	char *init_template, *index_template;
+
+	*out_range_start = *out_range_end = 0;
+	*out_url = NULL;
+
+	if (!group->timeline_setup) {
+		gf_dash_group_timeline_setup(mpd, group, 0);
+		group->timeline_setup = 1;
+	}
+
+	/*resolve base URLs from document base (download location) to representation (media)*/
+	url = gf_strdup(mpd_url);
+
+	url_child = gf_list_get(mpd->base_URLs, 0);
+	if (url_child) {
+		char *t_url = gf_url_concatenate(url, url_child->URL);
+		gf_free(url);
+		url = t_url;
+	}
+
+	url_child = gf_list_get(period->base_URLs, 0);
+	if (url_child) {
+		char *t_url = gf_url_concatenate(url, url_child->URL);
+		gf_free(url);
+		url = t_url;
+	}
+
+	url_child = gf_list_get(set->base_URLs, 0);
+	if (url_child) {
+		char *t_url = gf_url_concatenate(url, url_child->URL);
+		gf_free(url);
+		url = t_url;
+	}
+
+	url_child = gf_list_get(rep->base_URLs, 0);
+	if (url_child) {
+		char *t_url = gf_url_concatenate(url, url_child->URL);
+		gf_free(url);
+		url = t_url;
+	}
+
+	gf_dash_resolve_duration(rep, set, period, segment_duration, &timescale, NULL, NULL);
+	*segment_duration = (resolve_type==GF_DASH_RESOLVE_URL_MEDIA) ? (u32) ((Double) ((*segment_duration) * 1000.0) / timescale) : 0;
+
+	/*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) {	
+		GF_MPD_URL *res_url;
+		GF_MPD_SegmentBase *base_seg = NULL;
+		if (item_index > 0)
+			return GF_EOS;
+		switch (resolve_type) {
+		case GF_DASH_RESOLVE_URL_MEDIA:
+		case GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE:
+			if (!url) return GF_NON_COMPLIANT_BITSTREAM;
+			*out_url = url;
+			return GF_OK;
+		case GF_DASH_RESOLVE_URL_INIT:
+		case GF_DASH_RESOLVE_URL_INDEX:
+			res_url = NULL;
+			base_seg = rep->segment_base;
+			if (!base_seg) base_seg = set->segment_base;
+			if (!base_seg) base_seg = period->segment_base;
+
+			if (base_seg) {
+				if (resolve_type == GF_DASH_RESOLVE_URL_INDEX) {
+					res_url = base_seg->representation_index;
+				} else {
+					res_url = base_seg->initialization_segment;
+				}
+			}
+			if (is_in_base_url) *is_in_base_url = 0;
+			/*no initialization segment / index, use base URL*/
+			if (res_url && res_url->sourceURL) {
+				*out_url = gf_url_concatenate(url, res_url->sourceURL);
+				gf_free(url);
+			} else {
+				*out_url = url;
+				if (is_in_base_url) *is_in_base_url = 1;
+			}
+			if (res_url && res_url->byte_range) {
+				*out_range_start = res_url->byte_range->start_range;
+				*out_range_end = res_url->byte_range->end_range;
+			} else if (base_seg && base_seg->index_range && (resolve_type == GF_DASH_RESOLVE_URL_INDEX)) {
+				*out_range_start = base_seg->index_range->start_range;
+				*out_range_end = base_seg->index_range->end_range;
+			}
+			return GF_OK;
+		default:
+			break;
+		}
+		gf_free(url);
+		return GF_BAD_PARAM;
+	}
+
+	/*segmentList*/
+	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;
+		u32 segment_count;
+
+		init_url = index_url = NULL;
+
+		/*apply inheritance of attributes, lowest level having preceedence*/
+		if (period->segment_list) {
+			if (period->segment_list->initialization_segment) init_url = period->segment_list->initialization_segment;
+			if (period->segment_list->representation_index) index_url = period->segment_list->representation_index;
+			if (period->segment_list->segment_URLs) segments = period->segment_list->segment_URLs;
+			if (period->segment_list->start_number != (u32) -1) start_number = period->segment_list->start_number;
+			if (period->segment_list->segment_timeline) timeline = period->segment_list->segment_timeline;
+		}
+		if (set->segment_list) {
+			if (set->segment_list->initialization_segment) init_url = set->segment_list->initialization_segment;
+			if (set->segment_list->representation_index) index_url = set->segment_list->representation_index;
+			if (set->segment_list->segment_URLs) segments = set->segment_list->segment_URLs;
+			if (set->segment_list->start_number != (u32) -1) start_number = set->segment_list->start_number;
+			if (set->segment_list->segment_timeline) timeline = set->segment_list->segment_timeline;
+		}
+		if (rep->segment_list) {
+			if (rep->segment_list->initialization_segment) init_url = rep->segment_list->initialization_segment;
+			if (rep->segment_list->representation_index) index_url = rep->segment_list->representation_index;
+			if (rep->segment_list->segment_URLs) segments = rep->segment_list->segment_URLs;
+			if (rep->segment_list->start_number != (u32) -1) start_number = rep->segment_list->start_number;
+			if (rep->segment_list->segment_timeline) timeline = rep->segment_list->segment_timeline;
+		}
+
+
+		segment_count = gf_list_count(segments);
+
+		switch (resolve_type) {
+		case GF_DASH_RESOLVE_URL_INIT:
+			if (init_url) {
+				if (init_url->sourceURL) {
+					*out_url = gf_url_concatenate(url, init_url->sourceURL);
+					gf_free(url);
+				} else {
+					*out_url = url;
+				}
+				if (init_url->byte_range) {
+					*out_range_start = init_url->byte_range->start_range;
+					*out_range_end = init_url->byte_range->end_range;
+				}
+			} else {
+				gf_free(url);
+			}
+			return GF_OK;
+		case GF_DASH_RESOLVE_URL_MEDIA:
+		case GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE:
+			if (!url) {
+				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) {
+				gf_free(url);
+				return GF_EOS;
+			}
+			*out_url = url;
+			segment = gf_list_get(segments, item_index);
+			if (segment->media) {
+				*out_url = gf_url_concatenate(url, segment->media);
+				gf_free(url);
+			}
+			if (segment->media_range) {
+				*out_range_start = segment->media_range->start_range;
+				*out_range_end = segment->media_range->end_range;
+			}
+			if (segment->duration) {
+				*segment_duration = (u32) ((Double) (segment->duration) * 1000.0 / timescale);
+			}
+			return GF_OK;
+		case GF_DASH_RESOLVE_URL_INDEX:
+			if (item_index >= segment_count) {
+				gf_free(url);
+				return GF_EOS;
+			}
+			*out_url = url;
+			segment = gf_list_get(segments, item_index);
+			if (segment->index) {
+				*out_url = gf_url_concatenate(url, segment->index);
+				gf_free(url);
+			}
+			if (segment->index_range) {
+				*out_range_start = segment->index_range->start_range;
+				*out_range_end = segment->index_range->end_range;
+			}
+			return GF_OK;
+		default:
+			break;
+		}
+		gf_free(url);
+		return GF_BAD_PARAM;
+	}
+
+	/*segmentTemplate*/
+	media_url = init_template = index_template = NULL;
+
+	/*apply inheritance of attributes, lowest level having preceedence*/
+	if (period->segment_template) {
+		if (period->segment_template->initialization) init_template = period->segment_template->initialization;
+		if (period->segment_template->index) index_template = period->segment_template->index;
+		if (period->segment_template->media) media_url = period->segment_template->media;
+		if (period->segment_template->start_number != (u32) -1) start_number = period->segment_template->start_number;
+		if (period->segment_template->segment_timeline) timeline = period->segment_template->segment_timeline;
+	}
+	if (set->segment_template) {
+		if (set->segment_template->initialization) init_template = set->segment_template->initialization;
+		if (set->segment_template->index) index_template = set->segment_template->index;
+		if (set->segment_template->media) media_url = set->segment_template->media;
+		if (set->segment_template->start_number != (u32) -1) start_number = set->segment_template->start_number;
+		if (set->segment_template->segment_timeline) timeline = set->segment_template->segment_timeline;
+	}
+	if (rep->segment_template) {
+		if (rep->segment_template->initialization) init_template = rep->segment_template->initialization;
+		if (rep->segment_template->index) index_template = rep->segment_template->index;
+		if (rep->segment_template->media) media_url = rep->segment_template->media;
+		if (rep->segment_template->start_number != (u32) -1) start_number = rep->segment_template->start_number;
+		if (rep->segment_template->segment_timeline) timeline = rep->segment_template->segment_timeline;
+	}
+
+	/*offset the start_number with the number of discarded segments (no longer in our lists)*/
+	start_number += group->nb_segments_purged;
+
+	if (!media_url) {
+		GF_MPD_BaseURL *base = gf_list_get(rep->base_URLs, 0);
+		if (!base) return GF_BAD_PARAM;
+		media_url = base->URL;
+	}
+	url_to_solve = NULL;
+	switch (resolve_type) {
+	case GF_DASH_RESOLVE_URL_INIT:
+		url_to_solve = init_template;
+		break;
+	case GF_DASH_RESOLVE_URL_MEDIA:
+	case GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE:
+		url_to_solve = media_url;
+		break;
+	case GF_DASH_RESOLVE_URL_INDEX:
+		url_to_solve = index_template;
+		break;
+	default:
+		gf_free(url);
+		return GF_BAD_PARAM;
+	}
+	if (!url_to_solve) {
+		gf_free(url);
+		return GF_OK;
+	}
+	/*let's solve the template*/
+	solved_template = gf_malloc(sizeof(char)*(strlen(url_to_solve) + (rep->id ? strlen(rep->id) : 0) ) * 2 );
+	solved_template[0] = 0;
+	strcpy(solved_template, url_to_solve);
+	first_sep = strchr(solved_template, '$');
+	if (first_sep) first_sep[0] = 0;
+
+	first_sep = strchr(url_to_solve, '$');
+	while (first_sep) {
+		char szPrintFormat[50];
+		char szFormat[100];
+		char *format_tag;
+		char *second_sep = strchr(first_sep+1, '$');
+		if (!second_sep) {
+			gf_free(url);
+			gf_free(solved_template);
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		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'))
+				strcat(szPrintFormat, "d");
+		} else {
+			strcpy(szPrintFormat, "%d");
+		}
+		/* identifier is $$ -> replace by $*/
+		if (!strlen(first_sep+1)) {
+			strcat(solved_template, "$");
+		}
+		else if (!strcmp(first_sep+1, "RepresentationID")) {
+			strcat(solved_template, rep->id);
+		}
+		else if (!strcmp(first_sep+1, "Number")) {
+			if (resolve_type==GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE) {
+				strcat(solved_template, "$Number$");
+			} else {
+				sprintf(szFormat, szPrintFormat, start_number + item_index);
+				strcat(solved_template, szFormat);
+			}
+		}
+		else if (!strcmp(first_sep+1, "Index")) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Wrong template identifier Index detected - using Number instead\n\n"));
+			sprintf(szFormat, szPrintFormat, start_number + item_index);
+			strcat(solved_template, szFormat);
+		}
+		else if (!strcmp(first_sep+1, "Bandwidth")) {
+			sprintf(szFormat, szPrintFormat, rep->bandwidth);
+			strcat(solved_template, szFormat);
+		}
+		else if (!strcmp(first_sep+1, "Time")) {
+			if (resolve_type==GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE) {
+				strcat(solved_template, "$Time$");
+			} else if (timeline) {
+				/*uses segment timeline*/
+				u32 k, nb_seg, cur_idx, nb_repeat;
+				u64 time, start_time;
+				nb_seg = gf_list_count(timeline->entries);
+				cur_idx = 0;
+				start_time=0;
+				for (k=0; k<nb_seg; k++) {
+					GF_MPD_SegmentTimelineEntry *ent = gf_list_get(timeline->entries, k);
+					if (item_index>cur_idx+ent->repeat_count) {
+						cur_idx += 1 + ent->repeat_count;
+						if (ent->start_time) start_time = ent->start_time;
+
+						start_time += ent->duration * (1 + ent->repeat_count);
+						continue;
+					}
+					*segment_duration = ent->duration;
+					*segment_duration = (u32) ((Double) (*segment_duration) * 1000.0 / timescale);
+					nb_repeat = item_index - cur_idx;
+					time = ent->start_time ? ent->start_time : start_time;
+					time += nb_repeat * ent->duration;
+
+					/*replace final 'd' with LLD (%lld or I64d)*/
+					szPrintFormat[strlen(szPrintFormat)-1] = 0;
+					strcat(szPrintFormat, &LLD[1]);
+					sprintf(szFormat, szPrintFormat, time);
+					strcat(solved_template, szFormat);
+					break;
+				}
+			}
+		}
+		else {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unknown template identifier %s - disabling rep\n\n", first_sep+1));
+			*out_url = NULL;
+			gf_free(url);
+			gf_free(solved_template);
+			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
+			return GF_NON_COMPLIANT_BITSTREAM;
+		}
+		if (format_tag) format_tag[0] = '%';
+		second_sep[0] = '$';
+		/*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)) 
+			strcat(solved_template, second_sep+1);
+		if (first_sep) first_sep[0] = '$';
+	}
+	*out_url = gf_url_concatenate(url, solved_template);
+	gf_free(url);
+	gf_free(solved_template);
+	return GF_OK;
+}
+
+static GF_Err gf_dash_download_init_segment(GF_DashClient *dash, GF_DASH_Group *group)
+{
+	GF_Err e;
+	char *base_init_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 */
+	u32 nb_segment_read = 0;
+	if (!dash || !group)
+		return GF_BAD_PARAM;
+	gf_mx_p(dash->dl_mutex);
+
+	assert( group->adaptation_set && group->adaptation_set->representations );
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	if (!rep) {
+		gf_mx_v(dash->dl_mutex);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to find any representation, aborting.\n"));
+		return GF_IO_ERR;
+	}
+	start_range = end_range = 0;
+
+	e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+	if (e) {
+		gf_mx_v(dash->dl_mutex);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve initialization URL: %s\n", gf_error_to_string(e) ));
+		return e;
+	}
+
+	/*no error and no init segment, go for media segment*/
+	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);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media URL: %s\n", gf_error_to_string(e) ));
+			return e;
+		}
+		nb_segment_read = 1;
+#endif
+	} else if (!group->bitstream_switching) {
+		group->dont_delete_first_segment = 1;
+	}
+
+	if (!strstr(base_init_url, "://") || !strnicmp(base_init_url, "file://", 7) || !strnicmp(base_init_url, "gmem://", 7) || !strnicmp(base_init_url, "views://", 8)) {
+		assert(!group->nb_cached_segments);
+		group->cached[0].cache = gf_strdup(base_init_url);
+		group->cached[0].url = gf_strdup(base_init_url);
+		group->cached[0].representation_index = group->active_rep_index;
+		group->prev_active_rep_index = group->active_rep_index;
+
+		group->nb_cached_segments = 1;
+		/*do not erase local files*/
+		group->local_files = group->was_segment_base ? 0 : 1;
+		if (group->local_files) {
+			gf_dash_buffer_off(group);
+		}
+
+		group->download_segment_index += nb_segment_read;
+		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;
+
+
+		/*finally download all init segments if any*/
+		if (!group->bitstream_switching) {
+			u32 k;
+			for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+				char *a_base_init_url = NULL;
+				u64 a_start, a_end, a_dur;
+				GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
+				if (a_rep==rep) continue;
+				if (a_rep->playback.disabled) continue;
+
+				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &a_base_init_url, &a_start, &a_end, &a_dur, NULL);
+				if (!e && a_base_init_url) {
+					a_rep->playback.cached_init_segment_url = a_base_init_url;
+					a_rep->playback.init_start_range = a_start;
+					a_rep->playback.init_end_range =a_end ;
+				} else if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
+					a_rep->playback.disabled = 1;
+				}
+			}
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] First segment is %s \n", group->segment_local_url));
+		gf_mx_v(dash->dl_mutex);
+		gf_free(base_init_url);
+		return GF_OK;
+	}
+
+	group->max_bitrate = 0;
+	group->min_bitrate = (u32)-1;
+	/*use persistent connection for segment downloads*/
+	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_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 */
+		/* It is possible that the first segment has been deleted while we made the first request...
+		* so we try with the next segment on some M3U8 servers */
+
+		gf_free(base_init_url);
+
+		e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index + 1, &base_init_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+		if (!e) {
+			gf_mx_v(dash->dl_mutex);
+			return e;
+		}
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("Download of first segment failed... retrying with second one : %s\n", base_init_url));
+		nb_segment_read = 2;
+		/*use persistent connection for segment downloads*/
+		e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), base_init_url, 0, 0, 1, group);
+	} /* end of 404 */
+
+	if (e!= GF_OK && !group->segment_must_be_streamed) {
+		dash->mpd_stop_request = 1;
+		gf_mx_v(dash->dl_mutex);
+		gf_free(base_init_url);
+		return e;
+	} else {
+		char mime[128];
+		const char *mime_type;
+		if (!group->nb_segments_in_rep) {
+			if (dash->mpd->type==GF_MPD_TYPE_STATIC) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] 0 segments in static representation, aborting\n"));
+				gf_free(base_init_url);
+				gf_mx_v(dash->dl_mutex);
+				return GF_BAD_PARAM;
+			}
+		} else if (group->nb_segments_in_rep < group->max_cached_segments) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Resizing to %u max_cached_segments elements instead of %u.\n", group->nb_segments_in_rep, group->max_cached_segments));
+			/* OK, we have a problem, it may ends download */
+			group->max_cached_segments = group->nb_segments_in_rep;
+		}
+
+		/* Mime-Type check */
+		mime_type = dash->dash_io->get_mime(dash->dash_io, group->segment_download) ;
+		strcpy(mime, mime_type ? mime_type : "");
+		strlwr(mime);
+
+		if (dash->mimeTypeForM3U8Segments) 
+			gf_free(dash->mimeTypeForM3U8Segments);
+		dash->mimeTypeForM3U8Segments = gf_strdup( mime );
+		mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
+
+		if (!rep->mime_type) {
+			rep->mime_type = gf_strdup( mime_type ? mime_type : mime );
+			mime_type = gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
+		}
+
+		if (stricmp(mime, mime_type)) {
+			Bool valid = 0;
+			char *stype1, *stype2;
+			stype1 = strchr(mime_type, '/');
+			stype2 = strchr(mime, '/');
+			if (stype1 && stype2 && !strcmp(stype1, stype2)) valid = 1;
+
+			if (!valid && 0) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Mime '%s' is not correct for '%s', it should be '%s'\n", mime, base_init_url, mime_type));
+				dash->mpd_stop_request = 0;
+				gf_mx_v(dash->dl_mutex);
+				gf_free(base_init_url);
+				base_init_url = NULL;
+				return GF_BAD_PARAM;
+			}
+		}
+
+		if (group->segment_must_be_streamed ) {
+			group->segment_local_url = 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);
+		}
+
+		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));
+			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].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;
+
+		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_mx_v(dash->dl_mutex);
+		gf_free(base_init_url);
+
+		/*finally download all init segments if any*/
+		if (!group->bitstream_switching) {
+			u32 k;
+			for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+				char *a_base_init_url = NULL;
+				u64 a_start, a_end, a_dur;
+				GF_MPD_Representation *a_rep = gf_list_get(group->adaptation_set->representations, k);
+				if (a_rep==rep) continue;
+				if (a_rep->playback.disabled) continue;
+
+				e = gf_dash_resolve_url(dash->mpd, a_rep, group, dash->base_url, GF_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_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot retrieve initialization segment %s for representation: %s - discarding representation\n", a_base_init_url, gf_error_to_string(e) ));
+						a_rep->playback.disabled = 1;
+					} else {
+						a_rep->playback.cached_init_segment_url = gf_strdup( dash->dash_io->get_cache_name(dash->dash_io, group->segment_download) );
+						a_rep->playback.init_start_range = 0;
+						a_rep->playback.init_end_range = 0;
+					}
+					gf_free(a_base_init_url);
+				} else if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Cannot solve initialization segment for representation: %s - discarding representation\n", gf_error_to_string(e) ));
+					a_rep->playback.disabled = 1;
+				}
+
+			}
+		}
+
+		return GF_OK;
+	}
+}
+
+static void gf_dash_skip_disabled_representation(GF_DASH_Group *group, GF_MPD_Representation *rep, Bool for_autoswitch)
+{
+	s32 rep_idx, orig_idx;
+	u32 bandwidth = 0xFFFFFFFF;
+	if (for_autoswitch && group->segment_download) {
+		bandwidth = 8*group->dash->dash_io->get_bytes_per_sec(group->dash->dash_io, group->segment_download);
+	}
+
+	rep_idx = orig_idx = gf_list_find(group->adaptation_set->representations, rep);
+	while (1) {
+		rep_idx++;
+		if (rep_idx==gf_list_count(group->adaptation_set->representations)) rep_idx = 0;
+		//none other than current one
+		if (orig_idx==rep_idx) return;
+
+		rep = gf_list_get(group->adaptation_set->representations, rep_idx);
+		if (rep->playback.disabled) continue;
+
+		if (rep->bandwidth<=bandwidth) break;
+		assert(for_autoswitch);
+		//go to next rep
+	}
+	assert(rep && !rep->playback.disabled);
+	gf_dash_set_group_representation(group, rep);
+}
+
+static void gf_dash_group_reset(GF_DashClient *dash, GF_DASH_Group *group)
+{
+	if (group->buffering) {
+		gf_dash_buffer_off(group);
+	}
+	if (group->urlToDeleteNext) {
+		if (!dash->keep_files && !group->local_files)
+			dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
+
+		gf_free(group->urlToDeleteNext);
+		group->urlToDeleteNext = NULL;
+	}
+	if (group->segment_download) {
+		dash->dash_io->del(dash->dash_io, group->segment_download);
+		group->segment_download = NULL;
+	}
+	while (group->nb_cached_segments) {
+		group->nb_cached_segments --;
+		if (!dash->keep_files && !group->local_files)
+			gf_delete_file(group->cached[group->nb_cached_segments].cache);
+
+		gf_free(group->cached[group->nb_cached_segments].cache);
+		gf_free(group->cached[group->nb_cached_segments].url);
+	}
+	group->timeline_setup = 0;
+}
+
+static void gf_dash_reset_groups(GF_DashClient *dash)
+{
+	/*send playback destroy event*/
+	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_DESTROY_PLAYBACK, -1, GF_OK);
+
+	while (gf_list_count(dash->groups)) {
+		GF_DASH_Group *group = gf_list_last(dash->groups);
+		gf_list_rem_last(dash->groups);
+
+		gf_dash_group_reset(dash, group);
+
+		gf_free(group->cached);
+		if (group->service_mime) 
+			gf_free(group->service_mime);
+		gf_free(group);
+	}
+	gf_list_del(dash->groups);
+	dash->groups = NULL;
+}
+
+static u32 gf_dash_get_start_number(GF_DASH_Group *group, GF_MPD_Representation *rep)
+{
+	if (rep->segment_list && rep->segment_list->start_number) return rep->segment_list->start_number;
+	if (group->adaptation_set->segment_list && group->adaptation_set->segment_list->start_number) return group->adaptation_set->segment_list->start_number;
+	if (group->period->segment_list && group->period->segment_list->start_number) return group->period->segment_list->start_number;
+
+	if (rep->segment_template && rep->segment_template->start_number) return rep->segment_template->start_number;
+	if (group->adaptation_set->segment_template && group->adaptation_set->segment_template->start_number) return group->adaptation_set->segment_template->start_number;
+	if (group->period->segment_template && group->period->segment_template->start_number) return group->period->segment_template->start_number;
+
+	return 0;
+}
+
+/* create groups (implementation of adaptations set) */
+GF_Err gf_dash_setup_groups(GF_DashClient *dash)
+{
+	GF_Err e;
+	u32 i, j, count, nb_dependant_rep;
+	GF_MPD_Period *period;
+
+	if (!dash->groups) {
+		dash->groups = gf_list_new();
+		if (!dash->groups) return GF_OUT_OF_MEM;
+	}
+
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	if (!period) return GF_BAD_PARAM;
+
+	count = gf_list_count(period->adaptation_sets);
+	for (i=0; i<count; i++) {
+		Double seg_dur;
+		GF_DASH_Group *group;
+		Bool found = 0;
+		Bool has_dependent_representations = GF_FALSE;
+		GF_MPD_AdaptationSet *set = gf_list_get(period->adaptation_sets, i);
+		for (j=0; j<gf_list_count(dash->groups); j++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, j);
+			if (group->adaptation_set==set) {
+				found = 1;
+				break;
+			}
+		}
+
+		if (found) continue;
+
+
+		GF_SAFEALLOC(group, GF_DASH_Group);
+		if (!group) return GF_OUT_OF_MEM;
+		group->dash = dash;
+		group->adaptation_set = set;
+		group->period = period;
+
+		group->bitstream_switching = (set->bitstream_switching || period->bitstream_switching) ? 1 : 0;
+
+		seg_dur = 0;
+		nb_dependant_rep = 0;
+		for (j=0; j<gf_list_count(set->representations); j++) {
+			Double dur;
+			u32 nb_seg, k;
+			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->max_width && dash->max_height) {
+				if ((rep->width>dash->max_width) || (rep->height>dash->max_height)) {
+					rep->playback.disabled = 1;
+					continue;
+				}
+			}
+			if (rep->codecs && dash->max_bit_per_pixel) {
+				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");
+				if (!vid_type) vid_type = strstr(rep->codecs, "svc");
+				if (!vid_type) vid_type = strstr(rep->codecs, "mvc");
+				//HEVC
+				if (vid_type && (!strnicmp(rep->codecs, "hvc", 3) || !strnicmp(rep->codecs, "hev", 3))) {
+					char *pidc = rep->codecs+5;
+					if ((pidc[0]=='A') || (pidc[0]=='B') || (pidc[0]=='C')) pidc++;
+					//Main 10 !!
+					if (!strncmp(pidc, "2.", 2)) {
+						rep->playback.disabled = 1;
+						continue;
+					}
+				}
+				//AVC
+				if (vid_type && (!strnicmp(rep->codecs, "avc", 3) || !strnicmp(rep->codecs, "svc", 3) || !strnicmp(rep->codecs, "mvc", 3))) {
+					char prof_string[3];
+					u8 prof;
+					strncpy(prof_string, vid_type+5, 2);
+					prof_string[2]=0;
+					prof = atoi(prof_string);
+					//Main 10
+					if (prof==0x6E) {
+						rep->playback.disabled = 1;
+						continue;
+					}
+				}
+			}
+	
+			rep->playback.disabled = 0;
+			if (rep->width>set->max_width) {
+				set->max_width = rep->width;
+				set->max_height = rep->height;
+			}
+			if (rep->dependency_id && strlen(rep->dependency_id))
+				has_dependent_representations = GF_TRUE;
+			else
+				group->base_rep_index_plus_one = j+1;
+			rep->enhancement_rep_index_plus_one = 0;
+			for (k = 0; k < gf_list_count(set->representations); k++) {
+				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) 
+						tmp = tmp + 1;
+					else
+						tmp = a_rep->dependency_id;
+					if (!strcmp(tmp, rep->id))
+						rep->enhancement_rep_index_plus_one = k + 1;
+				}
+			}
+			if (!rep->enhancement_rep_index_plus_one)
+				group->force_max_rep_index = j;
+			if (!rep->playback.disabled && rep->dependency_id)
+				nb_dependant_rep++;
+		}
+
+		if (!seg_dur) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Cannot compute default segment duration\n"));
+		}
+
+		group->cache_duration = dash->max_cache_duration;
+		if (group->cache_duration < dash->mpd->min_buffer_time)
+			group->cache_duration = dash->mpd->min_buffer_time;
+
+		//we want at least 2 segments available in the cache, in order to perform rate adaptation with one cache ahead
+		group->max_cached_segments = 2;
+		if (seg_dur) {
+			while (group->max_cached_segments * seg_dur * 1000 < group->cache_duration)
+				group->max_cached_segments ++;
+
+			group->max_buffer_segments = group->max_cached_segments;
+
+			/*unless we are in low latency modes*/
+			if (dash->max_cache_duration>1000) {
+				/*we need one more entry in cache for segment being currently played*/
+				if (group->max_cached_segments<3)
+					group->max_cached_segments ++;
+			}
+			group->max_cached_segments *= (nb_dependant_rep+1);
+			group->max_buffer_segments *= (nb_dependant_rep+1);
+		}
+
+		if (!has_dependent_representations)
+			group->base_rep_index_plus_one = 0; // all representations in this group are independent
+
+		group->cached = gf_malloc(sizeof(segment_cache_entry)*group->max_cached_segments);
+		memset(group->cached, 0, sizeof(segment_cache_entry)*group->max_cached_segments);
+		if (!group->cached) {
+			gf_free(group);
+			return GF_OUT_OF_MEM;
+		}
+		e = gf_list_add(dash->groups, group);
+		if (e) {
+			gf_free(group->cached);
+			gf_free(group);
+			return e;
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_dash_load_sidx(GF_BitStream *bs, GF_MPD_Representation *rep, Bool seperate_index, u64 sidx_offset)
+{
+#ifdef GPAC_DISABLE_ISOM
+	return GF_NOT_SUPPORTED;
+#else
+	u64 anchor_position, prev_pos;
+	GF_SegmentIndexBox *sidx = NULL;
+	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);
+	type = gf_bs_read_u32(bs);
+	if (type != GF_4CC('s','i','d','x')) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error parsing SIDX: type is %s (box start offset "LLD")\n", gf_4cc_to_str(type), gf_bs_get_position(bs)-8 ));
+		return GF_ISOM_INVALID_FILE;
+	}
+
+	gf_bs_seek(bs, sidx_offset);
+
+	anchor_position = sidx_offset + size;
+	if (seperate_index) 
+		anchor_position = 0;
+
+	e = gf_isom_parse_box((GF_Box **) &sidx, bs);
+	if (e) return e;
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Loading SIDX - %d entries - Earliest Presentation Time "LLD"\n", sidx->nb_refs, sidx->earliest_presentation_time));
+
+	offset = sidx->first_offset + anchor_position;
+	rep->segment_list->timescale = sidx->timescale;
+	for (i=0; i<sidx->nb_refs; i++) {
+		GF_MPD_SegmentURL *seg;
+		if (sidx->refs[i].reference_type) {
+			e = gf_dash_load_sidx(bs, rep, seperate_index, offset);
+			if (e) {
+				break;
+			}
+		} else {
+			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));
+
+			seg->media_range->start_range = offset;
+			offset += sidx->refs[i].reference_size;
+			seg->media_range->end_range = offset - 1;
+			seg->duration = sidx->refs[i].subsegment_duration;
+			gf_list_add(rep->segment_list->segment_URLs, seg);
+		}
+	}
+	gf_isom_box_del((GF_Box*)sidx);
+	gf_bs_seek(bs, prev_pos);
+	return e;
+#endif
+}
+
+static GF_Err gf_dash_load_representation_sidx(GF_DASH_Group *group, GF_MPD_Representation *rep, const char *cache_name, Bool seperate_index, Bool needs_mov_range)
+{
+	GF_Err e;
+	GF_BitStream *bs;
+	FILE *f=NULL;
+	if (!strncmp(cache_name, "gmem://", 7)) {
+		u32 size;
+		char *mem_address;
+		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
+			return GF_IO_ERR;
+		} 
+		bs = gf_bs_new(mem_address, size, GF_BITSTREAM_READ);
+	} else {
+		FILE *f = gf_f64_open(cache_name, "rb");
+		if (!f) return GF_IO_ERR;
+		bs = gf_bs_from_file(f, GF_BITSTREAM_READ);
+	}
+	e = GF_OK;
+	while (gf_bs_available(bs)) {
+		u32 size = gf_bs_read_u32(bs);
+		u32 type = gf_bs_read_u32(bs);
+		if (type != GF_4CC('s','i','d','x')) {
+			gf_bs_skip_bytes(bs, size-8);
+
+			if (needs_mov_range && (type==GF_4CC('m','o','o','v') )) {
+				GF_SAFEALLOC(rep->segment_list->initialization_segment->byte_range, GF_MPD_ByteRange);
+				rep->segment_list->initialization_segment->byte_range->end_range = gf_bs_get_position(bs);
+			}
+			continue;
+		}
+		gf_bs_seek(bs, gf_bs_get_position(bs)-8);
+		e = gf_dash_load_sidx(bs, rep, seperate_index, gf_bs_get_position(bs) );
+
+		/*we could also parse the sub sidx*/
+		break;
+	}
+	gf_bs_del(bs);
+	if (f) fclose(f);
+	return e;
+}
+
+static GF_Err dash_load_box_type(const char *cache_name, u32 offset, u32 *box_type, u32 *box_size)
+{
+	*box_type = *box_size = 0;
+	if (!strncmp(cache_name, "gmem://", 7)) {
+		u32 size;
+		u8 *mem_address;
+		if (sscanf(cache_name, "gmem://%d@%p", &size, &mem_address) != 2) {
+			return GF_IO_ERR;
+		} 
+		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]);
+		*box_type = GF_4CC(mem_address[4], mem_address[5], mem_address[6], mem_address[7]);
+	} else {
+		unsigned char data[4];
+		FILE *f = gf_f64_open(cache_name, "rb");
+		if (!f) return GF_IO_ERR;
+		if (gf_f64_seek(f, offset, SEEK_SET))
+			return GF_IO_ERR;
+		if (fread(data, 1, 4, f) == 4) {
+			*box_size = GF_4CC(data[0], data[1], data[2], data[3]);
+			if (fread(data, 1, 4, f) == 4) {
+				*box_type = GF_4CC(data[0], data[1], data[2], data[3]);
+			}
+		}
+		fclose(f);
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_dash_setup_single_index_mode(GF_DASH_Group *group)
+{
+	u32 i;
+	GF_Err e;
+	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;
+
+	/*OK we are in single-file mode, download all required indexes & co*/
+	for (i=0; i<gf_list_count(group->adaptation_set->representations); i++) {
+		char *sidx_file = NULL;
+		u64 duration, index_start_range, index_end_range, init_start_range, init_end_range;
+		Bool index_in_base, init_in_base;
+		Bool init_needs_byte_range = 0;
+		Bool has_seen_sidx = 0;
+		Bool is_isom = 1;
+		rep = gf_list_get(group->adaptation_set->representations, i);
+
+		index_in_base = init_in_base = 0;
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_DASH_RESOLVE_URL_INIT, 0, &init_url, &init_start_range, &init_end_range, &duration, &init_in_base);
+		if (e) goto exit;
+
+		e = gf_dash_resolve_url(group->dash->mpd, rep, group, group->dash->base_url, GF_DASH_RESOLVE_URL_INDEX, 0, &index_url, &index_start_range, &index_end_range, &duration, &index_in_base);
+		if (e) goto exit;
+
+
+		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();
+
+				if (init_in_base) {
+					GF_SAFEALLOC(rep->segment_list->initialization_segment, GF_MPD_URL);
+					rep->segment_list->initialization_segment->sourceURL = gf_strdup(init_url);
+					/*we don't want to load the entire movie */
+					init_needs_byte_range = 1;
+				}
+				if (index_in_base) {
+					sidx_file = (char *)init_url;
+				}
+			}
+			/*we need to download the init segement, at least partially*/
+			else {
+				u32 offset = 0;
+				u32 box_type=0;
+				u32 box_size=0;
+				const char *cache_name;
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Downloading init segment and SIDX for representation %s\n", init_url));
+
+				/*download first 8 bytes and check if we do have a box starting there*/
+				e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, 7, 1, group);
+				if (e) goto exit;
+				cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+				e = dash_load_box_type(cache_name, offset, &box_type, &box_size);
+				offset=8;
+				while (box_type) {
+					/*we got the moov , stop here */
+					if (!index_in_base && (box_type==GF_4CC('m','o','o','v'))) {
+						e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, offset+box_size-8, 2, group);
+						break;
+					} else {
+						e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), init_url, offset, offset+box_size-1, 2, group);
+						offset += box_size;
+						/*we need to refresh the cache name because of our memory astorage thing ...*/
+						cache_name = group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+						e = dash_load_box_type(cache_name, offset-8, &box_type, &box_size);
+
+						if (box_type==GF_4CC('s','i','d','x'))
+							has_seen_sidx = 1;
+						else if (has_seen_sidx)
+							break;
+	
+	
+					}
+				}
+				if (e<0) goto exit;
+
+				if (box_type==0) {
+					e = GF_ISOM_INVALID_FILE;
+					goto exit;
+				}
+				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();
+
+				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);
+				}
+				if (index_in_base) {
+					sidx_file = (char *)cache_name;
+				}
+			}
+		}
+		/*we have index url, download it*/
+		if (! index_in_base) {
+			e = gf_dash_download_resource(group->dash->dash_io, &(group->segment_download), index_url, index_start_range, index_end_range, 1, group);
+			if (e) goto exit;
+			sidx_file = (char *)group->dash->dash_io->get_cache_name(group->dash->dash_io, group->segment_download);
+		}
+
+		/*load sidx*/
+		e = gf_dash_load_representation_sidx(group, rep, sidx_file, !index_in_base, init_needs_byte_range);
+		if (e) {
+			rep->playback.disabled = 1;
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Failed to load segment index for this representation - disabling\n"));
+		}
+
+		/*reset all seg based stuff*/
+		if (rep->segment_base) { 
+			gf_mpd_segment_base_free(rep->segment_base);
+			rep->segment_base = NULL;
+		}
+
+		gf_free(index_url);
+		index_url = NULL;
+		gf_free(init_url);
+		init_url = NULL;
+	}
+	if (group->adaptation_set->segment_base) { 
+		gf_mpd_segment_base_free(group->adaptation_set->segment_base);
+		group->adaptation_set->segment_base = NULL;
+	}
+	group->was_segment_base = 1;
+
+exit:
+	if (init_url) gf_free(init_url);
+	if (index_url) gf_free(index_url);
+	return e;
+}
+
+static GF_Err gf_dash_setup_period(GF_DashClient *dash)
+{
+	GF_MPD_Period *period;
+	u32 rep_i, group_i, nb_groups_ok;
+	/*setup all groups*/
+	gf_dash_setup_groups(dash);
+
+	nb_groups_ok = 0;
+	for (group_i=0; group_i<gf_list_count(dash->groups); group_i++) {
+		GF_MPD_Representation *rep_sel;
+		u32 active_rep, nb_rep;
+		const char *mime_type;
+		u32 nb_rep_ok = 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)) {
+			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
+			continue;
+		}
+
+		nb_rep = gf_list_count(group->adaptation_set->representations);
+
+		if ((nb_rep>1) && !group->adaptation_set->segment_alignment && !group->adaptation_set->subsegment_alignment) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet without segmentAlignment flag set - ignoring because not supported\n"));
+			continue;
+		}
+		if (group->adaptation_set->xlink_href) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] AdaptationSet with xlink:href to %s - ignoring because not supported\n", group->adaptation_set->xlink_href));
+			continue;
+		}
+
+		/*translate from single-indexed file to SegmentList*/
+		gf_dash_setup_single_index_mode(group);
+
+		/* Select the appropriate representation in the given period */
+		group->min_representation_bitrate = (u32) -1;
+		active_rep = 0;
+		for (rep_i = 0; rep_i < nb_rep; rep_i++) {
+			GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, rep_i);
+			rep_sel = gf_list_get(group->adaptation_set->representations, active_rep);
+
+			if (rep->bandwidth < group->min_representation_bitrate) {
+				group->min_representation_bitrate = rep->bandwidth;
+			}
+
+			if (rep_i) {
+				Bool ok;
+				char *sep;
+				if (rep->codecs && rep_sel->codecs) {
+
+					sep = strchr(rep_sel->codecs, '.');
+					if (sep) sep[0] = 0;
+					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));
+						//rep->playback.disabled = 1;
+						//continue;
+					}
+					if (rep->segment_list && rep->segment_list->xlink_href) {
+						GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Representation SegmentList uses xlink:href to %s - disabling because not supported\n", rep->segment_list->xlink_href));
+						rep->playback.disabled = 1;
+						continue;
+					}
+				}
+			}
+
+			switch (dash->first_select_mode) {
+			case GF_DASH_SELECT_QUALITY_LOWEST:
+				if (rep->quality_ranking && (rep->quality_ranking < rep_sel->quality_ranking)) {
+					active_rep = rep_i;
+					break;
+				}/*fallthrough if quality is not indicated*/
+			case GF_DASH_SELECT_BANDWIDTH_LOWEST:
+				if (rep->bandwidth < rep_sel->bandwidth) {
+					active_rep = rep_i;
+				}
+				break;
+			case GF_DASH_SELECT_QUALITY_HIGHEST:
+				/*fallthrough if quality is not indicated*/
+				if (rep->quality_ranking > rep_sel->quality_ranking) {
+					active_rep = rep_i;
+					break;
+				}
+			case GF_DASH_SELECT_BANDWIDTH_HIGHEST:
+				if (rep->bandwidth > rep_sel->bandwidth) {
+					active_rep = rep_i;
+				}
+				break;
+			default:
+				break;
+			}
+		}
+		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) 
+				nb_rep_ok++;
+		}
+
+		if (! nb_rep_ok) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No valid representation in this group - disabling\n"));
+			group->selection = GF_DASH_GROUP_NOT_SELECTABLE;
+			continue;
+		}
+
+		rep_sel = gf_list_get(group->adaptation_set->representations, active_rep);
+
+		gf_dash_set_group_representation(group, rep_sel);
+
+		if (dash->playback_start_range>=0) 
+			gf_dash_seek_group(dash, group);
+
+		mime_type = gf_dash_get_mime_type(NULL, rep_sel, group->adaptation_set);
+
+		if (!mime_type) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Missing MIME type for AdaptationSet - skipping\n"));
+			continue;
+		}
+
+		/* 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->selection = GF_DASH_GROUP_NOT_SELECTED;
+		nb_groups_ok++;
+	}
+
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	
+	if (period->segment_base) { 
+		gf_mpd_segment_base_free(period->segment_base);
+		period->segment_base = NULL;
+	}
+
+	if (!nb_groups_ok) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] No AdaptationSet could be selected in the MPD - Cannot play\n"));
+		return GF_NON_COMPLIANT_BITSTREAM;
+	}
+
+	/*and seek if needed*/
+	return GF_OK;
+}
+
+static void dash_do_rate_adaptation(GF_DashClient *dash, GF_DASH_Group *group, GF_MPD_Representation *rep)
+{
+	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);
+	bytes_per_sec = dash->dash_io->get_bytes_per_sec(dash->dash_io, group->segment_download);
+	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;
+
+			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;
+					}
+				}
+			}
+		}
+
+		if (!dash->disable_switching && new_rep && (new_rep!=rep)) {
+			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);
+		}
+	}
+}
+
+static u32 dash_main_thread_proc(void *par)
+{
+	GF_Err e;
+	GF_DashClient *dash = (GF_DashClient*) par;
+	GF_MPD_Representation *rep;
+	u32 i, group_count, ret = 0;
+	Bool go_on = 1;
+	u32 min_wait = 0;
+	Bool first_period_in_mpd = 1;
+	char *new_base_seg_url;
+	assert(dash);
+	if (!dash->mpd) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Incorrect state, no dash->mpd for URL=%s, already stopped ?\n", dash->base_url));
+		return 1;
+	}
+
+restart_period:
+
+	/* Setting the download status in exclusive code */
+	gf_mx_p(dash->dl_mutex);
+	dash->dash_state = GF_DASH_STATE_SETUP;
+	gf_mx_v(dash->dl_mutex);
+
+	dash->in_period_setup = 1;
+
+	/*setup period*/
+	e = gf_dash_setup_period(dash);
+	if (e) {
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, -1, e);
+		ret = 1;
+		goto exit;
+	}
+	dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SELECT_GROUPS, -1, GF_OK);
+
+	e = GF_OK;
+	group_count = gf_list_count(dash->groups);
+	for (i=0; i<group_count; i++) {
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		if (group->selection==GF_DASH_GROUP_NOT_SELECTABLE)
+			continue;
+
+		//by default all groups are started (init seg download and buffering). They will be (de)selected by the user
+		if (first_period_in_mpd) {
+			gf_dash_buffer_on(group);
+		}
+		e = gf_dash_download_init_segment(dash, group);
+		if (e) break;
+	}
+	dash->mpd_stop_request=0;
+	first_period_in_mpd = 0;
+
+	/*if error signal to the user*/
+	if (e != GF_OK) {
+		dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_PERIOD_SETUP_ERROR, -1, e);
+		ret = 1;
+		goto exit;
+	}
+
+
+	dash->last_update_time = gf_sys_clock();
+
+	gf_mx_p(dash->dl_mutex);
+	dash->dash_state = GF_DASH_STATE_CONNECTING;
+	gf_mx_v(dash->dl_mutex);
+
+
+	/*ask the user to connect to desired groups*/
+	e = dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_CREATE_PLAYBACK, -1, GF_OK);
+	if (e) {
+		ret = 1;
+		goto exit;
+	}
+	if (dash->mpd_stop_request) {
+		ret = 1;
+		goto exit;
+	}
+
+	gf_mx_p(dash->dl_mutex);
+	dash->in_period_setup = 0;
+	dash->dash_state = GF_DASH_STATE_RUNNING;
+	gf_mx_v(dash->dl_mutex);
+
+	min_wait = 0;
+	while (go_on) {
+		const char *local_file_name = NULL;
+		const char *resource_name = NULL;
+
+		/*wait until next segment is needed*/
+		while (!dash->mpd_stop_request) {
+			u32 timer = gf_sys_clock() - dash->last_update_time;
+
+			/*refresh MPD*/
+			if (dash->force_mpd_update || (dash->mpd->minimum_update_period && (timer > dash->mpd->minimum_update_period))) {
+				u32 diff = gf_sys_clock();
+				dash->force_mpd_update = 0;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Time to update the playlist (%u ms elapsed since last refresh and min reload rate is %u)\n", gf_sys_clock() , timer, dash->mpd->minimum_update_period));
+				e = gf_dash_update_manifest(dash);
+				group_count = gf_list_count(dash->groups);
+				diff = gf_sys_clock() - diff;
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
+				} else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Updated MPD in %d ms\n", diff));
+				}
+			} else {
+				Bool all_groups_done = 1;
+				Bool cache_full = 1;
+
+				/*wait if nothing is ready to be downloaded*/
+				if (min_wait>1) {
+					u32 sleep_for = MIN(min_wait/2, 1000);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] No segments available on the server until %d ms - going to sleep for %d ms\n", min_wait, sleep_for));
+					gf_sleep(sleep_for);
+				}
+
+				/*check if cache is not full*/
+				gf_mx_p(dash->dl_mutex);
+				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 (group->nb_cached_segments<group->max_cached_segments) {
+						cache_full = 0;
+						break;
+					}
+				}
+				gf_mx_v(dash->dl_mutex);
+
+				if (!cache_full) break;
+
+				if (dash->request_period_switch==2) all_groups_done = 1;
+
+				if (all_groups_done && dash->request_period_switch) {
+					gf_dash_reset_groups(dash);
+					if (dash->request_period_switch == 1) 
+						dash->active_period_index++;
+
+					dash->request_period_switch = 0;
+
+					goto restart_period;
+				}
+				gf_sleep(30);
+			}
+		}
+
+		/* stop the thread if requested */
+		if (dash->mpd_stop_request) {
+			go_on = 0;
+			break;
+		}
+
+		min_wait = 0;
+
+		/*for each selected groups*/
+		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
+			u64 start_range, end_range;
+			Bool use_byterange;
+			u32 representation_index;
+			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);
+				}
+				continue;
+			}
+			if (group->done) continue;
+
+			if (group->nb_cached_segments>=group->max_cached_segments) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] At %d Cache is full for this group - skipping\n", gf_sys_clock() ));
+				continue;
+			}
+
+			/*remember the active rep index, since group->active_rep_index may change because of bandwidth control algorithm*/
+			representation_index = group->active_rep_index;
+			rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+
+			/* if the index of the segment to be downloaded is greater or equal to the last segment (as seen in the playlist),
+			we need to check if a new playlist is ready */
+			if (group->nb_segments_in_rep && (group->download_segment_index >= (s32) group->nb_segments_in_rep)) {
+				u32 timer = gf_sys_clock() - dash->last_update_time;
+				Bool update_playlist = 0;
+				/* update of the playlist, only if indicated */
+				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*/
+				else if ((dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->mpd->media_presentation_duration) {
+					if (group->segment_duration && (timer > group->segment_duration*1000))
+						update_playlist = 1;
+				}
+				if (update_playlist) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Last segment in current playlist downloaded, checking updates after %u ms\n", timer));
+					e = gf_dash_update_manifest(dash);
+					if (e) {
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error updating MPD %s\n", gf_error_to_string(e)));
+					}
+					group_count = gf_list_count(dash->groups);
+					rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+				} else {
+					gf_sleep(16);
+				}
+				/* 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) {
+							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));
+							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..."));
+						group->done = 1;
+						break;
+					}
+				}
+			}
+			group->time_at_first_reload_required = 0;
+			gf_mx_p(dash->dl_mutex);
+
+			if (group->force_switch_bandwidth && !dash->auto_switch_count) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Forcing representation switch, retesting group"));
+				gf_dash_switch_group_representation(dash, group);
+				/*restart*/
+				i--;
+				gf_mx_v(dash->dl_mutex);
+				continue;
+			}
+
+			/*check availablity start time of segment in Live !!*/
+			if (!group->broken_timing && (dash->mpd->type==GF_MPD_TYPE_DYNAMIC) && !dash->is_m3u8) {
+				s32 to_wait = 0;
+				u32 seg_dur_ms=0;
+#ifndef GPAC_DISABLE_LOG
+				u32 start_number = gf_dash_get_start_number(group, rep);
+#endif
+				s64 segment_ast = (s64) gf_dash_get_segment_availability_start_time(dash->mpd, group, group->download_segment_index, &seg_dur_ms);
+				s64 now = (s64) gf_net_get_utc();
+
+
+				if (group->retry_after_utc > (u64) now) {
+					min_wait = (u32) (group->retry_after_utc - (u64) now);
+					gf_mx_v(dash->dl_mutex);
+					continue;
+				}
+
+				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 ...*/
+				if (to_wait > 1) {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) is not yet available on server - requesting later in %d ms\n", i+1, gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init)/1000.0, to_wait));
+					if (group->last_segment_time) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
+					}
+					gf_mx_v(dash->dl_mutex);
+					if (!min_wait || ((u32) to_wait < min_wait))
+						min_wait = to_wait;
+					continue;
+				} else {
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Set #%d At %d Next segment %d (AST "LLD" - sec in period %g) should now be available on server since %d ms - requesting it\n", i+1, gf_sys_clock(), group->download_segment_index + start_number, segment_ast, (segment_ast - group->period->start - group->ast_at_init)/1000.0, -to_wait));
+
+					if (group->last_segment_time) {
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] %d ms elapsed since previous segment download\n", clock_time - group->last_segment_time));
+					}
+#if 0
+					/*check if we are in the segment availability end time*/
+					if (now < segment_ast + seg_dur_ms + group->time_shift_buffer_depth )
+						in_segment_avail_time = 1;
+#endif
+				}
+			}
+			min_wait = 0;
+
+
+			/* At this stage, there are some segments left to be downloaded */
+			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA, group->download_segment_index, &new_base_seg_url, &start_range, &end_range, &group->current_downloaded_segment_duration, NULL);
+			gf_mx_v(dash->dl_mutex);
+			if (e) {
+				/*do something!!*/
+				break;
+			}
+			use_byterange = (start_range || end_range) ? 1 : 0;
+
+			if (use_byterange) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Downloading new segment: %s (range: "LLD"-"LLD")\n", new_base_seg_url, start_range, end_range));
+			}
+
+			/*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; 
+				e = GF_OK;
+				/*do not erase local files*/
+				group->local_files = 1;
+				gf_dash_buffer_off(group);
+				if (group->force_switch_bandwidth && !dash->auto_switch_count) {
+					gf_dash_switch_group_representation(dash, group);
+					/*restart*/
+					i--;
+					continue;
+				}
+			} else {
+				group->max_bitrate = 0;
+				group->min_bitrate = (u32)-1;
+
+				/*use persistent connection for segment downloads*/
+				if (use_byterange) {
+					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), new_base_seg_url, start_range, end_range, 1, group);
+				} else {
+					e = gf_dash_download_resource(dash->dash_io, &(group->segment_download), new_base_seg_url, 0, 0, 1, group);
+				}
+
+				/*TODO decide what is the best, fetch from another representation or ignore ...*/
+				if (e != GF_OK) {
+					clock_time = gf_sys_clock();
+					min_wait = dash->min_timeout_between_404;
+					group->retry_after_utc = min_wait + gf_net_get_utc();
+
+					if (group->maybe_end_of_stream) {
+						if (group->maybe_end_of_stream==2) {
+							GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Couldn't get segment %s (error %s) and end of period was guessed during last update - stoping playback\n", new_base_seg_url, gf_error_to_string(e)));
+							group->maybe_end_of_stream = 0;
+							group->done = 1;
+						}
+						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++;
+						group->segment_in_valid_range=0;
+					} else if (group->prev_segment_ok && !group->time_at_first_failure) {
+						if (!group->loop_detected) {
+							group->time_at_first_failure = clock_time;
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - starting countdown for %d ms\n", new_base_seg_url, gf_error_to_string(e), group->current_downloaded_segment_duration));
+						}
+					}
+					//if previous segment download was OK, we are likely asking too early - retry for the complete duration in case one segment was lost - we add 100ms safety
+					else if (group->prev_segment_ok && (clock_time - group->time_at_first_failure <= group->current_downloaded_segment_duration + dash->segment_lost_after_ms )) {
+					} else {
+						if (group->prev_segment_ok) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error in downloading new segment: %s %s - waited %d ms but segment still not available, checking next one ...\n", new_base_seg_url, gf_error_to_string(e), clock_time - group->time_at_first_failure));
+							group->time_at_first_failure = 0;
+							group->prev_segment_ok = GF_FALSE;
+						}
+#if 1
+						group->nb_consecutive_fail ++;
+						//we are lost ....
+						if (group->nb_consecutive_fail == 20) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Too many consecutive segments not found, sync or signal has been lost - entering end of stream detection mode\n"));
+							min_wait = 1000;
+							group->maybe_end_of_stream = 1;
+						} 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++;
+						}
+					}
+					gf_free(new_base_seg_url);
+					new_base_seg_url = NULL;
+					continue;
+				}
+
+				group->prev_segment_ok = GF_TRUE;
+				if (group->time_at_first_failure) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Recovered segment %s after 404 - was our download schedule too early ?\n", new_base_seg_url));
+					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);
+						/*restart*/
+						i--;
+						gf_free(new_base_seg_url);
+						new_base_seg_url = NULL;
+						continue;
+					}
+					if (rep->playback.disabled) {
+						gf_dash_skip_disabled_representation(group, rep, GF_FALSE);
+						/*restart*/
+						i--;
+						gf_free(new_base_seg_url);
+						new_base_seg_url = NULL;
+						continue;
+					}
+				}
+
+				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) 
+					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) {
+
+					group->cached[group->nb_cached_segments].cache = gf_strdup(local_file_name);
+					group->cached[group->nb_cached_segments].url = gf_strdup( resource_name );
+					group->cached[group->nb_cached_segments].start_range = 0;
+					group->cached[group->nb_cached_segments].end_range = 0;
+					group->cached[group->nb_cached_segments].representation_index = representation_index;
+					group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
+					group->cached[group->nb_cached_segments].loop_detected = group->loop_detected;
+					group->loop_detected = GF_FALSE;
+
+					if (group->local_files && use_byterange) {
+						group->cached[group->nb_cached_segments].start_range = start_range;
+						group->cached[group->nb_cached_segments].end_range = end_range;
+					}
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Added file to cache (%u/%u in cache): %s\n", group->nb_cached_segments+1, group->max_cached_segments, group->cached[group->nb_cached_segments].url));
+					group->nb_cached_segments++;
+					gf_dash_update_buffering(group, dash);
+				}
+
+				/* download enhancement representation of this segment*/
+				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;
+				/* 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->auto_switch_count) {
+					group->nb_segments_done++;
+					if (group->nb_segments_done==dash->auto_switch_count) {
+						group->nb_segments_done=0;
+						gf_dash_skip_disabled_representation(group, rep, GF_TRUE);
+					}
+				}
+				gf_mx_v(dash->dl_mutex);
+
+
+				dash->dash_io->on_dash_event(dash->dash_io, GF_DASH_EVENT_SEGMENT_AVAILABLE, gf_list_find(dash->groups, group), GF_OK); 
+
+			}
+			gf_free(new_base_seg_url);
+			new_base_seg_url = NULL;
+		}
+	}
+
+exit:
+	/* Signal that the download thread has ended */
+	gf_mx_p(dash->dl_mutex);
+
+	/*an error occured during playback chain creation and we couldn't release our plyayback chain in time, do it now*/
+	if (dash->dash_state == GF_DASH_STATE_CONNECTING)
+		gf_dash_reset_groups(dash);
+
+	dash->dash_state = GF_DASH_STATE_STOPPED;
+	gf_mx_v(dash->dl_mutex);
+	return ret;
+}
+
+static u32 gf_dash_period_index_from_time(GF_DashClient *dash, u32 time)
+{
+	u32 i, count, cumul_start=0;
+	GF_MPD_Period *period;
+	count = gf_list_count(dash->mpd->periods);
+	for (i = 0; i<count; i++) {
+		period = gf_list_get(dash->mpd->periods, i);
+		if ((period->start > time) || (cumul_start > time)) {
+			break;
+		}
+		cumul_start+=period->duration;
+	}
+	return (i>=1 ? (i-1) : 0);
+}
+
+static void gf_dash_download_stop(GF_DashClient *dash)
+{
+	u32 i;
+	assert( dash );
+	if (dash->groups) {
+		for (i=0; i<gf_list_count(dash->groups); i++) {
+			GF_DASH_Group *group = gf_list_get(dash->groups, i);
+			assert( group );
+			if ((group->selection == GF_DASH_GROUP_SELECTED) && group->segment_download) {
+				if (group->segment_download)
+					dash->dash_io->abort(dash->dash_io, group->segment_download);
+				group->done = 1;
+			}
+		}
+	}
+	/* stop the download thread */
+	gf_mx_p(dash->dl_mutex);
+	if (dash->dash_state != GF_DASH_STATE_STOPPED) {
+		dash->mpd_stop_request = 1;
+		gf_mx_v(dash->dl_mutex);
+		while (1) {
+			/* waiting for the download thread to stop */
+			gf_sleep(16);
+			gf_mx_p(dash->dl_mutex);
+			if (dash->dash_state != GF_DASH_STATE_RUNNING) {
+				/* it's stopped we can continue */
+				gf_mx_v(dash->dl_mutex);
+				break;
+			}
+			gf_mx_v(dash->dl_mutex);
+		}
+	} else {
+		gf_mx_v(dash->dl_mutex);
+	}
+}
+
+
+
+Bool gf_dash_seek_periods(GF_DashClient *dash)
+{
+	Double start_time;
+	u32 i, period_idx;
+
+	gf_mx_p(dash->dl_mutex);
+
+	dash->start_range_in_segment_at_next_period = 0;
+	start_time = 0;
+	period_idx = 0;
+	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;
+		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) ) {
+				period_idx = i;
+				break;
+			}
+		}
+		start_time += dur;
+	}
+	if (period_idx != dash->active_period_index) {
+		dash->playback_start_range -= 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;
+			}
+
+		}
+	}
+	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)
+{
+	Double seg_start;
+	u32 first_downloaded, last_downloaded, segment_idx;
+
+	group->force_segment_switch = 0;
+	if (!group->segment_duration) return;
+
+	/*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++;
+	}
+	/*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) 
+		dash->dash_io->abort(dash->dash_io, group->segment_download);
+
+	if (group->urlToDeleteNext) {
+		if (!dash->keep_files && !group->local_files)
+			dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
+
+		gf_free(group->urlToDeleteNext);
+		group->urlToDeleteNext = NULL;
+	}
+	if (group->segment_download) {
+		dash->dash_io->del(dash->dash_io, group->segment_download);
+		group->segment_download = NULL;
+	}
+	while (group->nb_cached_segments) {
+		group->nb_cached_segments --;
+		if (!dash->keep_files && !group->local_files && !group->segment_must_be_streamed)
+			gf_delete_file(group->cached[group->nb_cached_segments].cache);
+
+		gf_free(group->cached[group->nb_cached_segments].cache);
+		gf_free(group->cached[group->nb_cached_segments].url);
+		memset(&group->cached[group->nb_cached_segments], 0, sizeof(segment_cache_entry));
+	}
+}
+
+void gf_dash_seek_groups(GF_DashClient *dash)
+{
+	u32 i;
+
+	gf_mx_p(dash->dl_mutex);
+
+	if (dash->active_period_index) {
+		Double dur = 0;
+		u32 i;
+		for (i=0; i<dash->active_period_index; i++) {
+			GF_MPD_Period *period = gf_list_get(dash->mpd->periods, dash->active_period_index-1);
+			dur += period->duration/1000.0;
+		}
+		dash->playback_start_range -= 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_mx_v(dash->dl_mutex);
+}
+
+
+static GF_Err http_ifce_get(GF_FileDownload *getter, char *url)
+{
+	GF_Err e;
+	GF_DashClient *dash = (GF_DashClient*) getter->udta;
+	GF_DASHFileIOSession *sess = dash->dash_io->create(dash->dash_io, 0, url, -1);
+	if (!sess) return GF_IO_ERR;
+	getter->session = sess;
+	e = dash->dash_io->init(dash->dash_io, sess);
+	if (e) return e;
+	return dash->dash_io->run(dash->dash_io, sess);
+}
+
+static void http_ifce_clean(GF_FileDownload *getter)
+{
+	GF_DashClient *dash = (GF_DashClient*) getter->udta;
+	if (getter->session) dash->dash_io->del(dash->dash_io, getter->session);
+	getter->session = NULL;
+}
+
+static const char *http_ifce_cache_name(GF_FileDownload *getter)
+{
+	GF_DashClient *dash = (GF_DashClient*) getter->udta;
+	if (getter->session) return dash->dash_io->get_cache_name(dash->dash_io, getter->session);
+	return NULL;
+}
+
+GF_EXPORT
+GF_Err gf_dash_open(GF_DashClient *dash, const char *manifest_url)
+{
+	char local_path[GF_MAX_PATH];
+	const char *local_url;
+	GF_Err e;
+	GF_MPD_Period *period;
+	GF_DOMParser *mpd_parser;
+	Bool is_local = 0;
+
+	if (!dash || !manifest_url) return GF_BAD_PARAM;
+
+	memset( dash->lastMPDSignature, 0, sizeof(dash->last_update_time));
+	dash->reload_count = 0;
+
+	if (dash->base_url) gf_free(dash->base_url);
+	dash->base_url = gf_strdup(manifest_url);
+
+	dash->getter.udta = dash;
+	dash->getter.new_session = http_ifce_get;
+	dash->getter.del_session = http_ifce_clean;
+	dash->getter.get_cache_name = http_ifce_cache_name;
+	dash->getter.session = NULL;
+
+
+
+	if (dash->mpd_dnload) dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+	dash->mpd_dnload = NULL;
+	local_url = NULL;
+
+	if (!strnicmp(manifest_url, "file://", 7)) {
+		local_url = manifest_url + 7;
+		is_local = 1;
+		if (strstr(manifest_url, ".m3u8")) {
+			dash->is_m3u8 = 1;
+		}
+	} else if (strstr(manifest_url, "://")) {
+		const char *reloc_url, *mtype;
+		char mime[128];
+		e = gf_dash_download_resource(dash->dash_io, &(dash->mpd_dnload), manifest_url, 0, 0, 1, NULL);
+		if (e!=GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD downloading problem %s for %s\n", gf_error_to_string(e), manifest_url));
+			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+			dash->mpd_dnload = NULL;
+			return e;
+		}
+
+		mtype = dash->dash_io->get_mime(dash->dash_io, dash->mpd_dnload);
+		strcpy(mime, mtype ? mtype : "");
+		strlwr(mime);
+
+		reloc_url = dash->dash_io->get_url(dash->dash_io, dash->mpd_dnload);
+		/* Some servers, for instance http://tv.freebox.fr, serve m3u8 as text/plain */
+		if (gf_dash_is_m3u8_mime(reloc_url, mime) || strstr(reloc_url, ".m3u8") || strstr(reloc_url, ".M3U8")) {
+			dash->is_m3u8 = 1;
+		} else if (!gf_dash_is_dash_mime(mime) && !strstr(reloc_url, ".mpd") && !strstr(reloc_url, ".MPD")) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] mime '%s' for '%s' should be m3u8 or mpd\n", mime, reloc_url));
+			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+			dash->mpd_dnload = NULL;
+			return GF_REMOTE_SERVICE_ERROR;
+		}
+
+		/*if relocated use new URL as base URL for all requests*/
+		if (strcmp(reloc_url, manifest_url)) {
+			gf_free(dash->base_url);
+			dash->base_url = gf_strdup(reloc_url);
+		}
+
+		local_url = dash->dash_io->get_cache_name(dash->dash_io, dash->mpd_dnload);
+		if (!local_url) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: cache problem %s\n", local_url));
+			dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+			dash->mpd_dnload = NULL;
+			return GF_IO_ERR;
+		}
+	} else {
+		local_url = manifest_url;
+		is_local = 1;
+		if (strstr(manifest_url, ".m3u8"))
+			dash->is_m3u8 = 1;
+	}
+
+	if (is_local) {
+		FILE *f = fopen(local_url, "rt");
+		if (!f) return GF_URL_ERROR;
+		fclose(f);
+	}
+	dash->mpd_fetch_time = dash_get_fetch_time(dash);
+
+	if (dash->is_m3u8) {
+		if (is_local) {
+			char *sep;
+			strcpy(local_path, local_url);
+			sep = strrchr(local_path, '.');
+			if (sep) sep[0]=0;
+			strcat(local_path, ".mpd");
+
+			gf_m3u8_to_mpd(local_url, manifest_url, local_path, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
+			local_url = local_path;
+		} else {
+			gf_m3u8_to_mpd(local_url, manifest_url, NULL, dash->reload_count, dash->mimeTypeForM3U8Segments, 0, M3U8_TO_MPD_USE_TEMPLATE, &dash->getter);
+		}
+	}
+
+	if (!gf_dash_check_mpd_root_type(local_url)) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: wrong file type %s\n", local_url));
+		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+		dash->mpd_dnload = NULL;
+		return GF_URL_ERROR;
+	}
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] parsing MPD %s\n", local_url));
+
+	/* parse the MPD */
+	mpd_parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(mpd_parser, local_url, NULL, NULL);
+	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);
+		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+		dash->mpd_dnload = NULL;
+		return GF_URL_ERROR;
+	}
+	if (dash->mpd)
+		gf_mpd_del(dash->mpd);
+
+	dash->mpd = gf_mpd_new();
+	if (!dash->mpd) {
+		e = GF_OUT_OF_MEM;
+	} else {
+		e = gf_mpd_init_from_dom(gf_xml_dom_get_root(mpd_parser), dash->mpd, manifest_url);
+	}
+	gf_xml_dom_del(mpd_parser);
+
+	if (e != GF_OK) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot connect service: MPD creation problem %s\n", gf_error_to_string(e)));
+		goto exit;
+	}
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] DASH client initialized from MPD at UTC time "LLU" - availabilityStartTime "LLU"\n", dash->mpd_fetch_time , dash->mpd->availabilityStartTime));
+	if (is_local && dash->mpd->minimum_update_period) {
+		e = gf_dash_update_manifest(dash);
+		if (e != GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot update MPD: %s\n", gf_error_to_string(e)));
+			goto exit;
+		}
+	}
+
+	/* Get the right period from the given time */
+	dash->active_period_index = gf_dash_period_index_from_time(dash, 0);
+	period = gf_list_get(dash->mpd->periods, dash->active_period_index);
+	if (!period || !gf_list_count(period->adaptation_sets) ) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Error - cannot start: not enough periods or representations in MPD\n"));
+		e = GF_URL_ERROR;
+		goto exit;
+	}
+
+	e = gf_th_run(dash->dash_thread, dash_main_thread_proc, dash);
+
+	return e;
+exit:
+	dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+	dash->mpd_dnload = NULL;
+
+	if (dash->mpd)
+		gf_mpd_del(dash->mpd);
+	dash->mpd = NULL;
+	return e;
+}
+
+GF_EXPORT
+void gf_dash_close(GF_DashClient *dash)
+{
+	assert( dash );
+
+	gf_dash_download_stop(dash);
+
+	gf_mx_p(dash->dl_mutex);
+	if (dash->mpd_dnload) {
+		dash->dash_io->del(dash->dash_io, dash->mpd_dnload);
+		dash->mpd_dnload = NULL;
+	}
+	if (dash->mpd)
+		gf_mpd_del(dash->mpd);
+	dash->mpd = NULL;
+
+	gf_mx_v(dash->dl_mutex);
+
+	if (dash->dash_state != GF_DASH_STATE_CONNECTING)
+		gf_dash_reset_groups(dash);
+}
+
+GF_EXPORT
+GF_DashClient *gf_dash_new(GF_DASHFileIO *dash_io, u32 max_cache_duration, u32 auto_switch_count, Bool keep_files, Bool disable_switching, GF_DASHInitialSelectionMode first_select_mode, Bool enable_buffering, u32 initial_time_shift_percent)
+{
+	GF_DashClient *dash;
+	GF_SAFEALLOC(dash, GF_DashClient);
+	dash->dash_io = dash_io;
+
+	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->auto_switch_count = auto_switch_count;
+	dash->keep_files = keep_files;
+	dash->disable_switching = disable_switching;
+	dash->first_select_mode = first_select_mode;	
+	dash->idle_interval = 1000;
+	dash->min_timeout_between_404 = 500;
+	dash->segment_lost_after_ms = 100;
+	
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Client created\n"));
+	return dash;
+}
+
+GF_EXPORT
+void gf_dash_del(GF_DashClient *dash)
+{
+	gf_dash_close(dash);
+
+	gf_th_del(dash->dash_thread);
+	gf_mx_del(dash->dl_mutex);	
+
+	if (dash->mimeTypeForM3U8Segments) gf_free(dash->mimeTypeForM3U8Segments);
+	if (dash->base_url) gf_free(dash->base_url);
+
+	gf_free(dash);
+}
+
+GF_EXPORT
+void gf_dash_set_idle_interval(GF_DashClient *dash, u32 idle_time_ms)
+{
+	dash->idle_interval = idle_time_ms;
+}
+
+GF_EXPORT
+void gf_dash_enable_utc_drift_compensation(GF_DashClient *dash, Bool estimate_utc_drift)
+{
+	dash->estimate_utc_drift = estimate_utc_drift;
+}
+
+
+GF_EXPORT
+u32 gf_dash_get_group_count(GF_DashClient *dash)
+{
+	return gf_list_count(dash->groups);
+}
+
+
+GF_EXPORT
+void *gf_dash_get_group_udta(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return NULL;
+	return group->udta;
+}
+
+GF_EXPORT
+GF_Err gf_dash_set_group_udta(GF_DashClient *dash, u32 idx, void *udta)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return GF_BAD_PARAM;
+	group->udta = udta;
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_dash_is_group_selected(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return 0;
+	return (group->selection == GF_DASH_GROUP_SELECTED) ? 1 : 0;
+}
+
+GF_EXPORT
+Bool gf_dash_is_group_selectable(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return 0;
+	return (group->selection == GF_DASH_GROUP_NOT_SELECTABLE) ? 0 : 1;
+}
+
+GF_EXPORT
+void gf_dash_get_info(GF_DashClient *dash, const char **title, const char **source)
+{
+	GF_MPD_ProgramInfo *info = gf_list_get(dash->mpd->program_infos, 0);
+	if (info) {
+		*title = info->title;
+		*source = info->source;
+	}
+}
+
+GF_EXPORT
+void gf_dash_switch_quality(GF_DashClient *dash, Bool switch_up, Bool immediate_switch)
+{
+	u32 i;
+	for (i=0; i<gf_list_count(dash->groups); i++) {
+		u32 switch_to_rep_idx = 0;
+		u32 bandwidth, quality, k;
+		GF_MPD_Representation *rep, *active_rep;
+		GF_DASH_Group *group = gf_list_get(dash->groups, i);
+		u32 current_idx = group->active_rep_index;
+		if (group->selection != GF_DASH_GROUP_SELECTED) continue;
+
+		if (group->base_rep_index_plus_one) current_idx = group->force_max_rep_index;
+		if (group->force_representation_idx_plus_one) current_idx = group->force_representation_idx_plus_one - 1;
+
+		active_rep = gf_list_get(group->adaptation_set->representations, current_idx);
+		if (!active_rep) continue;
+		bandwidth = switch_up ? (u32) -1 : 0;
+		quality = switch_up ? (u32) -1 : 0;
+
+		for (k=0; k<gf_list_count(group->adaptation_set->representations); k++) {
+			rep = gf_list_get(group->adaptation_set->representations, k);
+			if (switch_up) {
+				if ((rep->quality_ranking>active_rep->quality_ranking) || (rep->bandwidth>active_rep->bandwidth)) {
+					if ((rep->quality_ranking < quality) || (rep->bandwidth < bandwidth)) {
+						bandwidth = rep->bandwidth;
+						quality = rep->quality_ranking;
+						switch_to_rep_idx = k+1;
+					}
+				}
+			} else {
+				if ((rep->quality_ranking < active_rep->quality_ranking) || (rep->bandwidth < active_rep->bandwidth)) {
+					if ((rep->quality_ranking > quality) || (rep->bandwidth > bandwidth)) {
+						bandwidth = rep->bandwidth;
+						quality = rep->quality_ranking;
+						switch_to_rep_idx = k+1;
+					}
+				}
+			}
+		}
+		if (switch_to_rep_idx && (switch_to_rep_idx-1 != current_idx) ) {
+			u32 nb_cached_seg_per_rep = group->max_cached_segments / gf_dash_group_count_rep_needed(group);
+			gf_mx_p(dash->dl_mutex);
+			group->force_switch_bandwidth = 1;
+			if (!group->base_rep_index_plus_one)
+				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
+				rep = gf_list_get(group->adaptation_set->representations, group->cached[0].representation_index);
+				if (rep->enhancement_rep_index_plus_one) {
+					u32 rep_idx = rep->enhancement_rep_index_plus_one;
+					while (keep_seg_index + 1 < group->nb_cached_segments) {
+						rep = gf_list_get(group->adaptation_set->representations, group->cached[keep_seg_index+1].representation_index);
+						if (rep_idx == group->cached[keep_seg_index+1].representation_index+1) {
+							keep_seg_index ++;
+							rep_idx = rep->enhancement_rep_index_plus_one;
+						}
+						else
+							break;
+					}
+				}
+
+				if (!group->base_rep_index_plus_one) {
+					/*in local playback just switch at the end of the current segment
+					for remote, we should let the user decide*/
+					while (group->nb_cached_segments > keep_seg_index + 1) {
+						group->nb_cached_segments--;
+						gf_dash_update_buffering(group, dash);
+						GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Switching quality - delete cached segment: %s\n", group->cached[group->nb_cached_segments].url));
+						gf_free(group->cached[group->nb_cached_segments].url);
+						group->cached[group->nb_cached_segments].url = NULL;
+						if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
+							gf_delete_file( group->cached[group->nb_cached_segments].cache );
+							gf_free(group->cached[group->nb_cached_segments].cache);
+							group->cached[group->nb_cached_segments].cache = NULL;
+						}
+						group->cached[group->nb_cached_segments].representation_index = 0;
+						group->cached[group->nb_cached_segments].start_range = 0;
+						group->cached[group->nb_cached_segments].end_range = 0;
+						group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
+						if (group->download_segment_index>1)
+							group->download_segment_index--;
+					}
+				} else {
+					if (switch_up) {
+						//first, we keep the second segment and remove all segments from the third one
+						keep_seg_index++;
+						rep = gf_list_get(group->adaptation_set->representations, group->cached[keep_seg_index].representation_index);
+						if (rep->enhancement_rep_index_plus_one) {
+							u32 rep_idx = rep->enhancement_rep_index_plus_one;
+							while (keep_seg_index + 1 < group->nb_cached_segments) {
+								rep = gf_list_get(group->adaptation_set->representations, group->cached[keep_seg_index+1].representation_index);
+								if (rep_idx == group->cached[keep_seg_index+1].representation_index+1) {
+									keep_seg_index ++;
+									rep_idx = rep->enhancement_rep_index_plus_one;
+								}
+								else
+									break;
+							}
+						}
+						while (group->nb_cached_segments > keep_seg_index + 1) {
+							Bool decrease_download_segment_index = (group->cached[group->nb_cached_segments-1].representation_index == current_idx) ? GF_TRUE : GF_FALSE;
+							group->nb_cached_segments--;
+							gf_dash_update_buffering(group, dash);
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Switching quality - delete cached segment: %s\n", group->cached[group->nb_cached_segments].url));
+							gf_free(group->cached[group->nb_cached_segments].url);
+							group->cached[group->nb_cached_segments].url = NULL;
+							if (!group->local_files && group->cached[group->nb_cached_segments].cache) {
+								gf_delete_file( group->cached[group->nb_cached_segments].cache );
+								gf_free(group->cached[group->nb_cached_segments].cache);
+								group->cached[group->nb_cached_segments].cache = NULL;
+							}
+							group->cached[group->nb_cached_segments].representation_index = 0;
+							group->cached[group->nb_cached_segments].start_range = 0;
+							group->cached[group->nb_cached_segments].duration = (u32) group->current_downloaded_segment_duration;
+							if (decrease_download_segment_index && group->download_segment_index>1)
+								group->download_segment_index--;
+						}
+						/*force to download scalable enhancement of the second segment*/
+						group->force_representation_idx_plus_one = switch_to_rep_idx;
+						group->active_rep_index = switch_to_rep_idx - 1;
+						group->download_segment_index--;
+					}
+					else {
+						/* 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)
+								continue;
+							group->nb_cached_segments--;
+							gf_dash_update_buffering(group, dash);
+							GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] Switching quality - delete cached segment: %s\n", group->cached[k].url));
+							if (k != group->nb_cached_segments) {
+								memmove(&group->cached[k], &group->cached[k+1], (group->nb_cached_segments-k)*sizeof(segment_cache_entry));
+							}
+							memset(&group->cached[group->nb_cached_segments], 0, sizeof(segment_cache_entry));
+						}
+					}
+				}
+			}
+			/*resize max cached segment*/
+			group->max_cached_segments = nb_cached_seg_per_rep * gf_dash_group_count_rep_needed(group);
+
+			gf_mx_v(dash->dl_mutex);
+		}
+	}
+}
+
+GF_EXPORT
+Double gf_dash_get_duration(GF_DashClient *dash)
+{
+	Double duration;
+	duration = (Double)dash->mpd->media_presentation_duration;
+	if (!duration) {
+		u32 i;
+		for (i=0; i<gf_list_count(dash->mpd->periods); i++) {
+			GF_MPD_Period *period = gf_list_get(dash->mpd->periods, i);
+			duration += (Double)period->duration;
+		}
+	}
+	duration /= 1000;
+	return duration;
+}
+
+GF_EXPORT
+const char *gf_dash_get_url(GF_DashClient *dash)
+{
+	return dash->base_url;
+}
+
+GF_EXPORT
+const char *gf_dash_group_get_segment_mime(GF_DashClient *dash, u32 idx)
+{
+	GF_MPD_Representation *rep;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return NULL;
+
+	rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+	return gf_dash_get_mime_type(NULL, rep, group->adaptation_set);
+}
+
+GF_EXPORT
+const char *gf_dash_group_get_segment_init_url(GF_DashClient *dash, u32 idx, u64 *start_range, u64 *end_range)
+{
+	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;
+}
+
+GF_EXPORT
+void gf_dash_group_select(GF_DashClient *dash, u32 idx, Bool select)
+{
+	Bool needs_resetup = 0;
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return;
+	if (group->selection == GF_DASH_GROUP_NOT_SELECTABLE)
+		return;
+
+	if ((group->selection==GF_DASH_GROUP_NOT_SELECTED) && select) needs_resetup = 1;
+
+	group->selection = select ? GF_DASH_GROUP_SELECTED : GF_DASH_GROUP_NOT_SELECTED;
+	/*this set is part of a group, make sure no all other sets from the indicated group are unselected*/
+	if (select && (group->adaptation_set->group>=0)) {
+		u32 i;
+		for (i=0; i<gf_dash_get_group_count(dash); i++) {
+			GF_DASH_Group *agroup = gf_list_get(dash->groups, i);
+			if (agroup==group) continue;
+
+			/*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;
+			}
+		}
+	}
+	//TODO: recompute grop download index based on current playback ...
+	if (needs_resetup) {
+
+	}
+}
+
+GF_EXPORT
+void gf_dash_groups_set_language(GF_DashClient *dash, const char *lang_3cc)
+{
+	u32 i;
+	if (!lang_3cc) return;
+	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)) {
+			gf_dash_group_select(dash, i, 1);
+		}
+	}
+}
+
+GF_EXPORT
+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) 
+{
+	return dash->request_period_switch;
+}
+GF_EXPORT
+void gf_dash_request_period_switch(GF_DashClient *dash)
+{
+	dash->request_period_switch = 1;
+}
+GF_EXPORT
+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) 
+{
+	return dash->in_period_setup;
+}
+
+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);
+	return group->max_cached_segments;
+}
+
+
+GF_EXPORT
+u32 gf_dash_group_get_num_segments_ready(GF_DashClient *dash, u32 idx, Bool *group_is_done)
+{
+	u32 res = 0;
+	GF_DASH_Group *group;
+
+	gf_mx_p(dash->dl_mutex);
+	group = gf_list_get(dash->groups, idx);
+
+	*group_is_done = 0;
+	if (!group) {
+		*group_is_done = 1;
+	} else {
+		*group_is_done = group->done;
+		res = group->nb_cached_segments;
+
+		if (group->buffering) {
+			res = 0;
+		}
+	}
+	gf_mx_v(dash->dl_mutex);
+	return res;
+}
+
+GF_EXPORT
+void gf_dash_group_discard_segment(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group;
+
+	gf_mx_p(dash->dl_mutex);
+	group = gf_list_get(dash->groups, idx);
+
+discard_segment:
+	if (!group->nb_cached_segments) {
+		gf_mx_v(dash->dl_mutex);	
+		return;
+	}
+	if (group->cached[0].cache) {
+		if (group->urlToDeleteNext) {
+			if (!group->local_files && !dash->keep_files)
+				dash->dash_io->delete_cache_file(dash->dash_io, group->segment_download, group->urlToDeleteNext);
+
+			gf_free( group->urlToDeleteNext);
+			group->urlToDeleteNext = NULL;
+		}
+		assert( group->cached[0].url );
+
+		if (group->dont_delete_first_segment) {
+			group->dont_delete_first_segment = 0;
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] deleting cache file %s : %s (kept in HTTP cache)\n", group->cached[0].url, group->cached[0].cache));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[DASH] deleting cache file %s : %s\n", group->cached[0].url, group->cached[0].cache));
+			group->urlToDeleteNext = gf_strdup( group->cached[0].url );
+		}
+
+		//remember the representation index of the last segment
+		group->prev_active_rep_index = group->cached[0].representation_index;
+
+		gf_free(group->cached[0].cache);
+		gf_free(group->cached[0].url);
+		group->cached[0].url = NULL;
+		group->cached[0].cache = NULL;
+		group->cached[0].representation_index = 0;
+		group->cached[0].duration = 0;
+
+	}
+	memmove(&group->cached[0], &group->cached[1], sizeof(segment_cache_entry)*(group->nb_cached_segments-1));
+	memset(&(group->cached[group->nb_cached_segments-1]), 0, sizeof(segment_cache_entry));
+	group->nb_cached_segments--;
+
+	/*if we have dependency representations, we need also discard them*/
+	if (group->base_rep_index_plus_one) {
+		if (group->cached[0].cache && (group->cached[0].representation_index != group->base_rep_index_plus_one-1))
+			goto discard_segment;
+	}
+
+	gf_mx_v(dash->dl_mutex);
+}
+
+GF_EXPORT
+void gf_dash_set_group_done(GF_DashClient *dash, u32 idx, Bool done)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (group) {
+		group->done = done;
+		if (done && group->segment_download) dash->dash_io->abort(dash->dash_io, group->segment_download);
+	}
+}
+
+GF_EXPORT
+GF_Err gf_dash_group_get_presentation_time_offset(GF_DashClient *dash, u32 idx, u64 *presentation_time_offset, u32 *timescale)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (group) {
+		u64 duration;
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+		gf_dash_resolve_duration(rep, group->adaptation_set, group->period, &duration, timescale, presentation_time_offset, NULL);
+		return GF_OK;
+	}
+	return GF_BAD_PARAM;
+}
+
+GF_EXPORT
+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_DASH_Group *group;
+	u32 index;
+	*url = NULL;
+	if (switching_url) *switching_url = NULL;
+	if (start_range) *start_range = 0;
+	if (end_range) *end_range = 0;
+	if (switching_start_range) *switching_start_range = 0;
+	if (switching_end_range) *switching_end_range = 0;
+	if (original_url) *original_url = NULL;
+	if (switching_index) *switching_index = -1;
+	if (has_next_segment) *has_next_segment = GF_FALSE;
+
+	gf_mx_p(dash->dl_mutex);	
+	group = gf_list_get(dash->groups, idx);
+	if (!group->nb_cached_segments) {
+		gf_mx_v(dash->dl_mutex);	
+		return GF_BAD_PARAM;
+	}
+
+	/*check the dependent rep is in the cache and does not target next segment (next in time)*/
+	index = 0;
+	while (dependent_representation_index) {
+		Bool valid = GF_TRUE;
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[index].representation_index);
+
+		if (!rep->enhancement_rep_index_plus_one) valid = GF_FALSE;
+		if (index+1 >= group->nb_cached_segments) valid = GF_FALSE;
+		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);	
+			return GF_BAD_PARAM;
+		}
+		index ++;
+		dependent_representation_index--;
+	}
+	assert(dependent_representation_index==0);
+
+	*url = group->cached[index].cache;
+	if (start_range) 
+		*start_range = group->cached[index].start_range;
+	if (end_range)
+		*end_range = group->cached[index].end_range;
+	if (original_url) *original_url = group->cached[index].url;
+
+	if (!group->base_rep_index_plus_one && (group->cached[index].representation_index != group->prev_active_rep_index)) {
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->cached[0].representation_index);
+		if (switching_index)
+			*switching_index = group->cached[0].representation_index;
+		if (switching_start_range)
+			*switching_start_range = rep->playback.init_start_range;
+		if (switching_end_range)
+			*switching_end_range = rep->playback.init_end_range;
+		if (switching_url)
+			*switching_url = rep->playback.cached_init_segment_url;
+	}
+	group->force_segment_switch = 0;
+
+	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;	
+		}
+	}
+	gf_mx_v(dash->dl_mutex);	
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dash_group_probe_current_download_segment_location(GF_DashClient *dash, u32 idx, const char **url, s32 *switching_index, const char **switching_url, const char **original_url, Bool *switched)
+{
+	GF_DASH_Group *group;
+
+	*url = NULL;
+	if (switching_url) *switching_url = NULL;
+	if (original_url) *original_url = NULL;
+	if (switching_index) *switching_index = -1;
+
+	gf_mx_p(dash->dl_mutex);	
+	group = gf_list_get(dash->groups, idx);
+	if (!group) {
+		gf_mx_v(dash->dl_mutex);	
+		return GF_BAD_PARAM;
+	}
+
+	if (!group->is_downloading) {
+		gf_mx_v(dash->dl_mutex);
+		return GF_OK;
+	}
+
+	*switched = GF_FALSE;
+	if (group->download_aborted) {
+		group->download_aborted = 0;
+		*switched = GF_TRUE;
+	}
+
+	*url = dash->dash_io->get_cache_name(dash->dash_io, group->segment_download);
+	if (original_url) *original_url = dash->dash_io->get_url(dash->dash_io, group->segment_download);
+
+	if (group->active_rep_index != group->prev_active_rep_index) {
+		GF_MPD_Representation *rep = gf_list_get(group->adaptation_set->representations, group->active_rep_index);
+		if (switching_index)
+			*switching_index = group->active_rep_index;
+		if (switching_url)
+			*switching_url = rep->playback.cached_init_segment_url;
+	}
+	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;
+	/*first check if we seek to another period*/
+	if (! gf_dash_seek_periods(dash)) {
+		/*if no, seek in group*/
+		gf_dash_seek_groups(dash);
+	}
+	gf_mx_v(dash->dl_mutex);	
+}
+
+GF_EXPORT
+Double gf_dash_get_playback_start_range(GF_DashClient *dash)
+{
+	return dash->playback_start_range;
+}
+
+GF_EXPORT
+Bool gf_dash_group_segment_switch_forced(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	return group->force_segment_switch;
+}
+
+GF_EXPORT
+Double gf_dash_group_current_segment_start_time(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	return gf_dash_get_segment_start_time(group, NULL);
+}
+
+GF_EXPORT
+void gf_dash_set_utc_shift(GF_DashClient *dash, s32 shift_utc_sec)
+{
+	if (dash) dash->utc_shift = shift_utc_sec;
+}
+
+GF_EXPORT
+GF_Err gf_dash_group_get_video_info(GF_DashClient *dash, u32 idx, u32 *max_width, u32 *max_height)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group || !max_width || !max_height) return GF_BAD_PARAM;
+
+	*max_width = group->adaptation_set->max_width;
+	*max_height = group->adaptation_set->max_height;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dash_set_min_timeout_between_404(GF_DashClient *dash, u32 min_timeout_between_404)
+{
+	if (!dash) return GF_BAD_PARAM;
+	dash->min_timeout_between_404 = min_timeout_between_404;
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dash_set_segment_expiration_threshold(GF_DashClient *dash, u32 expire_after_ms)
+{
+	if (!dash) return GF_BAD_PARAM;
+	dash->segment_lost_after_ms = expire_after_ms;
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_dash_group_get_representation_info(GF_DashClient *dash, u32 idx, u32 representation_idx, u32 *width, u32 *height, u32 *audio_samplerate, u32 *bandwidth, const char **codecs)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	GF_MPD_Representation *rep;
+	if (!group) return GF_BAD_PARAM;
+	rep = gf_list_get(group->adaptation_set->representations, representation_idx);
+	if (!rep) return GF_BAD_PARAM;
+
+	if (width) *width = rep->width ? rep->width : group->adaptation_set->width;
+	if (height) *height = rep->height ? rep->height : group->adaptation_set->height;
+	if (codecs) *codecs = rep->codecs ? rep->codecs : group->adaptation_set->codecs;
+	if (bandwidth) *bandwidth = rep->bandwidth;
+	if (audio_samplerate) *audio_samplerate = rep->samplerate ? rep->samplerate : group->adaptation_set->samplerate;
+
+	return GF_OK;
+}
+
+GF_EXPORT
+Bool gf_dash_group_loop_detected(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	return (group && group->nb_cached_segments) ? group->cached[0].loop_detected : GF_FALSE;
+}
+
+GF_EXPORT
+Double gf_dash_group_get_start_range(GF_DashClient *dash, u32 idx)
+{
+	GF_DASH_Group *group = gf_list_get(dash->groups, idx);
+	if (!group) return 0.0;
+	return group->start_playback_range;
+}
+
+
+GF_EXPORT
+Bool gf_dash_is_dynamic_mpd(GF_DashClient *dash)
+{
+	return (dash && dash->mpd->type==GF_MPD_TYPE_DYNAMIC) ? 1 : 0;
+}
+
+GF_EXPORT
+u32 gf_dash_get_min_buffer_time(GF_DashClient *dash)
+{
+	return dash ? dash->mpd->min_buffer_time : 0;
+}
+
+GF_EXPORT
+GF_Err gf_dash_resync_to_segment(GF_DashClient *dash, const char *latest_segment_name, const char *earliest_segment_name)
+{
+	Bool found = GF_FALSE;
+	u32 i, j, latest_segment_number, earliest_segment_number, start_number;
+	/*Double latest_segment_time, earliest_segment_time;*/ //FIX : set but not used
+	u64 start_range, end_range, current_dur;
+	char *seg_url, *seg_name, *seg_sep;
+	GF_MPD_Representation *rep;
+	GF_DASH_Group *group = NULL;
+	if (!latest_segment_name) return GF_BAD_PARAM;
+
+	seg_url = NULL;
+	for (i=0; i<gf_list_count(dash->groups); i++) {
+		group = gf_list_get(dash->groups, i);
+		for (j=0; j<gf_list_count(group->adaptation_set->representations); j++) {
+			GF_Err e;
+			rep = gf_list_get(group->adaptation_set->representations, j);
+			e = gf_dash_resolve_url(dash->mpd, rep, group, dash->base_url, GF_DASH_RESOLVE_URL_MEDIA_TEMPLATE, i, &seg_url, &start_range, &end_range, &current_dur, NULL);
+			if (e)
+				GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Unable to resolve media template URL: %s\n", gf_error_to_string(e)));
+
+			if (!seg_url) continue;
+
+			seg_sep = NULL;
+			seg_name = strstr(seg_url, "://");
+			if (seg_name) seg_name = strchr(seg_name+4, '/');
+			if (!seg_name) {
+				gf_free(seg_url);
+				continue;
+			}
+			seg_sep = strchr(seg_name+1, '$');
+			if (seg_sep) seg_sep[0] = 0;
+
+			if (!strncmp(seg_name, latest_segment_name, strlen(seg_name)))
+				found = GF_TRUE;
+
+			if (found) break;
+
+			if (seg_sep) seg_sep[0] = '$';
+			gf_free(seg_url);
+			continue;
+		}
+		if (found) break;
+	}
+
+	if (!found) {
+		if (seg_url) gf_free(seg_url);
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] No representation found matching the resync segment name %s\n", latest_segment_name));
+		return GF_BAD_PARAM;
+	}
+
+	start_number = gf_dash_get_start_number(group, rep);
+
+	if (seg_sep) {
+		char *sep_template, *sep_name, c;
+		char *latest_template = (char *) (latest_segment_name + strlen(seg_name));
+		char *earliest_template = earliest_segment_name ? (char *) (earliest_segment_name + strlen(seg_name)) : NULL;
+
+		latest_segment_number = earliest_segment_number = 0;
+		/*latest_segment_time = earliest_segment_time = 0;*/
+
+		seg_sep[0] = '$';
+		while (seg_sep) {
+			sep_template = strchr(seg_sep+1, '$');
+			if (!sep_template) break;
+			c = sep_template[1];
+			sep_template[1] = 0;
+			//solve template for latest
+			sep_name = strchr(latest_template, c);
+			if (!sep_name) break;
+
+			sep_name[0] = 0;
+			if (!strcmp(seg_sep, "$Number$")) {
+				latest_segment_number = atoi(latest_template);
+			}
+			/*else if (!strcmp(seg_sep, "$Time$")) {
+				latest_segment_time = atof(latest_template);
+			}*/
+			sep_name[0] = c;
+			latest_template = sep_name;
+
+			//solve template for earliest
+			if (earliest_template) {
+				sep_name = strchr(earliest_template, c);
+				if (!sep_name) break;
+
+				sep_name[0] = 0;
+				if (!strcmp(seg_sep, "$Number$")) {
+					earliest_segment_number = atoi(earliest_template);
+				}
+				/*else if (!strcmp(seg_sep, "$Time$")) {
+					earliest_segment_time = atof(earliest_template);
+				}*/
+				sep_name[0] = c;
+				earliest_template = sep_name;
+			}
+
+			sep_template[1] = c;
+			seg_sep = sep_template+1;
+			//find next $ - if any, move the segment name of the same amount of chars that what found in the template
+			sep_template = strchr(seg_sep, '$');
+			if (!sep_template) break;
+			sep_template[0]=0;
+			latest_template += strlen(sep_template);
+			sep_template[0]='$';
+		}
+		if (earliest_segment_number && !latest_segment_number) {
+			latest_segment_number = earliest_segment_number;
+		}
+
+		gf_free(seg_url);
+
+		//todo - recompute an AST offset so that the AST of the new segment equals UTC(now) + offset
+		if (latest_segment_number) {
+			Bool loop_detected = GF_FALSE;
+			s32 nb_seg_diff = 0;
+			s32 range_in = 0;
+			//how many segment ahead are we ?
+			nb_seg_diff = start_number + group->download_segment_index;
+			nb_seg_diff -= latest_segment_number;
+
+			//we are just too early for this request, do request later
+			if (nb_seg_diff == 1 ) {
+				//set to false, eg don't increment seg index
+				group->segment_in_valid_range = GF_FALSE;
+				return GF_OK;
+			}
+
+			//if earliest is not given, allow 5 segments
+			if (!earliest_segment_number) range_in = 4;
+			else range_in = latest_segment_number - earliest_segment_number;
+
+			//loop
+			if (latest_segment_number <= start_number ) {
+				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 
+			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) {
+					group->segment_in_valid_range = GF_TRUE;
+					return GF_OK;
+				}
+				//we are late (something wrong happen locally maybe) - If not too late (5 segs) jump to newest
+				else if (earliest_segment_number && (start_number + group->download_segment_index + 5 >= earliest_segment_number)) {
+					group->download_segment_index = latest_segment_number - start_number;
+					group->segment_in_valid_range = GF_FALSE;
+					return GF_OK;
+				}
+				//we are too late resync...
+			}
+
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Sync to live was lost - reloading MPD\n"));
+			for (i=0; i< gf_list_count(dash->groups); i++) {
+				group = gf_list_get(dash->groups, i);
+				//force reinit of timeline for this group
+				group->start_number_at_last_ast = 0;
+				if (loop_detected) 
+					group->loop_detected = GF_TRUE;
+			}
+			dash->force_mpd_update = GF_TRUE;
+		}
+		return GF_OK;
+	}
+
+	//TODO segment list adressing: 
+	return GF_OK;
+}
+
+GF_EXPORT
+GF_Err gf_dash_set_max_resolution(GF_DashClient *dash, u32 width, u32 height, u8 max_display_bpp)
+{
+	if (dash) {
+		dash->max_width = width;
+		dash->max_height = height;
+		dash->max_bit_per_pixel = max_display_bpp;
+		return GF_OK;
+	}
+	return GF_BAD_PARAM;
+}
+
+GF_EXPORT
+void gf_dash_debug_group(GF_DashClient *dash, s32 group_index)
+{
+	dash->debug_group_index = group_index;
+}
+
+GF_EXPORT
+void gf_dash_set_user_buffer(GF_DashClient *dash, u32 buffer_time_ms)
+{
+	if (dash) dash->user_buffer_ms = buffer_time_ms;
+}
+
+
+#endif //GPAC_DISABLE_DASH_CLIENT
+

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/dash_segmenter.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/dash_segmenter.c Changed

@@ -1,4102 +1,4788 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jean Le Feuvre , Cyril Concolato
- *			Copyright (c) Telecom ParisTech 2000-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / Media Tools sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <gpac/internal/media_dev.h>
-#include <gpac/constants.h>
-#include <gpac/mpegts.h>
-#include <gpac/config_file.h>
-#include <gpac/network.h>
-#ifdef _WIN32_WCE
-#include <winbase.h>
-#else
-#include <time.h>
-#endif
-#include <gpac/internal/isomedia_dev.h>
-
-#ifdef GPAC_DISABLE_ISOM
-/*we should need a better way to work with sidx when no isom is defined*/
-#define GPAC_DISABLE_MPEG2TS
-#endif
-
-
-typedef struct _dash_segment_input GF_DashSegInput;
-
-struct _dash_component
-{
-	u32 ID;/*audio/video/text/ ...*/
-	u32 media_type;/*audio/video/text/ ...*/
-	char szCodec[50];
-	/*for video */
-	u32 width, height, fps_num, fps_denum, sar_num, sar_denum, max_sap;
-
-	/*for audio*/
-	u32 sample_rate, channels;
-	/*for anything*/
-	char szLang[5];
-};	
-
-typedef struct
-{
-	Double segment_duration;
-	Double subduration;
-	Double fragment_duration;
-
-	u32 dash_scale;
-
-	Bool segments_start_with_rap;
-	FILE *mpd;
-	const char *mpd_name, *seg_rad_name, *seg_ext;
-	s32 subsegs_per_sidx;
-	Bool daisy_chain_sidx;
-	Bool use_url_template;
-	Bool use_segment_timeline;
-	u32 single_file_mode;
-	u32 segment_marker_4cc;
-	s32 time_shift_depth;
-	const char *bs_switch_segment_file;
-	Bool inband_param_set;
-
-	/*set if seg_rad_name depends on input file name (had %s in it). In this case, SegmentTemplate cannot be used at adaptation set level*/
-	Bool variable_seg_rad_name;
-
-	Bool fragments_start_with_rap;
-	Bool memory_mode;
-
-	GF_Config *dash_ctx;
-	const char *tmpdir;
-} GF_DASHSegmenterOptions;
-
-struct _dash_segment_input
-{
-	char *file_name;
-	char representationID[100];
-	char periodID[100];
-	char role[100];
-	u32 bandwidth;
-
-	/*if 0, input is disabled*/
-	u32 adaptation_set;
-	/*if 0, input is disabled*/
-	u32 period;
-	u32 group_id;
-	/*only set for the first representation in the AdaptationSet*/
-	u32 nb_rep_in_adaptation_set;
-	Double period_duration;
-
-	/*media-format specific functions*/
-	/*assigns the different media to the same adaptation set or group than the input_idx one*/
-	GF_Err (* dasher_input_classify) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type);
-	GF_Err ( *dasher_get_components_info) (GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *opts);
-	GF_Err ( *dasher_create_init_segment) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, Bool use_inband_param_set, Bool single_segment, Bool *disable_bs_switching);
-	GF_Err ( *dasher_segment_file) (GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *opts, Bool first_in_set);
-
-	/*shall be set after call to dasher_input_classify*/
-	char szMime[50];
-
-	/*all these shall be set after call to dasher_get_components_info*/
-	Double duration;
-	struct _dash_component components[20];
-	u32 nb_components;
-};
-
-
-
-#define EXTRACT_FORMAT(_nb_chars)	\
-			strcpy(szFmt, "%d");	\
-			char_template+=_nb_chars;	\
-			if (seg_rad_name[char_template]=='%') {	\
-				char *sep = strchr(seg_rad_name+char_template, '$');	\
-				if (sep) {	\
-					sep[0] = 0;	\
-					strcpy(szFmt, seg_rad_name+char_template);	\
-					char_template += (u32) strlen(seg_rad_name+char_template);	\
-					sep[0] = '$';	\
-				}	\
-			}	\
-			char_template+=1;	\
-
-GF_EXPORT
-GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *output_file_name, const char *rep_id, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
-{
-	char szFmt[20];
-	Bool has_number= GF_FALSE;
-	Bool is_index = (seg_type==GF_DASH_TEMPLATE_REPINDEX) ? GF_TRUE : GF_FALSE;
-	Bool is_init = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION) ? GF_TRUE : GF_FALSE;
-	Bool is_template = (seg_type==GF_DASH_TEMPLATE_TEMPLATE) ? GF_TRUE : GF_FALSE;
-	Bool is_init_template = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) ? GF_TRUE : GF_FALSE;
-	Bool needs_init=((is_init || is_init_template) && !is_bs_switching) ? GF_TRUE : GF_FALSE;
-	u32 char_template = 0;
-	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$"))) 
-		needs_init = GF_FALSE;
-	
-	if (!seg_rad_name) {
-		char *sep;
-		strcpy(segment_name, output_file_name);
-		sep = strrchr(segment_name, '.');
-		if (sep) sep[0] = 0;
-	} else {
-
-		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)) {
-				char_template+=18;
-				strcat(segment_name, rep_id);
-				needs_init=GF_FALSE;
-			}
-			else if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$Bandwidth", 10)) {
-				EXTRACT_FORMAT(10);
-
-				sprintf(tmp, szFmt, bandwidth);
-				strcat(segment_name, tmp);
-				needs_init=GF_FALSE;
-			}
-			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Time", 5)) {
-				EXTRACT_FORMAT(5);
-				if (is_init || is_init_template) continue;
-				/*replace %d to LLD*/
-				szFmt[strlen(szFmt)-1]=0;
-				strcat(szFmt, &LLD[1]);
-				sprintf(tmp, szFmt, start_time);
-				strcat(segment_name, tmp);
-				has_number=1;
-			}
-			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Number", 7)) {
-				EXTRACT_FORMAT(7);
-
-				if (is_init || is_init_template) continue;
-				sprintf(tmp, szFmt, segment_number);
-				strcat(segment_name, tmp);
-				has_number=GF_TRUE;
-			}
-			else if (!strnicmp(& seg_rad_name[char_template], "$Init=", 6)) {
-				char *sep = strchr(seg_rad_name + char_template+6, '$');
-				if (sep) sep[0] = 0;
-				if (is_init || is_init_template) {
-					strcat(segment_name, seg_rad_name + char_template+6);
-					needs_init=GF_FALSE;
-				}
-				char_template += (u32) strlen(seg_rad_name + char_template)+1;
-				if (sep) sep[0] = '$';
-			}
-			else if (!strnicmp(& seg_rad_name[char_template], "$Index=", 7)) {
-				char *sep = strchr(seg_rad_name + char_template+7, '$');
-				if (sep) sep[0] = 0;
-				if (is_index) {
-					strcat(segment_name, seg_rad_name + char_template+6);
-					needs_init=GF_FALSE;
-				}
-				char_template += (u32) strlen(seg_rad_name + char_template)+1;
-				if (sep) sep[0] = '$';
-			}
-			
-			else {
-				char_template+=1;
-				sprintf(tmp, "%c", c);
-				strcat(segment_name, tmp);
-			}
-		}
-	}
-
-	if (is_template && ! use_segment_timeline && !strstr(seg_rad_name, "$Number"))
-		strcat(segment_name, "$Number$");
-
-	if (needs_init)
-		strcat(segment_name, "init");
-
-	if (!is_init && !is_template && !is_init_template && !is_index && !has_number) {
-		sprintf(tmp, "%d", segment_number);
-		strcat(segment_name, tmp);
-	}
-	if (seg_ext) {
-		strcat(segment_name, ".");
-		strcat(segment_name, seg_ext);
-	}
-	return GF_OK;
-}
-
-GF_Err gf_dasher_store_segment_info(GF_DASHSegmenterOptions *dash_cfg, const char *SegmentName, Double segStartTime)
-{
-	char szKey[512];
-	if (!dash_cfg->dash_ctx) return GF_OK;
-
-	sprintf(szKey, "%g", segStartTime);
-	return gf_cfg_set_key(dash_cfg->dash_ctx, "SegmentsStartTimes", SegmentName, szKey);
-}
-
-
-#ifndef GPAC_DISABLE_ISOM
-
-GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec)
-{
-	GF_ESD *esd;
-	GF_AVCConfig *avcc;
-	u32 subtype = gf_isom_is_media_encrypted(movie, track, 1);
-	if (!subtype) subtype = gf_isom_get_media_subtype(movie, track, 1);
-
-	switch (subtype) {
-	case GF_ISOM_SUBTYPE_MPEG4:
-		esd = gf_isom_get_esd(movie, track, 1);
-		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_AUDIO:
-			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
-				/*5 first bits of AAC config*/
-				u8 audio_object_type = (esd->decoderConfig->decoderSpecificInfo->data[0] & 0xF8) >> 3;
-				sprintf(szCodec, "mp4a.%02x.%01x", esd->decoderConfig->objectTypeIndication, audio_object_type);
-			} else {
-				sprintf(szCodec, "mp4a.%02x", esd->decoderConfig->objectTypeIndication);
-			}
-			break;
-		case GF_STREAM_VISUAL:
-#ifndef GPAC_DISABLE_AV_PARSERS
-			if (esd->decoderConfig->decoderSpecificInfo) {
-				GF_M4VDecSpecInfo dsi;
-				gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
-				sprintf(szCodec, "mp4v.%02x.%01x", esd->decoderConfig->objectTypeIndication, dsi.VideoPL);
-			} else
-#endif
-			{
-				sprintf(szCodec, "mp4v.%02x", esd->decoderConfig->objectTypeIndication);
-			}
-			break;
-		default:
-			sprintf(szCodec, "mp4s.%02x", esd->decoderConfig->objectTypeIndication);
-			break;
-		}
-		gf_odf_desc_del((GF_Descriptor *)esd);
-		return GF_OK;
-
-	case GF_ISOM_SUBTYPE_AVC_H264:
-	case GF_ISOM_SUBTYPE_AVC2_H264:
-	case GF_ISOM_SUBTYPE_AVC3_H264:
-	case GF_ISOM_SUBTYPE_AVC4_H264:
-	case GF_ISOM_SUBTYPE_SVC_H264:
-		avcc = gf_isom_avc_config_get(movie, track, 1);
-		sprintf(szCodec, "%s.%02x%02x%02x", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
-		gf_odf_avc_cfg_del(avcc);
-		return GF_OK;
-	default:
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] codec parameters not known - setting codecs string to default value \"%s\"\n", gf_4cc_to_str(subtype) ));
-		sprintf(szCodec, "%s", gf_4cc_to_str(subtype));
-		return GF_OK;
-	}
-	return GF_OK;
-}
-
-#endif //GPAC_DISABLE_ISOM
-
-
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-
-typedef struct
-{
-	Bool is_ref_track;
-	Bool done;
-	u32 TrackID;
-	u32 SampleNum, SampleCount;
-	u64 FragmentLength;
-	u32 OriginalTrack;
-	u32 finalSampleDescriptionIndex;
-	u32 TimeScale, MediaType, DefaultDuration, InitialTSOffset;
-	u64 last_sample_cts, next_sample_dts;
-	Bool all_sample_raps, splitable;
-	u32 split_sample_dts_shift;
-} GF_ISOMTrackFragmenter;
-
-static u64 isom_get_next_sap_time(GF_ISOFile *input, u32 track, u32 sample_count, u32 sample_num)
-{
-	GF_ISOSample *samp;
-	u64 time;
-	Bool is_rap, has_roll;
-	u32 i, found_sample = 0;
-	for (i=sample_num; i<=sample_count; i++) {
-		if (gf_isom_get_sample_sync(input, track, i)) {
-			found_sample = i;
-			break;
-		}
-		gf_isom_get_sample_rap_roll_info(input, track, i, &is_rap, &has_roll, NULL);
-		if (is_rap || has_roll) {
-			found_sample = i;
-			break;
-		}
-	}
-	if (!found_sample) return 0;
-	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_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;
-	u32 i, TrackNum, descIndex, j, count, nb_sync, ref_track_id, nb_tracks_done;
-	u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess, nb_samp, nb_done;
-	u32 nb_video, nb_audio, nb_text, nb_scene, mpd_timescale;
-	u8 defaultPadding;
-	u16 defaultDegradationPriority;
-	GF_Err e;
-	char sOpt[100], sKey[100];
-	char szCodecs[200], szCodec[100];
-	u32 cur_seg, fragment_index, max_sap_type;
-	GF_ISOFile *output, *bs_switch_segment;
-	GF_ISOSample *sample, *next;
-	GF_List *fragmenters;
-	u64 MaxFragmentDuration, MaxSegmentDuration, SegmentDuration, maxFragDurationOverSegment;
-	u32 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 index_start_range, index_end_range;
-	Bool force_switch_segment = GF_FALSE;
-	Bool switch_segment = GF_FALSE;
-	Bool split_seg_at_rap = dash_cfg->segments_start_with_rap;
-	Bool split_at_rap = GF_FALSE;
-	Bool has_rap = GF_FALSE;
-	Bool next_sample_rap = GF_FALSE;
-	Bool flush_all_samples = GF_FALSE;
-	Bool simulation_pass = GF_FALSE;
-	Bool init_segment_deleted = GF_FALSE;
-	Bool first_segment_in_timeline = GF_TRUE;
-	u64 previous_segment_duration = 0;
-	u32 segment_timeline_repeat_count = 0;
-	//u64 last_ref_cts = 0;
-	u64 start_range, end_range, file_size, init_seg_size, ref_track_first_dts, ref_track_next_cts;
-	u32 tfref_timescale = 0;
-	u32 bandwidth = 0;
-	GF_ISOMTrackFragmenter *tf, *tfref;
-	GF_BitStream *mpd_bs = NULL;
-	GF_BitStream *mpd_timeline_bs = NULL;
-	char szMPDTempLine[2048];
-	char SegmentName[GF_MAX_PATH];
-	char RepSecName[200];
-	char RepURLsSecName[200];
-	const char *opt;
-	Double max_track_duration = 0;
-	Bool bs_switching_is_output = GF_FALSE;
-	Bool store_dash_params = GF_FALSE;
-	Bool dash_moov_setup = GF_FALSE;
-	Bool segments_start_with_sap = GF_TRUE;
-	Bool first_sample_in_segment = GF_FALSE;
-	u32 *segments_info = NULL;
-	u32 nb_segments_info = 0;
-	Bool audio_only = GF_TRUE;
-	Bool is_bs_switching = GF_FALSE;
-	Bool use_url_template = dash_cfg->use_url_template;
-	const char *seg_rad_name = dash_cfg->seg_rad_name;
-	const char *seg_ext = dash_cfg->seg_ext;
-	const char *bs_switching_segment_name = NULL;
-
-	SegmentName[0] = 0;
-	SegmentDuration = 0;
-	nb_samp = 0;
-	fragmenters = NULL;
-	if (!seg_ext) seg_ext = "m4s";
-
-	bs_switch_segment = NULL;
-	if (dash_cfg->bs_switch_segment_file) {
-		bs_switch_segment = gf_isom_open(dash_cfg->bs_switch_segment_file, GF_ISOM_OPEN_READ, NULL);
-		if (bs_switch_segment) {
-			bs_switching_segment_name = gf_url_get_resource_name(dash_cfg->bs_switch_segment_file);
-			is_bs_switching = 1;
-		}
-	}
-	
-	sprintf(RepSecName, "Representation_%s", dash_input ? dash_input->representationID : "");
-	sprintf(RepURLsSecName, "URLs_%s", dash_input ? dash_input->representationID : "");
-
-	bandwidth = dash_input ? dash_input->bandwidth : 0;
-	file_duration = 0;
-
-	startNumber = 1;
-	startNumberRewind = 0;
-
-	//create output file
-	/*need to precompute bandwidth*/
-	if (!bandwidth && seg_rad_name && strstr(seg_rad_name, "$Bandwidth$")) {
-		for (i=0; i<gf_isom_get_track_count(input); i++) {
-			Double tk_dur = (Double) gf_isom_get_media_duration(input, i+1);
-			tk_dur /= gf_isom_get_media_timescale(input, i+1);
-			if (file_duration < tk_dur ) {
-				file_duration = tk_dur;
-			}
-		}
-		bandwidth = (u32) (gf_isom_get_file_size(input) / file_duration * 8);
-	}
-
-	if (dash_cfg->dash_ctx) {
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Setup");
-		if (!opt || stricmp(opt, "yes") ) {
-			store_dash_params=GF_TRUE;
-			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "ID", dash_input->representationID);
-		}
-		/*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;
-			}
-		}
-	}
-
-	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);
-		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);
-	}
-	if (!output) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOBMF DASH] Cannot open %s for writing\n", opt ? opt : SegmentName));
-		e = gf_isom_last_error(NULL);
-		goto err_exit;
-	}
-
-	if (store_dash_params) {
-		const char *name;
-
-		if (!gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "SegmentTemplate"))
-			gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "SegmentTemplate", seg_rad_name);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Source", gf_isom_get_filename(input) );
-
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Setup", "yes");
-		name = SegmentName;
-		if (bs_switch_segment) name = gf_isom_get_filename(bs_switch_segment);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegment", name);
-
-		/*store BS flag per rep - it should be stored per adaptation set but we dson't have a key for adaptation sets right now*/
-		if (/*first_in_set && */ is_bs_switching)
-			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "BitstreamSwitching", "yes");
-	} else if (dash_cfg->dash_ctx) {
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "BitstreamSwitching");
-		if (opt && !strcmp(opt, "yes")) {
-			is_bs_switching = 1;
-			if (bs_switch_segment) 
-				gf_isom_delete(bs_switch_segment);
-			bs_switch_segment = output;
-			bs_switching_is_output = 1;
-			bs_switching_segment_name = gf_url_get_resource_name(gf_isom_get_filename(bs_switch_segment));
-		}
-
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth");
-		if (opt) sscanf(opt, "%u", &bandwidth);
-	}
-	mpd_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (first_in_set && dash_cfg->use_segment_timeline) {
-		mpd_timeline_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-		sprintf(szMPDTempLine, "    <SegmentTimeline>\n");
-		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-	}
-		
-	nb_sync = 0;
-	nb_samp = 0;
-	fragmenters = gf_list_new();
-
-	if (! dash_moov_setup) {
-		e = gf_isom_clone_movie(input, output, GF_FALSE, GF_FALSE);
-		if (e) goto err_exit;
-
-		/*because of movie fragments MOOF based offset, ISOM <4 is forbidden*/
-		gf_isom_set_brand_info(output, GF_4CC('i','s','o','5'), 1);
-		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','m'), 0);
-		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','1'), 0);
-		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','2'), 0);
-		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','3'), 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP41, 0);
-		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP42, 0);
-	}
-
-	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. 
-	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) {
-		simulation_pass = GF_TRUE;
-		seg_rad_name = NULL;
-	}
-	/*if single file is requested, store all segments in the same file*/
-	else if (dash_cfg->single_file_mode==2) {
-		seg_rad_name = NULL;
-	}
-
-	index_start_range = index_end_range = 0;	
-
-	tf = tfref = NULL;
-	file_duration = 0;
-	width = height = sample_rate = nb_channels = sar_w = sar_h = fps_num = fps_denum = 0;
-	langCode[0]=0;
-	langCode[4]=0;
-	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 mtype = gf_isom_get_media_type(input, i+1);
-		if (mtype == GF_ISOM_MEDIA_HINT) continue;
-
-		if (! dash_moov_setup) {
-			e = gf_isom_clone_track(input, i+1, output, GF_FALSE, &TrackNum);
-			if (e) goto err_exit;
-
-			if (gf_isom_is_track_in_root_od(input, i+1)) gf_isom_add_track_to_root_od(output, TrackNum);
-
-			//if only one sample, don't fragment track
-			count = gf_isom_get_sample_count(input, i+1);
-			if (count==1) {
-				sample = gf_isom_get_sample(input, i+1, 1, &descIndex);
-				e = gf_isom_add_sample(output, TrackNum, 1, sample);
-				gf_isom_sample_del(&sample);
-				if (e) goto err_exit;
-
-				continue;
-			}
-		} else {
-			TrackNum = gf_isom_get_track_by_id(output, gf_isom_get_track_id(input, i+1));
-			count = gf_isom_get_sample_count(input, i+1);
-		}
-
-		/*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) {
-			/*for AVC we concatenate SPS/PPS*/
-			if (dash_cfg->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) {
-			/*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);
-		}
-
-		if (mtype == GF_ISOM_MEDIA_VISUAL) nb_video++;
-		else if (mtype == GF_ISOM_MEDIA_AUDIO) nb_audio++;
-		else if (mtype == GF_ISOM_MEDIA_TEXT) nb_text++;
-		else if (mtype == GF_ISOM_MEDIA_SCENE) nb_scene++;
-		else if (mtype == GF_ISOM_MEDIA_DIMS) nb_scene++;
-
-		if (mtype != GF_ISOM_MEDIA_AUDIO) audio_only = GF_FALSE;
-
-		//setup fragmenters
-		if (! dash_moov_setup) {
-			gf_isom_get_fragment_defaults(input, i+1,
-									 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
-
-			//new initialization segment, setup fragmentation
-			e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum),
-						defaultDescriptionIndex, defaultDuration,
-						defaultSize, (u8) defaultRandomAccess,
-						defaultPadding, defaultDegradationPriority);
-			if (e) goto err_exit;
-		} else {
-			gf_isom_get_fragment_defaults(output, TrackNum,
-									 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
-		}
-
-		gf_media_get_rfc_6381_codec_name(bs_switch_segment ? bs_switch_segment : input, i+1, szCodec);
-		if (strlen(szCodecs)) strcat(szCodecs, ",");
-		strcat(szCodecs, szCodec);
-
-		GF_SAFEALLOC(tf, GF_ISOMTrackFragmenter);
-		tf->TrackID = gf_isom_get_track_id(output, TrackNum);
-		tf->SampleCount = gf_isom_get_sample_count(input, i+1);
-		tf->OriginalTrack = i+1;
-		tf->TimeScale = gf_isom_get_media_timescale(input, i+1);
-		tf->MediaType = gf_isom_get_media_type(input, i+1);
-		tf->DefaultDuration = defaultDuration;
-		mpd_timescale = tf->TimeScale;
-
-		if (max_track_duration < gf_isom_get_track_duration(input, i+1)) {
-			max_track_duration = (Double) gf_isom_get_track_duration(input, i+1);
-		}
-
-		if (gf_isom_get_sync_point_count(input, i+1)>nb_sync) {
-			tfref = tf;
-			nb_sync = gf_isom_get_sync_point_count(input, i+1);
-		} else if (!gf_isom_has_sync_points(input, i+1)) {
-			tf->all_sample_raps = GF_TRUE;
-		}
-
-		tf->finalSampleDescriptionIndex = 1;
-
-		/*figure out if we have an initial TS*/
-		if (!dash_moov_setup) {
-			if (gf_isom_get_edit_segment_count(input, i+1)) {
-				u64 EditTime, SegDuration, MediaTime;
-				u8 EditMode;
-				gf_isom_get_edit_segment(input, i+1, 1, &EditTime, &SegDuration, &MediaTime, &EditMode);
-				if (EditMode==GF_ISOM_EDIT_EMPTY) {
-					tf->InitialTSOffset = (u32) (SegDuration * tf->TimeScale / gf_isom_get_timescale(input));
-				}
-				/*and remove edit segments*/
-				gf_isom_remove_edit_segments(output, TrackNum);
-			}
-
-			gf_isom_set_brand_info(output, GF_4CC('i','s','o','5'), 1);
-
-			/*DASH self-init media segment*/
-			if (dash_cfg->single_file_mode==1) {
-				gf_isom_modify_alternate_brand(output, GF_4CC('d','s','m','s'), 1);
-			} else {
-				gf_isom_modify_alternate_brand(output, GF_4CC('d','a','s','h'), 1);
-			}
-
-			/*locate sample description in list if given*/
-			if (bs_switch_segment) {
-				u32 s_count;
-				u32 sample_descs_track = gf_isom_get_track_by_id(bs_switch_segment, tf->TrackID);
-				if (!sample_descs_track) {
-					e = GF_BAD_PARAM;
-					goto err_exit;
-
-				}
-
-				//the initialization segment is not yet setup for fragmentation
-				if (! gf_isom_is_track_fragmented(bs_switch_segment, tf->TrackID)) {
-					e = GF_BAD_PARAM;
-					if (e) goto err_exit;
-				}
-				/*otherwise override the fragment defauls so that we are consistent with the shared init segment*/
-				else {
-					e = gf_isom_get_fragment_defaults(bs_switch_segment, sample_descs_track,
-											 &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);
-					if (e) goto err_exit;
-				}
-
-				/*and search in new ones the new index*/
-				s_count = gf_isom_get_sample_description_count(bs_switch_segment, sample_descs_track); 
-
-				/*more than one sampleDesc, we will need to indicate all the sample descs in the file in case we produce a single file, 
-				otherwise the file would not be compliant*/
-				if (s_count > 1) {
-					gf_isom_clone_sample_descriptions(output, TrackNum, bs_switch_segment, sample_descs_track, 1);
-				}
-
-				/*and search in new ones the new index*/
-				s_count = gf_isom_get_sample_description_count(bs_switch_segment, sample_descs_track); 
-				if (s_count>1) {
-					u32 k;
-					/*remove all sample descs*/
-					for (k=0; k<s_count; k++) {
-						/*search in original file if we have the sample desc*/
-						if (gf_isom_is_same_sample_description(input, TrackNum, 1, bs_switch_segment, sample_descs_track, k+1)) {
-							tf->finalSampleDescriptionIndex = k+1;
-						}
-					}
-				}
-			}
-		}
-		/*restore track decode times*/
-		else {
-			char *opt, sKey[100];
-			sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
-			if (opt) tf->InitialTSOffset = atoi(opt);
-
-			/*in time shift enabled, restore presentationTimeOffset */
-			if (dash_cfg->time_shift_depth>=0)
-				presentationTimeOffset = tf->InitialTSOffset;
-		}
-
-		/*get language, width/height/layout info, audio info*/
-		switch (mtype) {
-		case GF_ISOM_MEDIA_TEXT:
-			tf->splitable = 1;
-			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;
-			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);
-			break;
-		}
-
-		if (mtype==GF_ISOM_MEDIA_VISUAL) {
-			/*get duration of 2nd sample*/
-			u32 sample_dur = gf_isom_get_sample_duration(input, i+1, 2);
-			gf_isom_get_pixel_aspect_ratio(input, i+1, 1, &sar_w, &sar_h);
-			if (! fps_num || ! fps_denum) {
-				fps_num = tf->TimeScale;
-				fps_denum = sample_dur;
-			}
-			else if (fps_num *sample_dur < tf->TimeScale * fps_denum) {
-				fps_num = tf->TimeScale;
-				fps_denum = sample_dur;
-			}
-		}
-
-
-		if (file_duration < ((Double) gf_isom_get_media_duration(input, i+1)) / tf->TimeScale ) {
-			file_duration = ((Double) gf_isom_get_media_duration(input, i+1)) / tf->TimeScale;
-		}
-		gf_list_add(fragmenters, tf);
-
-		nb_samp += count;
-	}
-
-	if (gf_list_count(fragmenters)>1)
-		mpd_timescale = 1000;
-
-	if (!tfref)
-		tfref = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
-	tfref->is_ref_track = GF_TRUE;
-	tfref_timescale = tfref->TimeScale;
-	ref_track_id = tfref->TrackID;
-	if (tfref->all_sample_raps)
-		split_seg_at_rap = GF_TRUE;
-
-
-	if (!dash_moov_setup) {
-		max_track_duration /= gf_isom_get_timescale(input);
-		max_track_duration *= gf_isom_get_timescale(output);
-		gf_isom_set_movie_duration(output, (u64) max_track_duration);
-	}
-
-	//if single segment, add msix brand if we use indexes
-	gf_isom_modify_alternate_brand(output, GF_4CC('m','s','i','x'), ((dash_cfg->single_file_mode==1) && (dash_cfg->subsegs_per_sidx>=0)) ? 1 : 0);
-
-	//flush movie
-	e = gf_isom_finalize_for_fragment(output, 1);
-	if (e) goto err_exit;
-
-	start_range = 0;
-	file_size = gf_isom_get_file_size(bs_switch_segment ? bs_switch_segment : output);
-	end_range = file_size - 1;
-	init_seg_size = file_size;
-
-	if (dash_cfg->dash_ctx) {
-		if (store_dash_params) {
-			char szVal[1024];
-			sprintf(szVal, LLU, init_seg_size);
-			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegmentSize", szVal);
-		} else {
-			const char *opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegmentSize");
-			if (opt) init_seg_size = atoi(opt);
-		}
-	}
-
-restart_fragmentation_pass:
-
-	for (i=0; i<gf_list_count(fragmenters); i++) {
-		tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-		tf->split_sample_dts_shift = 0;
-	}
-	segment_start_time = 0;
-	nb_segments = 0;
-
-	nb_tracks_done = 0;
-	ref_track_first_dts = (u64) -1;
-	nb_done = 0;
-
-	maxFragDurationOverSegment=0;
-	switch_segment=GF_TRUE;
-
-	if (!seg_rad_name) use_url_template = GF_FALSE;
-
-	cur_seg=1;
-	fragment_index=1;
-	period_duration = 0;
-	split_at_rap = GF_FALSE;
-	has_rap = GF_FALSE;
-	next_sample_rap = GF_FALSE;
-	flush_all_samples = GF_FALSE;
-	force_switch_segment = GF_FALSE;
-	max_sap_type = 0;
-	ref_track_next_cts = 0;
-
-	/*setup previous URL list*/
-	if (dash_cfg->dash_ctx) {
-		const char *opt;
-		char sKey[100];
-		count = gf_cfg_get_key_count(dash_cfg->dash_ctx, RepURLsSecName);
-		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);	
-			gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-		}
-
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex");
-		if (opt) cur_seg = atoi(opt);
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex");
-		if (opt) fragment_index = atoi(opt);
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration");
-		if (opt) period_duration = atof(opt);
-
-		for (i=0; i<gf_list_count(fragmenters); i++) {
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-			sprintf(sKey, "TKID_%d_NextSampleNum", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
-			if (opt) tf->SampleNum = atoi(opt);
-
-			sprintf(sKey, "TKID_%d_LastSampleCTS", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
-			if (opt) sscanf(opt, LLU, &tf->last_sample_cts);
-
-			sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
-			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
-			if (opt) {
-				sscanf(opt, LLU, &tf->next_sample_dts);
-			}
-		}
-	}
-	gf_isom_set_next_moof_number(output, fragment_index);
-
-
-	max_segment_duration = 0;
-
-	while ( (count = gf_list_count(fragmenters)) ) {
-
-		if (switch_segment) {
-			if (dash_cfg->subduration && (segment_start_time + MaxSegmentDuration/2 >= dash_cfg->dash_scale * dash_cfg->subduration)) {
-				/*done with file (next segment will exceppe of more than half the requested subduration : store all fragmenters state and abord*/
-				break;
-			}
-
-			SegmentDuration = 0;
-			switch_segment = GF_FALSE;
-			first_sample_in_segment = GF_TRUE;
-
-			if (simulation_pass) {
-				segments_info = (u32 *)gf_realloc(segments_info, sizeof(u32) * (nb_segments_info+1) );
-				segments_info[nb_segments_info] = 0;
-				nb_segments_info++;
-				e = GF_OK;
-			} else {
-				start_range = gf_isom_get_file_size(output);
-				if (seg_rad_name) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switching, SegmentName, output_file, dash_input->representationID, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, (u64) ( period_duration * dash_cfg->dash_scale + segment_start_time), bandwidth, cur_seg, dash_cfg->use_segment_timeline);
-					e = gf_isom_start_segment(output, SegmentName, dash_cfg->memory_mode);
-
-					gf_dasher_store_segment_info(dash_cfg, SegmentName, period_duration + segment_start_time / (Double) dash_cfg->dash_scale);
-
-					/*we are in bitstream switching mode, delete init segment*/
-					if (is_bs_switching && !init_segment_deleted) {
-						init_segment_deleted = GF_TRUE;
-						gf_delete_file(gf_isom_get_filename(output));
-					}
-
-					if (!use_url_template) {
-						const char *name = gf_url_get_resource_name(SegmentName);
-						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];
-							sprintf(szKey, "UrlInfo%d", cur_seg );
-							sprintf(szVal, "<SegmentURL media=\"%s\"/>", name);
-							gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
-						}
-					}
-				} else {
-					e = gf_isom_start_segment(output, NULL, dash_cfg->memory_mode);
-				}
-			}
-
-			cur_seg++;
-			if (e) goto err_exit;
-		} 
-
-		maxFragDurationOverSegment=0;
-
-		sample = NULL;
-
-		if (simulation_pass) {
-			segments_info[nb_segments_info-1] ++;
-			e = GF_OK;
-		} 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;
-				/*FIXME - we need a way in the spec to specify "past" DTS for splitted sample*/
-				gf_isom_set_traf_base_media_decode_time(output, tf->TrackID, tf->InitialTSOffset + tf->next_sample_dts);
-			}
-		
-		}
-
-		//process track by track
-		for (i=0; i<count; i++) {
-			Bool has_roll, is_rap;
-			s32 roll_distance;
-			u32 SAP_type = 0;
-			/*start with ref*/
-			if (split_seg_at_rap) {
-				if (tfref && (i==0)) {
-					tf = tfref;
-					has_rap = GF_FALSE;
-				} else {
-					u32 j;
-					for (j=0; j<=i; j++) {
-						if (!tfref || (gf_list_get(fragmenters, j) == tfref)) {
-							tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-							break;
-						} else if (i == j) {
-							tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i-1);
-							break;
-						}
-					}
-					assert(tf);
-				}
-			} else {
-				tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-				if (tf == tfref) 
-					has_rap = GF_FALSE;
-			} 
-			if (tf->done) continue;
-
-			//ok write samples
-			while (1) {
-				Bool stop_frag = GF_FALSE;
-				Bool is_redundant_sample = GF_FALSE;
-				u32 split_sample_duration = 0;
-
-				/*first sample*/
-				if (!sample) {
-					sample = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 1, &descIndex);
-					if (!sample) {
-						e = gf_isom_last_error(input);
-						goto err_exit;
-					}
-					if (tf->split_sample_dts_shift) {
-						sample->DTS += tf->split_sample_dts_shift;
-						is_redundant_sample = GF_TRUE;
-					}
-
-					/*also get SAP type - this is not needed if sample is not NULL as SAP tye was computed for "next sample" in previous loop*/
-					if (sample->IsRAP) {
-						SAP_type = 1;
-					} else {
-						SAP_type = 0;
-						e = gf_isom_get_sample_rap_roll_info(input, tf->OriginalTrack, tf->SampleNum + 1, &is_rap, &has_roll, &roll_distance);
-						if (e==GF_OK) {
-							if (is_rap) SAP_type = 3;
-							else if (has_roll && (roll_distance>=0) ) SAP_type = 4;
-						}
-					}
-				}
-
-				gf_isom_get_sample_padding_bits(input, tf->OriginalTrack, tf->SampleNum+1, &NbBits);
-
-				next = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 2, &j);
-				if (next) {
-					defaultDuration = (u32) (next->DTS - sample->DTS);
-				} else {
- 					defaultDuration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack)- sample->DTS);
-				}
-
-				if (tf->splitable) {
-					if (tfref==tf) {
-						u64 frag_dur = (tf->FragmentLength + defaultDuration) * 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) {
-							split_sample_duration = defaultDuration;
-							defaultDuration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / dash_cfg->dash_scale - tf->FragmentLength);
-							split_sample_duration -= defaultDuration;
-						}
-					} 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 */
-//								&& ((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)) {
-						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;
-					}
-				}
-
-				if (tf==tfref) {
-					if (segments_start_with_sap && first_sample_in_segment ) {
-						first_sample_in_segment = GF_FALSE;
-						if (! SAP_type) segments_start_with_sap = GF_FALSE;
-					}
-					if (ref_track_first_dts > sample->DTS) 
-						ref_track_first_dts = sample->DTS;
-
-					if (next) {
-						u64 next_cts = next->DTS + next->CTS_Offset;
-						if (split_sample_duration) 
-							next_cts -= split_sample_duration;
-
-						if (ref_track_next_cts<next_cts) {
-							ref_track_next_cts = next_cts;
-						}
-					} else {
-						u64 cts = gf_isom_get_media_duration(input, tf->OriginalTrack);
-						if (cts>ref_track_next_cts) ref_track_next_cts = cts;
-						else ref_track_next_cts += defaultDuration;
-					}
-				}
-
-				if (SAP_type > max_sap_type) max_sap_type = SAP_type;
-
-				if (simulation_pass) {
-					e = GF_OK;
-				} else {
-					/*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) 
-						goto err_exit;
-
-					/*copy subsample information*/
-					e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1);
-					if (e) 
-						goto err_exit;
-
-					gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
-					nb_done++;
-				}
-
-				tf->last_sample_cts = sample->DTS + sample->CTS_Offset;
-				tf->next_sample_dts = sample->DTS + defaultDuration;
-
-				if (split_sample_duration) {
-					gf_isom_sample_del(&next);
-					sample->DTS += defaultDuration;
-				} else {
-					gf_isom_sample_del(&sample);
-					sample = next;
-					tf->SampleNum += 1;
-					tf->split_sample_dts_shift = 0;
-				}
-				tf->FragmentLength += defaultDuration;
-
-				/*compute SAP type*/
-				if (sample) {
-					if (sample->IsRAP) {
-						SAP_type = 1;
-					} else {
-						SAP_type = 0;
-						e = gf_isom_get_sample_rap_roll_info(input, tf->OriginalTrack, tf->SampleNum + 1, &is_rap, &has_roll, NULL);
-						if (e==GF_OK) {
-							if (is_rap)
-								SAP_type = 3;
-							else if (has_roll && (roll_distance>=0) )
-								SAP_type = 4;
-						}
-					}
-				}
-
-				if (next && SAP_type) {
-					if (tf==tfref) {
-						if (split_sample_duration) {
-							stop_frag = GF_TRUE;
-						}
-						else if (split_seg_at_rap) {
-							u64 next_sap_time;
-							u64 frag_dur, next_dur;
-							next_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
-							if (!next_dur) next_dur = defaultDuration;
-							/*duration of fragment if we add this rap*/
-							frag_dur = (tf->FragmentLength+next_dur)*dash_cfg->dash_scale / tf->TimeScale;
-							next_sample_rap = GF_TRUE;
-							next_sap_time = isom_get_next_sap_time(input, tf->OriginalTrack, tf->SampleCount, tf->SampleNum + 2);
-							/*if no more SAP after this one, do not switch segment*/
-							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;
-								/*if media segment about to be produced is longer than max segment length, force segment split*/
-								if (SegmentDuration + frag_dur > MaxSegmentDuration) {
-									split_at_rap = GF_TRUE;
-									/*force new segment*/
-									force_switch_segment = GF_TRUE;
-									stop_frag = GF_TRUE;
-								}
-
-								if (tf->all_sample_raps) {
-									/*if adding this SAP will result in stoping the fragment "soon" after it, stop now and start with SAP
-									if all samples are RAPs, just stop fragment if we exceed the requested duration by adding the next sample
-									otherwise, take 3 samples (should be refined of course)*/
-									scaler = 3;
-									if ( (tf->FragmentLength + scaler * next_dur) * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale)
-										stop_frag = GF_TRUE;
-								}
-							}
-						} else if (!has_rap) {
-							if (tf->FragmentLength == defaultDuration) has_rap = 2;
-							else has_rap = 1;
-						}
-					} 
-				} else {
-					next_sample_rap = GF_FALSE;
-				}
-
-				if (tf->SampleNum==tf->SampleCount) {
-					stop_frag = GF_TRUE;
-				} else if (tf==tfref) {
-					/*fragmenting on "clock" track: no drift control*/
-					if (!dash_cfg->fragments_start_with_rap || ( (next && next->IsRAP) || split_at_rap) ) {
-						if (tf->FragmentLength * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale) {
-							stop_frag = GF_TRUE;
-						}
-					}
-				}
-				/*do not abort fragment if ref track is done, put everything in the last fragment*/
-				else if (!flush_all_samples) {
-					/*fragmenting on "non-clock" track: drift control*/
-					if ((tf->next_sample_dts /*+1 accuracy*/) * tfref_timescale >= ref_track_next_cts * tf->TimeScale)
-						stop_frag = GF_TRUE;
-				}
-
-				if (stop_frag) {
-					gf_isom_sample_del(&sample);
-					sample = next = NULL;
-					if (maxFragDurationOverSegment <= tf->FragmentLength * dash_cfg->dash_scale / tf->TimeScale) {
-						maxFragDurationOverSegment = tf->FragmentLength * dash_cfg->dash_scale / tf->TimeScale;
-					}
-					tf->FragmentLength = 0;
-					if (split_sample_duration)
-						tf->split_sample_dts_shift += defaultDuration;
-
-					//if (tf==tfref)
-						//last_ref_cts = tf->last_sample_cts;
-
-					break;
-				}
-			}
-
-			if (tf->SampleNum==tf->SampleCount) {
-				tf->done = GF_TRUE;
-				nb_tracks_done++;
-				if (tf == tfref) {
-					tfref = NULL;
-					flush_all_samples = GF_TRUE;
-				}
-			}
-		}
-
-		SegmentDuration += maxFragDurationOverSegment;
-		maxFragDurationOverSegment=0;
-
-		/*if no simulation and no SIDX is used, flush fragments as we write them*/
-		if (!simulation_pass && (dash_cfg->subsegs_per_sidx<0) ) {
-			e = gf_isom_flush_fragments(output, flush_all_samples ? GF_TRUE : GF_FALSE);
-			if (e) goto err_exit;
-		}
-
-
-		/*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;
-		}
-
-		if (force_switch_segment || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap))) {
-
-			if (mpd_timeline_bs) {
-
-				if (previous_segment_duration == SegmentDuration) {
-					segment_timeline_repeat_count ++;
-				} else {
-					if (previous_segment_duration) {
-						if (segment_timeline_repeat_count) {
-							sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
-						} else {
-							sprintf(szMPDTempLine, "/>\n");
-						}
-						gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-					}
-					previous_segment_duration = SegmentDuration;
-					if (first_segment_in_timeline) {
-						sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"", (u64) (segment_start_time*dash_cfg->dash_scale), (u64) SegmentDuration );
-						first_segment_in_timeline = GF_FALSE;
-					} else {
-						sprintf(szMPDTempLine, "     <S d=\""LLU"\"", (u64) SegmentDuration);
-					}
-					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) {
-				max_segment_duration = (Double) (s64) SegmentDuration;
-				max_segment_duration /= dash_cfg->dash_scale;
-			}
-			force_switch_segment=GF_FALSE;
-			switch_segment=GF_TRUE;
-			SegmentDuration=GF_FALSE;
-			split_at_rap = GF_FALSE;
-			has_rap = GF_FALSE;
-			/*restore fragment duration*/
-			MaxFragmentDuration = (u32) (max_duration_sec * dash_cfg->dash_scale);
-
-			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, 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);
-				ref_track_first_dts = (u64) -1;
-
-				if (!seg_rad_name) {
-					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);	
-						gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-						if (idx_start_range || idx_end_range) {
-							sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);	
-							gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-						}
-						gf_bs_write_data(mpd_bs, "/>\n", 3);
-
-						if (dash_cfg->dash_ctx) {
-							char szKey[100], szVal[4046];
-							sprintf(szKey, "UrlInfo%d", cur_seg );
-							sprintf(szVal, "<SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>", start_range, end_range, idx_start_range, idx_end_range);
-							gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
-						}
-					}
-				} else {
-					file_size += gf_isom_get_file_size(output);
-				}
-			}
-
-			/*next fragment will exceed segment length, abort fragment at next rap (possibly after MaxSegmentDuration)*/
-			if (split_seg_at_rap && SegmentDuration && (SegmentDuration + MaxFragmentDuration >= MaxSegmentDuration)) {
-				if (!split_at_rap) {
-					split_at_rap = GF_TRUE;
-				}
-			}
-		}
-		if (nb_tracks_done==count) break;
-	}
-
-	if (simulation_pass) {
-		/*OK, we have all segments and frags per segments*/
-		gf_isom_allocate_sidx(output, dash_cfg->subsegs_per_sidx, dash_cfg->daisy_chain_sidx, nb_segments_info, segments_info, &index_start_range, &index_end_range );
-		gf_free(segments_info);
-		segments_info = NULL;
-		simulation_pass = GF_FALSE;
-		/*reset fragmenters*/
-		for (i=0; i<gf_list_count(fragmenters); i++) {
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-			tf->done = GF_FALSE;
-			tf->last_sample_cts = 0;
-			tf->next_sample_dts = 0;
-			tf->FragmentLength = 0;
-			tf->SampleNum = 0;
-			if (tf->is_ref_track)
-				tfref = tf;
-		}
-		goto restart_fragmentation_pass;
-	}
-
-	/*flush last segment*/
-	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
-
-		segment_start_time += SegmentDuration;
-
-		gf_isom_close_segment(output, dash_cfg->subsegs_per_sidx, ref_track_id, ref_track_first_dts, ref_track_next_cts, dash_cfg->daisy_chain_sidx, 1, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
-		nb_segments++;
-
-		if (!seg_rad_name) {
-			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);
-				gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-				if (idx_start_range || idx_end_range) {
-					sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);
-					gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-				}
-				gf_bs_write_data(mpd_bs, "/>\n", 3);
-
-				if (dash_cfg->dash_ctx) {
-					char szKey[100], szVal[4046];
-					sprintf(szKey, "UrlInfo%d", cur_seg );
-					sprintf(szVal, "<SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>", start_range, end_range, idx_start_range, idx_end_range);
-					gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
-				}
-			}
-		} else {
-			file_size += gf_isom_get_file_size(output);
-		}
-	}
-	if (mpd_timeline_bs) {
-		if (previous_segment_duration == SegmentDuration) {
-			segment_timeline_repeat_count ++;
-			sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
-			gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-		} else {
-			if (previous_segment_duration) {
-				if (segment_timeline_repeat_count) {
-					sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
-				} else {
-					sprintf(szMPDTempLine, "/>\n");
-				}
-				gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-			}
-			if (SegmentDuration) {
-				if (first_segment_in_timeline) {
-					sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"/>\n", (u64) (segment_start_time), (u64) SegmentDuration );
-					first_segment_in_timeline = GF_FALSE;
-				} else {
-					sprintf(szMPDTempLine, "     <S d=\""LLU"\"/>\n", (u64) SegmentDuration);
-				}
-				gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-			}
-		}
-
-		sprintf(szMPDTempLine, "    </SegmentTimeline>\n");
-		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
-	}
-
-	if (!bandwidth)
-		bandwidth = (u32) (file_size * 8 / file_duration);
-
-	if (use_url_template) {
-		/*segment template does not depend on file name, write the template at the adaptationSet level*/
-		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\" duration=\"%d\" media=\"%s\" startNumber=\"%d\"", mpd_timescale, (u32) (max_segment_duration * mpd_timescale), SegmentName, startNumber - startNumberRewind);	
-			/*in BS switching we share the same IS for all reps*/
-			if (is_bs_switching) {
-				strcpy(SegmentName, bs_switching_segment_name);
-			} else {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, 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 (mpd_timeline_bs) {
-				char *mpd_seg_info = NULL;
-				u32 size;
-				fprintf(dash_cfg->mpd, ">\n");
-
-				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
-				gf_free(mpd_seg_info);
-				fprintf(dash_cfg->mpd, "   </SegmentTemplate>\n");
-			} else {
-				fprintf(dash_cfg->mpd, "/>\n");
-			}
-		}
-		/*in BS switching we share the same IS for all reps, write the SegmentTemplate for the init segment*/
-		else if (is_bs_switching && first_in_set) {
-			fprintf(dash_cfg->mpd, "   <SegmentTemplate initialization=\"%s\"", bs_switching_segment_name);
-			if (presentationTimeOffset) 
-				fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
-
-			if (mpd_timeline_bs) {
-				char *mpd_seg_info = NULL;
-				u32 size;
-				fprintf(dash_cfg->mpd, ">\n");
-
-				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
-				gf_free(mpd_seg_info);
-				fprintf(dash_cfg->mpd, "   </SegmentTemplate>\n");
-			} else {
-				fprintf(dash_cfg->mpd, "/>\n");
-			}
-		}
-	}
-	else if ((dash_cfg->single_file_mode!=1) && mpd_timeline_bs) {
-		char *mpd_seg_info = NULL;
-		u32 size;
-
-		fprintf(dash_cfg->mpd, "   <SegmentList>\n");
-
-		gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
-		gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
-		gf_free(mpd_seg_info);
-		fprintf(dash_cfg->mpd, "   </SegmentList>\n");
-	}
-
-
-	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);
-
-		/*this is a video track*/
-		if (fps_num || fps_denum) {
-			gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
-			if (fps_denum>1)
-				fprintf(dash_cfg->mpd, " frameRate=\"%d/%d\"", fps_num, fps_denum);
-			else
-				fprintf(dash_cfg->mpd, " frameRate=\"%d\"", fps_num);
-
-			if (!sar_w) sar_w = 1;
-			if (!sar_h) sar_h = 1;
-			fprintf(dash_cfg->mpd, " sar=\"%d:%d\"", sar_w, sar_h);
-		}
-
-	}
-	if (sample_rate) fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", sample_rate);
-	if (segments_start_with_sap || split_seg_at_rap) {
-		fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", max_sap_type);
-	} else {
-		fprintf(dash_cfg->mpd, " startWithSAP=\"0\"");
-	}
-	//only appears at AdaptationSet level - need to rewrite the DASH segementer to allow writing this at the proper place
-//		if ((single_file_mode==1) && segments_start_with_sap) fprintf(dash_cfg->mpd, " subsegmentStartsWithSAP=\"%d\"", max_sap_type);
-		
-	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);		
-	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);
-
-	if (dash_cfg->dash_ctx) {
-		Double seg_dur;
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration");
-		if (opt) {
-			seg_dur = atof(opt);
-			if (seg_dur < max_segment_duration) {
-				sprintf(sOpt, "%f", max_segment_duration);
-				gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
-				seg_dur = max_segment_duration;
-			} else {
-				max_segment_duration = seg_dur;
-			}
-		} else {
-			sprintf(sOpt, "%f", max_segment_duration);
-			gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
-		}
-	}
-
-	if (use_url_template) {
-		/*segment template depends on file name, but the template at the representation level*/
-		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);	
-			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);
-			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");	
-	} 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, "    <SegmentList 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, ">\n");	
-		/*we are not in bitstreamSwitching mode*/
-		if (!is_bs_switching) {
-			fprintf(dash_cfg->mpd, "     <Initialization");	
-			if (!seg_rad_name) {
-				fprintf(dash_cfg->mpd, " range=\"0-"LLD"\"", init_seg_size-1);
-			} else {
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, gf_url_get_resource_name( seg_rad_name) , !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
-				fprintf(dash_cfg->mpd, " sourceURL=\"%s\"", SegmentName);
-			}
-			fprintf(dash_cfg->mpd, "/>\n");
-		}
-	}
-	if (mpd_bs) {
-		char *mpd_seg_info = NULL;
-		u32 size;
-		gf_bs_get_content(mpd_bs, &mpd_seg_info, &size);
-		gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
-		gf_free(mpd_seg_info);
-	}
-
-	if (!use_url_template && (dash_cfg->single_file_mode!=1)) {
-		fprintf(dash_cfg->mpd, "    </SegmentList>\n");
-	}
-
-	fprintf(dash_cfg->mpd, "   </Representation>\n");
-
-
-	/*store context*/
-	if (dash_cfg->dash_ctx) {
-		period_duration += (Double)segment_start_time / dash_cfg->dash_scale;
-
-		for (i=0; i<gf_list_count(fragmenters); i++) {
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
-
-			/*InitialTSOffset is used when joining different files - if we are still in the same file , do not update it*/
-			if (tf->done) {
-				sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
-				sprintf(sOpt, LLU, tf->InitialTSOffset + tf->next_sample_dts);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, sOpt);
-			}
-
-			if (dash_cfg->subduration) {
-				sprintf(sKey, "TKID_%d_NextSampleNum", tf->TrackID);
-				sprintf(sOpt, "%d", tf->SampleNum);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
-
-				sprintf(sKey, "TKID_%d_LastSampleCTS", tf->TrackID);
-				sprintf(sOpt, LLU, tf->last_sample_cts);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
-
-				sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
-				sprintf(sOpt, LLU, tf->next_sample_dts);
-				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
-			}
-		}
-		sprintf(sOpt, "%d", cur_seg);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex", sOpt);
-
-		fragment_index = gf_isom_get_next_moof_number(output);
-		sprintf(sOpt, "%d", fragment_index);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex", sOpt);
-
-
-		sprintf(sOpt, "%f", period_duration);
-		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration", sOpt);
-
-		if (store_dash_params) {
-			sprintf(sOpt, "%u", bandwidth);
-			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth", sOpt);
-		}
-	}
-
-err_exit:
-	if (fragmenters){
-		while (gf_list_count(fragmenters)) {
-			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
-			gf_free(tf);
-			gf_list_rem(fragmenters, 0);
-		}
-		gf_list_del(fragmenters);
-	}
-	if (output) {
-		if (e) gf_isom_delete(output);
-		else gf_isom_close(output);
-	}
-	if (!bs_switching_is_output && bs_switch_segment) 
-		gf_isom_delete(bs_switch_segment);
-	gf_set_progress("ISO File Fragmenting", nb_samp, nb_samp);
-	if (mpd_bs) gf_bs_del(mpd_bs);
-	if (mpd_timeline_bs) gf_bs_del(mpd_timeline_bs);
-	return e;
-}
-
-
-static GF_Err dasher_isom_get_input_components_info(GF_DashSegInput *input, GF_DASHSegmenterOptions *opts)
-{
-	u32 i;
-	GF_ISOFile *in;
-	Double dur;
-
-	in = gf_isom_open(input->file_name, GF_ISOM_OPEN_READ, NULL);
-	input->duration = 0;
-	for (i=0; i<gf_isom_get_track_count(in); i++) {
-		u32 mtype = gf_isom_get_media_type(in, i+1);
-
-		if (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) {
-			dur = (Double) gf_isom_get_media_duration(in, i+1);
-			dur /= gf_isom_get_media_timescale(in, i+1);
-		}
-		if (dur > input->duration) input->duration = dur;
-
-		input->components[input->nb_components].ID = gf_isom_get_track_id(in, i+1);
-		input->components[input->nb_components].media_type = mtype;
-		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++;
-	}
-	return gf_isom_close(in);
-}
-
-static GF_Err dasher_isom_classify_input(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type)
-{
-	u32 i, j;
-	GF_ISOFile *set_file;
-	
-	if (input_idx+1>=nb_dash_inputs)
-		return GF_OK;
-
-	set_file = gf_isom_open(dash_inputs[input_idx].file_name, GF_ISOM_OPEN_READ, NULL);
-
-	for (i=input_idx+1; i<nb_dash_inputs; i++) {
-		Bool valid_in_adaptation_set = 1;
-		Bool assign_to_group = 1;
-		GF_ISOFile *in;
-
-		if (dash_inputs[input_idx].period != dash_inputs[i].period) 
-			continue;
-		
-		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
-			continue;
-
-		if (strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
-			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;
-			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;
-				break;
-			}
-			mtype = gf_isom_get_media_type(set_file, j+1);
-			if (mtype != gf_isom_get_media_type(in, j+1)) {
-				valid_in_adaptation_set = 0;
-				assign_to_group = 0;
-				break;
-			}
-			msub_type = gf_isom_get_media_subtype(set_file, j+1, 1);
-			if (msub_type != gf_isom_get_media_subtype(in, j+1, 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_LSR1)
-				) {
-					GF_DecoderConfig *dcd1 = gf_isom_get_decoder_config(set_file, j+1, 1);
-					GF_DecoderConfig *dcd2 = gf_isom_get_decoder_config(in, j+1, 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 (!same_codec) {
-				valid_in_adaptation_set = 0;
-				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, j+1, szLang2);
-				if (stricmp(szLang1, szLang2)) {
-					valid_in_adaptation_set = 0;
-					break;
-				}
-			}
-			if (mtype==GF_ISOM_MEDIA_VISUAL) {
-				u32 w1, h1, w2, h2, sap_type;
-				Bool rap, roll;
-				s32 roll_dist;
-
-				gf_isom_get_track_layout_info(set_file, j+1, &w1, &h1, NULL, NULL, NULL);
-				gf_isom_get_track_layout_info(in, j+1, &w2, &h2, NULL, NULL, NULL);
-
-				if (h1*w2 != h2*w1) {
-					valid_in_adaptation_set = 0;
-					break;
-				}
-
-				gf_isom_get_sample_rap_roll_info(in, j+1, 0, &rap, &roll, &roll_dist);
-				if (roll_dist>0) sap_type = 4;
-				else if (roll) sap_type = 3;
-				else if (rap) sap_type = 1;
-				else sap_type = 1;
-				if (*max_sap_type < sap_type) *max_sap_type = sap_type;
-			}
-		}
-		gf_isom_close(in);
-		if (valid_in_adaptation_set) {
-			dash_inputs[i].adaptation_set = dash_inputs[input_idx].adaptation_set;
-			dash_inputs[input_idx].nb_rep_in_adaptation_set ++;
-		} else if (assign_to_group) {
-			if (!dash_inputs[input_idx].group_id) {
-				(*current_group_id) ++;
-				dash_inputs[input_idx].group_id = (*current_group_id);
-			}
-			dash_inputs[i].group_id = (*current_group_id);
-		}
-	}
-	gf_isom_close(set_file);
-	return GF_OK;
-}
-
-static GF_Err dasher_isom_create_init_segment(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, Bool use_inband_param_set, Bool single_segment, Bool *disable_bs_switching)
-{
-	GF_Err e = GF_OK;
-	u32 i;
-	Bool sps_merge_failed = 0;
-	Bool use_avc3 = 0;
-	Bool use_hevc = 0;
-	GF_ISOFile *init_seg = gf_isom_open(szInitName, GF_ISOM_OPEN_WRITE, tmpdir);
-
-	for (i=0; i<nb_dash_inputs; i++) {
-		u32 j;
-		GF_ISOFile *in;
-
-		if (dash_inputs[i].adaptation_set != adaptation_set)
-			continue;
-
-		in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
-		if (!in) {
-			e = gf_isom_last_error(NULL);
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Error while opening %s: %s\n", dash_inputs[i].file_name, gf_error_to_string( e ) ));
-			return e;
-		}
-
-		for (j=0; j<gf_isom_get_track_count(in); j++) {
-			u32 track = gf_isom_get_track_by_id(init_seg, gf_isom_get_track_id(in, j+1));
-			if (track) {
-				u32 outDescIndex;
-				if ( gf_isom_get_sample_description_count(in, j+1) != 1) {
-					e = GF_NOT_SUPPORTED;
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot merge track with multiple sample descriptions (file %s) - try disabling bitstream switching\n", dash_inputs[i].file_name ));
-					gf_isom_delete(init_seg);
-					gf_isom_delete(in);
-					return e;
-				}
-
-				/*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;
-					u32 stype1, stype2;
-					stype1 = gf_isom_get_media_subtype(in, j+1, 1);
-					stype2 = gf_isom_get_media_subtype(init_seg, track, 1);
-					if (stype1 != stype2) merge_mode = 0;
-					switch (stype1) {
-						case GF_4CC( 'a', 'v', 'c', '1'):
-						case GF_4CC( 'a', 'v', 'c', '2'):
-						case GF_4CC( 's', 'v', 'c', '1'):
-							if (use_avc3) 
-								merge_mode = 2;
-							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*/
-							merge_mode = 2;
-							break;
-						default:
-							merge_mode = 0;
-							break;
-					}
-					if (merge_mode==1) {
-						u32 k, l, sps_id1, sps_id2;
-						GF_AVCConfig *avccfg1 = gf_isom_avc_config_get(in, j+1, 1);
-						GF_AVCConfig *avccfg2 = gf_isom_avc_config_get(init_seg, track, 1);
-#ifndef GPAC_DISABLE_AV_PARSERS
-						for (k=0; k<gf_list_count(avccfg2->sequenceParameterSets); k++) {
-							GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg2->sequenceParameterSets, k);
-							gf_avc_get_sps_info(slc->data, slc->size, &sps_id1, NULL, NULL, NULL, NULL);
-							for (l=0; l<gf_list_count(avccfg1->sequenceParameterSets); l++) {
-								GF_AVCConfigSlot *slc_orig = (GF_AVCConfigSlot *)gf_list_get(avccfg1->sequenceParameterSets, l);
-								gf_avc_get_sps_info(slc_orig->data, slc_orig->size, &sps_id2, NULL, NULL, NULL, NULL);
-								if (sps_id2==sps_id1) {
-									merge_mode = 0;
-									break;
-								}
-							}
-						}
-#endif
-						/*no conflicts in SPS ids, merge all SPS in a single sample desc*/
-						if (merge_mode==1) {
-							while (gf_list_count(avccfg1->sequenceParameterSets)) {
-								GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg1->sequenceParameterSets, 0);
-								gf_list_rem(avccfg1->sequenceParameterSets, 0);
-								gf_list_add(avccfg2->sequenceParameterSets, slc);
-							}
-							while (gf_list_count(avccfg1->pictureParameterSets)) {
-								GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg1->pictureParameterSets, 0);
-								gf_list_rem(avccfg1->pictureParameterSets, 0);
-								gf_list_add(avccfg2->pictureParameterSets, slc);
-							}
-							gf_isom_avc_config_update(init_seg, track, 1, avccfg2);
-						} else {
-							sps_merge_failed = 1;
-						}
-						gf_odf_avc_cfg_del(avccfg1);
-						gf_odf_avc_cfg_del(avccfg2);
-					}
-
-					/*cannot merge, clone*/
-					if (merge_mode==0)
-						gf_isom_clone_sample_description(init_seg, track, in, j+1, 1, NULL, NULL, &outDescIndex);
-				}
-			} else {
-				u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess;
-				u8 defaultPadding;
-				u16 defaultDegradationPriority;
-
-				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;
-					}
-					break;
-				case GF_4CC( 'h', 'v', 'c', '1'):
-					if (use_inband_param_set) {
-						gf_isom_hevc_set_inband_config(init_seg, track, 1);
-					}
-					use_hevc = GF_TRUE;
-					break;
-				}
-
-
-				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);
-				if (e) break;
-
-			}
-		}
-		if (!i) {
-			if (use_hevc || use_avc3) {
-				gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
-			} else {
-				gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','5'), 1);
-			}
-			/*DASH self-init media segment*/
-			if (single_segment) {
-				gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','s','m','s'), 1);
-			} else {
-				gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','a','s','h'), 1);
-			}
-		}
-		gf_isom_close(in);
-	}
-	if (e) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Couldn't create initialization segment: error %s\n", gf_error_to_string(e) ));
-		*disable_bs_switching = GF_TRUE;
-		gf_isom_delete(init_seg);
-		gf_delete_file(szInitName);
-		return GF_OK;
-	} else if (sps_merge_failed) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Couldnt merge AVC|H264 SPS from different files (same SPS ID used) - different sample descriptions will be used\n"));
-		*disable_bs_switching = GF_TRUE;
-		gf_isom_delete(init_seg);
-		gf_delete_file(szInitName);
-		return GF_OK;
-	} else {
-		e = gf_isom_close(init_seg);
-	}
-	return e;
-}
-
-static GF_Err dasher_isom_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
-{
-	GF_ISOFile *in = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, dash_cfg->tmpdir);
-	GF_Err e = gf_media_isom_segment_file(in, szOutName, dash_cfg->fragment_duration, dash_cfg, dash_input, first_in_set);
-	gf_isom_close(in);
-	return e;
-}
-#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-static GF_Err dasher_generic_classify_input(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type)
-{
-#ifdef GPAC_DISABLE_MEDIA_IMPORT
-	return GF_NOT_SUPPORTED;
-#else
-	GF_Err e;
-	u32 i, j, k;
-	GF_MediaImporter in, probe;
-
-	memset(&in, 0, sizeof(GF_MediaImporter));
-	in.flags = GF_IMPORT_PROBE_ONLY;
-	in.in_name = (char *)dash_inputs[input_idx].file_name;
-	e = gf_media_import(&in);
-	if (e) return e;
-
-	for (i=input_idx+1; i<nb_dash_inputs; i++) {
-		Bool valid_in_adaptation_set = GF_TRUE;
-		Bool assign_to_group = GF_TRUE;
-
-		if (dash_inputs[input_idx].period != dash_inputs[i].period) 
-			continue;
-
-		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
-			continue;
-
-		if (strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
-			continue;
-
-		memset(&probe, 0, sizeof(GF_MediaImporter));
-		probe.flags = GF_IMPORT_PROBE_ONLY;
-		probe.in_name = (char *)dash_inputs[i].file_name;
-		e = gf_media_import(&probe);
-		if (e) return e;
-
-		if (in.nb_progs != probe.nb_progs) valid_in_adaptation_set = 0;
-		if (in.nb_tracks != probe.nb_tracks) valid_in_adaptation_set = 0;
-
-		for (j=0; j<in.nb_tracks; j++) {
-			struct __track_import_info *src_tk, *probe_tk;
-			Bool found = GF_FALSE;
-			/*make sure we have the same track*/
-			for (k=0; k<probe.nb_tracks;k++) {
-				if (in.tk_info[j].track_num==probe.tk_info[k].track_num) {
-					found = GF_TRUE;
-					break;
-				}
-			}
-			if (!found) {
-				valid_in_adaptation_set = GF_FALSE;
-				assign_to_group = GF_FALSE;
-				break;
-			}
-			src_tk = &in.tk_info[j];
-			probe_tk = &probe.tk_info[k];
-
-			/*make sure we use the same media type*/
-			if (src_tk->type != probe_tk->type) {
-				valid_in_adaptation_set = GF_FALSE;
-				assign_to_group = GF_FALSE;
-				break;
-			}
-			/*make sure we use the same codec type*/
-			if (src_tk->media_type != probe_tk->media_type) {
-				valid_in_adaptation_set = GF_FALSE;
-				break;
-			}
-			/*make sure we use the same aspect ratio*/
-			if (src_tk->type==GF_ISOM_MEDIA_VISUAL) {
-				if (src_tk->video_info.width * probe_tk->video_info.height != src_tk->video_info.height * probe_tk->video_info.width) {
-					valid_in_adaptation_set = GF_FALSE;
-					break;
-				}
-			} else if (src_tk->lang != probe_tk->lang) {
-				valid_in_adaptation_set = GF_FALSE;
-				break;
-			}
-
-			if (!valid_in_adaptation_set) break;
-		}
-		if (valid_in_adaptation_set) {
-			dash_inputs[i].adaptation_set = dash_inputs[input_idx].adaptation_set;
-			dash_inputs[input_idx].nb_rep_in_adaptation_set ++;
-		} else if (assign_to_group) {
-			if (!dash_inputs[input_idx].group_id) {
-				(*current_group_id) ++;
-				dash_inputs[input_idx].group_id = (*current_group_id);
-			}
-			dash_inputs[i].group_id = (*current_group_id);
-		}
-	}
-#endif
-	return GF_OK;
-}
-
-#endif
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-static GF_Err dasher_generic_get_components_info(GF_DashSegInput *input, GF_DASHSegmenterOptions *opts)
-{
-#ifdef GPAC_DISABLE_MEDIA_IMPORT
-	return GF_NOT_SUPPORTED;
-#else
-	u32 i;
-	GF_Err e;
-	GF_MediaImporter in;
-	memset(&in, 0, sizeof(GF_MediaImporter));
-	in.flags = GF_IMPORT_PROBE_ONLY;
-	in.in_name = (char *)input->file_name;
-	e = gf_media_import(&in);
-	if (e) return e;
-
-	input->nb_components = in.nb_tracks;
-	for (i=0; i<in.nb_tracks; i++) {
-		input->components[i].width = in.tk_info[i].video_info.width;
-		input->components[i].height = in.tk_info[i].video_info.height;
-		input->components[i].media_type = in.tk_info[i].type;
-		input->components[i].channels = in.tk_info[i].audio_info.nb_channels;
-		input->components[i].sample_rate = in.tk_info[i].audio_info.sample_rate;
-		input->components[i].ID = in.tk_info[i].track_num;
-		if (in.tk_info[i].lang)
-			strcpy(input->components[i].szLang, gf_4cc_to_str(in.tk_info[i].lang) );
-		strcpy(input->components[i].szCodec, in.tk_info[i].szCodecProfile);
-		input->components[i].fps_denum = 1000;
-		input->components[i].fps_num = (u32) (in.tk_info[i].video_info.FPS*1000);
-	}
-#endif
-	return GF_OK;
-}
-#endif
-
-
-#ifndef GPAC_DISABLE_MPEG2TS
-
-typedef struct
-{
-	FILE *src;
-	GF_M2TS_Demuxer *ts;
-	u64 file_size;
-	u32 bandwidth;
-	Bool has_seen_pat;
-	
-	u64 suspend_indexing;
-
-	/* For indexing the TS*/
-	Double segment_duration;
-	Bool segment_at_rap;
-
-	FILE *index_file;
-	GF_BitStream *index_bs;
-
-	u32 subduration;
-	u32 skip_nb_segments;
-	u64 duration_at_last_pass;
-
-	GF_SegmentIndexBox *sidx;
-	GF_PcrInfoBox *pcrb;
-
-	u32 reference_pid;
-	GF_M2TS_PES *reference_stream;
-	
-	u32 nb_pes_in_segment;
-	/* earliest presentation time for the whole segment */
-	u64 first_PTS;
-	/* DTS-PCR diff for the first PES packet */
-	u64 PCR_DTS_initial_diff;
-
-	/* earliest presentation time for the subsegment being processed */
-	u64 base_PTS;
-	/* byte offset for the start of subsegment being processed */
-	u64 base_offset;
-	/* last presentation time for the subsegment being processed (before the next subsegment is started) */
-	u64 last_PTS;
-	/* last decoding time for the subsegment being processed */
-	u64 last_DTS;
-	/* byte offset for the last PES packet for the subsegment being processed */
-	u32 last_offset;
-	u32 last_frame_duration;
-
-	/* earliest presentation time for the previous subsegment */
-	u64 prev_base_PTS;
-	/* byte offset for the start of the previous subsegment */
-	u64 prev_base_offset;
-	/* last presentation time for the previous subsegment */
-	u64 prev_last_PTS;
-	/* byte offset for the last PES packet for the previous subsegment */
-	u32 prev_last_offset;
-
-	/* indicates if the current subsegment contains a SAP and its SAP type*/
-	u32 SAP_type;
-	/* indicates if the first PES in the current subsegment is a SAP*/
-	Bool first_pes_sap;
-	/* Presentation time for the first RAP encountered in the subsegment */
-	u64 first_SAP_PTS;
-	/* byte offset for the first RAP encountered in the subsegment */
-	u32 first_SAP_offset;
-	u64 prev_last_SAP_PTS;
-	u32 prev_last_SAP_offset;
-	u64 last_SAP_PTS;
-	u32 last_SAP_offset;
-
-	Bool pes_after_last_pat_is_sap;
-
-	/*Interpolated PCR value for the pcrb*/
-	u64 interpolated_pcr_value;
-	u64 last_pcr_value;
-
-	/* information about the first PAT found in the subsegment */
-	u32 last_pat_position;
-	u32 first_pat_position;
-	u32 prev_last_pat_position;
-	Bool first_pat_position_valid, first_pes_after_last_pat;
-	u32 pat_version;
-
-	/* information about the first CAT found in the subsegment */
-	u32 last_cat_position;
-	u32 first_cat_position;
-	u32 prev_last_cat_position;
-	Bool first_cat_position_valid;
-	u32 cat_version;
-
-	/* information about the first PMT found in the subsegment */
-	u32 last_pmt_position;
-	u32 first_pmt_position;
-	u32 prev_last_pmt_position;
-	Bool first_pmt_position_valid;
-	u32 pmt_version;
-
-	/* information about the first PCR found in the subsegment */
-	u32 last_pcr_position;
-	u32 first_pcr_position;
-	Bool first_pcr_position_valid;
-	u32 prev_last_pcr_position;
-
-} GF_TSSegmenter;
-
-static void m2ts_sidx_add_entry(GF_SegmentIndexBox *sidx, Bool ref_type, 
-								u32 size, u32 duration, Bool first_is_SAP, u32 sap_type, u32 RAP_delta_time)
-{
-	GF_SIDXReference *ref;
-	sidx->nb_refs++;
-	sidx->refs = (GF_SIDXReference *)gf_realloc(sidx->refs, sidx->nb_refs*sizeof(GF_SIDXReference));
-	ref = &(sidx->refs[sidx->nb_refs-1]);
-	ref->reference_type = ref_type;
-	ref->reference_size = size;
-	ref->subsegment_duration = duration;
-	ref->starts_with_SAP = first_is_SAP;
-	ref->SAP_type = sap_type;
-	ref->SAP_delta_time = (sap_type ? RAP_delta_time: 0);
-}
-
-static void m2ts_sidx_finalize_size(GF_TSSegmenter *index_info, u64 file_size)
-{
-	GF_SIDXReference *ref;
-	if (index_info->suspend_indexing) return;
-	if (index_info->sidx->nb_refs == 0) return;
-	ref = &(index_info->sidx->refs[index_info->sidx->nb_refs-1]);
-	ref->reference_size = (u32)(file_size - index_info->prev_base_offset);
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment: position-range ajdustment:%d-%d (%d bytes)\n", index_info->prev_base_offset, (u32)file_size, ref->reference_size));
-}
-
-static void m2ts_sidx_flush_entry(GF_TSSegmenter *index_info) 
-{
-	u32 end_offset, size, duration; 
-	Bool store_segment = 1;
-
-	if (index_info->suspend_indexing) 
-		return;
-
-	if (index_info->skip_nb_segments) {
-		index_info->skip_nb_segments --;
-		store_segment = GF_FALSE;
-	}
-
-	/* determine the end of the current index */
-	if (index_info->segment_at_rap) {
-		/*split at PAT*/
-		end_offset = index_info->last_pat_position;
-	} else {
-		/* split at PES header */
-		end_offset = index_info->last_offset; 
-	}
-	size = (u32)(end_offset - index_info->base_offset);
-	duration = (u32)(index_info->last_PTS - index_info->base_PTS);
-
-	if (store_segment) {
-		u32 prev_duration, SAP_delta_time, SAP_offset;
-		if (!index_info->sidx) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Segment: Reference PID: %d, EPTime: "LLU", Start Offset: %d bytes\n", index_info->reference_pid, index_info->base_PTS, index_info->base_offset));
-			index_info->sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
-			index_info->sidx->reference_ID = index_info->reference_pid;
-			/* timestamps in MPEG-2 are expressed in 90 kHz timescale */
-			index_info->sidx->timescale = 90000;
-			/* first encountered PTS on the PID for this subsegment */
-			index_info->sidx->earliest_presentation_time = index_info->base_PTS;
-			index_info->sidx->first_offset = index_info->base_offset;
-					
-		}
-		
-		if (!index_info->pcrb) {
-			index_info->pcrb = (GF_PcrInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PCRB);
-		}
-
-		/* close the current index */ 
-		SAP_delta_time = (u32)(index_info->first_SAP_PTS - index_info->base_PTS);
-		SAP_offset = (u32)(index_info->first_SAP_offset - index_info->base_offset);
-		m2ts_sidx_add_entry(index_info->sidx, 0, size, duration, index_info->first_pes_sap, index_info->SAP_type, SAP_delta_time);
-
-		/*add pcrb entry*/
-		index_info->pcrb->subsegment_count++;
-		index_info->pcrb->pcr_values = gf_realloc(index_info->pcrb->pcr_values, index_info->pcrb->subsegment_count*sizeof(u64));
-		index_info->pcrb->pcr_values[index_info->pcrb->subsegment_count-1] = index_info->interpolated_pcr_value;
-
-		/* adjust the previous index duration */
-		if (index_info->sidx->nb_refs > 0 && (index_info->base_PTS < index_info->prev_last_PTS) ) {
-			prev_duration = (u32)(index_info->base_PTS-index_info->prev_base_PTS);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("           time-range adj.: %.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;
-			}
-
-		}
-
-		/* Printing result */
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment:"));
-		//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));
-		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));
-		}
-		if (index_info->first_pat_position_valid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PAT @ %d bytes", (u32)(index_info->first_pat_position - index_info->base_offset)));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PAT"));
-		}
-		if (index_info->first_cat_position_valid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", CAT @ %d bytes", (u32)(index_info->first_cat_position - index_info->base_offset)));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No CAT"));
-		}
-		if (index_info->first_pmt_position_valid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PMT @ %d bytes", (u32)(index_info->first_pmt_position - index_info->base_offset)));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PMT"));
-		}
-		if (index_info->first_pcr_position_valid) {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PCR @ %d bytes", (u32)(index_info->first_pcr_position - index_info->base_offset)));
-		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PCR"));
-		}
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
-
-	}
-
-	/* save the current values for later adjustments */
-	index_info->prev_last_SAP_PTS = index_info->last_SAP_PTS;
-	index_info->prev_last_SAP_offset = index_info->last_SAP_offset;
-	index_info->prev_last_PTS = index_info->last_PTS;
-	index_info->prev_last_offset = index_info->last_offset;
-	index_info->prev_base_PTS = index_info->base_PTS;
-	index_info->base_PTS = index_info->last_PTS;
-	index_info->prev_base_offset = index_info->base_offset;
-	index_info->prev_last_pat_position = index_info->last_pat_position;
-	index_info->prev_last_cat_position = index_info->last_cat_position;
-	index_info->prev_last_pmt_position = index_info->last_pmt_position;
-	index_info->prev_last_pcr_position = index_info->last_pcr_position;
-	
-	/* update the values for the new index*/
-	index_info->base_offset = end_offset;
-
-	if (index_info->pes_after_last_pat_is_sap) {
-		index_info->SAP_type = 1;
-		index_info->first_SAP_PTS = index_info->last_SAP_PTS;
-		index_info->first_SAP_offset = index_info->last_SAP_offset;
-		index_info->first_pes_sap = GF_TRUE;
-		index_info->nb_pes_in_segment = 1;
-		index_info->base_PTS = index_info->first_SAP_PTS;
-
-		index_info->pes_after_last_pat_is_sap= 0;
-	} else {
-		index_info->SAP_type = 0;
-		index_info->first_SAP_PTS = 0;
-		index_info->first_SAP_offset = 0;
-		index_info->first_pes_sap = GF_FALSE;
-		index_info->nb_pes_in_segment = 0;
-	}
-	index_info->last_DTS = 0;
-
-	if (index_info->last_pat_position >= index_info->base_offset) {
-		index_info->first_pat_position_valid = GF_TRUE;
-		index_info->first_pat_position = index_info->last_pat_position;
-	} else {
-		index_info->first_pat_position_valid = GF_FALSE;
-		index_info->first_pat_position = 0;
-	}
-	if (index_info->last_cat_position >= index_info->base_offset) {
-		index_info->first_cat_position_valid = GF_TRUE;
-		index_info->first_cat_position = index_info->last_cat_position;
-	} else {
-		index_info->first_cat_position_valid = GF_FALSE;
-		index_info->first_cat_position = 0;
-	}
-	if (index_info->last_pmt_position >= index_info->base_offset) {
-		index_info->first_pmt_position_valid = GF_TRUE;
-		index_info->first_pmt_position = index_info->last_pmt_position;
-	} else {
-		index_info->first_pmt_position_valid = GF_FALSE;
-		index_info->first_pmt_position = 0;
-	}
-	if (index_info->last_pcr_position >= index_info->base_offset) {
-		index_info->first_pcr_position_valid = GF_TRUE;
-		index_info->first_pcr_position = index_info->last_pcr_position;
-	} else {
-		index_info->first_pcr_position_valid = GF_FALSE;
-		index_info->first_pcr_position = 0;
-	}
-
-	if (index_info->subduration && (index_info->last_PTS - index_info->first_PTS >= index_info->duration_at_last_pass + index_info->subduration)) {
-		index_info->suspend_indexing = end_offset;
-		index_info->duration_at_last_pass = (u32) (index_info->last_PTS - index_info->first_PTS);
-	}
-}
-
-static void m2ts_check_indexing(GF_TSSegmenter *index_info)
-{
-	u32 segment_duration = (u32)(index_info->segment_duration*90000);
-	u64 current_duration = (index_info->last_PTS - index_info->base_PTS);
-	u64 target_duration = segment_duration;
-
-	//using drift control to ensure that nb_seg*segment_duration is roughly aligned with segment(nb_seg).first_PTS
-	if (index_info->sidx) {
-		current_duration = (index_info->last_PTS - index_info->first_PTS) - index_info->duration_at_last_pass;
-		target_duration += index_info->sidx->nb_refs * segment_duration;
-	}
-
-	if (index_info->segment_at_rap) {
-		s32 diff = (s32) ((s64) current_duration - (s64) segment_duration);
-		if (diff<0)diff=-diff;
-		//check if below 10% limit 
-		if (diff/900 < 5) {
-			//below 10% limit of segment duration, if we have a RAP flush now
-			if (index_info->pes_after_last_pat_is_sap)
-				m2ts_sidx_flush_entry(index_info);
-			//no rap and below 10% limit, wait for rap
-			return;
-		}
-	}
-
-	/* we exceed the segment duration flush sidx entry*/
-	if (current_duration >= target_duration) {
-		m2ts_sidx_flush_entry(index_info);
-	} 
-}
-static void dash_m2ts_event_check_pat(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
-{
-	GF_TSSegmenter *ts_seg = (GF_TSSegmenter*)ts->user;
-	GF_M2TS_PES_PCK *pck;
-	switch (evt_type) {
-	case GF_M2TS_EVT_PAT_REPEAT:
-		ts_seg->has_seen_pat = 1;
-		break;
-	case GF_M2TS_EVT_PMT_FOUND:
-	{
-		u32 i, count;
-		GF_M2TS_Program *prog = (GF_M2TS_Program*)par;
-		count = gf_list_count(prog->streams);
-		for (i=0; i<count; i++) {
-			GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
-		}
-	}
-		break;
-	case GF_M2TS_EVT_PMT_REPEAT:
-		if (ts_seg->has_seen_pat) {
-			u32 i, count;
-			Bool done = 1;
-			GF_M2TS_Program *prog = (GF_M2TS_Program*)par;
-			count = gf_list_count(prog->streams);
-			for (i=0; i<count; i++) {
-				GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
-				if (es->flags&GF_M2TS_ES_IS_PES) {
-					GF_M2TS_PES *pes = (GF_M2TS_PES *)es; 
-					if (!pes->aud_sr && !pes->vid_w) {
-						done = 0;
-						break;
-					} else {
-						/*stream is configured, we only need PES header now*/
-						gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_RAW);
-					}
-				}
-			}
-			if (done) ts_seg->has_seen_pat = 2;
-		}
-		break;
-	case GF_M2TS_EVT_PES_PCK:
-		pck = par;
-		/* we process packets only for the given PID */
-		if (pck->stream->pid == pck->stream->program->pcr_pid) {
-			if (!ts_seg->nb_pes_in_segment || (ts_seg->first_PTS > pck->PTS)) {
-				ts_seg->first_PTS = pck->PTS;
-				ts_seg->nb_pes_in_segment++;
-			}
-			if (pck->PTS > ts_seg->last_PTS) {
-				ts_seg->last_PTS = pck->PTS;
-			}
-			if (ts_seg->last_DTS != pck->DTS) {
-				ts_seg->last_frame_duration = (u32) (pck->DTS - ts_seg->last_DTS);
-				ts_seg->last_DTS = pck->DTS;
-			}
-		}
-		break;
-	}
-}
-
-static void dash_m2ts_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
-{
-	GF_M2TS_Program *prog;
-	GF_M2TS_PES_PCK *pck;
-	GF_M2TS_PES *pes;
-	u64 interpolated_pcr_value;
-	u32 count, i;
-	GF_TSSegmenter *ts_seg = (GF_TSSegmenter*)ts->user;
-
-	switch (evt_type) {
-	case GF_M2TS_EVT_PAT_FOUND:
-		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = 1;
-			ts_seg->first_pat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = 0;
-		ts_seg->pes_after_last_pat_is_sap = 0;
-		break;
-	case GF_M2TS_EVT_PAT_UPDATE:
-		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = 1;
-			ts_seg->first_pat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = 0;
-		ts_seg->pes_after_last_pat_is_sap = 0;
-		break;
-	case GF_M2TS_EVT_PAT_REPEAT:
-		if (!ts_seg->first_pat_position_valid) {
-			ts_seg->first_pat_position_valid = 1;
-			ts_seg->first_pat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pat_position = (ts->pck_number-1)*188;
-		ts_seg->first_pes_after_last_pat = 0;
-		ts_seg->pes_after_last_pat_is_sap = 0;
-		break;
-	case GF_M2TS_EVT_CAT_FOUND:
-		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = 1;
-			ts_seg->first_cat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_cat_position = (ts->pck_number-1)*188;
-		break;
-	case GF_M2TS_EVT_CAT_UPDATE:
-		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = 1;
-			ts_seg->first_cat_position = (ts->pck_number-1)*188;
-		}
-		break;
-	case GF_M2TS_EVT_CAT_REPEAT:
-		if (!ts_seg->first_cat_position_valid) {
-			ts_seg->first_cat_position_valid = 1;
-			ts_seg->first_cat_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_cat_position = (ts->pck_number-1)*188;
-		break;
-	case GF_M2TS_EVT_PMT_FOUND:
-		ts_seg->has_seen_pat = 1;
-		prog = (GF_M2TS_Program*)par;
-		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = 1;
-			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
-		/* we create indexing information on the stream used for carrying the PCR */
-		ts_seg->reference_pid = prog->pcr_pid;
-		ts_seg->reference_stream = (GF_M2TS_PES *) ts_seg->ts->ess[prog->pcr_pid];
-		count = gf_list_count(prog->streams);
-
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program number %d found - %d streams:\n", prog->number, count));
-		for (i=0; i<count; i++) {
-			GF_M2TS_ES *es = gf_list_get(prog->streams, i);
-			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
-		}
-		break;
-	case GF_M2TS_EVT_PMT_UPDATE:
-		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = 1;
-			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
-		break;
-	case GF_M2TS_EVT_PMT_REPEAT:
-		if (!ts_seg->first_pmt_position_valid) {
-			ts_seg->first_pmt_position_valid = 1;
-			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
-		break;
-	case GF_M2TS_EVT_PES_PCK:
-		pck = par;
-		/*We need the interpolated PCR for the pcrb, hence moved this calculus out, and saving the calculated value in ts_seg to put it in the pcrb*/
-		pes = pck->stream;
-		/* Interpolated PCR value for the TS packet containing the PES header start */
-		interpolated_pcr_value = 0;
-		if (pes->last_pcr_value && pes->before_last_pcr_value_pck_number && pes->last_pcr_value > pes->before_last_pcr_value) {
-			u32 delta_pcr_pck_num = pes->last_pcr_value_pck_number - pes->before_last_pcr_value_pck_number;
-			u32 delta_pts_pcr_pck_num = pes->pes_start_packet_number - pes->last_pcr_value_pck_number;
-			u64 delta_pcr_value = pes->last_pcr_value - pes->before_last_pcr_value; 
-			if ((pes->pes_start_packet_number > pes->last_pcr_value_pck_number)
-				&& (pes->last_pcr_value > pes->before_last_pcr_value)) {
-				
-					pes->last_pcr_value = pes->before_last_pcr_value;
-			}
-			/* we can compute the interpolated pcr value for the packet containing the PES header */
-			interpolated_pcr_value = pes->last_pcr_value + (u64)((delta_pcr_value*delta_pts_pcr_pck_num*1.0)/delta_pcr_pck_num);
-			ts_seg->interpolated_pcr_value = interpolated_pcr_value;
-			ts_seg->last_pcr_value = pes->last_pcr_value;
-		}
-		/* we process packets only for the given PID */
-		if (pck->stream->pid != ts_seg->reference_pid) {
-			break;
-		} else {
-			if (ts_seg->last_DTS != pck->DTS) {
-				if (ts_seg->last_DTS)
-					ts_seg->last_frame_duration = (u32) (pck->DTS - ts_seg->last_DTS);
-				ts_seg->last_DTS = pck->DTS;
-				ts_seg->nb_pes_in_segment++;
-
-				if (!ts_seg->first_pes_after_last_pat) {
-					ts_seg->first_pes_after_last_pat = ts_seg->nb_pes_in_segment;
-					ts_seg->pes_after_last_pat_is_sap=0;
-				}
-			}
-
-			/* we store the fact that there is at least a RAP for the index
-			and we store the PTS of the first encountered RAP in the index*/
-			if (pck->flags & GF_M2TS_PES_PCK_RAP) {
-				ts_seg->SAP_type = 1;
-				if (!ts_seg->first_SAP_PTS || (ts_seg->first_SAP_PTS > pck->PTS)) {
-					ts_seg->first_SAP_PTS = pck->PTS;
-					ts_seg->first_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
-				}
-				ts_seg->last_SAP_PTS = pck->PTS;
-				ts_seg->last_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
-
-				if (ts_seg->nb_pes_in_segment==1) {
-					ts_seg->first_pes_sap = GF_TRUE;
-				}
-				if ((ts_seg->nb_pes_in_segment>1) && (ts_seg->first_pes_after_last_pat==ts_seg->nb_pes_in_segment)) {
-					ts_seg->pes_after_last_pat_is_sap=1;
-				}
-			}
-			/* we need to know the earliest PTS value (RAP or not) in the index*/
-			if (!ts_seg->base_PTS || (ts_seg->base_PTS > pck->PTS)) {
-				ts_seg->base_PTS = pck->PTS;
-			}
-			/* we need to know the earliest PTS value for the whole file (segment) */
-			if (!ts_seg->first_PTS || (ts_seg->first_PTS > pck->PTS)) {
-				ts_seg->first_PTS = pck->PTS;
-			}
-			if (pck->PTS > ts_seg->last_PTS) {
-				/* we use the last PTS for first approximation of the duration */
-				ts_seg->last_PTS = pck->PTS;
-				ts_seg->last_offset = (ts_seg->reference_stream->pes_start_packet_number-1)*188;
-			}
-
-			if (ts_seg->PCR_DTS_initial_diff == (u64) -1) {
-				ts_seg->PCR_DTS_initial_diff = ts_seg->last_DTS - pes->last_pcr_value / 300;
-			}
-
-			m2ts_check_indexing(ts_seg);
-		}
-		break;
-	case GF_M2TS_EVT_PES_PCR:
-		pck = par;
-		if (!ts_seg->first_pcr_position_valid) {
-			ts_seg->first_pcr_position_valid = GF_TRUE;
-			ts_seg->first_pcr_position = (ts->pck_number-1)*188;
-		}
-		ts_seg->last_pcr_position = (ts->pck_number-1)*188;
-		break;
-	}
-}
-
-static GF_Err dasher_get_ts_demux(GF_TSSegmenter *ts_seg, const char *file, u32 probe_mode)
-{
-	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
-	ts_seg->src = gf_f64_open(file, "rb");
-	if (!ts_seg->src) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot open input %s: no such file\n", file));
-		return GF_URL_ERROR;
-	}
-	ts_seg->ts = gf_m2ts_demux_new();
-	ts_seg->ts->on_event = dash_m2ts_event_check_pat;
-	ts_seg->ts->notify_pes_timing = GF_TRUE;
-	ts_seg->ts->user = ts_seg;
-
-	gf_f64_seek(ts_seg->src, 0, SEEK_END);
-	ts_seg->file_size = gf_f64_tell(ts_seg->src);
-	gf_f64_seek(ts_seg->src, 0, SEEK_SET);
-
-	if (probe_mode) {
-		/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
-		while (!feof(ts_seg->src)) {
-			char data[188];
-			u32 size = (u32) fread(data, 1, 188, ts_seg->src);
-			if (size<188) break;
-
-			gf_m2ts_process_data(ts_seg->ts, data, size);
-			if (ts_seg->has_seen_pat==probe_mode)
-				break;
-		}
-		gf_m2ts_reset_parsers(ts_seg->ts);
-		gf_f64_seek(ts_seg->src, 0, SEEK_SET);
-	}
-	ts_seg->ts->on_event = dash_m2ts_event;
-	return GF_OK;
-}
-
-static void dasher_del_ts_demux(GF_TSSegmenter *ts_seg)
-{
-	if (ts_seg->ts) gf_m2ts_demux_del(ts_seg->ts);
-	if (ts_seg->src) fclose(ts_seg->src);
-	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
-}
-
-static GF_Err dasher_mp2t_get_components_info(GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *dash_opts)
-{
-	char sOpt[40];
-	GF_TSSegmenter ts_seg;
-	GF_Err e = dasher_generic_get_components_info(dash_input, dash_opts);
-	if (e) return e;
-
-	dash_input->duration = 0;
-	if (dash_opts->dash_ctx) {
-		const char *opt = gf_cfg_get_key(dash_opts->dash_ctx, "DASH", "LastFileName");
-		if (opt && !strcmp(opt, dash_input->file_name)) {
-			const char *opt = gf_cfg_get_key(dash_opts->dash_ctx, "DASH", "LastFileDuration");
-			if (opt) dash_input->duration = atof(opt);
-		}
-	}
-
-	e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, dash_input->duration ? 2 : 3);
-	if (e) return e;
-
-	if (!dash_input->duration)
-		dash_input->duration = (ts_seg.last_PTS + ts_seg.last_frame_duration - ts_seg.first_PTS)/90000.0;
-
-	gf_cfg_set_key(dash_opts->dash_ctx, "DASH", "LastFileName", dash_input->file_name);
-	sprintf(sOpt, "%g", dash_input->duration);
-	gf_cfg_set_key(dash_opts->dash_ctx, "DASH", "LastFileDuration", sOpt);
-
-	dasher_del_ts_demux(&ts_seg);
-
-	return GF_OK;
-}
-
-#define NB_TSPCK_IO_BYTES 18800
-
-static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
-{	
-	GF_TSSegmenter ts_seg;
-	Bool rewrite_input = 0;
-	u8 is_pes[GF_M2TS_MAX_STREAMS];
-	char szOpt[100];
-	char SegName[GF_MAX_PATH], IdxName[GF_MAX_PATH];
-	char szSectionName[100], szRepURLsSecName[100];
-	char szCodecs[100];
-	const char *opt;
-	u32 i, startNumberRewind;
-	GF_Err e;
-	u64 start, pcr_shift, next_pcr_shift;
-	Double cumulated_duration = 0;
-	u32 bandwidth = 0;
-	u32 segment_index;
-	/*compute name for indexed segments*/
-	const char *basename = gf_url_get_resource_name(szOutName);
-
-	/*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);	
-
-	/*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);	
-
-		ts_seg.index_file = gf_f64_open(IdxName, "wb");
-		if (!ts_seg.index_file) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create index file %s\n", IdxName));
-			e = GF_IO_ERR;
-			goto exit;
-		}
-		ts_seg.index_bs = gf_bs_from_file(ts_seg.index_file, GF_BITSTREAM_WRITE);
-
-		styp = (GF_SegmentTypeBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_STYP);
-		styp->majorBrand = GF_4CC('r','i','s','x');
-		styp->minorVersion = 0;
-		styp->altBrand = (u32*)gf_malloc(sizeof(u32));
-		styp->altBrand[0] = styp->majorBrand;
-		styp->altCount = 1;
-		gf_isom_box_size((GF_Box *)styp);
-		gf_isom_box_write((GF_Box *)styp, ts_seg.index_bs);
-		gf_isom_box_del((GF_Box *)styp);
-#endif
-	}
-
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 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);
-
-	szSectionName[0] = 0;
-	if (dash_cfg->dash_ctx) {
-		sprintf(szSectionName, "Representation_%s", dash_input->representationID);
-		sprintf(szRepURLsSecName, "URLs_%s", dash_input->representationID);
-
-		/*restart where we left last time*/
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "ByteOffset");
-		if (opt) {
-			u64 offset;
-			sscanf(opt, LLU, &offset);
-
-			while (!feof(ts_seg.src) && !ts_seg.has_seen_pat) {
-				char data[NB_TSPCK_IO_BYTES];
-				u32 size = (u32) fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
-				gf_m2ts_process_data(ts_seg.ts, data, size);
-
-				if (size<NB_TSPCK_IO_BYTES) break;
-			}
-			gf_m2ts_reset_parsers(ts_seg.ts);
-			ts_seg.base_PTS = 0;
-			gf_f64_seek(ts_seg.src, offset, SEEK_SET);
-			ts_seg.base_offset = offset;
-			ts_seg.ts->pck_number = (u32) (offset/188);
-		}
-
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset");
-		if (opt) sscanf(opt, LLU, &ts_seg.PCR_DTS_initial_diff);
-
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "DurationAtLastPass");
-		if (opt) sscanf(opt, LLD, &ts_seg.duration_at_last_pass);
-	}
-
-	/*index the file*/
-	while (!feof(ts_seg.src) && !ts_seg.suspend_indexing) {
-		char data[NB_TSPCK_IO_BYTES];
-		u32 size = (u32) fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
-		gf_m2ts_process_data(ts_seg.ts, data, size);
-		if (size<NB_TSPCK_IO_BYTES) break;
-	}
-	if (feof(ts_seg.src)) ts_seg.suspend_indexing = 0;
-
-	next_pcr_shift = 0;
-	if (!ts_seg.suspend_indexing) {
-		next_pcr_shift = ts_seg.last_DTS + ts_seg.last_frame_duration - ts_seg.PCR_DTS_initial_diff;
-	}
-
-	/* flush SIDX entry for the last packets */
-	m2ts_sidx_flush_entry(&ts_seg);
-	m2ts_sidx_finalize_size(&ts_seg, ts_seg.file_size);
-	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH]: Indexing done (1 sidx, %d entries).\n", ts_seg.sidx->nb_refs));
-
-	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 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);
-	for (i=0; i<dash_input->nb_components; i++) {
-		is_pes[ dash_input->components[i].ID ] = 1;
-	}
-	pcr_shift = 0;
-
-	bandwidth = dash_input->bandwidth;
-	if (!bandwidth) bandwidth = ts_seg.bandwidth;
-
-	if (dash_cfg->dash_ctx) {
-
-		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "Setup");
-		if (!opt || strcmp(opt, "yes")) {
-			gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "Setup", "yes");
-			gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "ID", dash_input->representationID);
-		} else {
-			if (!bandwidth) {
-				opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "Bandwidth");
-				if (opt) sscanf(opt, "%u", &bandwidth);
-			}
-
-			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);
-
-			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration");
-			if (opt) cumulated_duration = atof(opt);
-		}
-	}
-
-	/*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); 
-		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, "/>\n");
-	}
-
-
-	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(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].sample_rate) 
-			fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", dash_input->components[i].sample_rate);
-	}
-	if (strlen(szCodecs))
-		fprintf(dash_cfg->mpd, " codecs=\"%s\"", szCodecs);
-
-	fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", dash_cfg->segments_start_with_rap ? 1 : 0);
-	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);
-	fprintf(dash_cfg->mpd, ">\n");
-
-	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);
-		fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n", SegName);
-
-		fprintf(dash_cfg->mpd, "    <SegmentBase>\n");
-		fprintf(dash_cfg->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
-		fprintf(dash_cfg->mpd, "    </SegmentBase>\n");
-
-		/*we rewrite the file*/
-		rewrite_input = 1;
-	} else {
-		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); 
-				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); 
-				}
-
-				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); 
-				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"); 
-
-			if (!dash_cfg->dash_ctx) {
-				fprintf(dash_cfg->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName); 
-			}
-		}
-
-		/*rewrite previous SegmentList entries*/
-		if ( dash_cfg->dash_ctx && ((dash_cfg->single_file_mode==2) || (!dash_cfg->single_file_mode && !dash_cfg->use_url_template))) {
-			/*rewrite previous URLs*/
-			const char *opt;
-			u32 count, i;
-			count = gf_cfg_get_key_count(dash_cfg->dash_ctx, szRepURLsSecName);
-			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);	
-			}
-		}
-
-		if (dash_cfg->single_file_mode==2) {
-
-			start = ts_seg.sidx->first_offset;
-			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
-				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
-				fprintf(dash_cfg->mpd, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"/>\n", start, start+ref->reference_size-1);
-				start += ref->reference_size;
-			}
-			rewrite_input = GF_TRUE;
-
-		} else {
-			FILE *src, *dst;
-			u64 pos, end;
-			Double current_time = cumulated_duration, dur;
-			src = gf_f64_open(dash_input->file_name, "rb");
-			start = ts_seg.sidx->first_offset;
-			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
-				char buf[NB_TSPCK_IO_BYTES];
-				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
-
-				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 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 
-				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");
-					if (!dst) {
-						fclose(src);
-						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create segment file %s\n", SegName));
-						e = GF_IO_ERR;
-						goto exit;
-					}
-
-					gf_dasher_store_segment_info(dash_cfg, SegName, current_time);
-					dur = ref->subsegment_duration;
-					dur /= 90000;
-					current_time += dur;
-
-					gf_f64_seek(src, start, SEEK_SET);
-					pos = start;
-					end = start+ref->reference_size;
-					while (pos<end) {
-						u32 res;
-						u32 to_read = NB_TSPCK_IO_BYTES;
-						if (pos+NB_TSPCK_IO_BYTES >= end) {
-							to_read = (u32) (end-pos);
-						}
-						res = (u32) fread(buf, 1, to_read, src);
-						if (res==to_read) {
-							gf_m2ts_restamp(buf, res, pcr_shift, is_pes);
-							res = (u32) fwrite(buf, 1, to_read, dst);
-						}
-						if (res!=to_read) {
-							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: IO error while Extracting segment %03d / %03d\r", i+1, ts_seg.sidx->nb_refs));
-							break;
-						}
-						pos += res;
-					}
-					fclose(dst);
-				}
-				start += ref->reference_size;
-
-				if (!dash_cfg->use_url_template) {
-					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, basename, dash_input->representationID, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-					fprintf(dash_cfg->mpd, "     <SegmentURL media=\"%s\"/>\n", SegName);
-
-					if (dash_cfg->dash_ctx) {
-						char szKey[100], szVal[4046];
-						sprintf(szKey, "UrlInfo%d", segment_index);
-						sprintf(szVal, "<SegmentURL media=\"%s\"/>", SegName);
-						gf_cfg_set_key(dash_cfg->dash_ctx, szRepURLsSecName, szKey, szVal);
-					}
-				}
-
-				segment_index++;
-				gf_set_progress("Extracting segment ", i+1, ts_seg.sidx->nb_refs);
-			}
-			fclose(src);
-			cumulated_duration = current_time;
-		}	
-		if (!dash_cfg->seg_rad_name || !dash_cfg->use_url_template) {
-			fprintf(dash_cfg->mpd, "    </SegmentList>\n");
-		}
-	}
-
-	if (rewrite_input) {
-		FILE *in, *out;
-		u64 fsize, done;
-		char buf[NB_TSPCK_IO_BYTES];
-
-		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, dash_cfg->seg_rad_name ? basename : szOutName, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
-		out = gf_f64_open(SegName, "wb");
-		if (!out) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create segment file %s\n", SegName));
-			e = GF_IO_ERR;
-			goto exit;
-		}
-		in = gf_f64_open(dash_input->file_name, "rb");
-		gf_f64_seek(in, 0, SEEK_END);
-		fsize = gf_f64_tell(in);
-		gf_f64_seek(in, 0, SEEK_SET);
-		done = 0;
-		while (1) {
-			u32 read = (u32) fread(buf, 1, NB_TSPCK_IO_BYTES, in);
-			gf_m2ts_restamp(buf, read, pcr_shift, is_pes);
-			fwrite(buf, 1, read, out);
-			done+=read;
-			gf_set_progress("Extracting segment ", done/188, fsize/188);
-			if (read<NB_TSPCK_IO_BYTES) break;
-		}
-		fclose(in);
-		fclose(out);
-	}
-
-	fprintf(dash_cfg->mpd, "   </Representation>\n");
-
-	if (dash_cfg->dash_ctx) {
-		sprintf(szOpt, "%u", bandwidth);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "Bandwidth", szOpt);
-
-		sprintf(szOpt, "%u", segment_index);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "StartIndex", szOpt);
-
-		sprintf(szOpt, "%g", ts_seg.segment_duration);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
-
-		sprintf(szOpt, LLU, next_pcr_shift + pcr_shift);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "PCR90kOffset", szOpt);
-
-		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);
-
-		sprintf(szOpt, LLU, ts_seg.PCR_DTS_initial_diff);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset", ts_seg.suspend_indexing ? szOpt : NULL);
-
-		sprintf(szOpt, "%g", cumulated_duration);
-		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
-	}
-
-	if (ts_seg.sidx && ts_seg.index_bs) {
-		gf_isom_box_size((GF_Box *)ts_seg.sidx);
-		gf_isom_box_write((GF_Box *)ts_seg.sidx, ts_seg.index_bs);
-	}
-	if (ts_seg.pcrb && ts_seg.index_bs) {
-		gf_isom_box_size((GF_Box *)ts_seg.pcrb);
-		gf_isom_box_write((GF_Box *)ts_seg.pcrb, ts_seg.index_bs);
-	}
-
-exit:
-	if (ts_seg.sidx) gf_isom_box_del((GF_Box *)ts_seg.sidx);
-	if (ts_seg.pcrb) gf_isom_box_del((GF_Box *)ts_seg.pcrb);
-	if (ts_seg.index_file) fclose(ts_seg.index_file);
-	if (ts_seg.index_bs) gf_bs_del(ts_seg.index_bs);
-	dasher_del_ts_demux(&ts_seg);
-	return e;
-}
-
-#endif //GPAC_DISABLE_MPEG2TS
-
-GF_Err gf_dash_segmenter_probe_input(GF_DashSegInput *dash_input)
-{
-	FILE *t = gf_f64_open(dash_input->file_name, "rb");
-	if (!t) return GF_URL_ERROR;
-	fclose(t);
-#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
-	if (gf_isom_probe_file(dash_input->file_name)) {
-		strcpy(dash_input->szMime, "video/mp4");
-		dash_input->dasher_create_init_segment = dasher_isom_create_init_segment;
-		dash_input->dasher_input_classify = dasher_isom_classify_input;
-		dash_input->dasher_get_components_info = dasher_isom_get_input_components_info;
-		dash_input->dasher_segment_file = dasher_isom_segment_file;
-		return GF_OK;
-	}
-#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
-
-#ifndef GPAC_DISABLE_MPEG2TS
-	if (gf_m2ts_probe_file(dash_input->file_name)) {
-		GF_TSSegmenter ts_seg;
-		u32 count = 0;
-		GF_Err e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 1);
-		if (e) return e;
-		count = gf_list_count(ts_seg.ts->programs);
-		dasher_del_ts_demux(&ts_seg);
-		if (count>1) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: MPEG-2 TS file %s has several programs - this is not supported in MPEG-DASH - skipping\n", dash_input->file_name));
-			return GF_NOT_SUPPORTED;
-		}
-
-		strcpy(dash_input->szMime, "video/mp2t");
-		/*we don't use init segments with MPEG-2 TS*/
-		dash_input->dasher_create_init_segment = NULL;
-		dash_input->dasher_input_classify = dasher_generic_classify_input;
-		dash_input->dasher_get_components_info = dasher_mp2t_get_components_info;
-		dash_input->dasher_segment_file = dasher_mp2t_segment_file;
-		return GF_OK;
-	}
-#endif
-
-	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: File %s not supported for dashing - skipping\n", dash_input->file_name));
-	return GF_NOT_SUPPORTED;
-}
-
-static GF_Err write_mpd_header(FILE *mpd, const char *mpd_name, GF_Config *dash_ctx, GF_DashProfile profile, Bool is_mpeg2, const char *title, const char *source, const char *copyright, const char *moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls, Bool dash_dynamic, u32 time_shift_depth, Double mpd_duration, Double mpd_update_period, Double min_buffer, u32 ast_shift_sec)
-{
-	u32 sec, frac;
-#ifdef _WIN32_WCE
-	SYSTEMTIME syst;
-	FILETIME filet;
-#else
-	time_t gtime;
-	struct tm *t;
-#endif
-	u32 h, m, i;
-	Double s;
-
-	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"); 
-	if (dash_dynamic) {
-		/*otherwise timeshift is infinite, use original availability start time*/
-		if ((s32)time_shift_depth<0) {
-			const char *opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
-			sscanf(opt, "%u", &sec);
-			sec += ast_shift_sec;
-		}
-#ifdef _WIN32_WCE
-
-#define TIMESPEC_TO_FILETIME_OFFSET (((LONGLONG)27111902 << 32) + (LONGLONG)3577643008)
-
-		*(LONGLONG *) &filet = (sec - GF_NTP_SEC_1900_TO_1970) * 10000000 + TIMESPEC_TO_FILETIME_OFFSET;
-
-#undef TIMESPEC_TO_FILETIME_OFFSET 
-		
-		FileTimeToSystemTime(&filet, &syst);
-		fprintf(mpd, " on %d-%02d-%02dT%02d:%02d:%02dZ", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond);
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Generating MPD at time %d-%02d-%02dT%02d:%02d:%02dZ\n", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond) );
-
-#else
-		gtime = sec - GF_NTP_SEC_1900_TO_1970;
-		t = gmtime(&gtime);
-		fprintf(mpd, " availabilityStartTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-		if (ast_shift_sec) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] MPD AvailabilityStartTime %d-%02d-%02dT%02d:%02d:%02dZ\n", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec) );
-		}
-#endif
-
-		if ((s32)time_shift_depth>=0) {
-			h = (u32) (time_shift_depth/3600);
-			m = (u32) (time_shift_depth/60 - h*60);
-			s = time_shift_depth - h*3600 - m*60;
-			fprintf(mpd, " timeShiftBufferDepth=\"PT%dH%dM%.2fS\"", h, m, s);
-		}
-		if (mpd_update_period) {
-			h = (u32) (mpd_update_period/3600);
-			m = (u32) (mpd_update_period/60 - h*60);
-			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);
-		s = mpd_duration - h*3600 - m*60;
-		fprintf(mpd, " mediaPresentationDuration=\"PT%dH%dM%.2fS\"", h, m, s);
-	}
-
-	if (profile==GF_DASH_PROFILE_LIVE) {
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011\"", is_mpeg2 ? "mp2t-simple" : "isoff-live");
-	} else if (profile==GF_DASH_PROFILE_ONDEMAND) 
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011\"");
-	else if (profile==GF_DASH_PROFILE_MAIN) 
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011\"", is_mpeg2 ? "mp2t-main" : "isoff-main");
-	else 
-		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:full:2011\"");	
-
-	fprintf(mpd, ">\n");
-
-	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", moreInfoURL ? moreInfoURL : "http://gpac.sourceforge.net");	
-	if (title) 
-		fprintf(mpd, "  <Title>%s</Title>\n", title);
-	else 
-		fprintf(mpd, "  <Title>%s generated by GPAC</Title>\n", mpd_name);
-
-	if (source) 
-		fprintf(mpd, "  <Source>%s</Source>\n", source);
-	if (copyright)
-		fprintf(mpd, "  <Copyright>%s</Copyright>\n", copyright);
-	fprintf(mpd, " </ProgramInformation>\n");
-
-	for (i=0; i<nb_mpd_base_urls; i++) {
-		fprintf(mpd, " <BaseURL>%s</BaseURL>\n", mpd_base_urls[i]);
-	}
-	fprintf(mpd, "\n");
-	return GF_OK;
-}
-
-static GF_Err write_period_header(FILE *mpd, const char *szID, Double period_start, Double period_duration, Bool dash_dynamic)
-{
-	u32 h, m;
-	Double s;
-
-	fprintf(mpd, " <Period");
-	if (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);	
-	}
-	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, ">\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)
-{
-	fprintf(mpd, "  <AdaptationSet segmentAlignment=\"true\"");
-	if (bitstream_switching_mode) {
-		fprintf(mpd, " bitstreamSwitching=\"true\"");
-	}
-	if (first_rep->group_id) {
-		fprintf(mpd, " group=\"%d\"", first_rep->group_id);
-	}
-	if (max_width && max_height) {
-		fprintf(mpd, " maxWidth=\"%d\" maxHeight=\"%d\"", max_width, max_height);
-		if (strlen(szMaxFPS))
-			fprintf(mpd, " maxFrameRate=\"%s\"", szMaxFPS);
-		gf_media_reduce_aspect_ratio(&max_width, &max_height);
-		fprintf(mpd, " par=\"%d:%d\"", max_width, max_height);
-	}
-	if (szLang && szLang[0]) {
-		fprintf(mpd, " lang=\"%s\"", szLang);
-	}
-	/*this should be fixed to use info collected during segmentation process*/
-	if (profile==GF_DASH_PROFILE_ONDEMAND) 
-		fprintf(mpd, " subsegmentStartsWithSAP=\"1\"");
-
-	if (!strcmp(first_rep->szMime, "video/mp2t"))
-		fprintf(mpd, " subsegmentAlignment=\"true\"");
-
-	fprintf(mpd, ">\n");
-	
-	if (first_rep) {
-		u32 i;
-
-		if (bitstream_switching_mode) {
-			for (i=0; i<first_rep->nb_components; i++) {
-				struct _dash_component *comp = &first_rep->components[i];
-				if (comp->media_type == GF_ISOM_MEDIA_AUDIO) {
-					fprintf(mpd, "   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", comp->channels);
-				}
-			}
-		}
-
-		/*set role*/
-		if (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")
-			) {
-				fprintf(mpd, "   <Role schemeIdUri=\"urn:mpeg:dash:role:2011\" 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];
-
-				fprintf(mpd, "   <ContentComponent id=\"%d\" ", comp->ID);
-				switch (comp->media_type ) {
-				case GF_ISOM_MEDIA_TEXT:
-					fprintf(mpd, "contentType=\"text\" ");
-					break;
-				case GF_ISOM_MEDIA_VISUAL:
-					fprintf(mpd, "contentType=\"video\" ");
-					break;
-				case GF_ISOM_MEDIA_AUDIO:
-					fprintf(mpd, "contentType=\"audio\" ");
-					break;
-				case GF_ISOM_MEDIA_SCENE:
-				case GF_ISOM_MEDIA_DIMS:
-				default:
-					fprintf(mpd, "contentType=\"application\" ");
-					break;
-				}
-				/*if lang not specified at adaptationSet level, put it here*/
-				if ((!szLang || !szLang[0]) && comp->szLang[0]) {
-					fprintf(mpd, " lang=\"%s\"", comp->szLang);
-				}
-				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");	
-		}
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_dasher_init_context(GF_Config *dash_ctx, u32 *dynamic, u32 *timeShiftBufferDepth, const char *periodID, u32 ast_shift_sec)
-{
-	const char *opt;
-	char szVal[100];
-	Bool first_run = GF_FALSE;
-	u32 sec, frac;
-#ifndef _WIN32_WCE
-	time_t gtime;
-#endif
-
-	if (!dash_ctx) return GF_BAD_PARAM;
-	
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "SessionType");
-	/*first run, init all options*/
-	if (!opt) {
-		first_run = GF_TRUE;
-		sprintf(szVal, "%d", *timeShiftBufferDepth);
-		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", (*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");
-	} 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) {
-#ifndef _WIN32_WCE
-		gtime = sec - GF_NTP_SEC_1900_TO_1970;
-		gf_cfg_set_key(dash_ctx, "DASH", "GenerationTime", asctime(gmtime(&gtime)));
-#endif
-		sprintf(szVal, "%u", sec);
-		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 {
-
-		/*check if we change period*/
-		if (periodID) {
-			opt = gf_cfg_get_key(dash_ctx, "DASH", "PeriodID");
-			if (!opt || strcmp(opt, periodID)) {
-				gf_cfg_set_key(dash_ctx, "DASH", "PeriodID", periodID);
-				gf_cfg_set_key(dash_ctx, "DASH", "PeriodSwitch", "yes");
-			}
-		}
-	}
-
-	/*perform cleanup of previous representations*/
-
-	return GF_OK;
-}
-
-GF_EXPORT
-u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time)
-{
-	Double max_dur = 0;
-	Double safety_dur;
-	Double ms_elapsed;
-	u32 i, ntp_sec, frac, prev_sec, prev_frac;
-	const char *opt, *section;
-
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "MaxSegmentDuration");
-	if (!opt) return 0;
-
-	safety_dur = atof(opt);
-	if (safety_dur > (Double) mpd_update_time)
-		safety_dur = (Double) mpd_update_time;
-
-
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
-	sscanf(opt, "%u", &prev_sec);
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTPFraction");
-	sscanf(opt, "%u", &prev_frac);
-
-	/*compute cumulated duration*/
-	for (i=0; i<gf_cfg_get_section_count(dash_ctx); i++) {
-		Double dur = 0;
-		section = gf_cfg_get_section_name(dash_ctx, i);
-		if (section && !strncmp(section, "Representation_", 15)) {
-			opt = gf_cfg_get_key(dash_ctx, section, "CumulatedDuration");
-			if (opt) dur = atof(opt);
-			if (dur>max_dur) max_dur = dur;
-		}
-	}
-
-	if (!max_dur) return 0;
-	gf_net_get_ntp(&ntp_sec, &frac);
-
-	ms_elapsed = frac;
-	ms_elapsed -= prev_frac;
-	ms_elapsed /= 0xFFFFFFFF;
-	ms_elapsed *= 1000;
-	ms_elapsed += (ntp_sec - prev_sec)*1000;
-
-	/*check if we need to generate */
-	if (ms_elapsed < (max_dur - safety_dur)*1000 ) {
-		return (u32) (1000*max_dur - ms_elapsed);
-	}
-	return 0;
-}
-
-/*peform all file cleanup*/
-static Bool gf_dasher_cleanup(GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double dash_duration, u32 ast_shift_sec)
-{
-	Double max_dur = 0;
-	Double elapsed = 0;
-	Double safety_dur = MAX(mpd_update_time, (u32) dash_duration);
-	u32 i, ntp_sec, frac, prev_sec;
-	const char *opt, *section;
-	GF_Err e;
-
-	if (!dash_dynamic) return 1;
-
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "StoreParams");
-	if (opt && !strcmp(opt, "yes")) return 1;
-
-	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
-	if (!opt) return 1;
-	sscanf(opt, "%u", &prev_sec);
-
-	/*compute cumulated duration*/
-	for (i=0; i<gf_cfg_get_section_count(dash_ctx); i++) {
-		Double dur = 0;
-		section = gf_cfg_get_section_name(dash_ctx, i);
-		if (section && !strncmp(section, "Representation_", 15)) {
-			opt = gf_cfg_get_key(dash_ctx, section, "CumulatedDuration");
-			if (opt) dur = atof(opt);
-			if (dur>max_dur) max_dur = dur;
-		}
-	}
-	if (!max_dur) return 1;
-	gf_net_get_ntp(&ntp_sec, &frac);
-
-	if (dash_dynamic==2) {
-		elapsed = (u32)-1;
-	} else {
-		elapsed = ntp_sec;
-		elapsed -= prev_sec;
-		/*check if we need to generate */
-		if (elapsed < max_dur - safety_dur ) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Asked to regenerate segments before expiration of the current segment list, please wait %g seconds - ignoring\n", max_dur + prev_sec - ntp_sec ));
-			return 0;
-		}
-		if (elapsed > max_dur) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Generating segments and MPD %g seconds too late\n", elapsed - (u32) max_dur));
-		} else {
-			/*generate as if max_dur has been reached*/
-			elapsed = max_dur;
-		}
-	}
-
-	/*cleanup old segments*/
-	if ((s32) time_shift_depth >= 0) {
-		for (i=0; i<gf_cfg_get_key_count(dash_ctx, "SegmentsStartTimes"); i++) {
-			Double seg_time;
-			Bool found=0;
-			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) 
-				break;
-
-			seg_time = atof(MPDTime);
-			seg_time += ast_shift_sec;
-			seg_time += dash_duration + time_shift_depth;
-			seg_time -= elapsed;
-			/*safety gard of one second*/
-			if (seg_time >= -1)
-				break;
-
-			if (dash_dynamic!=2) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Removing segment %s - %g sec too late\n", fileName, -seg_time));
-			}
-
-			e = gf_delete_file(fileName);
-			if (e) {
-				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Could not remove file %s: %s\n", fileName, gf_error_to_string(e) ));
-				break;
-			}
-
-			/*check all reps*/
-			for (j=0; j<gf_cfg_get_section_count(dash_ctx); j++) {
-				u32 k;
-				const char *secName = gf_cfg_get_section_name(dash_ctx, j);
-				if (!strstr(secName, "URLs_")) continue;
-				for (k=0; k<gf_cfg_get_key_count(dash_ctx, secName); k++) {
-					const char *entry = gf_cfg_get_key_name(dash_ctx, secName, k);
-					const char *name = gf_cfg_get_key(dash_ctx, secName, entry);
-					if (strstr(name, fileName)) {
-						gf_cfg_set_key(dash_ctx, secName, entry, NULL);
-						found=1;
-						break;
-					}
-				}
-				if (found) break;
-			}
-
-			gf_cfg_set_key(dash_ctx, "SegmentsStartTimes", fileName, NULL);
-			i--;
-		}
-	}
-	return 1;
-}
-
-
-/*dash segmenter*/
-GF_EXPORT
-GF_Err gf_dasher_segment_files(const char *mpdfile, GF_DashSegmenterInput *inputs, u32 nb_dash_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, 
-							   Bool 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 i, j, segment_mode;
-	char *sep, szSegName[GF_MAX_PATH], szSolvedSegName[GF_MAX_PATH], szTempMPD[GF_MAX_PATH];
-	u32 cur_adaptation_set;
-	u32 max_adaptation_set = 0;
-	u32 cur_period;
-	u32 max_period = 0;
-	u32 cur_group_id = 0;
-	u32 max_sap_type = 0;
-	Bool none_supported = GF_TRUE;
-	Bool has_mpeg2 = GF_FALSE;
-	Bool has_role = GF_FALSE;
-	Double presentation_duration = 0;
-	GF_Err e = GF_OK;
-	FILE *mpd = NULL;
-	GF_DashSegInput *dash_inputs;
-	GF_DASHSegmenterOptions dash_opts;
-
-	/*init dash context if needed*/
-	if (dash_ctx) {
-
-		e = gf_dasher_init_context(dash_ctx, &dash_dynamic, &time_shift_depth, NULL, ast_shift_sec);
-		if (e) return e;
-		if (dash_ctx) {
-			Bool regenerate;
-			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;
-				}
-*/
-				dash_duration = seg_dur;
-			} else {
-				char sOpt[100];
-				sprintf(sOpt, "%f", dash_duration);
-				gf_cfg_set_key(dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
-			}
-
-			/*peform all file cleanup*/
-			regenerate = gf_dasher_cleanup(dash_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_duration, ast_shift_sec);
-			if (!regenerate) return GF_OK;
-		}
-	}
-
-	/*copy over input files to our internal structure*/
-	max_period = 0;
-	dash_inputs = gf_malloc(sizeof(GF_DashSegInput)*nb_dash_inputs);
-	memset(dash_inputs, 0, sizeof(GF_DashSegInput)*nb_dash_inputs);
-	for (i=0; i<nb_dash_inputs; i++) {
-		dash_inputs[i].file_name = inputs[i].file_name;
-		strcpy(dash_inputs[i].representationID, inputs[i].representationID);
-		strcpy(dash_inputs[i].periodID, inputs[i].periodID);
-		strcpy(dash_inputs[i].role, inputs[i].role);
-		dash_inputs[i].bandwidth = inputs[i].bandwidth;
-
-		if (strlen(inputs[i].role) && strcmp(inputs[i].role, "main"))
-			has_role = 1;
-
-		if (!strlen(dash_inputs[i].periodID)) {
-			max_period = 1;
-			dash_inputs[i].period = 1;
-			if (dash_dynamic) {
-				strcpy(dash_inputs[i].periodID, "GENID_DEF");
-			}
-		}
-		e = gf_dash_segmenter_probe_input(&dash_inputs[i]);
-		if (e) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Cannot open file %s for dashing: %s\n", dash_inputs[i].file_name, gf_error_to_string(e) ));
-		}
-
-		if (!strcmp(dash_inputs[i].szMime, "video/mp2t")) has_mpeg2 = 1;
- 	}
-	memset(&dash_opts, 0, sizeof(GF_DASHSegmenterOptions));
-
-	/*set all default roles to main if needed*/
-	if (has_role) {
-		for (i=0; i<nb_dash_inputs; i++) {
-			if (!strlen(dash_inputs[i].role))
-				strcpy(dash_inputs[i].role, "main");
-		}
-	}
-
-	for (i=0; i<nb_dash_inputs; i++) {
-		if (dash_inputs[i].period) 
-			continue;
-		if (strlen(dash_inputs[i].periodID)) {
-			max_period++;
-			dash_inputs[i].period = max_period;
-
-			for (j=i+1; j<nb_dash_inputs; j++) {
-				if (!strcmp(dash_inputs[j].periodID, dash_inputs[i].periodID))
-					dash_inputs[j].period = dash_inputs[i].period;
-			}
-		}
-	}
-	if (dash_dynamic && max_period>1) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Multiple periods in live mode not supported\n"));
-		e = GF_NOT_SUPPORTED;
-		goto exit;
-	}
-
-	for (cur_period=0; cur_period<max_period; cur_period++) {
-		/*classify all input in possible adaptation sets*/
-		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;
-
-			/*we cannot fragment the input file*/
-			if (!dash_inputs[i].dasher_input_classify || !dash_inputs[i].dasher_segment_file) {
-				continue;
-			}
-
-			max_adaptation_set ++;
-			dash_inputs[i].adaptation_set = max_adaptation_set;
-			dash_inputs[i].nb_rep_in_adaptation_set = 1;
-
-			e = dash_inputs[i].dasher_input_classify(dash_inputs, nb_dash_inputs, i, &cur_group_id, &max_sap_type);
-			if (e) goto exit;
-			none_supported = 0;
-		}
-		if (none_supported) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: None of the input types are supported for DASHing - nothing to do ...\n"));
-			e = GF_OK;
-			goto exit;
-		}
-	}
-
-	/*check requested profiles can be generated, or adjust them*/
-	if (max_sap_type>=3) {
-		if (dash_profile) {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! Max SAP type %d detected\n\tswitching to FULL profile\n", max_sap_type));
-		}
-		dash_profile = 0;
-	}
-	if ((dash_profile==GF_DASH_PROFILE_LIVE) && !seg_name) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n"));
-		seg_name = "%s_dash";
-	}
-
-	/*if output id not in the current working dir, concatenate output path to segment name*/
-	szSegName[0] = 0;
-	if (seg_name) {
-		if (gf_url_get_resource_path(mpdfile, szSegName)) {
-			strcat(szSegName, seg_name);
-			seg_name = szSegName;
-		}
-	}
-
-	/*adjust params based on profiles*/
-	switch (dash_profile) {
-	case GF_DASH_PROFILE_LIVE:
-		seg_at_rap = 1;
-		use_url_template = 1;
-		single_segment = single_file = 0;
-		break;
-	case GF_DASH_PROFILE_ONDEMAND:
-		seg_at_rap = 1;
-		single_segment = 1;
-		/*BS switching is meaningless in onDemand profile*/
-		bitstream_switching = GF_DASH_BSMODE_NONE;
-		use_url_template = single_file = 0;
-		break;
-	case GF_DASH_PROFILE_MAIN:
-		seg_at_rap = 1;
-		single_segment = 0;
-		break;
-	default:
-		break;
-	}
-
-	segment_mode = single_segment ? 1 : (single_file ? 2 : 0);
-
-	if (single_segment) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s - single segment\nSubsegment duration %.3f - Fragment duration: %.3f secs\n", (nb_dash_inputs>1) ? "s" : "", dash_duration, frag_duration));
-		subsegs_per_sidx = 0;
-	} else {
-		if (!seg_ext) seg_ext = "m4s";
-
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s: %.2fs segments %.2fs fragments ", (nb_dash_inputs>1) ? "s" : "", dash_duration, frag_duration));
-		if (subsegs_per_sidx<0) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("no sidx used"));
-		} else if (subsegs_per_sidx) {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("%d subsegments per sidx", subsegs_per_sidx));
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("single sidx per segment"));
-		}
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
-	}
-	if (frag_at_rap) seg_at_rap = 1;
-
-	if (seg_at_rap) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Spliting segments %sat GOP boundaries\n", frag_at_rap ? "and fragments " : ""));
-	}
-
-	dash_opts.mpd_name = mpdfile;
-	dash_opts.segments_start_with_rap = seg_at_rap;
-	dash_opts.seg_ext = seg_ext;
-	dash_opts.daisy_chain_sidx = daisy_chain_sidx;
-	dash_opts.subsegs_per_sidx = subsegs_per_sidx;
-	dash_opts.use_url_template = use_url_template;
-	dash_opts.use_segment_timeline = use_segment_timeline;
-	dash_opts.single_file_mode = segment_mode;
-	dash_opts.fragments_start_with_rap = frag_at_rap;
-	dash_opts.dash_scale = dash_scale ? dash_scale : 1000;
-	dash_opts.tmpdir = tmpdir;
-	dash_opts.dash_ctx = dash_ctx;
-	dash_opts.time_shift_depth = (s32) time_shift_depth;
-	dash_opts.segment_marker_4cc = segment_marker_4cc;
-	dash_opts.inband_param_set = ((bitstream_switching == GF_DASH_BSMODE_INBAND) || (bitstream_switching == GF_DASH_BSMODE_SINGLE) ) ? 1 : 0;
-	dash_opts.memory_mode = fragments_in_memory;
-
-	dash_opts.segment_duration = dash_duration * 1000 / dash_scale;
-	dash_opts.subduration = subduration * 1000 / dash_scale;
-	dash_opts.fragment_duration = frag_duration * 1000 / dash_scale;
-
-	for (cur_period=0; cur_period<max_period; cur_period++) {
-		u32 first_in_period = 0;
-		Double period_duration=0;
-		for (i=0; i<nb_dash_inputs; i++) {
-			/*this file does not belongs to any adaptation set*/
-			if (dash_inputs[i].period != cur_period+1) continue;
-
-			/*this file does not belongs to any adaptation set*/
-			if (!dash_inputs[i].adaptation_set) continue;
-
-			if (!first_in_period) {
-				first_in_period = i+1;
-			}
-
-			if (dash_inputs[i].dasher_get_components_info) {
-				e = dash_inputs[i].dasher_get_components_info(&dash_inputs[i], &dash_opts);
-				if (e) goto exit;
-			}
-			if (dash_inputs[i].duration > period_duration)
-				period_duration = dash_inputs[i].duration;
-		}
-		if (first_in_period)
-			dash_inputs[first_in_period-1].period_duration = period_duration;
-
-		presentation_duration += period_duration;
-	}
-
-	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));
-		e = GF_IO_ERR;
-		goto exit;
-	}
-
-	dash_opts.mpd = mpd;
-
-	e = write_mpd_header(mpd, mpdfile, dash_ctx, dash_profile, has_mpeg2, mpd_title, mpd_source, mpd_copyright, mpd_moreInfoURL, (const char **) mpd_base_urls, nb_mpd_base_urls, dash_dynamic, time_shift_depth, presentation_duration, mpd_update_time, min_buffer, ast_shift_sec);
-	if (e) goto exit;
-
-	for (cur_period=0; cur_period<max_period; cur_period++) {
-		Double period_duration = 0;
-		const char *id=NULL;
-		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
-		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;
-				id = dash_inputs[i].periodID;
-				break;
-			}
-		}
-		e = write_period_header(mpd, id, 0.0, period_duration, dash_dynamic);
-		if (e) goto exit;
-
-		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
-		for (cur_adaptation_set=0; cur_adaptation_set < max_adaptation_set; cur_adaptation_set++) {
-			char szInit[GF_MAX_PATH], tmp[GF_MAX_PATH];
-			u32 first_rep_in_set=0;
-			u32 max_width = 0;
-			u32 max_height = 0;
-			u32 fps_num = 0;
-			u32 fps_denum = 0;
-			Bool use_bs_switching = bitstream_switching ? 1 : 0;
-			char szLang[4];
-			char szFPS[100];
-			Bool is_first_rep=0;
-			Bool skip_init_segment_creation = 0;
-
-			while (dash_inputs[first_rep_in_set].adaptation_set!=cur_adaptation_set+1)
-				first_rep_in_set++;
-
-			/*not in our period*/
-			if (dash_inputs[first_rep_in_set].period != cur_period+1)
-				continue;
-
-			strcpy(tmp, mpdfile);
-			sep = strrchr(tmp, '.');
-			if (sep) sep[0] = 0;
-
-			if (max_adaptation_set==1) {
-				strcpy(szInit, tmp);
-				strcat(szInit, "_init.mp4");
-			} else {
-				sprintf(szInit, "%s_set%d_init.mp4", tmp, cur_adaptation_set+1);
-			}
-			/*unless asked to do BS switching on single rep, don't do it ...*/
-			if ((bitstream_switching < GF_DASH_BSMODE_SINGLE) && dash_inputs[first_rep_in_set].nb_rep_in_adaptation_set==1)
-				use_bs_switching = 0;
-
-			if (! use_bs_switching) {
-				skip_init_segment_creation = 1;
-			}
-			else if (! dash_inputs[first_rep_in_set].dasher_create_init_segment) {
-				skip_init_segment_creation = 1;
-				strcpy(szInit, "");
-			}
-			/*if we already wrote the InitializationSegment, get rid of it (no overwrite) and let the dashing routine open it*/
-			else if (dash_ctx) {
-				char RepSecName[GF_MAX_PATH];
-				const char *init_seg_name;
-				sprintf(RepSecName, "Representation_%s", dash_inputs[first_rep_in_set].representationID);
-				if ((init_seg_name = gf_cfg_get_key(dash_ctx, RepSecName, "InitializationSegment")) != NULL) {
-					skip_init_segment_creation = 1;
-				}
-			}
-
-			if (!skip_init_segment_creation) {
-				Bool disable_bs_switching = 0;
-				e = dash_inputs[first_rep_in_set].dasher_create_init_segment(dash_inputs, nb_dash_inputs, cur_adaptation_set+1, szInit, tmpdir, dash_opts.inband_param_set, (dash_opts.single_file_mode==1) ? 1 : 0, &disable_bs_switching);
-				if (e) goto exit;
-				if (disable_bs_switching)
-					use_bs_switching = 0;
-			}
-
-			dash_opts.bs_switch_segment_file = use_bs_switching ? szInit : NULL;
-			dash_opts.use_url_template = seg_name ? use_url_template : 0;
-
-			szFPS[0] = 0;
-			szLang[0] = 0;
-			/*compute some max defaults*/
-			for (i=0; i<nb_dash_inputs && !e; i++) {
-
-				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
-					continue;
-
-				for (j=0; j<dash_inputs[i].nb_components; j++) {
-					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) 
-						max_height = dash_inputs[i].components[j].height;
-
-					if (! fps_num || !fps_denum) {
-						fps_num = dash_inputs[i].components[j].fps_num;
-						fps_denum = dash_inputs[i].components[j].fps_denum;
-					}
-					else if (fps_num * dash_inputs[i].components[j].fps_denum < dash_inputs[i].components[j].fps_num * fps_denum) {
-						fps_num = dash_inputs[i].components[j].fps_num;
-						fps_denum = dash_inputs[i].components[j].fps_denum;
-					}
-				}
-			}
-
-			if (max_width && max_height) {
-				gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
-				if (fps_denum>1) 
-					sprintf(szFPS, "%d/%d", fps_num, fps_denum);
-				else if (fps_num)
-					sprintf(szFPS, "%d", fps_num);
-			}
-
-			e = write_adaptation_header(mpd, dash_profile, use_url_template, segment_mode, &dash_inputs[first_rep_in_set], use_bs_switching, max_width, max_height, szFPS, szLang, szInit);
-			if (e) goto exit;
-
-			is_first_rep = 1;
-			for (i=0; i<nb_dash_inputs && !e; i++) {
-				char szOutName[GF_MAX_PATH], *segment_name;
-
-				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
-					continue;
-
-				segment_name = seg_name;
-
-				strcpy(szOutName, gf_url_get_resource_name(dash_inputs[i].file_name));
-				sep = strrchr(szOutName, '.');
-				if (sep) sep[0] = 0;
-
-				dash_opts.variable_seg_rad_name = 0;
-				if (seg_name) {
-					if (strstr(seg_name, "%s")) {
-						sprintf(szSolvedSegName, seg_name, szOutName);
-						dash_opts.variable_seg_rad_name = 1;
-					} else {
-						strcpy(szSolvedSegName, seg_name);
-					}
-					segment_name = szSolvedSegName;
-				}
-				strcat(szOutName, "_dash");
-
-				if (gf_url_get_resource_path(mpdfile, tmp)) {
-					strcat(tmp, szOutName);
-					strcpy(szOutName, tmp);
-				}
-				dash_opts.seg_rad_name = segment_name;
-
-				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHing file %s\n", dash_inputs[i].file_name));
-				e = dash_inputs[i].dasher_segment_file(&dash_inputs[i], szOutName, &dash_opts, is_first_rep);
-
-				if (e) {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while DASH-ing file: %s\n", gf_error_to_string(e)));
-					goto exit;
-				}
-				is_first_rep = 0;
-			}
-			/*close adaptation set*/
-			fprintf(mpd, "  </AdaptationSet>\n");
-		}
-
-		fprintf(mpd, " </Period>\n");
-	}
-	fprintf(mpd, "</MPD>");
-
-exit:
-	if (mpd) {
-		fclose(mpd);
-		if (!e && dash_dynamic)
-			gf_move_file(szTempMPD, mpdfile);
-	}
-	gf_free(dash_inputs);
-	return e;
-}
-
-
-
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jean Le Feuvre , Cyril Concolato
+ *			Copyright (c) Telecom ParisTech 2000-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / Media Tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/internal/media_dev.h>
+#include <gpac/constants.h>
+#include <gpac/mpegts.h>
+#include <gpac/config_file.h>
+#include <gpac/network.h>
+#ifdef _WIN32_WCE
+#include <winbase.h>
+#else
+#include <time.h>
+#endif
+#include <gpac/internal/isomedia_dev.h>
+
+#ifdef GPAC_DISABLE_ISOM
+/*we should need a better way to work with sidx when no isom is defined*/
+#define GPAC_DISABLE_MPEG2TS
+#endif
+
+
+typedef struct _dash_segment_input GF_DashSegInput;
+
+struct _dash_component
+{
+	u32 ID;/*audio/video/text/ ...*/
+	u32 media_type;/*audio/video/text/ ...*/
+	char szCodec[50];
+	/*for video */
+	u32 width, height, fps_num, fps_denum, sar_num, sar_denum, max_sap;
+
+	/*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];
+};	
+
+typedef struct
+{
+	Double segment_duration;
+	Double subduration;
+	Double fragment_duration;
+
+	u32 dash_scale;
+
+	Bool segments_start_with_rap;
+	FILE *mpd;
+	const char *mpd_name, *seg_rad_name, *seg_ext;
+	s32 subsegs_per_sidx;
+	Bool daisy_chain_sidx;
+	u32 use_url_template;
+	Bool use_segment_timeline;
+	u32 single_file_mode;
+	u32 segment_marker_4cc;
+	s32 time_shift_depth;
+	const char *bs_switch_segment_file;
+	Bool inband_param_set;
+
+	/*set if seg_rad_name depends on input file name (had %s in it). In this case, SegmentTemplate cannot be used at adaptation set level*/
+	Bool variable_seg_rad_name;
+
+	Bool fragments_start_with_rap;
+	Bool memory_mode;
+	Bool pssh_moof;
+
+	GF_Config *dash_ctx;
+	const char *tmpdir;
+	u32 initial_moof_sn;
+	u64 initial_tfdt;
+	Bool no_fragments_defaults;
+	Bool samplegroups_in_traf;
+} GF_DASHSegmenterOptions;
+
+struct _dash_segment_input
+{
+	char *file_name;
+	char representationID[100];
+	char periodID[100];
+	char xlink[100];
+	char role[100];
+	u32 bandwidth;
+	u32 dependency_bandwidth;
+	char dependencyID[100];
+
+	/*if 0, input is disabled*/
+	u32 adaptation_set;
+	/*if 0, input is disabled*/
+	u32 period;
+	u32 group_id;
+	/*only set for the first representation in the AdaptationSet*/
+	u32 nb_rep_in_adaptation_set;
+	Double period_duration;
+
+	/*media-format specific functions*/
+	/*assigns the different media to the same adaptation set or group than the input_idx one*/
+	GF_Err (* dasher_input_classify) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type);
+	GF_Err ( *dasher_get_components_info) (GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *opts);
+	GF_Err ( *dasher_create_init_segment) (GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenterOptions *dash_opts, Bool *disable_bs_switching);
+	GF_Err ( *dasher_segment_file) (GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *opts, Bool first_in_set);
+
+	/*shall be set after call to dasher_input_classify*/
+	char szMime[50];
+
+	u32 single_track_num;
+	//information for scalability
+	u32 trackNum, lower_layer_track, nb_representations, idx_representations;
+	//increase sequence number between consecutive segments by this amount (for scalable reps)
+	u32 moof_seqnum_increase;
+	
+	u32 protection_scheme_type;
+
+	/*all these shall be set after call to dasher_get_components_info*/
+	Double duration;
+	struct _dash_component components[20];
+	u32 nb_components;
+};
+
+
+
+#define EXTRACT_FORMAT(_nb_chars)	\
+			strcpy(szFmt, "%d");	\
+			char_template+=_nb_chars;	\
+			if (seg_rad_name[char_template]=='%') {	\
+				char *sep = strchr(seg_rad_name+char_template, '$');	\
+				if (sep) {	\
+					sep[0] = 0;	\
+					strcpy(szFmt, seg_rad_name+char_template);	\
+					char_template += (u32) strlen(seg_rad_name+char_template);	\
+					sep[0] = '$';	\
+				}	\
+			}	\
+			char_template+=1;	\
+
+GF_EXPORT
+GF_Err gf_media_mpd_format_segment_name(GF_DashTemplateSegmentType seg_type, Bool is_bs_switching, char *segment_name, const char *output_file_name, const char *rep_id, const char *seg_rad_name, const char *seg_ext, u64 start_time, u32 bandwidth, u32 segment_number, Bool use_segment_timeline)
+{
+	char szFmt[20];
+	Bool has_number= GF_FALSE;
+	Bool is_index = (seg_type==GF_DASH_TEMPLATE_REPINDEX) ? GF_TRUE : GF_FALSE;
+	Bool is_init = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION) ? GF_TRUE : GF_FALSE;
+	Bool is_template = (seg_type==GF_DASH_TEMPLATE_TEMPLATE) ? GF_TRUE : GF_FALSE;
+	Bool is_init_template = (seg_type==GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE) ? GF_TRUE : GF_FALSE;
+	Bool needs_init=((is_init || is_init_template) && !is_bs_switching) ? GF_TRUE : GF_FALSE;
+	u32 char_template = 0;
+	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$"))) 
+		needs_init = GF_FALSE;
+	
+	if (!seg_rad_name) {
+		strcpy(segment_name, output_file_name);
+	} else {
+
+		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))
+			) {
+				char_template+=18;
+				strcat(segment_name, rep_id);
+				needs_init=GF_FALSE;
+			}
+			else if (!is_template && !is_init_template && !strnicmp(& seg_rad_name[char_template], "$Bandwidth", 10)) {
+				EXTRACT_FORMAT(10);
+
+				sprintf(tmp, szFmt, bandwidth);
+				strcat(segment_name, tmp);
+				needs_init=GF_FALSE;
+			}
+			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Time", 5)) {
+				EXTRACT_FORMAT(5);
+				if (is_init || is_init_template) continue;
+				/*replace %d to LLD*/
+				szFmt[strlen(szFmt)-1]=0;
+				strcat(szFmt, &LLD[1]);
+				sprintf(tmp, szFmt, start_time);
+				strcat(segment_name, tmp);
+				has_number=1;
+			}
+			else if (!is_template && !strnicmp(& seg_rad_name[char_template], "$Number", 7)) {
+				EXTRACT_FORMAT(7);
+
+				if (is_init || is_init_template) continue;
+				sprintf(tmp, szFmt, segment_number);
+				strcat(segment_name, tmp);
+				has_number=GF_TRUE;
+			}
+			else if (!strnicmp(& seg_rad_name[char_template], "$Init=", 6)) {
+				char *sep = strchr(seg_rad_name + char_template+6, '$');
+				if (sep) sep[0] = 0;
+				if (is_init || is_init_template) {
+					strcat(segment_name, seg_rad_name + char_template+6);
+					needs_init=GF_FALSE;
+				}
+				char_template += (u32) strlen(seg_rad_name + char_template)+1;
+				if (sep) sep[0] = '$';
+			}
+			else if (!strnicmp(& seg_rad_name[char_template], "$Index=", 7)) {
+				char *sep = strchr(seg_rad_name + char_template+7, '$');
+				if (sep) sep[0] = 0;
+				if (is_index) {
+					strcat(segment_name, seg_rad_name + char_template+6);
+					needs_init=GF_FALSE;
+				}
+				char_template += (u32) strlen(seg_rad_name + char_template)+1;
+				if (sep) sep[0] = '$';
+			}
+			
+			else {
+				char_template+=1;
+				sprintf(tmp, "%c", c);
+				strcat(segment_name, tmp);
+			}
+		}
+	}
+
+	if (is_template && ! use_segment_timeline && !strstr(seg_rad_name, "$Number"))
+		strcat(segment_name, "$Number$");
+
+	if (needs_init)
+		strcat(segment_name, "init");
+
+	if (!is_init && !is_template && !is_init_template && !is_index && !has_number) {
+		sprintf(tmp, "%d", segment_number);
+		strcat(segment_name, tmp);
+	}
+	if (seg_ext) {
+		strcat(segment_name, ".");
+		strcat(segment_name, seg_ext);
+	}
+	return GF_OK;
+}
+
+GF_Err gf_dasher_store_segment_info(GF_DASHSegmenterOptions *dash_cfg, const char *SegmentName, Double segStartTime)
+{
+	char szKey[512];
+	if (!dash_cfg->dash_ctx) return GF_OK;
+
+	sprintf(szKey, "%g", segStartTime);
+	return gf_cfg_set_key(dash_cfg->dash_ctx, "SegmentsStartTimes", SegmentName, szKey);
+}
+
+
+#ifndef GPAC_DISABLE_ISOM
+
+GF_Err gf_media_get_rfc_6381_codec_name(GF_ISOFile *movie, u32 track, char *szCodec)
+{
+	GF_ESD *esd;
+	GF_AVCConfig *avcc;
+#ifndef GPAC_DISABLE_HEVC
+	GF_HEVCConfig *hvcc;
+#endif
+
+	u32 subtype = gf_isom_get_media_subtype(movie, track, 1);
+
+	if (subtype==GF_ISOM_SUBTYPE_MPEG4_CRYP) {
+		GF_Err e;
+		u32 originalFormat=0;
+		if (gf_isom_is_ismacryp_media(movie, track, 1)) {
+			e = gf_isom_get_ismacryp_info(movie, track, 1, &originalFormat, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		} else if (gf_isom_is_omadrm_media(movie, track, 1)) {
+			e = gf_isom_get_omadrm_info(movie, track, 1, &originalFormat, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		} else if(gf_isom_is_cenc_media(movie, track, 1)) {
+			e = gf_isom_get_cenc_info(movie, track, 1, &originalFormat, NULL, NULL, NULL);
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISOM Tools] Unkown protection scheme type %s\n", gf_4cc_to_str( gf_isom_is_media_encrypted(movie, track, 1)) ));
+			e = gf_isom_get_original_format_type(movie, track, 1, &originalFormat);
+		}
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOM Tools] Error fecthing protection information\n"));
+			return e;
+		}
+
+		if (originalFormat) subtype = originalFormat;
+	}
+
+	switch (subtype) {
+	case GF_ISOM_SUBTYPE_MPEG4:
+		esd = gf_isom_get_esd(movie, track, 1);
+		switch (esd->decoderConfig->streamType) {
+		case GF_STREAM_AUDIO:
+			if (esd->decoderConfig->decoderSpecificInfo && esd->decoderConfig->decoderSpecificInfo->data) {
+				/*5 first bits of AAC config*/
+				u8 audio_object_type = (esd->decoderConfig->decoderSpecificInfo->data[0] & 0xF8) >> 3;
+				sprintf(szCodec, "mp4a.%02x.%01d", esd->decoderConfig->objectTypeIndication, audio_object_type);
+			} else {
+				sprintf(szCodec, "mp4a.%02x", esd->decoderConfig->objectTypeIndication);
+			}
+			break;
+		case GF_STREAM_VISUAL:
+#ifndef GPAC_DISABLE_AV_PARSERS
+			if (esd->decoderConfig->decoderSpecificInfo) {
+				GF_M4VDecSpecInfo dsi;
+				gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
+				sprintf(szCodec, "mp4v.%02x.%01x", esd->decoderConfig->objectTypeIndication, dsi.VideoPL);
+			} else
+#endif
+			{
+				sprintf(szCodec, "mp4v.%02x", esd->decoderConfig->objectTypeIndication);
+			}
+			break;
+		default:
+			sprintf(szCodec, "mp4s.%02x", esd->decoderConfig->objectTypeIndication);
+			break;
+		}
+		gf_odf_desc_del((GF_Descriptor *)esd);
+		return GF_OK;
+
+	case GF_ISOM_SUBTYPE_AVC_H264:
+	case GF_ISOM_SUBTYPE_AVC2_H264:
+	case GF_ISOM_SUBTYPE_AVC3_H264:
+	case GF_ISOM_SUBTYPE_AVC4_H264:
+		avcc = gf_isom_avc_config_get(movie, track, 1);
+		sprintf(szCodec, "%s.%02x%02x%02x", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+		gf_odf_avc_cfg_del(avcc);
+		return GF_OK;
+	case GF_ISOM_SUBTYPE_SVC_H264:
+		avcc = gf_isom_svc_config_get(movie, track, 1);
+		sprintf(szCodec, "%s.%02x%02x%02x", gf_4cc_to_str(subtype), avcc->AVCProfileIndication, avcc->profile_compatibility, avcc->AVCLevelIndication);
+		gf_odf_avc_cfg_del(avcc);
+		return GF_OK;
+#ifndef GPAC_DISABLE_HEVC
+	case GF_4CC('h','v','c','1'):
+	case GF_4CC('h','e','v','1'):
+		hvcc = gf_isom_hevc_config_get(movie, track, 1);
+		if (hvcc) {
+			u8 c;
+			char szTemp[40];
+			sprintf(szCodec, "%s.", gf_4cc_to_str(subtype));
+			if (hvcc->profile_space==1) strcat(szCodec, "A");
+			else if (hvcc->profile_space==2) strcat(szCodec, "B");
+			else if (hvcc->profile_space==3) strcat(szCodec, "C");
+			//profile idc encoded as a decimal number
+			sprintf(szTemp, "%d", hvcc->profile_idc);
+			strcat(szCodec, szTemp);
+			//general profile compatibility flags: hexa, bit-reversed 
+			{
+				u32 val = hvcc->general_profile_compatibility_flags;
+				u32 i, res = 0;
+				for (i=0; i<32; i++) {
+					res |= val & 1;
+					res <<= 1;
+					val >>=1;
+				}
+				sprintf(szTemp, ".%x", res);
+				strcat(szCodec, szTemp);
+			}
+
+			if (hvcc->tier_flag) strcat(szCodec, ".H");
+			else strcat(szCodec, ".L");
+			sprintf(szTemp, "%d", hvcc->level_idc);
+			strcat(szCodec, szTemp);
+
+			c = hvcc->progressive_source_flag << 7;
+			c |= hvcc->interlaced_source_flag << 6;
+			c |= hvcc->non_packed_constraint_flag << 5;
+			c |= hvcc->frame_only_constraint_flag << 4;
+			c |= (hvcc->constraint_indicator_flags >> 40);
+			sprintf(szTemp, ".%x", c);
+			strcat(szCodec, szTemp);
+			if (hvcc->constraint_indicator_flags & 0xFFFFFFFF) {
+				c = (hvcc->constraint_indicator_flags >> 32) & 0xFF;
+				sprintf(szTemp, ".%x", c);
+				strcat(szCodec, szTemp);
+				if (hvcc->constraint_indicator_flags & 0x00FFFFFF) {
+					c = (hvcc->constraint_indicator_flags >> 24) & 0xFF;
+					sprintf(szTemp, ".%x", c);
+					strcat(szCodec, szTemp);
+					if (hvcc->constraint_indicator_flags & 0x0000FFFF) {
+						c = (hvcc->constraint_indicator_flags >> 16) & 0xFF;
+						sprintf(szTemp, ".%x", c);
+						strcat(szCodec, szTemp);
+						if (hvcc->constraint_indicator_flags & 0x000000FF) {
+							c = (hvcc->constraint_indicator_flags >> 8) & 0xFF;
+							sprintf(szTemp, ".%x", c);
+							strcat(szCodec, szTemp);
+							c = (hvcc->constraint_indicator_flags ) & 0xFF;
+							sprintf(szTemp, ".%x", c);
+							strcat(szCodec, szTemp);
+						}
+					}
+				}
+			}
+		
+			gf_odf_hevc_cfg_del(hvcc);
+		} else {
+			sprintf(szCodec, "%s", gf_4cc_to_str(subtype));
+		}
+		return GF_OK;
+#endif
+
+	default:
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[ISOM Tools] codec parameters not known - setting codecs string to default value \"%s\"\n", gf_4cc_to_str(subtype) ));
+		sprintf(szCodec, "%s", gf_4cc_to_str(subtype));
+		return GF_OK;
+	}
+	return GF_OK;
+}
+
+#endif //GPAC_DISABLE_ISOM
+
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+
+typedef struct
+{
+	Bool is_ref_track;
+	Bool done;
+	u32 TrackID;
+	u32 SampleNum, SampleCount;
+	u64 FragmentLength;
+	u32 OriginalTrack;
+	u32 finalSampleDescriptionIndex;
+	u32 TimeScale, MediaType, DefaultDuration, InitialTSOffset;
+	u64 last_sample_cts, next_sample_dts;
+	Bool all_sample_raps, splitable;
+	u32 split_sample_dts_shift;
+	s32 media_time_to_pres_time_shift;
+} GF_ISOMTrackFragmenter;
+
+static u64 isom_get_next_sap_time(GF_ISOFile *input, u32 track, u32 sample_count, u32 sample_num)
+{
+	GF_ISOSample *samp;
+	u64 time;
+	Bool is_rap, has_roll;
+	u32 i, found_sample = 0;
+	for (i=sample_num; i<=sample_count; i++) {
+		if (gf_isom_get_sample_sync(input, track, i)) {
+			found_sample = i;
+			break;
+		}
+		gf_isom_get_sample_rap_roll_info(input, track, i, &is_rap, &has_roll, NULL);
+		if (is_rap || has_roll) {
+			found_sample = i;
+			break;
+		}
+	}
+	if (!found_sample) return 0;
+	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_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;
+	u32 i, TrackNum, descIndex, j, count, nb_sync, ref_track_id, nb_tracks_done;
+	u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess, nb_samp, nb_done;
+	u32 nb_video, nb_audio, nb_text, nb_scene, mpd_timescale;
+	u8 defaultPadding;
+	u16 defaultDegradationPriority;
+	GF_Err e;
+	char sOpt[100], sKey[100];
+	char szCodecs[200], szCodec[100];
+	u32 cur_seg, fragment_index, max_sap_type;
+	GF_ISOFile *output, *bs_switch_segment;
+	GF_ISOSample *sample, *next;
+	GF_List *fragmenters;
+	u64 MaxFragmentDuration, MaxSegmentDuration, SegmentDuration, maxFragDurationOverSegment;
+	u32 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 index_start_range, index_end_range;
+	Bool force_switch_segment = GF_FALSE;
+	Bool switch_segment = GF_FALSE;
+	Bool split_seg_at_rap = dash_cfg->segments_start_with_rap;
+	Bool split_at_rap = GF_FALSE;
+	Bool has_rap = GF_FALSE;
+	Bool next_sample_rap = GF_FALSE;
+	Bool flush_all_samples = GF_FALSE;
+	Bool simulation_pass = GF_FALSE;
+	Bool init_segment_deleted = GF_FALSE;
+	Bool first_segment_in_timeline = GF_TRUE;
+	u64 previous_segment_duration = 0;
+	u32 segment_timeline_repeat_count = 0;
+	//u64 last_ref_cts = 0;
+	u64 start_range, end_range, file_size, init_seg_size, ref_track_first_dts, ref_track_next_cts;
+	u32 tfref_timescale = 0;
+	u32 bandwidth = 0;
+	GF_ISOMTrackFragmenter *tf, *tfref;
+	GF_BitStream *mpd_bs = NULL;
+	GF_BitStream *mpd_timeline_bs = NULL;
+	char szMPDTempLine[2048];
+	char SegmentName[GF_MAX_PATH];
+	char RepSecName[200];
+	char RepURLsSecName[200];
+	const char *opt;
+	Double max_track_duration = 0;
+	Bool bs_switching_is_output = GF_FALSE;
+	Bool store_dash_params = GF_FALSE;
+	Bool dash_moov_setup = GF_FALSE;
+	Bool segments_start_with_sap = GF_TRUE;
+	Bool first_sample_in_segment = GF_FALSE;
+	u32 *segments_info = NULL;
+	u32 nb_segments_info = 0;
+	u32 protected_track = 0;
+	Bool audio_only = GF_TRUE;
+	Bool is_bs_switching = GF_FALSE;
+	Bool use_url_template = dash_cfg->use_url_template;
+	const char *seg_rad_name = dash_cfg->seg_rad_name;
+	const char *seg_ext = dash_cfg->seg_ext;
+	const char *bs_switching_segment_name = NULL;
+
+	SegmentName[0] = 0;
+	SegmentDuration = 0;
+	nb_samp = 0;
+	fragmenters = NULL;
+	if (!seg_ext) seg_ext = "m4s";
+
+	bs_switch_segment = NULL;
+	if (dash_cfg->bs_switch_segment_file) {
+		bs_switch_segment = gf_isom_open(dash_cfg->bs_switch_segment_file, GF_ISOM_OPEN_READ, NULL);
+		if (bs_switch_segment) {
+			bs_switching_segment_name = gf_url_get_resource_name(dash_cfg->bs_switch_segment_file);
+			is_bs_switching = 1;
+		}
+	}
+	
+	sprintf(RepSecName, "Representation_%s", dash_input ? dash_input->representationID : "");
+	sprintf(RepURLsSecName, "URLs_%s", dash_input ? dash_input->representationID : "");
+
+	bandwidth = dash_input ? dash_input->bandwidth : 0;
+	file_duration = 0;
+
+	startNumber = 1;
+	startNumberRewind = 0;
+
+	//create output file
+	/*need to precompute bandwidth*/
+	if (!bandwidth && seg_rad_name && strstr(seg_rad_name, "$Bandwidth$")) {
+		for (i=0; i<gf_isom_get_track_count(input); i++) {
+			Double tk_dur = (Double) gf_isom_get_media_duration(input, i+1);
+			tk_dur /= gf_isom_get_media_timescale(input, i+1);
+			if (file_duration < tk_dur ) {
+				file_duration = tk_dur;
+			}
+		}
+		bandwidth = (u32) (gf_isom_get_file_size(input) / file_duration * 8);
+	}
+
+	if (dash_cfg->dash_ctx) {
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Setup");
+		if (!opt || stricmp(opt, "yes") ) {
+			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);
+		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);
+	}
+	if (!output) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISOBMF DASH] Cannot open %s for writing\n", opt ? opt : SegmentName));
+		e = gf_isom_last_error(NULL);
+		goto err_exit;
+	}
+
+	if (store_dash_params) {
+		const char *name;
+
+		if (!gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "SegmentTemplate"))
+			gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "SegmentTemplate", seg_rad_name);
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Source", gf_isom_get_filename(input) );
+
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Setup", "yes");
+		name = SegmentName;
+		if (bs_switch_segment) name = gf_isom_get_filename(bs_switch_segment);
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegment", name);
+
+		/*store BS flag per rep - it should be stored per adaptation set but we dson't have a key for adaptation sets right now*/
+		if (/*first_in_set && */ is_bs_switching)
+			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "BitstreamSwitching", "yes");
+	} else if (dash_cfg->dash_ctx) {
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "BitstreamSwitching");
+		if (opt && !strcmp(opt, "yes")) {
+			is_bs_switching = 1;
+			if (bs_switch_segment) 
+				gf_isom_delete(bs_switch_segment);
+			bs_switch_segment = output;
+			bs_switching_is_output = 1;
+			bs_switching_segment_name = gf_url_get_resource_name(gf_isom_get_filename(bs_switch_segment));
+		}
+
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth");
+		if (opt) sscanf(opt, "%u", &bandwidth);
+	}
+	mpd_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (first_in_set && dash_cfg->use_segment_timeline) {
+		mpd_timeline_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		sprintf(szMPDTempLine, "    <SegmentTimeline>\n");
+		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+	}
+		
+	nb_sync = 0;
+	nb_samp = 0;
+	fragmenters = gf_list_new();
+
+	if (! dash_moov_setup) {
+		e = gf_isom_clone_movie(input, output, GF_FALSE, GF_FALSE, !dash_cfg->pssh_moof );
+		if (e) goto err_exit;
+
+		/*because of movie fragments MOOF based offset, ISOM <4 is forbidden*/
+		gf_isom_set_brand_info(output, GF_4CC('i','s','o','5'), 1);
+		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','m'), 0);
+		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','1'), 0);
+		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','2'), 0);
+		gf_isom_modify_alternate_brand(output, GF_4CC('i','s','o','3'), 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP41, 0);
+		gf_isom_modify_alternate_brand(output, GF_ISOM_BRAND_MP42, 0);
+
+	}
+
+	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. 
+	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) {
+		simulation_pass = GF_TRUE;
+		seg_rad_name = NULL;
+	}
+	/*if single file is requested, store all segments in the same file*/
+	else if (dash_cfg->single_file_mode==2) {
+		seg_rad_name = NULL;
+	}
+
+	index_start_range = index_end_range = 0;	
+
+	tf = tfref = NULL;
+	file_duration = 0;
+	width = height = sample_rate = nb_channels = sar_w = sar_h = fps_num = fps_denum = 0;
+	langCode[0]=0;
+	langCode[4]=0;
+	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 mtype = gf_isom_get_media_type(input, i+1);
+		if (mtype == GF_ISOM_MEDIA_HINT) continue;
+
+		if (dash_input->trackNum && ((i+1) != dash_input->trackNum))
+			continue;
+
+		if (dash_input->single_track_num && ((i+1) != dash_input->single_track_num))
+			continue;
+
+		if (! dash_moov_setup) {
+			e = gf_isom_clone_track(input, i+1, output, GF_FALSE, &TrackNum);
+			if (e) goto err_exit;
+
+			if (gf_isom_is_track_in_root_od(input, i+1)) gf_isom_add_track_to_root_od(output, TrackNum);
+
+			/*remove sgpd in stbl; it wuold 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;
+				while (gf_list_count(trak->Media->information->sampleTable->sampleGroupsDescription)) {
+					GF_Box* box = (GF_Box*)gf_list_get(trak->Media->information->sampleTable->sampleGroupsDescription, 0);
+					gf_isom_box_del(box);
+					gf_list_rem(trak->Media->information->sampleTable->sampleGroupsDescription, 0);
+				}
+			}
+
+// Commenting it the code for Timed Text tracks, it may happen that we have only one long sample, fragmentation is useful
+#if 0 
+			//if only one sample, don't fragment track
+			if (gf_isom_get_sample_count(input, i+1) == 1) {
+				sample = gf_isom_get_sample(input, i+1, 1, &descIndex);
+				e = gf_isom_add_sample(output, TrackNum, 1, sample);
+				gf_isom_sample_del(&sample);
+				if (e) goto err_exit;
+
+				continue;
+			}
+#endif
+		} else {
+			TrackNum = gf_isom_get_track_by_id(output, gf_isom_get_track_id(input, i+1));
+		}
+
+		/*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) {
+			/*for AVC we concatenate SPS/PPS unless SVC base*/
+			if (!dash_input->trackNum && dash_cfg->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) {
+			/*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);
+		}
+
+		if (mtype == GF_ISOM_MEDIA_VISUAL) nb_video++;
+		else if (mtype == GF_ISOM_MEDIA_AUDIO) nb_audio++;
+		else if (mtype == GF_ISOM_MEDIA_TEXT || mtype == GF_ISOM_MEDIA_MPEG_SUBT || mtype == GF_ISOM_MEDIA_SUBT) nb_text++;
+		else if (mtype == GF_ISOM_MEDIA_SCENE) nb_scene++;
+		else if (mtype == GF_ISOM_MEDIA_DIMS) nb_scene++;
+
+		if (mtype != GF_ISOM_MEDIA_AUDIO) audio_only = GF_FALSE;
+
+		//setup fragmenters
+		if (! dash_moov_setup) {
+				//new initialization segment, setup fragmentation
+			gf_isom_get_fragment_defaults(input, i+1,
+										&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);
+
+			} else {
+				e = gf_isom_setup_track_fragment(output, gf_isom_get_track_id(output, TrackNum), defaultDescriptionIndex, 0, 0, 0, 0, 0);
+			}
+			if (e) goto err_exit;
+		} else {
+			gf_isom_get_fragment_defaults(output, TrackNum,
+									 &defaultDuration, &defaultSize, &defaultDescriptionIndex, &defaultRandomAccess, &defaultPadding, &defaultDegradationPriority);
+		}
+
+		gf_media_get_rfc_6381_codec_name(bs_switch_segment ? bs_switch_segment : input, i+1, szCodec);
+		if (strlen(szCodecs)) strcat(szCodecs, ",");
+		strcat(szCodecs, szCodec);
+
+		GF_SAFEALLOC(tf, GF_ISOMTrackFragmenter);
+		tf->TrackID = gf_isom_get_track_id(output, TrackNum);
+		tf->SampleCount = gf_isom_get_sample_count(input, i+1);
+		tf->OriginalTrack = i+1;
+		tf->TimeScale = gf_isom_get_media_timescale(input, i+1);
+		tf->MediaType = gf_isom_get_media_type(input, i+1);
+		tf->DefaultDuration = defaultDuration;
+		mpd_timescale = tf->TimeScale;
+
+		if (max_track_duration < gf_isom_get_track_duration(input, i+1)) {
+			max_track_duration = (Double) gf_isom_get_track_duration(input, i+1);
+		}
+
+		if (gf_isom_get_sync_point_count(input, i+1)>nb_sync) {
+			tfref = tf;
+			nb_sync = gf_isom_get_sync_point_count(input, i+1);
+		} else if (!gf_isom_has_sync_points(input, i+1)) {
+			tf->all_sample_raps = GF_TRUE;
+		}
+
+		tf->finalSampleDescriptionIndex = 1;
+
+		/*figure out if we have an initial TS*/
+		if (!dash_moov_setup) {
+			u32 j, edit_count = gf_isom_get_edit_segment_count(input, i+1);
+			Double scale = tf->TimeScale;
+			scale /= gf_isom_get_timescale(input);
+
+			/*remove all segments*/
+			gf_isom_remove_edit_segments(output, TrackNum);
+			tf->media_time_to_pres_time_shift = 0;
+			//clone all edits before first nomal, and stop at first normal setting duration to 0
+			for (j=0; j<edit_count; j++) {
+				u64 EditTime, SegDuration, MediaTime;
+				u8 EditMode;
+
+				/*get first edit*/
+				gf_isom_get_edit_segment(input, i+1, j+1, &EditTime, &SegDuration, &MediaTime, &EditMode);
+
+				if (EditMode==GF_ISOM_EDIT_NORMAL) 
+					SegDuration = 0;
+
+				gf_isom_set_edit_segment(output, TrackNum, EditTime, SegDuration, MediaTime, EditMode);
+
+				if (EditMode==GF_ISOM_EDIT_NORMAL) {
+					tf->media_time_to_pres_time_shift -= (s32) MediaTime;
+					break;
+				}
+				tf->media_time_to_pres_time_shift += (u32) (scale*SegDuration);
+			}
+
+			gf_isom_set_brand_info(output, GF_4CC('i','s','o','5'), 1);
+
+			/*DASH self-init media segment*/
+			if (dash_cfg->single_file_mode==1) {
+				gf_isom_modify_alternate_brand(output, GF_4CC('d','s','m','s'), 1);
+			} else {
+				gf_isom_modify_alternate_brand(output, GF_4CC('d','a','s','h'), 1);
+			}
+
+			/*locate sample description in list if given*/
+			if (bs_switch_segment) {
+				u32 s_count;
+				u32 sample_descs_track = gf_isom_get_track_by_id(bs_switch_segment, tf->TrackID);
+				if (!sample_descs_track) {
+					e = GF_BAD_PARAM;
+					goto err_exit;
+
+				}
+
+				//the initialization segment is not yet setup for fragmentation
+				if (! gf_isom_is_track_fragmented(bs_switch_segment, tf->TrackID)) {
+					e = GF_BAD_PARAM;
+					if (e) goto err_exit;
+				}
+				/*otherwise override the fragment defauls so that we are consistent with the shared init segment*/
+				else {
+					e = gf_isom_get_fragment_defaults(bs_switch_segment, sample_descs_track,
+											 &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);
+					if (e) goto err_exit;
+				}
+
+				/*and search in new ones the new index*/
+				s_count = gf_isom_get_sample_description_count(bs_switch_segment, sample_descs_track); 
+
+				/*more than one sampleDesc, we will need to indicate all the sample descs in the file in case we produce a single file, 
+				otherwise the file would not be compliant*/
+				if (s_count > 1) {
+					gf_isom_clone_sample_descriptions(output, TrackNum, bs_switch_segment, sample_descs_track, 1);
+				}
+
+				/*and search in new ones the new index*/
+				s_count = gf_isom_get_sample_description_count(bs_switch_segment, sample_descs_track); 
+				if (s_count>1) {
+					u32 k;
+					/*remove all sample descs*/
+					for (k=0; k<s_count; k++) {
+						/*search in original file if we have the sample desc*/
+						if (gf_isom_is_same_sample_description(input, TrackNum, 1, bs_switch_segment, sample_descs_track, k+1)) {
+							tf->finalSampleDescriptionIndex = k+1;
+						}
+					}
+				}
+			}
+		}
+		/*restore track decode times*/
+		else {
+			char *opt, sKey[100];
+			sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
+			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			if (opt) tf->InitialTSOffset = atoi(opt);
+
+			/*store presentationTimeOffset on the first rep*/
+			if (store_dash_params)
+				presentationTimeOffset = tf->InitialTSOffset;
+		}
+
+		/*get language, width/height/layout info, audio info*/
+		switch (mtype) {
+		case GF_ISOM_MEDIA_TEXT:
+		case GF_ISOM_MEDIA_SUBT:
+		case GF_ISOM_MEDIA_MPEG_SUBT:
+			tf->splitable = GF_TRUE;
+			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;
+			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);
+			break;
+		}
+
+		if (mtype==GF_ISOM_MEDIA_VISUAL) {
+			/*get duration of 2nd sample*/
+			u32 sample_dur = gf_isom_get_sample_duration(input, i+1, 2);
+			gf_isom_get_pixel_aspect_ratio(input, i+1, 1, &sar_w, &sar_h);
+			if (! fps_num || ! fps_denum) {
+				fps_num = tf->TimeScale;
+				fps_denum = sample_dur;
+			}
+			else if (fps_num *sample_dur < tf->TimeScale * fps_denum) {
+				fps_num = tf->TimeScale;
+				fps_denum = sample_dur;
+			}
+		}
+
+
+		if (file_duration < ((Double) gf_isom_get_media_duration(input, i+1)) / tf->TimeScale ) {
+			file_duration = ((Double) gf_isom_get_media_duration(input, i+1)) / tf->TimeScale;
+		}
+		gf_list_add(fragmenters, tf);
+
+		if (gf_isom_is_media_encrypted(input, i+1, 1)) {
+			protected_track = i+1;
+		}
+
+		nb_samp += tf->SampleCount;
+	}
+
+	if (gf_list_count(fragmenters)>1)
+		mpd_timescale = 1000;
+
+	if (!tfref) {
+		tfref = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
+		assert(tfref);
+	} else {
+		//put tfref in first pos
+		gf_list_del_item(fragmenters, tfref);
+		gf_list_insert(fragmenters, tfref, 0);
+	}
+
+	tfref->is_ref_track = GF_TRUE;
+	tfref_timescale = tfref->TimeScale;
+	ref_track_id = tfref->TrackID;
+	if (tfref->all_sample_raps)
+		split_seg_at_rap = GF_TRUE;
+
+
+	if (!dash_moov_setup) {
+		max_track_duration /= gf_isom_get_timescale(input);
+		max_track_duration *= gf_isom_get_timescale(output);
+		gf_isom_set_movie_duration(output, (u64) max_track_duration);
+	}
+
+	//if single segment, add msix brand if we use indexes
+	gf_isom_modify_alternate_brand(output, GF_4CC('m','s','i','x'), ((dash_cfg->single_file_mode==1) && (dash_cfg->subsegs_per_sidx>=0)) ? 1 : 0);
+
+	//flush movie
+	e = gf_isom_finalize_for_fragment(output, 1);
+	if (e) goto err_exit;
+
+	start_range = 0;
+	file_size = gf_isom_get_file_size(bs_switch_segment ? bs_switch_segment : output);
+	end_range = file_size - 1;
+	init_seg_size = file_size;
+
+	if (dash_cfg->dash_ctx) {
+		if (store_dash_params) {
+			char szVal[1024];
+			sprintf(szVal, LLU, init_seg_size);
+			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegmentSize", szVal);
+		} else {
+			const char *opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "InitializationSegmentSize");
+			if (opt) init_seg_size = atoi(opt);
+		}
+	}
+
+restart_fragmentation_pass:
+
+	for (i=0; i<gf_list_count(fragmenters); i++) {
+		tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+		tf->split_sample_dts_shift = 0;
+	}
+	segment_start_time = 0;
+	nb_segments = 0;
+
+	nb_tracks_done = 0;
+	ref_track_first_dts = (u64) -1;
+	nb_done = 0;
+
+	maxFragDurationOverSegment=0;
+	switch_segment=GF_TRUE;
+
+	if (!seg_rad_name) use_url_template = GF_FALSE;
+
+	cur_seg=1;
+	fragment_index=1;
+	if (dash_input->moof_seqnum_increase) {
+		fragment_index = dash_input->moof_seqnum_increase * dash_input->idx_representations + 1;
+	}
+	period_duration = 0;
+	split_at_rap = GF_FALSE;
+	has_rap = GF_FALSE;
+	next_sample_rap = GF_FALSE;
+	flush_all_samples = GF_FALSE;
+	force_switch_segment = GF_FALSE;
+	max_sap_type = 0;
+	ref_track_next_cts = 0;
+
+	/*setup previous URL list*/
+	if (dash_cfg->dash_ctx) {
+		const char *opt;
+		char sKey[100];
+		count = gf_cfg_get_key_count(dash_cfg->dash_ctx, RepURLsSecName);
+		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);	
+			gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+		}
+
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex");
+		if (opt) cur_seg = atoi(opt);
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex");
+		if (opt) fragment_index = atoi(opt);
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration");
+		if (opt) period_duration = atof(opt);
+
+		for (i=0; i<gf_list_count(fragmenters); i++) {
+			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+			sprintf(sKey, "TKID_%d_NextSampleNum", tf->TrackID);
+			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			if (opt) tf->SampleNum = atoi(opt);
+
+			sprintf(sKey, "TKID_%d_LastSampleCTS", tf->TrackID);
+			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			if (opt) sscanf(opt, LLU, &tf->last_sample_cts);
+
+			sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
+			opt = (char *)gf_cfg_get_key(dash_cfg->dash_ctx, RepSecName, sKey);
+			if (opt) {
+				sscanf(opt, LLU, &tf->next_sample_dts);
+			}
+		}
+	}
+
+	gf_isom_set_next_moof_number(output, dash_cfg->initial_moof_sn + fragment_index);
+
+
+	max_segment_duration = 0;
+
+	while ( (count = gf_list_count(fragmenters)) ) {
+		Bool store_pssh = GF_FALSE;
+		if (switch_segment) {
+			if (dash_cfg->subduration && (segment_start_time + MaxSegmentDuration/2 >= dash_cfg->dash_scale * dash_cfg->subduration)) {
+				/*done with file (next segment will exceppe of more than half the requested subduration : store all fragmenters state and abord*/
+				break;
+			}
+
+			SegmentDuration = 0;
+			switch_segment = GF_FALSE;
+			first_sample_in_segment = GF_TRUE;
+
+			if (simulation_pass) {
+				segments_info = (u32 *)gf_realloc(segments_info, sizeof(u32) * (nb_segments_info+1) );
+				segments_info[nb_segments_info] = 0;
+				nb_segments_info++;
+				e = GF_OK;
+			} else {
+				start_range = gf_isom_get_file_size(output);
+				if (seg_rad_name) {
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, is_bs_switching, SegmentName, output_file, dash_input->representationID, seg_rad_name, !stricmp(seg_ext, "null") ? NULL : seg_ext, (u64) ( period_duration * dash_cfg->dash_scale + segment_start_time), bandwidth, cur_seg, dash_cfg->use_segment_timeline);
+					e = gf_isom_start_segment(output, SegmentName, dash_cfg->memory_mode);
+
+					gf_dasher_store_segment_info(dash_cfg, SegmentName, period_duration + segment_start_time / (Double) dash_cfg->dash_scale);
+
+					/*we are in bitstream switching mode, delete init segment*/
+					if (is_bs_switching && !init_segment_deleted) {
+						init_segment_deleted = GF_TRUE;
+						if (strcmp(dash_cfg->bs_switch_segment_file, gf_isom_get_filename(output))) {
+							gf_delete_file(gf_isom_get_filename(output));
+						}
+					}
+
+					if (!use_url_template) {
+						const char *name = gf_url_get_resource_name(SegmentName);
+						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];
+							sprintf(szKey, "UrlInfo%d", cur_seg );
+							sprintf(szVal, "<SegmentURL media=\"%s\"/>", name);
+							gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
+						}
+					}
+				} else {
+					e = gf_isom_start_segment(output, NULL, dash_cfg->memory_mode);
+				}
+				if (dash_cfg->pssh_moof)
+					store_pssh = GF_TRUE;
+			}
+
+			cur_seg++;
+			if (e) goto err_exit;
+		} 
+
+		maxFragDurationOverSegment=0;
+
+		sample = NULL;
+
+		if (simulation_pass) {
+			segments_info[nb_segments_info-1] ++;
+			e = GF_OK;
+		} else {
+			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;
+					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);
+				}
+			}
+			if (store_pssh) {
+				store_pssh = GF_FALSE;
+				e = gf_isom_clone_pssh(output, input, GF_TRUE);
+			}
+		}
+
+		//process track by track
+		for (i=0; i<count; i++) {
+			Bool has_roll, is_rap;
+			s32 roll_distance;
+			u32 SAP_type = 0;
+
+			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+			if (tf == tfref) 
+				has_rap = GF_FALSE;
+
+			if (tf->done) continue;
+
+			//ok write samples
+			while (1) {
+				Bool stop_frag = GF_FALSE;
+				Bool is_redundant_sample = GF_FALSE;
+				u32 split_sample_duration = 0;
+
+				/*first sample*/
+				if (!sample) {
+					sample = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 1, &descIndex);
+					if (!sample) {
+						e = gf_isom_last_error(input);
+						goto err_exit;
+					}
+
+					/*FIXME - use negative ctts to indicate "past" DTS for splitted sample*/
+					if (tf->split_sample_dts_shift) {
+						sample->DTS += tf->split_sample_dts_shift;
+						is_redundant_sample = GF_TRUE;
+					}
+
+					/*also get SAP type - this is not needed if sample is not NULL as SAP tye was computed for "next sample" in previous loop*/
+					if (sample->IsRAP) {
+						SAP_type = 1;
+					} else {
+						SAP_type = 0;
+						e = gf_isom_get_sample_rap_roll_info(input, tf->OriginalTrack, tf->SampleNum + 1, &is_rap, &has_roll, &roll_distance);
+						if (e==GF_OK) {
+							if (is_rap) SAP_type = 3;
+							else if (has_roll && (roll_distance>=0) ) SAP_type = 4;
+						}
+					}
+				}
+
+				gf_isom_get_sample_padding_bits(input, tf->OriginalTrack, tf->SampleNum+1, &NbBits);
+
+				next = gf_isom_get_sample(input, tf->OriginalTrack, tf->SampleNum + 2, &j);
+				if (next) {
+					defaultDuration = (u32) (next->DTS - sample->DTS);
+				} else {
+ 					defaultDuration = (u32) (gf_isom_get_media_duration(input, tf->OriginalTrack)- sample->DTS);
+				}
+
+				if (tf->splitable) {
+					if (tfref==tf) {
+						u64 frag_dur = (tf->FragmentLength + defaultDuration) * 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) {
+							split_sample_duration = defaultDuration;
+							defaultDuration = (u32) (tf->TimeScale * (MaxSegmentDuration - SegmentDuration) / dash_cfg->dash_scale - tf->FragmentLength);
+							split_sample_duration -= defaultDuration;
+						}
+					} 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 */
+//								&& ((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)) {
+						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;
+					}
+				}
+
+				if (tf==tfref) {
+					if (segments_start_with_sap && first_sample_in_segment ) {
+						first_sample_in_segment = GF_FALSE;
+						if (! SAP_type) segments_start_with_sap = GF_FALSE;
+					}
+					if (ref_track_first_dts > sample->DTS) 
+						ref_track_first_dts = sample->DTS;
+
+					if (next) {
+						u64 next_cts = next->DTS + next->CTS_Offset;
+						if (split_sample_duration) 
+							next_cts -= split_sample_duration;
+
+						if (ref_track_next_cts<next_cts) {
+							ref_track_next_cts = next_cts;
+						}
+					} else {
+						u64 cts = gf_isom_get_media_duration(input, tf->OriginalTrack);
+						if (cts>ref_track_next_cts) ref_track_next_cts = cts;
+						else ref_track_next_cts += defaultDuration;
+					}
+				}
+
+				if (SAP_type > max_sap_type) max_sap_type = SAP_type;
+
+				if (simulation_pass) {
+					e = GF_OK;
+				} else {
+					/*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) 
+						goto err_exit;
+
+					e = gf_isom_fragment_add_sai(output, input, tf->TrackID, tf->SampleNum + 1);
+					if (e) goto err_exit;
+
+					/*copy subsample information*/
+					e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, dash_cfg->samplegroups_in_traf);
+					if (e) 
+						goto err_exit;
+
+					gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
+					nb_done++;
+				}
+
+				tf->last_sample_cts = sample->DTS + sample->CTS_Offset;
+				tf->next_sample_dts = sample->DTS + defaultDuration;
+
+				if (split_sample_duration) {
+					gf_isom_sample_del(&next);
+					sample->DTS += defaultDuration;
+				} else {
+					gf_isom_sample_del(&sample);
+					sample = next;
+					tf->SampleNum += 1;
+					tf->split_sample_dts_shift = 0;
+				}
+				tf->FragmentLength += defaultDuration;
+
+				/*compute SAP type*/
+				if (sample) {
+					if (sample->IsRAP) {
+						SAP_type = 1;
+					} else {
+						SAP_type = 0;
+						e = gf_isom_get_sample_rap_roll_info(input, tf->OriginalTrack, tf->SampleNum + 1, &is_rap, &has_roll, NULL);
+						if (e==GF_OK) {
+							if (is_rap)
+								SAP_type = 3;
+							else if (has_roll && (roll_distance>=0) )
+								SAP_type = 4;
+						}
+					}
+				}
+
+				if (next && SAP_type) {
+					if (tf==tfref) {
+						if (split_sample_duration) {
+							stop_frag = GF_TRUE;
+						}
+						else if (split_seg_at_rap) {
+							u64 next_sap_time;
+							u64 frag_dur, next_dur;
+							next_dur = gf_isom_get_sample_duration(input, tf->OriginalTrack, tf->SampleNum + 1);
+							if (!next_dur) next_dur = defaultDuration;
+							/*duration of fragment if we add this rap*/
+							frag_dur = (tf->FragmentLength+next_dur)*dash_cfg->dash_scale / tf->TimeScale;
+							next_sample_rap = GF_TRUE;
+							next_sap_time = isom_get_next_sap_time(input, tf->OriginalTrack, tf->SampleCount, tf->SampleNum + 2);
+							/*if no more SAP after this one, do not switch segment*/
+							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;
+								/*if media segment about to be produced is longer than max segment length, force segment split*/
+								if (SegmentDuration + frag_dur > MaxSegmentDuration) {
+									split_at_rap = GF_TRUE;
+									/*force new segment*/
+									force_switch_segment = GF_TRUE;
+									stop_frag = GF_TRUE;
+								}
+
+								if (! tf->all_sample_raps) {
+									/*if adding this SAP will result in stoping the fragment "soon" after it, stop now and start with SAP
+									if all samples are RAPs, just stop fragment if we exceed the requested duration by adding the next sample
+									otherwise, take 3 samples (should be refined of course)*/
+									scaler = 3;
+									if ( (tf->FragmentLength + scaler * next_dur) * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale)
+										stop_frag = GF_TRUE;
+								}
+							}
+						} else if (!has_rap) {
+							if (tf->FragmentLength == defaultDuration) has_rap = 2;
+							else has_rap = 1;
+						}
+					} 
+				} else {
+					next_sample_rap = GF_FALSE;
+				}
+
+				if (tf->SampleNum==tf->SampleCount) {
+					stop_frag = GF_TRUE;
+				} else if (tf==tfref) {
+					/*fragmenting on "clock" track: no drift control*/
+					if (!dash_cfg->fragments_start_with_rap || ( (next && next->IsRAP) || split_at_rap) ) {
+						if (tf->FragmentLength * dash_cfg->dash_scale >= MaxFragmentDuration * tf->TimeScale) {
+							stop_frag = GF_TRUE;
+						}
+					}
+				}
+				/*do not abort fragment if ref track is done, put everything in the last fragment*/
+				else if (!flush_all_samples) {
+					/*fragmenting on "non-clock" track: drift control*/
+					if ((tf->next_sample_dts /*+1 accuracy*/) * tfref_timescale >= ref_track_next_cts * tf->TimeScale)
+						stop_frag = GF_TRUE;
+				}
+
+				if (stop_frag) {
+					gf_isom_sample_del(&sample);
+					sample = next = NULL;
+					if (maxFragDurationOverSegment <= tf->FragmentLength * dash_cfg->dash_scale / tf->TimeScale) {
+						maxFragDurationOverSegment = tf->FragmentLength * dash_cfg->dash_scale / tf->TimeScale;
+					}
+					tf->FragmentLength = 0;
+					if (split_sample_duration)
+						tf->split_sample_dts_shift += defaultDuration;
+
+					//if (tf==tfref)
+						//last_ref_cts = tf->last_sample_cts;
+
+					break;
+				}
+			}
+
+			if (tf->SampleNum==tf->SampleCount) {
+				tf->done = GF_TRUE;
+				nb_tracks_done++;
+				if (tf == tfref) {
+					tfref = NULL;
+					flush_all_samples = GF_TRUE;
+				}
+			}
+		}
+
+		SegmentDuration += maxFragDurationOverSegment;
+		maxFragDurationOverSegment=0;
+
+		/*if no simulation and no SIDX is used, flush fragments as we write them*/
+		if (!simulation_pass && (dash_cfg->subsegs_per_sidx<0) ) {
+			e = gf_isom_flush_fragments(output, flush_all_samples ? GF_TRUE : GF_FALSE);
+			if (e) goto err_exit;
+		}
+
+
+		/*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;
+		}
+
+		if (force_switch_segment || ((SegmentDuration >= MaxSegmentDuration) && (!split_seg_at_rap || next_sample_rap))) {
+
+			if (mpd_timeline_bs) {
+
+				if (previous_segment_duration == SegmentDuration) {
+					segment_timeline_repeat_count ++;
+				} else {
+					if (previous_segment_duration) {
+						if (segment_timeline_repeat_count) {
+							sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
+						} else {
+							sprintf(szMPDTempLine, "/>\n");
+						}
+						gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+					}
+					previous_segment_duration = SegmentDuration;
+					if (first_segment_in_timeline) {
+						sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"", (u64) (segment_start_time*dash_cfg->dash_scale), (u64) SegmentDuration );
+						first_segment_in_timeline = GF_FALSE;
+					} else {
+						sprintf(szMPDTempLine, "     <S d=\""LLU"\"", (u64) SegmentDuration);
+					}
+					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) {
+				max_segment_duration = (Double) (s64) SegmentDuration;
+				max_segment_duration /= dash_cfg->dash_scale;
+			}
+			force_switch_segment = GF_FALSE;
+			switch_segment = GF_TRUE;
+			SegmentDuration = 0;
+			split_at_rap = GF_FALSE;
+			has_rap = GF_FALSE;
+			/*restore fragment duration*/
+			MaxFragmentDuration = (u32) (max_duration_sec * dash_cfg->dash_scale);
+
+			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);
+
+				//take care of scalable reps
+				if (dash_input->moof_seqnum_increase) {
+					u32 frag_index = gf_isom_get_next_moof_number(output) + dash_input->nb_representations * dash_input->moof_seqnum_increase;
+					gf_isom_set_next_moof_number(output, dash_cfg->initial_moof_sn + frag_index);
+				}
+
+				ref_track_first_dts = (u64) -1;
+
+				if (!seg_rad_name) {
+					file_size = gf_isom_get_file_size(output);
+					end_range = file_size - 1;
+					if (dash_cfg->single_file_mode!=1) {
+						sprintf(szMPDTempLine, "      <SegmentURL mediaRange=\""LLD"-"LLD"\"", start_range, end_range);	
+						gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+						if (idx_start_range || idx_end_range) {
+							sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);	
+							gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+						}
+						gf_bs_write_data(mpd_bs, "/>\n", 3);
+
+						if (dash_cfg->dash_ctx) {
+							char szKey[100], szVal[4046];
+							sprintf(szKey, "UrlInfo%d", cur_seg );
+							sprintf(szVal, "<SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>", start_range, end_range, idx_start_range, idx_end_range);
+							gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
+						}
+					}
+				} else {
+					file_size += gf_isom_get_file_size(output);
+				}
+			}
+
+			/*next fragment will exceed segment length, abort fragment at next rap (possibly after MaxSegmentDuration)*/
+			if (split_seg_at_rap && SegmentDuration && (SegmentDuration + MaxFragmentDuration >= MaxSegmentDuration)) {
+				if (!split_at_rap) {
+					split_at_rap = GF_TRUE;
+				}
+			}
+		}
+		if (nb_tracks_done==count) break;
+	}
+
+	if (simulation_pass) {
+		/*OK, we have all segments and frags per segments*/
+		gf_isom_allocate_sidx(output, dash_cfg->subsegs_per_sidx, dash_cfg->daisy_chain_sidx, nb_segments_info, segments_info, &index_start_range, &index_end_range );
+		gf_free(segments_info);
+		segments_info = NULL;
+		simulation_pass = GF_FALSE;
+		/*reset fragmenters*/
+		for (i=0; i<gf_list_count(fragmenters); i++) {
+			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+			tf->done = GF_FALSE;
+			tf->last_sample_cts = 0;
+			tf->next_sample_dts = 0;
+			tf->FragmentLength = 0;
+			tf->SampleNum = 0;
+			if (tf->is_ref_track)
+				tfref = tf;
+		}
+		goto restart_fragmentation_pass;
+	}
+
+	/*flush last segment*/
+	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
+
+		segment_start_time += SegmentDuration;
+
+		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, 1, dash_cfg->segment_marker_4cc, &idx_start_range, &idx_end_range);
+		nb_segments++;
+
+		if (!seg_rad_name) {
+			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);
+				gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+				if (idx_start_range || idx_end_range) {
+					sprintf(szMPDTempLine, " indexRange=\""LLD"-"LLD"\"", idx_start_range, idx_end_range);
+					gf_bs_write_data(mpd_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+				}
+				gf_bs_write_data(mpd_bs, "/>\n", 3);
+
+				if (dash_cfg->dash_ctx) {
+					char szKey[100], szVal[4046];
+					sprintf(szKey, "UrlInfo%d", cur_seg );
+					sprintf(szVal, "<SegmentURL mediaRange=\""LLD"-"LLD"\" indexRange=\""LLD"-"LLD"\"/>", start_range, end_range, idx_start_range, idx_end_range);
+					gf_cfg_set_key(dash_cfg->dash_ctx, RepURLsSecName, szKey, szVal);
+				}
+			}
+		} else {
+			file_size += gf_isom_get_file_size(output);
+		}
+	}
+	if (mpd_timeline_bs) {
+		if (previous_segment_duration == SegmentDuration) {
+			segment_timeline_repeat_count ++;
+			sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
+			gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+		} else {
+			if (previous_segment_duration) {
+				if (segment_timeline_repeat_count) {
+					sprintf(szMPDTempLine, " r=\"%d\"/>\n", segment_timeline_repeat_count);
+				} else {
+					sprintf(szMPDTempLine, "/>\n");
+				}
+				gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+			}
+			if (SegmentDuration) {
+				if (first_segment_in_timeline) {
+					sprintf(szMPDTempLine, "     <S t=\""LLU"\" d=\""LLU"\"/>\n", (u64) (segment_start_time), (u64) SegmentDuration );
+					first_segment_in_timeline = GF_FALSE;
+				} else {
+					sprintf(szMPDTempLine, "     <S d=\""LLU"\"/>\n", (u64) SegmentDuration);
+				}
+				gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+			}
+		}
+
+		sprintf(szMPDTempLine, "    </SegmentTimeline>\n");
+		gf_bs_write_data(mpd_timeline_bs, szMPDTempLine, (u32) strlen(szMPDTempLine));
+	}
+
+	if (!bandwidth)
+		bandwidth = (u32) (file_size * 8 / file_duration);
+	
+	bandwidth += dash_input->dependency_bandwidth;
+	dash_input->bandwidth = bandwidth;
+
+	if (use_url_template) {
+		/*segment template does not depend on file name, write the template at the adaptationSet level*/
+		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) {
+				if (!max_segment_duration)
+					max_segment_duration = dash_cfg->segment_duration;
+				fprintf(dash_cfg->mpd, " duration=\"%d\"", (u32) (max_segment_duration * mpd_timescale));
+			}
+			/*in BS switching we share the same IS for all reps*/
+			if (is_bs_switching) {
+				strcpy(SegmentName, bs_switching_segment_name);
+			} else {
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION_TEMPLATE, is_bs_switching, SegmentName, output_file, dash_input->representationID, 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 (mpd_timeline_bs) {
+				char *mpd_seg_info = NULL;
+				u32 size;
+				fprintf(dash_cfg->mpd, ">\n");
+
+				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
+				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+				gf_free(mpd_seg_info);
+				fprintf(dash_cfg->mpd, "   </SegmentTemplate>\n");
+			} else {
+				fprintf(dash_cfg->mpd, "/>\n");
+			}
+		}
+		/*in BS switching we share the same IS for all reps, write the SegmentTemplate for the init segment*/
+		else if (is_bs_switching && first_in_set) {
+			fprintf(dash_cfg->mpd, "   <SegmentTemplate initialization=\"%s\"", bs_switching_segment_name);
+			if (presentationTimeOffset) 
+				fprintf(dash_cfg->mpd, " presentationTimeOffset=\"%d\"", presentationTimeOffset);
+
+			if (mpd_timeline_bs) {
+				char *mpd_seg_info = NULL;
+				u32 size;
+				fprintf(dash_cfg->mpd, ">\n");
+
+				gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
+				gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+				gf_free(mpd_seg_info);
+				fprintf(dash_cfg->mpd, "   </SegmentTemplate>\n");
+			} else {
+				fprintf(dash_cfg->mpd, "/>\n");
+			}
+		}
+	}
+	else if ((dash_cfg->single_file_mode!=1) && mpd_timeline_bs) {
+		char *mpd_seg_info = NULL;
+		u32 size;
+
+		fprintf(dash_cfg->mpd, "   <SegmentList timescale=\"%d\">\n", dash_cfg->dash_scale);
+
+		gf_bs_get_content(mpd_timeline_bs, &mpd_seg_info, &size);
+		gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+		gf_free(mpd_seg_info);
+		fprintf(dash_cfg->mpd, "   </SegmentList>\n");
+	}
+
+
+	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);
+
+		/*this is a video track*/
+		if (fps_num || fps_denum) {
+			gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
+			if (fps_denum>1)
+				fprintf(dash_cfg->mpd, " frameRate=\"%d/%d\"", fps_num, fps_denum);
+			else
+				fprintf(dash_cfg->mpd, " frameRate=\"%d\"", fps_num);
+
+			if (!sar_w) sar_w = 1;
+			if (!sar_h) sar_h = 1;
+			fprintf(dash_cfg->mpd, " sar=\"%d:%d\"", sar_w, sar_h);
+		}
+
+	}
+	if (sample_rate) fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", sample_rate);
+	if (segments_start_with_sap || split_seg_at_rap) {
+		fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", max_sap_type);
+	} else {
+		fprintf(dash_cfg->mpd, " startWithSAP=\"0\"");
+	}
+	//only appears at AdaptationSet level - need to rewrite the DASH segementer to allow writing this at the proper place
+//		if ((single_file_mode==1) && segments_start_with_sap) fprintf(dash_cfg->mpd, " subsegmentStartsWithSAP=\"%d\"", max_sap_type);
+
+	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);
+
+
+	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
+	}
+
+	if (dash_cfg->dash_ctx) {
+		Double seg_dur;
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration");
+		if (opt) {
+			seg_dur = atof(opt);
+			if (seg_dur < max_segment_duration) {
+				sprintf(sOpt, "%f", max_segment_duration);
+				gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+				seg_dur = max_segment_duration;
+			} else {
+				max_segment_duration = seg_dur;
+			}
+		} else {
+			sprintf(sOpt, "%f", max_segment_duration);
+			gf_cfg_set_key(dash_cfg->dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+		}
+	}
+
+	if (use_url_template) {
+		/*segment template depends on file name, but the template at the representation level*/
+		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);	
+			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);
+			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");	
+	} 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, "    <SegmentList");
+		if (!mpd_timeline_bs) {
+			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, ">\n");	
+		/*we are not in bitstreamSwitching mode*/
+		if (!is_bs_switching) {
+			fprintf(dash_cfg->mpd, "     <Initialization");	
+			if (!seg_rad_name) {
+				fprintf(dash_cfg->mpd, " range=\"0-"LLD"\"", init_seg_size-1);
+			} else {
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_INITIALIZATION, is_bs_switching, SegmentName, output_file, dash_input->representationID, gf_url_get_resource_name( seg_rad_name) , !stricmp(seg_ext, "null") ? NULL : "mp4", 0, bandwidth, 0, dash_cfg->use_segment_timeline);
+				fprintf(dash_cfg->mpd, " sourceURL=\"%s\"", SegmentName);
+			}
+			fprintf(dash_cfg->mpd, "/>\n");
+		}
+	}
+	if (mpd_bs) {
+		char *mpd_seg_info = NULL;
+		u32 size;
+		gf_bs_get_content(mpd_bs, &mpd_seg_info, &size);
+		gf_fwrite(mpd_seg_info, 1, size, dash_cfg->mpd);
+		gf_free(mpd_seg_info);
+	}
+
+	if (!use_url_template && (dash_cfg->single_file_mode!=1)) {
+		fprintf(dash_cfg->mpd, "    </SegmentList>\n");
+	}
+
+	fprintf(dash_cfg->mpd, "   </Representation>\n");
+
+
+	/*store context*/
+	if (dash_cfg->dash_ctx) {
+		period_duration += (Double)segment_start_time / dash_cfg->dash_scale;
+
+		for (i=0; i<gf_list_count(fragmenters); i++) {
+			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, i);
+
+			/*InitialTSOffset is used when joining different files - if we are still in the same file , do not update it*/
+			if (tf->done) {
+				sprintf(sKey, "TKID_%d_NextDecodingTime", tf->TrackID);
+				sprintf(sOpt, LLU, tf->InitialTSOffset + tf->next_sample_dts);
+				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, sOpt);
+			}
+
+			if (dash_cfg->subduration) {
+				sprintf(sKey, "TKID_%d_NextSampleNum", tf->TrackID);
+				sprintf(sOpt, "%d", tf->SampleNum);
+				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
+
+				sprintf(sKey, "TKID_%d_LastSampleCTS", tf->TrackID);
+				sprintf(sOpt, LLU, tf->last_sample_cts);
+				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
+
+				sprintf(sKey, "TKID_%d_NextSampleDTS", tf->TrackID);
+				sprintf(sOpt, LLU, tf->next_sample_dts);
+				gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, sKey, tf->done ? NULL : sOpt);
+			}
+		}
+		sprintf(sOpt, "%d", cur_seg);
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextSegmentIndex", sOpt);
+
+		fragment_index = gf_isom_get_next_moof_number(output);
+		sprintf(sOpt, "%d", fragment_index);
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "NextFragmentIndex", sOpt);
+
+
+		sprintf(sOpt, "%f", period_duration);
+		gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "CumulatedDuration", sOpt);
+
+		if (store_dash_params) {
+			sprintf(sOpt, "%u", bandwidth);
+			gf_cfg_set_key(dash_cfg->dash_ctx, RepSecName, "Bandwidth", sOpt);
+		}
+	}
+
+err_exit:
+	if (fragmenters){
+		while (gf_list_count(fragmenters)) {
+			tf = (GF_ISOMTrackFragmenter *)gf_list_get(fragmenters, 0);
+			gf_free(tf);
+			gf_list_rem(fragmenters, 0);
+		}
+		gf_list_del(fragmenters);
+	}
+	if (output) {
+		if (e) gf_isom_delete(output);
+		else gf_isom_close(output);
+	}
+	if (!bs_switching_is_output && bs_switch_segment) 
+		gf_isom_delete(bs_switch_segment);
+	gf_set_progress("ISO File Fragmenting", nb_samp, nb_samp);
+	if (mpd_bs) gf_bs_del(mpd_bs);
+	if (mpd_timeline_bs) gf_bs_del(mpd_timeline_bs);
+	return e;
+}
+
+
+static GF_Err dasher_isom_get_input_components_info(GF_DashSegInput *input, GF_DASHSegmenterOptions *opts)
+{
+	u32 i;
+	GF_ISOFile *in;
+	Double dur;
+
+	in = gf_isom_open(input->file_name, GF_ISOM_OPEN_READ, NULL);
+	input->duration = 0;
+	for (i=0; i<gf_isom_get_track_count(in); i++) {
+		u32 mtype = gf_isom_get_media_type(in, i+1);
+
+		if (input->trackNum && (input->trackNum != i+1))
+			continue;
+
+		if (input->single_track_num && (input->single_track_num != i+1))
+			continue;
+
+		if (mtype == GF_ISOM_MEDIA_HINT) 
+			continue;
+		
+		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) {
+			dur = (Double) gf_isom_get_media_duration(in, i+1);
+			dur /= gf_isom_get_media_timescale(in, i+1);
+		}
+		if (dur > input->duration) input->duration = dur;
+
+		input->components[input->nb_components].ID = gf_isom_get_track_id(in, i+1);
+		input->components[input->nb_components].media_type = mtype;
+		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++;
+	}
+	return gf_isom_close(in);
+}
+
+static GF_Err dasher_isom_classify_input(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type)
+{
+	u32 i, j;
+	GF_ISOFile *set_file;
+	
+	if (input_idx+1>=nb_dash_inputs)
+		return GF_OK;
+
+	set_file = gf_isom_open(dash_inputs[input_idx].file_name, GF_ISOM_OPEN_READ, NULL);
+
+	for (i=input_idx+1; i<nb_dash_inputs; i++) {
+		Bool valid_in_adaptation_set = 1;
+		Bool assign_to_group = 1;
+		GF_ISOFile *in;
+
+		if (dash_inputs[input_idx].period != dash_inputs[i].period) 
+			continue;
+		
+		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
+			continue;
+
+		if (strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
+			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;
+			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;
+				break;
+			}
+
+			if (dash_inputs[input_idx].single_track_num && (dash_inputs[input_idx].single_track_num != j+1))
+				continue;
+
+			if (dash_inputs[i].single_track_num) {
+				track = dash_inputs[i].single_track_num;
+			}
+
+			mtype = gf_isom_get_media_type(set_file, j+1);
+			if (mtype != gf_isom_get_media_type(in, track)) {
+				valid_in_adaptation_set = 0;
+				assign_to_group = 0;
+				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 (!same_codec) {
+				valid_in_adaptation_set = 0;
+				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;
+					break;
+				}
+			}
+			if (mtype==GF_ISOM_MEDIA_VISUAL) {
+				u32 w1, h1, w2, h2, sap_type;
+				Bool rap, roll;
+				s32 roll_dist;
+
+				gf_isom_get_track_layout_info(set_file, j+1, &w1, &h1, NULL, NULL, NULL);
+				gf_isom_get_track_layout_info(in, track, &w2, &h2, NULL, NULL, NULL);
+
+				if (h1*w2 != h2*w1) {
+					valid_in_adaptation_set = 0;
+					break;
+				}
+
+				gf_isom_get_sample_rap_roll_info(in, track, 0, &rap, &roll, &roll_dist);
+				if (roll_dist>0) sap_type = 4;
+				else if (roll) sap_type = 3;
+				else if (rap) sap_type = 1;
+				else sap_type = 1;
+				if (*max_sap_type < sap_type) *max_sap_type = sap_type;
+			}
+		}
+		gf_isom_close(in);
+		if (valid_in_adaptation_set) {
+			dash_inputs[i].adaptation_set = dash_inputs[input_idx].adaptation_set;
+			dash_inputs[input_idx].nb_rep_in_adaptation_set ++;
+		} else if (assign_to_group) {
+			if (!dash_inputs[input_idx].group_id) {
+				(*current_group_id) ++;
+				dash_inputs[input_idx].group_id = (*current_group_id);
+			}
+			dash_inputs[i].group_id = (*current_group_id);
+		}
+	}
+	gf_isom_close(set_file);
+	return GF_OK;
+}
+
+static GF_Err dasher_isom_create_init_segment(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 adaptation_set, char *szInitName, const char *tmpdir, GF_DASHSegmenterOptions *dash_opts, Bool *disable_bs_switching)
+{
+	GF_Err e = GF_OK;
+	u32 i;
+	u32 single_track_id = 0;
+	Bool sps_merge_failed = 0;
+	Bool use_avc3 = 0;
+	Bool use_hevc = 0;
+	Bool use_inband_param_set;
+	Bool single_segment = (dash_opts->single_file_mode==1) ? 1 : 0;
+	GF_ISOFile *init_seg = gf_isom_open(szInitName, GF_ISOM_OPEN_WRITE, tmpdir);
+
+	for (i=0; i<nb_dash_inputs; i++) {
+		u32 j;
+		GF_ISOFile *in;
+
+		if (dash_inputs[i].adaptation_set != adaptation_set)
+			continue;
+
+		//no inband param set for scalable files
+		use_inband_param_set = dash_inputs[i].trackNum ? 0 : dash_opts->inband_param_set;
+
+		in = gf_isom_open(dash_inputs[i].file_name, GF_ISOM_OPEN_READ, NULL);
+		if (!in) {
+			e = gf_isom_last_error(NULL);
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Error while opening %s: %s\n", dash_inputs[i].file_name, gf_error_to_string( e ) ));
+			return e;
+		}
+
+		for (j=0; j<gf_isom_get_track_count(in); j++) {
+			u32 track;
+			
+			if (dash_inputs[i].single_track_num) {
+				if (dash_inputs[i].single_track_num != j+1)
+					continue;
+
+				if (!single_track_id)
+					single_track_id = gf_isom_get_track_id(in, j+1);
+				//if not the same ID between the two tracks we cannot create a legal file with bitstream switching enabled
+				else if (single_track_id != gf_isom_get_track_id(in, j+1)) {
+					*disable_bs_switching = GF_TRUE;
+					gf_isom_delete(init_seg);
+					gf_delete_file(szInitName);
+					return GF_OK;
+				}
+			}
+
+			track = gf_isom_get_track_by_id(init_seg, gf_isom_get_track_id(in, j+1));
+
+			if (track) {
+				u32 outDescIndex;
+				if ( gf_isom_get_sample_description_count(in, j+1) != 1) {
+					e = GF_NOT_SUPPORTED;
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot merge track with multiple sample descriptions (file %s) - try disabling bitstream switching\n", dash_inputs[i].file_name ));
+					gf_isom_delete(init_seg);
+					gf_isom_delete(in);
+					return e;
+				}
+
+				/*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;
+					u32 stype1, stype2;
+					stype1 = gf_isom_get_media_subtype(in, j+1, 1);
+					stype2 = gf_isom_get_media_subtype(init_seg, track, 1);
+					if (stype1 != stype2) merge_mode = 0;
+					switch (stype1) {
+						case GF_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*/
+							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*/
+							merge_mode = 2;
+							break;
+						default:
+							merge_mode = 0;
+							break;
+					}
+					if (merge_mode==1) {
+#ifndef GPAC_DISABLE_AV_PARSERS
+						u32 k, l, sps_id1, sps_id2;
+#endif
+						GF_AVCConfig *avccfg1 = gf_isom_avc_config_get(in, j+1, 1);
+						GF_AVCConfig *avccfg2 = gf_isom_avc_config_get(init_seg, track, 1);
+#ifndef GPAC_DISABLE_AV_PARSERS
+						for (k=0; k<gf_list_count(avccfg2->sequenceParameterSets); k++) {
+							GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg2->sequenceParameterSets, k);
+							gf_avc_get_sps_info(slc->data, slc->size, &sps_id1, NULL, NULL, NULL, NULL);
+							for (l=0; l<gf_list_count(avccfg1->sequenceParameterSets); l++) {
+								GF_AVCConfigSlot *slc_orig = (GF_AVCConfigSlot *)gf_list_get(avccfg1->sequenceParameterSets, l);
+								gf_avc_get_sps_info(slc_orig->data, slc_orig->size, &sps_id2, NULL, NULL, NULL, NULL);
+								if (sps_id2==sps_id1) {
+									merge_mode = 0;
+									break;
+								}
+							}
+						}
+#endif
+						/*no conflicts in SPS ids, merge all SPS in a single sample desc*/
+						if (merge_mode==1) {
+							while (gf_list_count(avccfg1->sequenceParameterSets)) {
+								GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg1->sequenceParameterSets, 0);
+								gf_list_rem(avccfg1->sequenceParameterSets, 0);
+								gf_list_add(avccfg2->sequenceParameterSets, slc);
+							}
+							while (gf_list_count(avccfg1->pictureParameterSets)) {
+								GF_AVCConfigSlot *slc = (GF_AVCConfigSlot *)gf_list_get(avccfg1->pictureParameterSets, 0);
+								gf_list_rem(avccfg1->pictureParameterSets, 0);
+								gf_list_add(avccfg2->pictureParameterSets, slc);
+							}
+							gf_isom_avc_config_update(init_seg, track, 1, avccfg2);
+						} else {
+							sps_merge_failed = 1;
+						}
+						gf_odf_avc_cfg_del(avccfg1);
+						gf_odf_avc_cfg_del(avccfg2);
+					}
+
+					/*cannot merge, clone*/
+					if (merge_mode==0)
+						gf_isom_clone_sample_description(init_seg, track, in, j+1, 1, NULL, NULL, &outDescIndex);
+				}
+			} else {
+				u32 defaultDuration, defaultSize, defaultDescriptionIndex, defaultRandomAccess;
+				u8 defaultPadding;
+				u16 defaultDegradationPriority;
+
+				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;
+					}
+					break;
+				case GF_4CC( 'h', 'v', 'c', '1'):
+					if (use_inband_param_set) {
+						gf_isom_hevc_set_inband_config(init_seg, track, 1);
+					}
+					use_hevc = GF_TRUE;
+					break;
+				}
+
+
+				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);
+				if (e) break;
+			}
+		}
+		if (!i) {
+			if (use_hevc || use_avc3) {
+				gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','6'), 1);
+			} else {
+				gf_isom_set_brand_info(init_seg, GF_4CC('i','s','o','5'), 1);
+			}
+			/*DASH self-init media segment*/
+			if (single_segment) {
+				gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','s','m','s'), 1);
+			} else {
+				gf_isom_modify_alternate_brand(init_seg, GF_4CC('d','a','s','h'), 1);
+			}
+
+			if (!dash_opts->pssh_moof) {
+				e = gf_isom_clone_pssh(init_seg, in, GF_TRUE);
+			}
+		}
+		gf_isom_close(in);
+	}
+	if (e) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Couldn't create initialization segment: error %s\n", gf_error_to_string(e) ));
+		*disable_bs_switching = GF_TRUE;
+		gf_isom_delete(init_seg);
+		gf_delete_file(szInitName);
+		return GF_OK;
+	} else if (sps_merge_failed) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Couldnt merge AVC|H264 SPS from different files (same SPS ID used) - different sample descriptions will be used\n"));
+		*disable_bs_switching = GF_TRUE;
+		gf_isom_delete(init_seg);
+		gf_delete_file(szInitName);
+		return GF_OK;
+	} else {
+		e = gf_isom_close(init_seg);
+	}
+	return e;
+}
+
+static GF_Err dasher_isom_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
+{
+	GF_ISOFile *in = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, dash_cfg->tmpdir);
+	GF_Err e = gf_media_isom_segment_file(in, szOutName, dash_cfg->fragment_duration, dash_cfg, dash_input, first_in_set);
+	gf_isom_close(in);
+	return e;
+}
+#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
+
+#ifndef GPAC_DISABLE_MPEG2TS
+
+static GF_Err dasher_generic_classify_input(GF_DashSegInput *dash_inputs, u32 nb_dash_inputs, u32 input_idx, u32 *current_group_id, u32 *max_sap_type)
+{
+#ifdef GPAC_DISABLE_MEDIA_IMPORT
+	return GF_NOT_SUPPORTED;
+#else
+	GF_Err e;
+	u32 i, j, k;
+	GF_MediaImporter in, probe;
+
+	memset(&in, 0, sizeof(GF_MediaImporter));
+	in.flags = GF_IMPORT_PROBE_ONLY;
+	in.in_name = (char *)dash_inputs[input_idx].file_name;
+	e = gf_media_import(&in);
+	if (e) return e;
+
+	for (i=input_idx+1; i<nb_dash_inputs; i++) {
+		Bool valid_in_adaptation_set = GF_TRUE;
+		Bool assign_to_group = GF_TRUE;
+
+		if (dash_inputs[input_idx].period != dash_inputs[i].period) 
+			continue;
+
+		if (strcmp(dash_inputs[input_idx].szMime, dash_inputs[i].szMime))
+			continue;
+
+		if (strcmp(dash_inputs[input_idx].role, dash_inputs[i].role))
+			continue;
+
+		memset(&probe, 0, sizeof(GF_MediaImporter));
+		probe.flags = GF_IMPORT_PROBE_ONLY;
+		probe.in_name = (char *)dash_inputs[i].file_name;
+		e = gf_media_import(&probe);
+		if (e) return e;
+
+		if (in.nb_progs != probe.nb_progs) valid_in_adaptation_set = 0;
+		if (in.nb_tracks != probe.nb_tracks) valid_in_adaptation_set = 0;
+
+		for (j=0; j<in.nb_tracks; j++) {
+			struct __track_import_info *src_tk, *probe_tk;
+			Bool found = GF_FALSE;
+			/*make sure we have the same track*/
+			for (k=0; k<probe.nb_tracks;k++) {
+				if (in.tk_info[j].track_num==probe.tk_info[k].track_num) {
+					found = GF_TRUE;
+					break;
+				}
+			}
+			if (!found) {
+				valid_in_adaptation_set = GF_FALSE;
+				assign_to_group = GF_FALSE;
+				break;
+			}
+			src_tk = &in.tk_info[j];
+			probe_tk = &probe.tk_info[k];
+
+			/*make sure we use the same media type*/
+			if (src_tk->type != probe_tk->type) {
+				valid_in_adaptation_set = GF_FALSE;
+				assign_to_group = GF_FALSE;
+				break;
+			}
+			/*make sure we use the same codec type*/
+			if (src_tk->media_type != probe_tk->media_type) {
+				valid_in_adaptation_set = GF_FALSE;
+				break;
+			}
+			/*make sure we use the same aspect ratio*/
+			if (src_tk->type==GF_ISOM_MEDIA_VISUAL) {
+				if (src_tk->video_info.width * probe_tk->video_info.height != src_tk->video_info.height * probe_tk->video_info.width) {
+					valid_in_adaptation_set = GF_FALSE;
+					break;
+				}
+			} else if (src_tk->lang != probe_tk->lang) {
+				valid_in_adaptation_set = GF_FALSE;
+				break;
+			}
+
+			if (!valid_in_adaptation_set) break;
+		}
+		if (valid_in_adaptation_set) {
+			dash_inputs[i].adaptation_set = dash_inputs[input_idx].adaptation_set;
+			dash_inputs[input_idx].nb_rep_in_adaptation_set ++;
+		} else if (assign_to_group) {
+			if (!dash_inputs[input_idx].group_id) {
+				(*current_group_id) ++;
+				dash_inputs[input_idx].group_id = (*current_group_id);
+			}
+			dash_inputs[i].group_id = (*current_group_id);
+		}
+	}
+#endif
+	return GF_OK;
+}
+
+#endif
+
+#ifndef GPAC_DISABLE_MPEG2TS
+
+static GF_Err dasher_generic_get_components_info(GF_DashSegInput *input, GF_DASHSegmenterOptions *opts)
+{
+#ifdef GPAC_DISABLE_MEDIA_IMPORT
+	return GF_NOT_SUPPORTED;
+#else
+	u32 i;
+	GF_Err e;
+	GF_MediaImporter in;
+	memset(&in, 0, sizeof(GF_MediaImporter));
+	in.flags = GF_IMPORT_PROBE_ONLY;
+	in.in_name = (char *)input->file_name;
+	e = gf_media_import(&in);
+	if (e) return e;
+
+	input->nb_components = in.nb_tracks;
+
+	for (i=0; i<in.nb_tracks; i++) {
+		input->components[i].width = in.tk_info[i].video_info.width;
+		input->components[i].height = in.tk_info[i].video_info.height;
+		input->components[i].media_type = in.tk_info[i].type;
+		input->components[i].channels = in.tk_info[i].audio_info.nb_channels;
+		input->components[i].sample_rate = in.tk_info[i].audio_info.sample_rate;
+		input->components[i].ID = in.tk_info[i].track_num;
+		if (in.tk_info[i].lang)
+			strcpy(input->components[i].szLang, gf_4cc_to_str(in.tk_info[i].lang) );
+		strcpy(input->components[i].szCodec, in.tk_info[i].szCodecProfile);
+		input->components[i].fps_denum = 1000;
+		input->components[i].fps_num = (u32) (in.tk_info[i].video_info.FPS*1000);
+	}
+#endif
+	return GF_OK;
+}
+#endif
+
+
+#ifndef GPAC_DISABLE_MPEG2TS
+
+typedef struct
+{
+	FILE *src;
+	GF_M2TS_Demuxer *ts;
+	u64 file_size;
+	u32 bandwidth;
+	Bool has_seen_pat;
+	
+	u64 suspend_indexing;
+
+	/* For indexing the TS*/
+	Double segment_duration;
+	Bool segment_at_rap;
+
+	FILE *index_file;
+	GF_BitStream *index_bs;
+
+	u32 subduration;
+	u32 skip_nb_segments;
+	u64 duration_at_last_pass;
+
+	GF_SegmentIndexBox *sidx;
+	GF_PcrInfoBox *pcrb;
+
+	u32 reference_pid;
+	GF_M2TS_PES *reference_stream;
+	
+	u32 nb_pes_in_segment;
+	/* earliest presentation time for the whole segment */
+	u64 first_PTS;
+	/* DTS-PCR diff for the first PES packet */
+	u64 PCR_DTS_initial_diff;
+
+	/* earliest presentation time for the subsegment being processed */
+	u64 base_PTS;
+	/* byte offset for the start of subsegment being processed */
+	u64 base_offset;
+	/* last presentation time for the subsegment being processed (before the next subsegment is started) */
+	u64 last_PTS;
+	/* last decoding time for the subsegment being processed */
+	u64 last_DTS;
+	/* byte offset for the last PES packet for the subsegment being processed */
+	u32 last_offset;
+	u32 last_frame_duration;
+
+	/* earliest presentation time for the previous subsegment */
+	u64 prev_base_PTS;
+	/* byte offset for the start of the previous subsegment */
+	u64 prev_base_offset;
+	/* last presentation time for the previous subsegment */
+	u64 prev_last_PTS;
+	/* byte offset for the last PES packet for the previous subsegment */
+	u32 prev_last_offset;
+
+	/* indicates if the current subsegment contains a SAP and its SAP type*/
+	u32 SAP_type;
+	/* indicates if the first PES in the current subsegment is a SAP*/
+	Bool first_pes_sap;
+	/* Presentation time for the first RAP encountered in the subsegment */
+	u64 first_SAP_PTS;
+	/* byte offset for the first RAP encountered in the subsegment */
+	u32 first_SAP_offset;
+	u64 prev_last_SAP_PTS;
+	u32 prev_last_SAP_offset;
+	u64 last_SAP_PTS;
+	u32 last_SAP_offset;
+
+	Bool pes_after_last_pat_is_sap;
+
+	/*Interpolated PCR value for the pcrb*/
+	u64 interpolated_pcr_value;
+	u64 last_pcr_value;
+
+	/* information about the first PAT found in the subsegment */
+	u32 last_pat_position;
+	u32 first_pat_position;
+	u32 prev_last_pat_position;
+	Bool first_pat_position_valid, first_pes_after_last_pat;
+	u32 pat_version;
+
+	/* information about the first CAT found in the subsegment */
+	u32 last_cat_position;
+	u32 first_cat_position;
+	u32 prev_last_cat_position;
+	Bool first_cat_position_valid;
+	u32 cat_version;
+
+	/* information about the first PMT found in the subsegment */
+	u32 last_pmt_position;
+	u32 first_pmt_position;
+	u32 prev_last_pmt_position;
+	Bool first_pmt_position_valid;
+	u32 pmt_version;
+
+	/* information about the first PCR found in the subsegment */
+	u32 last_pcr_position;
+	u32 first_pcr_position;
+	Bool first_pcr_position_valid;
+	u32 prev_last_pcr_position;
+
+} GF_TSSegmenter;
+
+static void m2ts_sidx_add_entry(GF_SegmentIndexBox *sidx, Bool ref_type, 
+								u32 size, u32 duration, Bool first_is_SAP, u32 sap_type, u32 RAP_delta_time)
+{
+	GF_SIDXReference *ref;
+	sidx->nb_refs++;
+	sidx->refs = (GF_SIDXReference *)gf_realloc(sidx->refs, sidx->nb_refs*sizeof(GF_SIDXReference));
+	ref = &(sidx->refs[sidx->nb_refs-1]);
+	ref->reference_type = ref_type;
+	ref->reference_size = size;
+	ref->subsegment_duration = duration;
+	ref->starts_with_SAP = first_is_SAP;
+	ref->SAP_type = sap_type;
+	ref->SAP_delta_time = (sap_type ? RAP_delta_time: 0);
+}
+
+static void m2ts_sidx_finalize_size(GF_TSSegmenter *index_info, u64 file_size)
+{
+	GF_SIDXReference *ref;
+	if (index_info->suspend_indexing) return;
+	if (index_info->sidx->nb_refs == 0) return;
+	ref = &(index_info->sidx->refs[index_info->sidx->nb_refs-1]);
+	ref->reference_size = (u32)(file_size - index_info->prev_base_offset);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment: position-range ajdustment:%d-%d (%d bytes)\n", index_info->prev_base_offset, (u32)file_size, ref->reference_size));
+}
+
+static void m2ts_sidx_flush_entry(GF_TSSegmenter *index_info) 
+{
+	u32 end_offset, size, duration; 
+	Bool store_segment = 1;
+
+	if (index_info->suspend_indexing) 
+		return;
+
+	if (index_info->skip_nb_segments) {
+		index_info->skip_nb_segments --;
+		store_segment = GF_FALSE;
+	}
+
+	/* determine the end of the current index */
+	if (index_info->segment_at_rap) {
+		/*split at PAT*/
+		end_offset = index_info->last_pat_position;
+	} else {
+		/* split at PES header */
+		end_offset = index_info->last_offset; 
+	}
+	size = (u32)(end_offset - index_info->base_offset);
+	duration = (u32)(index_info->last_PTS - index_info->base_PTS);
+
+	if (store_segment) {
+		u32 prev_duration, SAP_delta_time, SAP_offset;
+		if (!index_info->sidx) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Segment: Reference PID: %d, EPTime: "LLU", Start Offset: %d bytes\n", index_info->reference_pid, index_info->base_PTS, index_info->base_offset));
+			index_info->sidx = (GF_SegmentIndexBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_SIDX);
+			index_info->sidx->reference_ID = index_info->reference_pid;
+			/* timestamps in MPEG-2 are expressed in 90 kHz timescale */
+			index_info->sidx->timescale = 90000;
+			/* first encountered PTS on the PID for this subsegment */
+			index_info->sidx->earliest_presentation_time = index_info->base_PTS;
+			index_info->sidx->first_offset = index_info->base_offset;
+					
+		}
+		
+		if (!index_info->pcrb) {
+			index_info->pcrb = (GF_PcrInfoBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_PCRB);
+		}
+
+		/* close the current index */ 
+		SAP_delta_time = (u32)(index_info->first_SAP_PTS - index_info->base_PTS);
+		SAP_offset = (u32)(index_info->first_SAP_offset - index_info->base_offset);
+		m2ts_sidx_add_entry(index_info->sidx, 0, size, duration, index_info->first_pes_sap, index_info->SAP_type, SAP_delta_time);
+
+		/*add pcrb entry*/
+		index_info->pcrb->subsegment_count++;
+		index_info->pcrb->pcr_values = gf_realloc(index_info->pcrb->pcr_values, index_info->pcrb->subsegment_count*sizeof(u64));
+		index_info->pcrb->pcr_values[index_info->pcrb->subsegment_count-1] = index_info->interpolated_pcr_value;
+
+		/* adjust the previous index duration */
+		if (index_info->sidx->nb_refs > 0 && (index_info->base_PTS < index_info->prev_last_PTS) ) {
+			prev_duration = (u32)(index_info->base_PTS-index_info->prev_base_PTS);
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("           time-range adj.: %.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;
+			}
+
+		}
+
+		/* Printing result */
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Subsegment:"));
+		//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));
+		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));
+		}
+		if (index_info->first_pat_position_valid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PAT @ %d bytes", (u32)(index_info->first_pat_position - index_info->base_offset)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PAT"));
+		}
+		if (index_info->first_cat_position_valid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", CAT @ %d bytes", (u32)(index_info->first_cat_position - index_info->base_offset)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No CAT"));
+		}
+		if (index_info->first_pmt_position_valid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PMT @ %d bytes", (u32)(index_info->first_pmt_position - index_info->base_offset)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PMT"));
+		}
+		if (index_info->first_pcr_position_valid) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", PCR @ %d bytes", (u32)(index_info->first_pcr_position - index_info->base_offset)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, (", No PCR"));
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("\n"));
+
+	}
+
+	/* save the current values for later adjustments */
+	index_info->prev_last_SAP_PTS = index_info->last_SAP_PTS;
+	index_info->prev_last_SAP_offset = index_info->last_SAP_offset;
+	index_info->prev_last_PTS = index_info->last_PTS;
+	index_info->prev_last_offset = index_info->last_offset;
+	index_info->prev_base_PTS = index_info->base_PTS;
+	index_info->base_PTS = index_info->last_PTS;
+	index_info->prev_base_offset = index_info->base_offset;
+	index_info->prev_last_pat_position = index_info->last_pat_position;
+	index_info->prev_last_cat_position = index_info->last_cat_position;
+	index_info->prev_last_pmt_position = index_info->last_pmt_position;
+	index_info->prev_last_pcr_position = index_info->last_pcr_position;
+	
+	/* update the values for the new index*/
+	index_info->base_offset = end_offset;
+
+	if (index_info->pes_after_last_pat_is_sap) {
+		index_info->SAP_type = 1;
+		index_info->first_SAP_PTS = index_info->last_SAP_PTS;
+		index_info->first_SAP_offset = index_info->last_SAP_offset;
+		index_info->first_pes_sap = GF_TRUE;
+		index_info->nb_pes_in_segment = 1;
+		index_info->base_PTS = index_info->first_SAP_PTS;
+
+		index_info->pes_after_last_pat_is_sap= 0;
+	} else {
+		index_info->SAP_type = 0;
+		index_info->first_SAP_PTS = 0;
+		index_info->first_SAP_offset = 0;
+		index_info->first_pes_sap = GF_FALSE;
+		index_info->nb_pes_in_segment = 0;
+	}
+	index_info->last_DTS = 0;
+
+	if (index_info->last_pat_position >= index_info->base_offset) {
+		index_info->first_pat_position_valid = GF_TRUE;
+		index_info->first_pat_position = index_info->last_pat_position;
+	} else {
+		index_info->first_pat_position_valid = GF_FALSE;
+		index_info->first_pat_position = 0;
+	}
+	if (index_info->last_cat_position >= index_info->base_offset) {
+		index_info->first_cat_position_valid = GF_TRUE;
+		index_info->first_cat_position = index_info->last_cat_position;
+	} else {
+		index_info->first_cat_position_valid = GF_FALSE;
+		index_info->first_cat_position = 0;
+	}
+	if (index_info->last_pmt_position >= index_info->base_offset) {
+		index_info->first_pmt_position_valid = GF_TRUE;
+		index_info->first_pmt_position = index_info->last_pmt_position;
+	} else {
+		index_info->first_pmt_position_valid = GF_FALSE;
+		index_info->first_pmt_position = 0;
+	}
+	if (index_info->last_pcr_position >= index_info->base_offset) {
+		index_info->first_pcr_position_valid = GF_TRUE;
+		index_info->first_pcr_position = index_info->last_pcr_position;
+	} else {
+		index_info->first_pcr_position_valid = GF_FALSE;
+		index_info->first_pcr_position = 0;
+	}
+
+	if (index_info->subduration && (index_info->last_PTS - index_info->first_PTS >= index_info->duration_at_last_pass + index_info->subduration)) {
+		index_info->suspend_indexing = end_offset;
+		index_info->duration_at_last_pass = (u32) (index_info->last_PTS - index_info->first_PTS);
+	}
+}
+
+static void m2ts_check_indexing(GF_TSSegmenter *index_info)
+{
+	u32 segment_duration = (u32)(index_info->segment_duration*90000);
+	u64 current_duration = (index_info->last_PTS - index_info->base_PTS);
+	u64 target_duration = segment_duration;
+
+	//using drift control to ensure that nb_seg*segment_duration is roughly aligned with segment(nb_seg).first_PTS
+	if (index_info->sidx) {
+		current_duration = (index_info->last_PTS - index_info->first_PTS) - index_info->duration_at_last_pass;
+		target_duration += index_info->sidx->nb_refs * segment_duration;
+	}
+
+	if (index_info->segment_at_rap) {
+		s32 diff = (s32) ((s64) current_duration - (s64) segment_duration);
+		if (diff<0)diff=-diff;
+		//check if below 10% limit 
+		if (diff/900 < 5) {
+			//below 10% limit of segment duration, if we have a RAP flush now
+			if (index_info->pes_after_last_pat_is_sap)
+				m2ts_sidx_flush_entry(index_info);
+			//no rap and below 10% limit, wait for rap
+			return;
+		}
+	}
+
+	/* we exceed the segment duration flush sidx entry*/
+	if (current_duration >= target_duration) {
+		m2ts_sidx_flush_entry(index_info);
+	} 
+}
+static void dash_m2ts_event_check_pat(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+{
+	GF_TSSegmenter *ts_seg = (GF_TSSegmenter*)ts->user;
+	GF_M2TS_PES_PCK *pck;
+	switch (evt_type) {
+	case GF_M2TS_EVT_PAT_REPEAT:
+		ts_seg->has_seen_pat = 1;
+		break;
+	case GF_M2TS_EVT_PMT_FOUND:
+	{
+		u32 i, count;
+		GF_M2TS_Program *prog = (GF_M2TS_Program*)par;
+		count = gf_list_count(prog->streams);
+		for (i=0; i<count; i++) {
+			GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
+			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
+		}
+	}
+		break;
+	case GF_M2TS_EVT_PMT_REPEAT:
+		if (ts_seg->has_seen_pat) {
+			u32 i, count;
+			Bool done = 1;
+			GF_M2TS_Program *prog = (GF_M2TS_Program*)par;
+			count = gf_list_count(prog->streams);
+			for (i=0; i<count; i++) {
+				GF_M2TS_ES *es = (GF_M2TS_ES *)gf_list_get(prog->streams, i);
+				if (es->flags&GF_M2TS_ES_IS_PES) {
+					GF_M2TS_PES *pes = (GF_M2TS_PES *)es; 
+					if (!pes->aud_sr && !pes->vid_w) {
+						done = 0;
+						break;
+					} else {
+						/*stream is configured, we only need PES header now*/
+						gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_RAW);
+					}
+				}
+			}
+			if (done) ts_seg->has_seen_pat = 2;
+		}
+		break;
+	case GF_M2TS_EVT_PES_PCK:
+		pck = par;
+		/* we process packets only for the given PID */
+		if (pck->stream->pid == pck->stream->program->pcr_pid) {
+			if (!ts_seg->nb_pes_in_segment || (ts_seg->first_PTS > pck->PTS)) {
+				ts_seg->first_PTS = pck->PTS;
+				ts_seg->nb_pes_in_segment++;
+			}
+			if (pck->PTS > ts_seg->last_PTS) {
+				ts_seg->last_PTS = pck->PTS;
+			}
+			if (ts_seg->last_DTS != pck->DTS) {
+				ts_seg->last_frame_duration = (u32) (pck->DTS - ts_seg->last_DTS);
+				ts_seg->last_DTS = pck->DTS;
+			}
+		}
+		break;
+	}
+}
+
+static void dash_m2ts_event(GF_M2TS_Demuxer *ts, u32 evt_type, void *par) 
+{
+	GF_M2TS_Program *prog;
+	GF_M2TS_PES_PCK *pck;
+	GF_M2TS_PES *pes;
+	u64 interpolated_pcr_value;
+	u32 count, i;
+	GF_TSSegmenter *ts_seg = (GF_TSSegmenter*)ts->user;
+
+	switch (evt_type) {
+	case GF_M2TS_EVT_PAT_FOUND:
+		if (!ts_seg->first_pat_position_valid) {
+			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pat_position = (ts->pck_number-1)*188;
+		ts_seg->first_pes_after_last_pat = 0;
+		ts_seg->pes_after_last_pat_is_sap = 0;
+		break;
+	case GF_M2TS_EVT_PAT_UPDATE:
+		if (!ts_seg->first_pat_position_valid) {
+			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pat_position = (ts->pck_number-1)*188;
+		ts_seg->first_pes_after_last_pat = 0;
+		ts_seg->pes_after_last_pat_is_sap = 0;
+		break;
+	case GF_M2TS_EVT_PAT_REPEAT:
+		if (!ts_seg->first_pat_position_valid) {
+			ts_seg->first_pat_position_valid = 1;
+			ts_seg->first_pat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pat_position = (ts->pck_number-1)*188;
+		ts_seg->first_pes_after_last_pat = 0;
+		ts_seg->pes_after_last_pat_is_sap = 0;
+		break;
+	case GF_M2TS_EVT_CAT_FOUND:
+		if (!ts_seg->first_cat_position_valid) {
+			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_cat_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_CAT_UPDATE:
+		if (!ts_seg->first_cat_position_valid) {
+			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position = (ts->pck_number-1)*188;
+		}
+		break;
+	case GF_M2TS_EVT_CAT_REPEAT:
+		if (!ts_seg->first_cat_position_valid) {
+			ts_seg->first_cat_position_valid = 1;
+			ts_seg->first_cat_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_cat_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_PMT_FOUND:
+		ts_seg->has_seen_pat = 1;
+		prog = (GF_M2TS_Program*)par;
+		if (!ts_seg->first_pmt_position_valid) {
+			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
+		/* we create indexing information on the stream used for carrying the PCR */
+		ts_seg->reference_pid = prog->pcr_pid;
+		ts_seg->reference_stream = (GF_M2TS_PES *) ts_seg->ts->ess[prog->pcr_pid];
+		count = gf_list_count(prog->streams);
+
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("Program number %d found - %d streams:\n", prog->number, count));
+		for (i=0; i<count; i++) {
+			GF_M2TS_ES *es = gf_list_get(prog->streams, i);
+			gf_m2ts_set_pes_framing((GF_M2TS_PES *)es, GF_M2TS_PES_FRAMING_DEFAULT);
+		}
+		break;
+	case GF_M2TS_EVT_PMT_UPDATE:
+		if (!ts_seg->first_pmt_position_valid) {
+			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_PMT_REPEAT:
+		if (!ts_seg->first_pmt_position_valid) {
+			ts_seg->first_pmt_position_valid = 1;
+			ts_seg->first_pmt_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pmt_position = (ts->pck_number-1)*188;
+		break;
+	case GF_M2TS_EVT_PES_PCK:
+		pck = par;
+		/*We need the interpolated PCR for the pcrb, hence moved this calculus out, and saving the calculated value in ts_seg to put it in the pcrb*/
+		pes = pck->stream;
+		/* Interpolated PCR value for the TS packet containing the PES header start */
+		interpolated_pcr_value = 0;
+		if (pes->last_pcr_value && pes->before_last_pcr_value_pck_number && pes->last_pcr_value > pes->before_last_pcr_value) {
+			u32 delta_pcr_pck_num = pes->last_pcr_value_pck_number - pes->before_last_pcr_value_pck_number;
+			u32 delta_pts_pcr_pck_num = pes->pes_start_packet_number - pes->last_pcr_value_pck_number;
+			u64 delta_pcr_value = pes->last_pcr_value - pes->before_last_pcr_value; 
+			if ((pes->pes_start_packet_number > pes->last_pcr_value_pck_number)
+				&& (pes->last_pcr_value > pes->before_last_pcr_value)) {
+				
+					pes->last_pcr_value = pes->before_last_pcr_value;
+			}
+			/* we can compute the interpolated pcr value for the packet containing the PES header */
+			interpolated_pcr_value = pes->last_pcr_value + (u64)((delta_pcr_value*delta_pts_pcr_pck_num*1.0)/delta_pcr_pck_num);
+			ts_seg->interpolated_pcr_value = interpolated_pcr_value;
+			ts_seg->last_pcr_value = pes->last_pcr_value;
+		}
+		/* we process packets only for the given PID */
+		if (pck->stream->pid != ts_seg->reference_pid) {
+			break;
+		} else {
+			if (ts_seg->last_DTS != pck->DTS) {
+				if (ts_seg->last_DTS)
+					ts_seg->last_frame_duration = (u32) (pck->DTS - ts_seg->last_DTS);
+				ts_seg->last_DTS = pck->DTS;
+				ts_seg->nb_pes_in_segment++;
+
+				if (!ts_seg->first_pes_after_last_pat) {
+					ts_seg->first_pes_after_last_pat = ts_seg->nb_pes_in_segment;
+					ts_seg->pes_after_last_pat_is_sap=0;
+				}
+			}
+
+			/* we store the fact that there is at least a RAP for the index
+			and we store the PTS of the first encountered RAP in the index*/
+			if (pck->flags & GF_M2TS_PES_PCK_RAP) {
+				ts_seg->SAP_type = 1;
+				if (!ts_seg->first_SAP_PTS || (ts_seg->first_SAP_PTS > pck->PTS)) {
+					ts_seg->first_SAP_PTS = pck->PTS;
+					ts_seg->first_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
+				}
+				ts_seg->last_SAP_PTS = pck->PTS;
+				ts_seg->last_SAP_offset = (pck->stream->pes_start_packet_number-1)*188;
+
+				if (ts_seg->nb_pes_in_segment==1) {
+					ts_seg->first_pes_sap = GF_TRUE;
+				}
+				if ((ts_seg->nb_pes_in_segment>1) && (ts_seg->first_pes_after_last_pat==ts_seg->nb_pes_in_segment)) {
+					ts_seg->pes_after_last_pat_is_sap=1;
+				}
+			}
+			/* we need to know the earliest PTS value (RAP or not) in the index*/
+			if (!ts_seg->base_PTS || (ts_seg->base_PTS > pck->PTS)) {
+				ts_seg->base_PTS = pck->PTS;
+			}
+			/* we need to know the earliest PTS value for the whole file (segment) */
+			if (!ts_seg->first_PTS || (ts_seg->first_PTS > pck->PTS)) {
+				ts_seg->first_PTS = pck->PTS;
+			}
+			if (pck->PTS > ts_seg->last_PTS) {
+				/* we use the last PTS for first approximation of the duration */
+				ts_seg->last_PTS = pck->PTS;
+				ts_seg->last_offset = (ts_seg->reference_stream->pes_start_packet_number-1)*188;
+			}
+
+			if (ts_seg->PCR_DTS_initial_diff == (u64) -1) {
+				ts_seg->PCR_DTS_initial_diff = ts_seg->last_DTS - pes->last_pcr_value / 300;
+			}
+
+			m2ts_check_indexing(ts_seg);
+		}
+		break;
+	case GF_M2TS_EVT_PES_PCR:
+		pck = par;
+		if (!ts_seg->first_pcr_position_valid) {
+			ts_seg->first_pcr_position_valid = GF_TRUE;
+			ts_seg->first_pcr_position = (ts->pck_number-1)*188;
+		}
+		ts_seg->last_pcr_position = (ts->pck_number-1)*188;
+		break;
+	}
+}
+
+static GF_Err dasher_get_ts_demux(GF_TSSegmenter *ts_seg, const char *file, u32 probe_mode)
+{
+	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
+	ts_seg->src = gf_f64_open(file, "rb");
+	if (!ts_seg->src) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot open input %s: no such file\n", file));
+		return GF_URL_ERROR;
+	}
+	ts_seg->ts = gf_m2ts_demux_new();
+	ts_seg->ts->on_event = dash_m2ts_event_check_pat;
+	ts_seg->ts->notify_pes_timing = GF_TRUE;
+	ts_seg->ts->user = ts_seg;
+
+	gf_f64_seek(ts_seg->src, 0, SEEK_END);
+	ts_seg->file_size = gf_f64_tell(ts_seg->src);
+	gf_f64_seek(ts_seg->src, 0, SEEK_SET);
+
+	if (probe_mode) {
+		/* first loop to process all packets between two PAT, and assume all signaling was found between these 2 PATs */
+		while (!feof(ts_seg->src)) {
+			char data[188];
+			u32 size = (u32) fread(data, 1, 188, ts_seg->src);
+			if (size<188) break;
+
+			gf_m2ts_process_data(ts_seg->ts, data, size);
+			if (ts_seg->has_seen_pat==probe_mode)
+				break;
+		}
+		gf_m2ts_reset_parsers(ts_seg->ts);
+		gf_f64_seek(ts_seg->src, 0, SEEK_SET);
+	}
+	ts_seg->ts->on_event = dash_m2ts_event;
+	return GF_OK;
+}
+
+static void dasher_del_ts_demux(GF_TSSegmenter *ts_seg)
+{
+	if (ts_seg->ts) gf_m2ts_demux_del(ts_seg->ts);
+	if (ts_seg->src) fclose(ts_seg->src);
+	memset(ts_seg, 0, sizeof(GF_TSSegmenter));
+}
+
+static GF_Err dasher_mp2t_get_components_info(GF_DashSegInput *dash_input, GF_DASHSegmenterOptions *dash_opts)
+{
+	char sOpt[40];
+	GF_TSSegmenter ts_seg;
+	GF_Err e = dasher_generic_get_components_info(dash_input, dash_opts);
+	if (e) return e;
+
+	dash_input->duration = 0;
+	if (dash_opts->dash_ctx) {
+		const char *opt = gf_cfg_get_key(dash_opts->dash_ctx, "DASH", "LastFileName");
+		if (opt && !strcmp(opt, dash_input->file_name)) {
+			const char *opt = gf_cfg_get_key(dash_opts->dash_ctx, "DASH", "LastFileDuration");
+			if (opt) dash_input->duration = atof(opt);
+		}
+	}
+
+	e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, dash_input->duration ? 2 : 3);
+	if (e) return e;
+
+	if (!dash_input->duration)
+		dash_input->duration = (ts_seg.last_PTS + ts_seg.last_frame_duration - ts_seg.first_PTS)/90000.0;
+
+	gf_cfg_set_key(dash_opts->dash_ctx, "DASH", "LastFileName", dash_input->file_name);
+	sprintf(sOpt, "%g", dash_input->duration);
+	gf_cfg_set_key(dash_opts->dash_ctx, "DASH", "LastFileDuration", sOpt);
+
+	dasher_del_ts_demux(&ts_seg);
+
+	return GF_OK;
+}
+
+#define NB_TSPCK_IO_BYTES 18800
+
+static GF_Err dasher_mp2t_segment_file(GF_DashSegInput *dash_input, const char *szOutName, GF_DASHSegmenterOptions *dash_cfg, Bool first_in_set)
+{	
+	GF_TSSegmenter ts_seg;
+	Bool rewrite_input = 0;
+	u8 is_pes[GF_M2TS_MAX_STREAMS];
+	char szOpt[100];
+	char SegName[GF_MAX_PATH], IdxName[GF_MAX_PATH];
+	char szSectionName[100], szRepURLsSecName[100];
+	char szCodecs[100];
+	const char *opt;
+	u32 i, startNumberRewind;
+	GF_Err e;
+	u64 start, pcr_shift, next_pcr_shift;
+	Double cumulated_duration = 0;
+	u32 bandwidth = 0;
+	u32 segment_index;
+	/*compute name for indexed segments*/
+	const char *basename = gf_url_get_resource_name(szOutName);
+
+	/*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);	
+
+	/*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);	
+
+		ts_seg.index_file = gf_f64_open(IdxName, "wb");
+		if (!ts_seg.index_file) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create index file %s\n", IdxName));
+			e = GF_IO_ERR;
+			goto exit;
+		}
+		ts_seg.index_bs = gf_bs_from_file(ts_seg.index_file, GF_BITSTREAM_WRITE);
+
+		styp = (GF_SegmentTypeBox *)gf_isom_box_new(GF_ISOM_BOX_TYPE_STYP);
+		styp->majorBrand = GF_4CC('r','i','s','x');
+		styp->minorVersion = 0;
+		styp->altBrand = (u32*)gf_malloc(sizeof(u32));
+		styp->altBrand[0] = styp->majorBrand;
+		styp->altCount = 1;
+		gf_isom_box_size((GF_Box *)styp);
+		gf_isom_box_write((GF_Box *)styp, ts_seg.index_bs);
+		gf_isom_box_del((GF_Box *)styp);
+#endif
+	}
+
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 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);
+
+	szSectionName[0] = 0;
+	if (dash_cfg->dash_ctx) {
+		sprintf(szSectionName, "Representation_%s", dash_input->representationID);
+		sprintf(szRepURLsSecName, "URLs_%s", dash_input->representationID);
+
+		/*restart where we left last time*/
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "ByteOffset");
+		if (opt) {
+			u64 offset;
+			sscanf(opt, LLU, &offset);
+
+			while (!feof(ts_seg.src) && !ts_seg.has_seen_pat) {
+				char data[NB_TSPCK_IO_BYTES];
+				u32 size = (u32) fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
+				gf_m2ts_process_data(ts_seg.ts, data, size);
+
+				if (size<NB_TSPCK_IO_BYTES) break;
+			}
+			gf_m2ts_reset_parsers(ts_seg.ts);
+			ts_seg.base_PTS = 0;
+			gf_f64_seek(ts_seg.src, offset, SEEK_SET);
+			ts_seg.base_offset = offset;
+			ts_seg.ts->pck_number = (u32) (offset/188);
+		}
+
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset");
+		if (opt) sscanf(opt, LLU, &ts_seg.PCR_DTS_initial_diff);
+
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "DurationAtLastPass");
+		if (opt) sscanf(opt, LLD, &ts_seg.duration_at_last_pass);
+	}
+
+	/*index the file*/
+	while (!feof(ts_seg.src) && !ts_seg.suspend_indexing) {
+		char data[NB_TSPCK_IO_BYTES];
+		u32 size = (u32) fread(data, 1, NB_TSPCK_IO_BYTES, ts_seg.src);
+		gf_m2ts_process_data(ts_seg.ts, data, size);
+		if (size<NB_TSPCK_IO_BYTES) break;
+	}
+	if (feof(ts_seg.src)) ts_seg.suspend_indexing = 0;
+
+	next_pcr_shift = 0;
+	if (!ts_seg.suspend_indexing) {
+		next_pcr_shift = ts_seg.last_DTS + ts_seg.last_frame_duration - ts_seg.PCR_DTS_initial_diff;
+	}
+
+	/* flush SIDX entry for the last packets */
+	m2ts_sidx_flush_entry(&ts_seg);
+	m2ts_sidx_finalize_size(&ts_seg, ts_seg.file_size);
+	GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH]: Indexing done (1 sidx, %d entries).\n", ts_seg.sidx->nb_refs));
+
+	gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_REPINDEX, 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);
+	for (i=0; i<dash_input->nb_components; i++) {
+		is_pes[ dash_input->components[i].ID ] = 1;
+	}
+	pcr_shift = 0;
+
+	bandwidth = dash_input->bandwidth;
+	if (!bandwidth) bandwidth = ts_seg.bandwidth;
+
+	if (dash_cfg->dash_ctx) {
+
+		opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "Setup");
+		if (!opt || strcmp(opt, "yes")) {
+			gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "Setup", "yes");
+			gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "ID", dash_input->representationID);
+		} else {
+			if (!bandwidth) {
+				opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "Bandwidth");
+				if (opt) sscanf(opt, "%u", &bandwidth);
+			}
+
+			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);
+
+			opt = gf_cfg_get_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration");
+			if (opt) cumulated_duration = atof(opt);
+		}
+	}
+
+	/*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); 
+		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, "/>\n");
+	}
+
+
+	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(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].sample_rate) 
+			fprintf(dash_cfg->mpd, " audioSamplingRate=\"%d\"", dash_input->components[i].sample_rate);
+	}
+	if (strlen(szCodecs))
+		fprintf(dash_cfg->mpd, " codecs=\"%s\"", szCodecs);
+
+	fprintf(dash_cfg->mpd, " startWithSAP=\"%d\"", dash_cfg->segments_start_with_rap ? 1 : 0);
+	fprintf(dash_cfg->mpd, " bandwidth=\"%d\"", bandwidth);
+	fprintf(dash_cfg->mpd, ">\n");
+
+
+	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);
+		fprintf(dash_cfg->mpd, "    <BaseURL>%s</BaseURL>\n", SegName);
+
+		fprintf(dash_cfg->mpd, "    <SegmentBase>\n");
+		fprintf(dash_cfg->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName);
+		fprintf(dash_cfg->mpd, "    </SegmentBase>\n");
+
+		/*we rewrite the file*/
+		rewrite_input = 1;
+	} else {
+		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); 
+				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); 
+				}
+
+				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); 
+				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"); 
+
+			if (!dash_cfg->dash_ctx) {
+				fprintf(dash_cfg->mpd, "     <RepresentationIndex sourceURL=\"%s\"/>\n", IdxName); 
+			}
+		}
+
+		/*rewrite previous SegmentList entries*/
+		if ( dash_cfg->dash_ctx && ((dash_cfg->single_file_mode==2) || (!dash_cfg->single_file_mode && !dash_cfg->use_url_template))) {
+			/*rewrite previous URLs*/
+			const char *opt;
+			u32 count, i;
+			count = gf_cfg_get_key_count(dash_cfg->dash_ctx, szRepURLsSecName);
+			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);	
+			}
+		}
+
+		if (dash_cfg->single_file_mode==2) {
+
+			start = ts_seg.sidx->first_offset;
+			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
+				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
+				fprintf(dash_cfg->mpd, "     <SegmentURL mediaRange=\""LLD"-"LLD"\"/>\n", start, start+ref->reference_size-1);
+				start += ref->reference_size;
+			}
+			rewrite_input = GF_TRUE;
+
+		} else {
+			FILE *src, *dst;
+			u64 pos, end;
+			Double current_time = cumulated_duration, dur;
+			src = gf_f64_open(dash_input->file_name, "rb");
+			start = ts_seg.sidx->first_offset;
+			for (i=0; i<ts_seg.sidx->nb_refs; i++) {
+				char buf[NB_TSPCK_IO_BYTES];
+				GF_SIDXReference *ref = &ts_seg.sidx->refs[i];
+
+				gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 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 
+				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");
+					if (!dst) {
+						fclose(src);
+						GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create segment file %s\n", SegName));
+						e = GF_IO_ERR;
+						goto exit;
+					}
+
+					gf_dasher_store_segment_info(dash_cfg, SegName, current_time);
+					dur = ref->subsegment_duration;
+					dur /= 90000;
+					current_time += dur;
+
+					gf_f64_seek(src, start, SEEK_SET);
+					pos = start;
+					end = start+ref->reference_size;
+					while (pos<end) {
+						u32 res;
+						u32 to_read = NB_TSPCK_IO_BYTES;
+						if (pos+NB_TSPCK_IO_BYTES >= end) {
+							to_read = (u32) (end-pos);
+						}
+						res = (u32) fread(buf, 1, to_read, src);
+						if (res==to_read) {
+							gf_m2ts_restamp(buf, res, pcr_shift, is_pes);
+							res = (u32) fwrite(buf, 1, to_read, dst);
+						}
+						if (res!=to_read) {
+							GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: IO error while Extracting segment %03d / %03d\r", i+1, ts_seg.sidx->nb_refs));
+							break;
+						}
+						pos += res;
+					}
+					fclose(dst);
+				}
+				start += ref->reference_size;
+
+				if (!dash_cfg->use_url_template) {
+					gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, 1, SegName, basename, dash_input->representationID, dash_cfg->seg_rad_name, "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+					fprintf(dash_cfg->mpd, "     <SegmentURL media=\"%s\"/>\n", SegName);
+
+					if (dash_cfg->dash_ctx) {
+						char szKey[100], szVal[4046];
+						sprintf(szKey, "UrlInfo%d", segment_index);
+						sprintf(szVal, "<SegmentURL media=\"%s\"/>", SegName);
+						gf_cfg_set_key(dash_cfg->dash_ctx, szRepURLsSecName, szKey, szVal);
+					}
+				}
+
+				segment_index++;
+				gf_set_progress("Extracting segment ", i+1, ts_seg.sidx->nb_refs);
+			}
+			fclose(src);
+			cumulated_duration = current_time;
+		}	
+		if (!dash_cfg->seg_rad_name || !dash_cfg->use_url_template) {
+			fprintf(dash_cfg->mpd, "    </SegmentList>\n");
+		}
+	}
+
+	if (rewrite_input) {
+		FILE *in, *out;
+		u64 fsize, done;
+		char buf[NB_TSPCK_IO_BYTES];
+
+		gf_media_mpd_format_segment_name(GF_DASH_TEMPLATE_SEGMENT, GF_TRUE, SegName, dash_cfg->seg_rad_name ? basename : szOutName, dash_input->representationID, gf_url_get_resource_name(dash_cfg->seg_rad_name), "ts", 0, bandwidth, segment_index, dash_cfg->use_segment_timeline);
+		out = gf_f64_open(SegName, "wb");
+		if (!out) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: Cannot create segment file %s\n", SegName));
+			e = GF_IO_ERR;
+			goto exit;
+		}
+		in = gf_f64_open(dash_input->file_name, "rb");
+		gf_f64_seek(in, 0, SEEK_END);
+		fsize = gf_f64_tell(in);
+		gf_f64_seek(in, 0, SEEK_SET);
+		done = 0;
+		while (1) {
+			u32 read = (u32) fread(buf, 1, NB_TSPCK_IO_BYTES, in);
+			gf_m2ts_restamp(buf, read, pcr_shift, is_pes);
+			fwrite(buf, 1, read, out);
+			done+=read;
+			gf_set_progress("Extracting segment ", done/188, fsize/188);
+			if (read<NB_TSPCK_IO_BYTES) break;
+		}
+		fclose(in);
+		fclose(out);
+	}
+
+	fprintf(dash_cfg->mpd, "   </Representation>\n");
+
+	if (dash_cfg->dash_ctx) {
+		sprintf(szOpt, "%u", bandwidth);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "Bandwidth", szOpt);
+
+		sprintf(szOpt, "%u", segment_index);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "StartIndex", szOpt);
+
+		sprintf(szOpt, "%g", ts_seg.segment_duration);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
+
+		sprintf(szOpt, LLU, next_pcr_shift + pcr_shift);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "PCR90kOffset", szOpt);
+
+		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);
+
+		sprintf(szOpt, LLU, ts_seg.PCR_DTS_initial_diff);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "InitialDTSOffset", ts_seg.suspend_indexing ? szOpt : NULL);
+
+		sprintf(szOpt, "%g", cumulated_duration);
+		gf_cfg_set_key(dash_cfg->dash_ctx, szSectionName, "CumulatedDuration", szOpt);
+	}
+
+	if (ts_seg.sidx && ts_seg.index_bs) {
+		gf_isom_box_size((GF_Box *)ts_seg.sidx);
+		gf_isom_box_write((GF_Box *)ts_seg.sidx, ts_seg.index_bs);
+	}
+	if (ts_seg.pcrb && ts_seg.index_bs) {
+		gf_isom_box_size((GF_Box *)ts_seg.pcrb);
+		gf_isom_box_write((GF_Box *)ts_seg.pcrb, ts_seg.index_bs);
+	}
+
+exit:
+	if (ts_seg.sidx) gf_isom_box_del((GF_Box *)ts_seg.sidx);
+	if (ts_seg.pcrb) gf_isom_box_del((GF_Box *)ts_seg.pcrb);
+	if (ts_seg.index_file) fclose(ts_seg.index_file);
+	if (ts_seg.index_bs) gf_bs_del(ts_seg.index_bs);
+	dasher_del_ts_demux(&ts_seg);
+	return e;
+}
+
+#endif //GPAC_DISABLE_MPEG2TS
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+static char * gf_dash_get_representationID(GF_DashSegInput *inputs, u32 nb_dash_inputs, const char *file_name, u32 trackNum) {
+	u32 i;
+
+	for (i = 0; i < nb_dash_inputs; i++) {
+		if (!strcmp(inputs[i].file_name, file_name) && (inputs[i].trackNum == trackNum))
+			return inputs[i].representationID;
+	}
+
+	return 0; //we should never be here !!!!
+}
+#endif
+
+GF_Err gf_dash_segmenter_probe_input(GF_DashSegInput **io_dash_inputs, u32 *nb_dash_inputs, u32 idx)
+{
+	GF_DashSegInput *dash_inputs = *io_dash_inputs;
+	GF_DashSegInput *dash_input = & dash_inputs[idx];
+	char *uri_frag = strchr(dash_input->file_name, '#');
+	FILE *t = gf_f64_open(dash_input->file_name, "rb");
+	
+	if (uri_frag) uri_frag[0] = 0;
+
+	t = gf_f64_open(dash_input->file_name, "rb");
+	if (!t) return GF_URL_ERROR;
+	fclose(t);
+
+#ifndef GPAC_DISABLE_ISOM_FRAGMENTS
+	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;
+		dash_input->dasher_get_components_info = dasher_isom_get_input_components_info;
+		dash_input->dasher_segment_file = dasher_isom_segment_file;
+
+		file = gf_isom_open(dash_input->file_name, GF_ISOM_OPEN_READ, NULL);
+		if (!file) return gf_isom_last_error(NULL);
+		nb_track = gf_isom_get_track_count(file);
+
+		/*if this dash input file has only one track, or this has not the scalable track: let it be*/
+		if ((nb_track == 1) || !gf_isom_has_scalable_layer(file)) {
+
+			if (uri_frag) {
+				u32 id = 0;
+				if (!strnicmp(uri_frag+1, "trackID=", 8)) 
+					id = atoi(uri_frag+9);
+				else if (!strnicmp(uri_frag+1, "ID=", 3)) 
+					id = atoi(uri_frag+4);
+				else if (!stricmp(uri_frag+1, "audio") || !stricmp(uri_frag+1, "video")) {
+					Bool check_video = !stricmp(uri_frag+1, "video") ? 1 : 0;
+					u32 i;
+					for (i=0; i<nb_track; i++) {
+						switch (gf_isom_get_media_type(file, i+1)) {
+						case GF_ISOM_MEDIA_VISUAL:
+							if (check_video) id = gf_isom_get_track_id(file, i+1);
+							break;
+						case GF_ISOM_MEDIA_AUDIO:
+							if (!check_video) id = gf_isom_get_track_id(file, i+1);
+							break;
+						}
+						if (id) break;
+					}
+				}
+				dash_input->single_track_num = gf_isom_get_track_by_id(file, id);
+				nb_track = dash_input->single_track_num;
+			}
+			dash_input->protection_scheme_type = gf_isom_is_media_encrypted(file, nb_track, 1);
+			gf_isom_close(file);
+			dash_input->moof_seqnum_increase = 0;
+
+			return GF_OK;
+		}
+
+		max_nb_deps = 0;
+		for (j = 0; j < nb_track; j++) {
+			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)
+					max_nb_deps ++;
+			}
+		}
+		//scalable input file, realloc
+		j = *nb_dash_inputs + max_nb_deps;
+		dash_inputs = gf_realloc(dash_inputs, sizeof(GF_DashSegInput) * j);
+		memset(&dash_inputs[*nb_dash_inputs], 0, sizeof(GF_DashSegInput) * max_nb_deps);
+		*io_dash_inputs = dash_inputs;
+
+		dash_input = & dash_inputs[idx];
+		dash_input->nb_representations = 1 + max_nb_deps;
+		dash_input->idx_representations=0;
+		rep_idx = 1;
+		cur_idx = idx+1;
+
+		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*/
+			if (!count) {
+				dash_input->trackNum = j+1;
+				continue;
+			}
+
+			di = &dash_inputs [cur_idx];
+			*nb_dash_inputs += 1;
+			cur_idx++;
+			//copy over values from base rep
+			memcpy(di, dash_input, sizeof(GF_DashSegInput));
+
+			/*representationID*/
+			sprintf(di->representationID, "%s_%d", dash_input->representationID, cur_idx);
+			di->trackNum = j+1;
+
+			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
+			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, " ");
+				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;
+	}
+#endif /*GPAC_DISABLE_ISOM_FRAGMENTS*/
+
+	dash_input->moof_seqnum_increase = 0;
+
+#ifndef GPAC_DISABLE_MPEG2TS
+	if (gf_m2ts_probe_file(dash_input->file_name)) {
+		GF_TSSegmenter ts_seg;
+		u32 count = 0;
+		GF_Err e = dasher_get_ts_demux(&ts_seg, dash_input->file_name, 1);
+		if (e) return e;
+		count = gf_list_count(ts_seg.ts->programs);
+		dasher_del_ts_demux(&ts_seg);
+		if (count>1) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: MPEG-2 TS file %s has several programs - this is not supported in MPEG-DASH - skipping\n", dash_input->file_name));
+			return GF_NOT_SUPPORTED;
+		}
+
+		strcpy(dash_input->szMime, "video/mp2t");
+		/*we don't use init segments with MPEG-2 TS*/
+		dash_input->dasher_create_init_segment = NULL;
+		dash_input->dasher_input_classify = dasher_generic_classify_input;
+		dash_input->dasher_get_components_info = dasher_mp2t_get_components_info;
+		dash_input->dasher_segment_file = dasher_mp2t_segment_file;
+		return GF_OK;
+	}
+#endif
+
+	GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH]: File %s not supported for dashing - skipping\n", dash_input->file_name));
+	return GF_NOT_SUPPORTED;
+}
+
+static GF_Err write_mpd_header(FILE *mpd, const char *mpd_name, GF_Config *dash_ctx, GF_DashProfile profile, Bool is_mpeg2, const char *title, const char *source, const char *copyright, const char *moreInfoURL, const char **mpd_base_urls, u32 nb_mpd_base_urls, Bool dash_dynamic, u32 time_shift_depth, Double mpd_duration, Double mpd_update_period, Double min_buffer, u32 ast_shift_sec, Bool use_cenc, Bool use_xlink)
+{
+	u32 sec, frac;
+#ifdef _WIN32_WCE
+	SYSTEMTIME syst;
+	FILETIME filet;
+#else
+	time_t gtime;
+	struct tm *t;
+#endif
+	u32 h, m, i;
+	Double s;
+
+	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"); 
+	if (dash_dynamic) {
+		/*otherwise timeshift is infinite, use original availability start time*/
+		if ((s32)time_shift_depth<0) {
+			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);
+		fprintf(mpd, " on %d-%02d-%02dT%02d:%02d:%02dZ", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond);
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Generating MPD at time %d-%02d-%02dT%02d:%02d:%02dZ\n", syst.wYear, syst.wMonth, syst.wDay, syst.wHour, syst.wMinute, syst.wSecond) );
+#else
+		gtime = sec - GF_NTP_SEC_1900_TO_1970;
+		t = gmtime(&gtime);
+		fprintf(mpd, " availabilityStartTime=\"%d-%02d-%02dT%02d:%02d:%02dZ\"", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+		if (ast_shift_sec) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] MPD AvailabilityStartTime %d-%02d-%02dT%02d:%02d:%02dZ\n", 1900+t->tm_year, t->tm_mon+1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec) );
+		}
+#endif
+
+		if ((s32)time_shift_depth>=0) {
+			h = (u32) (time_shift_depth/3600);
+			m = (u32) (time_shift_depth/60 - h*60);
+			s = time_shift_depth - h*3600 - m*60;
+			fprintf(mpd, " timeShiftBufferDepth=\"PT%dH%dM%.2fS\"", h, m, s);
+		}
+		if (mpd_update_period) {
+			h = (u32) (mpd_update_period/3600);
+			m = (u32) (mpd_update_period/60 - h*60);
+			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);
+		s = mpd_duration - h*3600 - m*60;
+		fprintf(mpd, " mediaPresentationDuration=\"PT%dH%dM%.2fS\"", h, m, s);
+	}
+
+	if (profile==GF_DASH_PROFILE_LIVE) {
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011\"", is_mpeg2 ? "mp2t-simple" : "isoff-live");
+	} else if (profile==GF_DASH_PROFILE_ONDEMAND) {
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-on-demand:2011\"");
+	} else if (profile==GF_DASH_PROFILE_MAIN) {
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:%s:2011\"", is_mpeg2 ? "mp2t-main" : "isoff-main");
+	} else if (profile==GF_DASH_PROFILE_AVC264_LIVE) {
+		fprintf(mpd, " profiles=\"urn:mpeg:dash:profile:isoff-live:2011, http://dashif.org/guildelines/dash264\"");
+	} 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\"");	
+	}
+	if (use_cenc) {
+		fprintf(mpd, " xmlns:cenc=\"urn:mpeg:cenc:2013\"");
+	}
+	if (use_xlink) {
+		fprintf(mpd, " xmlns:xlink=\"http://www.w3.org/1999/xlink\"");
+	}
+
+	fprintf(mpd, ">\n");
+
+	fprintf(mpd, " <ProgramInformation moreInformationURL=\"%s\">\n", moreInfoURL ? moreInfoURL : "http://gpac.sourceforge.net");	
+	if (title) 
+		fprintf(mpd, "  <Title>%s</Title>\n", title);
+	else 
+		fprintf(mpd, "  <Title>%s generated by GPAC</Title>\n", mpd_name);
+
+	if (source) 
+		fprintf(mpd, "  <Source>%s</Source>\n", source);
+	if (copyright)
+		fprintf(mpd, "  <Copyright>%s</Copyright>\n", copyright);
+	fprintf(mpd, " </ProgramInformation>\n");
+
+	for (i=0; i<nb_mpd_base_urls; i++) {
+		fprintf(mpd, " <BaseURL>%s</BaseURL>\n", mpd_base_urls[i]);
+	}
+	fprintf(mpd, "\n");
+	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)
+{
+	u32 h, m;
+	Double s;
+
+	fprintf(mpd, " <Period");
+	if (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);	
+	}
+	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);	
+	}
+	if (xlink) {
+		fprintf(mpd, " xlink:href=\"%s\"", xlink);	
+	}
+	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)
+{
+	fprintf(mpd, "  <AdaptationSet segmentAlignment=\"true\"");
+	if (bitstream_switching_mode) {
+		fprintf(mpd, " bitstreamSwitching=\"true\"");
+	}
+	if (first_rep->group_id) {
+		fprintf(mpd, " group=\"%d\"", first_rep->group_id);
+	}
+	if (max_width && max_height) {
+		fprintf(mpd, " maxWidth=\"%d\" maxHeight=\"%d\"", max_width, max_height);
+		if (strlen(szMaxFPS))
+			fprintf(mpd, " maxFrameRate=\"%s\"", szMaxFPS);
+		gf_media_reduce_aspect_ratio(&max_width, &max_height);
+		fprintf(mpd, " par=\"%d:%d\"", max_width, max_height);
+	}
+	if (szLang && szLang[0]) {
+		fprintf(mpd, " lang=\"%s\"", szLang);
+	}
+	/*this should be fixed to use info collected during segmentation process*/
+	if (profile==GF_DASH_PROFILE_ONDEMAND) 
+		fprintf(mpd, " subsegmentStartsWithSAP=\"1\"");
+
+	if (!strcmp(first_rep->szMime, "video/mp2t"))
+		fprintf(mpd, " subsegmentAlignment=\"true\"");
+
+	fprintf(mpd, ">\n");
+	
+	if (first_rep) {
+		u32 i;
+
+		if (bitstream_switching_mode) {
+			for (i=0; i<first_rep->nb_components; i++) {
+				struct _dash_component *comp = &first_rep->components[i];
+				if (comp->media_type == GF_ISOM_MEDIA_AUDIO) {
+					fprintf(mpd, "   <AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\"/>\n", comp->channels);
+				}
+			}
+		}
+
+		/*set role*/
+		if (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")
+			) {
+				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];
+
+				fprintf(mpd, "   <ContentComponent id=\"%d\" ", comp->ID);
+				switch (comp->media_type ) {
+				case GF_ISOM_MEDIA_TEXT:
+					fprintf(mpd, "contentType=\"text\" ");
+					break;
+				case GF_ISOM_MEDIA_VISUAL:
+					fprintf(mpd, "contentType=\"video\" ");
+					break;
+				case GF_ISOM_MEDIA_AUDIO:
+					fprintf(mpd, "contentType=\"audio\" ");
+					break;
+				case GF_ISOM_MEDIA_SCENE:
+				case GF_ISOM_MEDIA_DIMS:
+				default:
+					fprintf(mpd, "contentType=\"application\" ");
+					break;
+				}
+				/*if lang not specified at adaptationSet level, put it here*/
+				if ((!szLang || !szLang[0]) && comp->szLang[0]) {
+					fprintf(mpd, " lang=\"%s\"", comp->szLang);
+				}
+				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");	
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_dasher_init_context(GF_Config *dash_ctx, u32 *dynamic, u32 *timeShiftBufferDepth, const char *periodID, u32 ast_shift_sec)
+{
+	const char *opt;
+	char szVal[100];
+	Bool first_run = GF_FALSE;
+	u32 sec, frac;
+#ifndef _WIN32_WCE
+	time_t gtime;
+#endif
+
+	if (!dash_ctx) return GF_BAD_PARAM;
+	
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "SessionType");
+	/*first run, init all options*/
+	if (!opt) {
+		first_run = GF_TRUE;
+		sprintf(szVal, "%d", *timeShiftBufferDepth);
+		gf_cfg_set_key(dash_ctx, "DASH", "SessionType", (*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");
+	} 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) {
+#ifndef _WIN32_WCE
+		gtime = sec - GF_NTP_SEC_1900_TO_1970;
+		gf_cfg_set_key(dash_ctx, "DASH", "GenerationTime", asctime(gmtime(&gtime)));
+#endif
+		sprintf(szVal, "%u", sec);
+		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 {
+
+		/*check if we change period*/
+		if (periodID) {
+			opt = gf_cfg_get_key(dash_ctx, "DASH", "PeriodID");
+			if (!opt || strcmp(opt, periodID)) {
+				gf_cfg_set_key(dash_ctx, "DASH", "PeriodID", periodID);
+				gf_cfg_set_key(dash_ctx, "DASH", "PeriodSwitch", "yes");
+			}
+		}
+	}
+
+	/*perform cleanup of previous representations*/
+
+	return GF_OK;
+}
+
+GF_EXPORT
+u32 gf_dasher_next_update_time(GF_Config *dash_ctx, u32 mpd_update_time)
+{
+	Double max_dur = 0;
+	Double safety_dur;
+	Double ms_elapsed;
+	u32 i, ntp_sec, frac, prev_sec, prev_frac;
+	const char *opt, *section;
+
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "MaxSegmentDuration");
+	if (!opt) return 0;
+
+	safety_dur = atof(opt);
+	if (safety_dur > (Double) mpd_update_time)
+		safety_dur = (Double) mpd_update_time;
+
+
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
+	sscanf(opt, "%u", &prev_sec);
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTPFraction");
+	sscanf(opt, "%u", &prev_frac);
+
+	/*compute cumulated duration*/
+	for (i=0; i<gf_cfg_get_section_count(dash_ctx); i++) {
+		Double dur = 0;
+		section = gf_cfg_get_section_name(dash_ctx, i);
+		if (section && !strncmp(section, "Representation_", 15)) {
+			opt = gf_cfg_get_key(dash_ctx, section, "CumulatedDuration");
+			if (opt) dur = atof(opt);
+			if (dur>max_dur) max_dur = dur;
+		}
+	}
+
+	if (!max_dur) return 0;
+	gf_net_get_ntp(&ntp_sec, &frac);
+
+	ms_elapsed = frac;
+	ms_elapsed -= prev_frac;
+	ms_elapsed /= 0xFFFFFFFF;
+	ms_elapsed *= 1000;
+	ms_elapsed += (ntp_sec - prev_sec)*1000;
+
+	/*check if we need to generate */
+	if (ms_elapsed < (max_dur - safety_dur)*1000 ) {
+		return (u32) (1000*max_dur - ms_elapsed);
+	}
+	return 0;
+}
+
+/*peform all file cleanup*/
+static Bool gf_dasher_cleanup(GF_Config *dash_ctx, u32 dash_dynamic, u32 mpd_update_time, u32 time_shift_depth, Double dash_duration, u32 ast_shift_sec)
+{
+	Double max_dur = 0;
+	Double elapsed = 0;
+	Double safety_dur = MAX(mpd_update_time, (u32) dash_duration);
+	u32 i, ntp_sec, frac, prev_sec;
+	const char *opt, *section;
+	GF_Err e;
+
+	if (!dash_dynamic) return 1;
+
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "StoreParams");
+	if (opt && !strcmp(opt, "yes")) return 1;
+
+	opt = gf_cfg_get_key(dash_ctx, "DASH", "GenerationNTP");
+	if (!opt) return 1;
+	sscanf(opt, "%u", &prev_sec);
+
+	/*compute cumulated duration*/
+	for (i=0; i<gf_cfg_get_section_count(dash_ctx); i++) {
+		Double dur = 0;
+		section = gf_cfg_get_section_name(dash_ctx, i);
+		if (section && !strncmp(section, "Representation_", 15)) {
+			opt = gf_cfg_get_key(dash_ctx, section, "CumulatedDuration");
+			if (opt) dur = atof(opt);
+			if (dur>max_dur) max_dur = dur;
+		}
+	}
+	if (!max_dur) return 1;
+	gf_net_get_ntp(&ntp_sec, &frac);
+
+	if (dash_dynamic==2) {
+		elapsed = (u32)-1;
+	} else {
+		elapsed = ntp_sec;
+		elapsed -= prev_sec;
+		/*check if we need to generate */
+		if (!dash_dynamic && elapsed < max_dur - safety_dur ) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Asked to regenerate segments before expiration of the current segment list, please wait %g seconds - ignoring\n", max_dur + prev_sec - ntp_sec ));
+			return 0;
+		}
+		if (elapsed > max_dur) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Generating segments and MPD %g seconds too late\n", elapsed - (u32) max_dur));
+		} else {
+			/*generate as if max_dur has been reached*/
+			elapsed = max_dur;
+		}
+	}
+
+	/*cleanup old segments*/
+	if ((s32) time_shift_depth >= 0) {
+		for (i=0; i<gf_cfg_get_key_count(dash_ctx, "SegmentsStartTimes"); i++) {
+			Double seg_time;
+			Bool found=0;
+			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) 
+				break;
+
+			seg_time = atof(MPDTime);
+			seg_time += ast_shift_sec;
+			seg_time += dash_duration + time_shift_depth;
+			seg_time -= elapsed;
+			/*safety gard of one second*/
+			if (seg_time >= -1)
+				break;
+
+			if (dash_dynamic!=2) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("[DASH] Removing segment %s - %g sec too late\n", fileName, -seg_time));
+			}
+
+			e = gf_delete_file(fileName);
+			if (e) {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH] Could not remove file %s: %s\n", fileName, gf_error_to_string(e) ));
+				break;
+			}
+
+			/*check all reps*/
+			for (j=0; j<gf_cfg_get_section_count(dash_ctx); j++) {
+				u32 k;
+				const char *secName = gf_cfg_get_section_name(dash_ctx, j);
+				if (!strstr(secName, "URLs_")) continue;
+				for (k=0; k<gf_cfg_get_key_count(dash_ctx, secName); k++) {
+					const char *entry = gf_cfg_get_key_name(dash_ctx, secName, k);
+					const char *name = gf_cfg_get_key(dash_ctx, secName, entry);
+					if (strstr(name, fileName)) {
+						gf_cfg_set_key(dash_ctx, secName, entry, NULL);
+						found=1;
+						break;
+					}
+				}
+				if (found) break;
+			}
+
+			gf_cfg_set_key(dash_ctx, "SegmentsStartTimes", fileName, NULL);
+			i--;
+		}
+	}
+	return 1;
+}
+
+static u32 gf_dash_get_dependency_bandwidth(GF_DashSegInput *inputs, u32 nb_dash_inputs, const char *file_name, u32 trackNum) {
+	u32 i;
+
+	for (i = 0; i < nb_dash_inputs; i++) {
+		if (!strcmp(inputs[i].file_name, file_name) && (inputs[i].trackNum == trackNum))
+			return inputs[i].bandwidth;
+	}
+
+	return 0; //we should never be here !!!!
+}
+
+static GF_Err dash_insert_period_xml(FILE *mpd, char *szPeriodXML)
+{
+	FILE *period_mpd;
+	u32 xml_size;
+
+	period_mpd = gf_f64_open(szPeriodXML, "rb");
+	if (!period_mpd) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Error opening period MPD file %s\n", szPeriodXML));
+		return GF_IO_ERR;
+	}
+	gf_f64_seek(period_mpd, 0, SEEK_END);
+	xml_size = (u32) gf_f64_tell(period_mpd);
+	gf_f64_seek(period_mpd, 0, SEEK_SET);
+
+	while (xml_size) {
+		char buf[4096];
+		u32 read, size = 4096;
+		if (xml_size<4096) size = xml_size;
+		read = (u32) fread(buf, 1, size, period_mpd);
+		if (read != size) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Error reading from period MPD file: got %d but requested %d bytes\n", read, size ));
+			fclose(period_mpd);
+			return GF_IO_ERR;
+		}
+
+		fwrite(buf, 1, size, mpd);
+		xml_size -= size;
+	}
+	fclose(period_mpd);
+	return GF_OK;
+}
+
+static void purge_dash_context(GF_Config *dash_ctx)
+{
+	u32 i, count;
+	//purge dash context
+	count = gf_cfg_get_section_count(dash_ctx);
+	for (i=0; i<count; i++) {
+		const char *opt = gf_cfg_get_section_name(dash_ctx, i);
+		if (!opt) continue;
+		if( !strnicmp(opt, "Representation_", 15) || !strcmp(opt, "SegmentsStartTimes")) {
+			gf_cfg_del_section(dash_ctx, opt);
+			count--; 
+			i--;
+		}
+	}
+}
+
+/*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)
+{
+	u32 i, j, 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;
+	u32 cur_adaptation_set;
+	u32 max_adaptation_set = 0;
+	u32 cur_period;
+	u32 max_period = 0;
+	u32 cur_group_id = 0;
+	u32 max_sap_type = 0;
+	u32 last_period_rep_idx_plus_one = 0;
+	Bool use_cenc = GF_FALSE;
+	Bool none_supported = GF_TRUE;
+	Bool has_mpeg2 = GF_FALSE;
+	Bool has_role = GF_FALSE;
+	Double presentation_duration = 0;
+	Double active_period_start = 0;
+	GF_Err e = GF_OK;
+	FILE *mpd = NULL;
+	GF_DashSegInput *dash_inputs;
+	GF_DASHSegmenterOptions dash_opts;
+	u32 nb_dash_inputs;
+	Bool uses_xlink = GF_FALSE;
+
+	/*init dash context if needed*/
+	if (dash_ctx) {
+		e = gf_dasher_init_context(dash_ctx, &dash_dynamic, &time_shift_depth, NULL, ast_shift_sec);
+		if (e) return e;
+		if (dash_ctx) {
+			Bool regenerate;
+			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;
+				}
+*/
+				dash_duration = seg_dur;
+			} else {
+				char sOpt[100];
+				sprintf(sOpt, "%f", dash_duration);
+				gf_cfg_set_key(dash_ctx, "DASH", "MaxSegmentDuration", sOpt);
+			}
+
+			/*peform all file cleanup*/
+			regenerate = gf_dasher_cleanup(dash_ctx, dash_dynamic, mpd_update_time, time_shift_depth, dash_duration, ast_shift_sec);
+			if (!regenerate) return GF_OK;
+
+			opt = gf_cfg_get_key(dash_ctx, "DASH", "HasXLINK");
+			if (opt && !strcmp(opt, "yes")) uses_xlink = GF_TRUE;
+		}
+	}
+
+	/*copy over input files to our internal structure*/
+	max_period = 0;
+	/* first, we assume that nb_dash_inputs is equal to nb_inputs. This value will be recompute then*/
+	nb_dash_inputs = nb_inputs;
+	dash_inputs = gf_malloc(sizeof(GF_DashSegInput)*nb_dash_inputs);
+	memset(dash_inputs, 0, sizeof(GF_DashSegInput)*nb_dash_inputs);
+	j = 0;
+	for (i=0; i<nb_inputs; i++) {
+		s32 nb_diff;
+		dash_inputs[j].file_name = inputs[i].file_name;
+		strcpy(dash_inputs[j].representationID, inputs[i].representationID);
+		strcpy(dash_inputs[j].periodID, inputs[i].periodID);
+		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].bandwidth = inputs[i].bandwidth;
+
+		if (strlen(inputs[i].role) && strcmp(inputs[i].role, "main"))
+			has_role = 1;
+
+		if (!strlen(dash_inputs[j].periodID)) {
+			max_period = 1;
+			dash_inputs[j].period = 1;
+			if (dash_dynamic) {
+				strcpy(dash_inputs[j].periodID, "GENID_DEF");
+			}
+		}
+		nb_diff = nb_dash_inputs;
+		dash_inputs[j].moof_seqnum_increase = 2 + (u32) (dash_duration/frag_duration);
+		e = gf_dash_segmenter_probe_input(&dash_inputs, &nb_dash_inputs, j);
+		nb_diff = nb_dash_inputs - nb_diff;
+		if (e) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: Cannot open file %s for dashing: %s\n", dash_inputs[i].file_name, gf_error_to_string(e) ));
+			nb_diff--;
+		}
+
+		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;
+		goto exit;
+	}
+
+	memset(&dash_opts, 0, sizeof(GF_DASHSegmenterOptions));
+
+	/*set all default roles to main if needed*/
+	if (has_role) {
+		for (i=0; i<nb_dash_inputs; i++) {
+			if (!strlen(dash_inputs[i].role))
+				strcpy(dash_inputs[i].role, "main");
+		}
+	}
+
+	for (i=0; i<nb_dash_inputs; i++) {
+		if (dash_inputs[i].period) 
+			continue;
+		if (strlen(dash_inputs[i].periodID)) {
+			max_period++;
+			dash_inputs[i].period = max_period;
+
+			for (j=i+1; j<nb_dash_inputs; j++) {
+				if (!strcmp(dash_inputs[j].periodID, dash_inputs[i].periodID))
+					dash_inputs[j].period = dash_inputs[i].period;
+			}
+		}
+	}
+	if (dash_dynamic && max_period>1) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[DASH] Multiple periods in live mode not supported\n"));
+		e = GF_NOT_SUPPORTED;
+		goto exit;
+	}
+
+	for (cur_period=0; cur_period<max_period; cur_period++) {
+		/*classify all input in possible adaptation sets*/
+		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;
+
+			/*we cannot fragment the input file*/
+			if (!dash_inputs[i].dasher_input_classify || !dash_inputs[i].dasher_segment_file) {
+				continue;
+			}
+
+			max_adaptation_set ++;
+			dash_inputs[i].adaptation_set = max_adaptation_set;
+			dash_inputs[i].nb_rep_in_adaptation_set = 1;
+
+			e = dash_inputs[i].dasher_input_classify(dash_inputs, nb_dash_inputs, i, &cur_group_id, &max_sap_type);
+			if (e) goto exit;
+			none_supported = 0;
+		}
+		if (none_supported) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: None of the input types are supported for DASHing - nothing to do ...\n"));
+			e = GF_OK;
+			goto exit;
+		}
+	}
+
+	/*check requested profiles can be generated, or adjust them*/
+	if (max_sap_type>=3) {
+		if (dash_profile) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! Max SAP type %d detected\n\tswitching to FULL profile\n", max_sap_type));
+		}
+		dash_profile = 0;
+	}
+	if ((dash_profile==GF_DASH_PROFILE_LIVE) && !seg_name) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_DASH, ("[DASH]: WARNING! DASH Live profile requested but no -segment-name\n\tusing \"%%s_dash\" by default\n\n"));
+		seg_name = "%s_dash";
+	}
+
+	/*if output id not in the current working dir, concatenate output path to segment name*/
+	szSegName[0] = 0;
+	if (seg_name) {
+		if (gf_url_get_resource_path(mpdfile, szSegName)) {
+			strcat(szSegName, seg_name);
+			seg_name = szSegName;
+		}
+	}
+
+	/*adjust params based on profiles*/
+	switch (dash_profile) {
+	case GF_DASH_PROFILE_LIVE:
+		seg_at_rap = 1;
+		use_url_template = 1;
+		single_segment = single_file = 0;
+		break;
+	case GF_DASH_PROFILE_AVC264_LIVE:
+		seg_at_rap = 1;
+		use_url_template = 1;
+		single_segment = single_file = 0;
+		break;
+	case GF_DASH_PROFILE_AVC264_ONDEMAND:
+		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;
+			goto exit;
+		}
+	case GF_DASH_PROFILE_ONDEMAND:
+		seg_at_rap = 1;
+		single_segment = 1;
+		/*BS switching is meaningless in onDemand profile*/
+		bitstream_switching = GF_DASH_BSMODE_NONE;
+		use_url_template = single_file = 0;
+		break;
+	case GF_DASH_PROFILE_MAIN:
+		seg_at_rap = 1;
+		single_segment = 0;
+		break;
+	default:
+		break;
+	}
+
+	segment_mode = single_segment ? 1 : (single_file ? 2 : 0);
+
+	if (single_segment) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s - single segment\nSubsegment duration %.3f - Fragment duration: %.3f secs\n", (nb_dash_inputs>1) ? "s" : "", dash_duration, frag_duration));
+		subsegs_per_sidx = 0;
+	} else {
+		if (!seg_ext) seg_ext = "m4s";
+
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASH-ing file%s: %.2fs segments %.2fs fragments ", (nb_dash_inputs>1) ? "s" : "", dash_duration, frag_duration));
+		if (subsegs_per_sidx<0) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("no sidx used"));
+		} else if (subsegs_per_sidx) {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("%d subsegments per sidx", subsegs_per_sidx));
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("single sidx per segment"));
+		}
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("\n"));
+	}
+	if (frag_at_rap) seg_at_rap = 1;
+
+	if (seg_at_rap) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("Spliting segments %sat GOP boundaries\n", frag_at_rap ? "and fragments " : ""));
+	}
+
+	dash_opts.mpd_name = mpdfile;
+	dash_opts.segments_start_with_rap = seg_at_rap;
+	dash_opts.seg_ext = seg_ext;
+	dash_opts.daisy_chain_sidx = daisy_chain_sidx;
+	dash_opts.subsegs_per_sidx = subsegs_per_sidx;
+	dash_opts.use_url_template = use_url_template;
+	dash_opts.use_segment_timeline = use_segment_timeline;
+	dash_opts.single_file_mode = segment_mode;
+	dash_opts.fragments_start_with_rap = frag_at_rap;
+	dash_opts.dash_scale = dash_scale ? dash_scale : 1000;
+	dash_opts.tmpdir = tmpdir;
+	dash_opts.dash_ctx = dash_ctx;
+	dash_opts.time_shift_depth = (s32) time_shift_depth;
+	dash_opts.segment_marker_4cc = segment_marker_4cc;
+	dash_opts.inband_param_set = ((bitstream_switching == GF_DASH_BSMODE_INBAND) || (bitstream_switching == GF_DASH_BSMODE_SINGLE) ) ? 1 : 0;
+	dash_opts.memory_mode = fragments_in_memory;
+	dash_opts.pssh_moof = pssh_moof;
+	dash_opts.samplegroups_in_traf = samplegroups_in_traf;
+
+	dash_opts.segment_duration = dash_duration * 1000 / dash_scale;
+	dash_opts.subduration = subduration * 1000 / dash_scale;
+	dash_opts.fragment_duration = frag_duration * 1000 / dash_scale;
+	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;
+		Double period_duration=0;
+
+		for (i=0; i<nb_dash_inputs; i++) {
+			/*this file does not belongs to any adaptation set*/
+			if (dash_inputs[i].period != cur_period+1) continue;
+
+			/*this file does not belongs to any adaptation set*/
+			if (!dash_inputs[i].adaptation_set) continue;
+
+			if (!first_in_period) {
+				first_in_period = i+1;
+				last_period_rep_idx_plus_one = first_in_period;
+			}
+
+			if (dash_inputs[i].dasher_get_components_info) {
+				e = dash_inputs[i].dasher_get_components_info(&dash_inputs[i], &dash_opts);
+				if (e) goto exit;
+			}
+			if (dash_inputs[i].duration > period_duration)
+				period_duration = dash_inputs[i].duration;
+
+			switch (dash_inputs[i].protection_scheme_type) {
+			case GF_ISOM_CENC_SCHEME:
+			case GF_ISOM_CBC_SCHEME:
+				use_cenc = GF_TRUE;
+				break;
+			}
+		}
+		if (first_in_period) {
+			dash_inputs[first_in_period-1].period_duration = period_duration;
+		}
+		presentation_duration += period_duration;
+	}
+
+	active_period_start = 0;
+	if (dash_ctx) {
+		Double duration;
+		char *id = "";
+		if (last_period_rep_idx_plus_one) id = dash_inputs[last_period_rep_idx_plus_one-1].periodID;
+		if (!id) id = "";
+
+		opt = gf_cfg_get_key(dash_ctx, "DASH", "LastActivePeriod");
+		//period has changed
+		if (opt && strcmp(opt, id)) {
+			Bool prev_period_not_done = GF_FALSE;
+			const char *prev_id = opt;
+			Double last_period_dur = 0;
+			opt = gf_cfg_get_key(dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
+			duration = opt ? atof(opt) : 0.0;
+
+			opt = gf_cfg_get_key(dash_ctx, "DASH", "LastPeriodDuration");
+			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 
+			//previous period and update cumulated duration
+			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)) {
+					last_period_dur += dash_inputs[last_period_rep_idx_plus_one-1].period_duration;
+					prev_period_not_done = GF_TRUE;
+					break;
+				}
+			}
+			gf_cfg_set_key(dash_ctx, "DASH", "LastPeriodDuration", NULL);
+
+			duration += last_period_dur;
+			sprintf(szOpt, "%g", duration);
+			gf_cfg_set_key(dash_ctx, "DASH", "CumulatedPastPeriodsDuration", szOpt);
+
+			//get active period start
+			opt = gf_cfg_get_key(dash_ctx, "DASH", "LastActivePeriodStart");
+			if (opt) active_period_start = atof(opt);
+			active_period_start += last_period_dur;
+
+			//and add period to past periods, storing their start time
+			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);
+
+				purge_dash_context(dash_ctx);
+			}
+
+			//and finally switch active period
+			gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriod", id);
+
+			sprintf(szOpt, "%g", dash_inputs[last_period_rep_idx_plus_one-1].period_duration);
+			gf_cfg_set_key(dash_ctx, "DASH", "LastPeriodDuration", szOpt);
+		} else {
+			opt = gf_cfg_get_key(dash_ctx, "DASH", "LastPeriodDuration");
+			if (opt) {
+				duration = atof(opt);
+				dash_inputs[last_period_rep_idx_plus_one-1].period_duration += duration;
+				presentation_duration += duration;
+			}
+			sprintf(szOpt, "%g", dash_inputs[last_period_rep_idx_plus_one-1].period_duration);
+			gf_cfg_set_key(dash_ctx, "DASH", "LastPeriodDuration", szOpt);
+			gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriod", id);
+
+			opt = gf_cfg_get_key(dash_ctx, "DASH", "CumulatedPastPeriodsDuration");
+			presentation_duration += opt ? atof(opt) : 0.0;
+		}
+	}
+
+	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));
+		e = GF_IO_ERR;
+		goto exit;
+	}
+
+	dash_opts.mpd = mpd;
+
+	e = write_mpd_header(mpd, mpdfile, dash_ctx, dash_profile, has_mpeg2, mpd_title, mpd_source, mpd_copyright, mpd_moreInfoURL, (const char **) mpd_base_urls, nb_mpd_base_urls, dash_dynamic, time_shift_depth, presentation_duration, mpd_update_time, min_buffer, ast_shift_sec,use_cenc, uses_xlink);
+	if (e) goto exit;
+
+	if (dash_ctx) {
+		u32 count = gf_cfg_get_key_count(dash_ctx, "PastPeriods");
+		for (i=0; i<count; i++) {
+			const char *xlink = NULL;
+			const char *p_id = gf_cfg_get_key_name(dash_ctx, "PastPeriods", i);
+
+			strcpy(szPeriodXML, mpdfile);
+			sep = strrchr(szPeriodXML, '.');
+			if (sep) sep[0] = 0;
+			strcat(szPeriodXML, "-Period_");
+			strcat(szPeriodXML, p_id);
+			strcat(szPeriodXML, ".mpd");
+
+			if (xlink) {
+				//TODOD !
+				//write_period_header(mpd, id, 0.0, period_duration, dash_dynamic, xlink);
+			} else {
+				dash_insert_period_xml(mpd, szPeriodXML);
+			}
+		}
+	}
+
+	for (cur_period=0; cur_period<max_period; cur_period++) {
+		FILE *period_mpd;
+		Double period_duration = 0;
+		const char *id=NULL;
+		const char *xlink = NULL;
+
+		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
+		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;
+				id = dash_inputs[i].periodID;
+				if (strlen(dash_inputs[i].xlink))
+					xlink = dash_inputs[i].xlink;
+				break;
+			}
+		}
+
+		strcpy(szPeriodXML, mpdfile);
+		sep = strrchr(szPeriodXML, '.');
+		if (sep) sep[0] = 0;
+		strcat(szPeriodXML, "-Period_");
+		strcat(szPeriodXML, id ? id : "");
+		strcat(szPeriodXML, ".mpd");
+
+		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);
+		if (e) goto exit;
+
+
+		/*for each identified adaptationSets, write MPD and perform segmentation of input files*/
+		for (cur_adaptation_set=0; cur_adaptation_set < max_adaptation_set; cur_adaptation_set++) {
+			char szInit[GF_MAX_PATH], tmp[GF_MAX_PATH];
+			u32 first_rep_in_set=0;
+			u32 max_width = 0;
+			u32 max_height = 0;
+			u32 fps_num = 0;
+			u32 fps_denum = 0;
+			Bool use_bs_switching = bitstream_switching ? 1 : 0;
+			char szLang[4];
+			char szFPS[100];
+			Bool is_first_rep=0;
+			Bool skip_init_segment_creation = 0;
+
+			while (dash_inputs[first_rep_in_set].adaptation_set!=cur_adaptation_set+1)
+				first_rep_in_set++;
+
+			/*not in our period*/
+			if (dash_inputs[first_rep_in_set].period != cur_period+1)
+				continue;
+
+			strcpy(tmp, mpdfile);
+			sep = strrchr(tmp, '.');
+			if (sep) sep[0] = 0;
+
+			if (max_adaptation_set==1) {
+				strcpy(szInit, tmp);
+				strcat(szInit, "_init.mp4");
+			} else {
+				sprintf(szInit, "%s_set%d_init.mp4", tmp, cur_adaptation_set+1);
+			}
+			/*unless asked to do BS switching on single rep, don't do it ...*/
+			if ((bitstream_switching < GF_DASH_BSMODE_SINGLE) && dash_inputs[first_rep_in_set].nb_rep_in_adaptation_set==1)
+				use_bs_switching = 0;
+
+			if (! use_bs_switching) {
+				skip_init_segment_creation = 1;
+			}
+			else if (! dash_inputs[first_rep_in_set].dasher_create_init_segment) {
+				skip_init_segment_creation = 1;
+				strcpy(szInit, "");
+			}
+			/*if we already wrote the InitializationSegment, get rid of it (no overwrite) and let the dashing routine open it*/
+			else if (dash_ctx) {
+				char RepSecName[GF_MAX_PATH];
+				const char *init_seg_name;
+				sprintf(RepSecName, "Representation_%s", dash_inputs[first_rep_in_set].representationID);
+				if ((init_seg_name = gf_cfg_get_key(dash_ctx, RepSecName, "InitializationSegment")) != NULL) {
+					skip_init_segment_creation = 1;
+				}
+			}
+
+			if (!skip_init_segment_creation) {
+				Bool disable_bs_switching = 0;
+				e = dash_inputs[first_rep_in_set].dasher_create_init_segment(dash_inputs, nb_dash_inputs, cur_adaptation_set+1, szInit, tmpdir, &dash_opts, &disable_bs_switching);
+				if (e) goto exit;
+				if (disable_bs_switching)
+					use_bs_switching = 0;
+			}
+
+			dash_opts.bs_switch_segment_file = use_bs_switching ? szInit : NULL;
+			dash_opts.use_url_template = seg_name ? use_url_template : 0;
+
+			szFPS[0] = 0;
+			szLang[0] = 0;
+			/*compute some max defaults*/
+			for (i=0; i<nb_dash_inputs && !e; i++) {
+
+				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
+					continue;
+
+				for (j=0; j<dash_inputs[i].nb_components; j++) {
+					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) 
+						max_height = dash_inputs[i].components[j].height;
+
+					if (! fps_num || !fps_denum) {
+						fps_num = dash_inputs[i].components[j].fps_num;
+						fps_denum = dash_inputs[i].components[j].fps_denum;
+					}
+					else if (fps_num * dash_inputs[i].components[j].fps_denum < dash_inputs[i].components[j].fps_num * fps_denum) {
+						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 (max_width && max_height) {
+				gf_media_get_reduced_frame_rate(&fps_num, &fps_denum);
+				if (fps_denum>1) 
+					sprintf(szFPS, "%d/%d", fps_num, fps_denum);
+				else if (fps_num)
+					sprintf(szFPS, "%d", fps_num);
+			}
+
+			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);
+			if (e) goto exit;
+
+			is_first_rep = 1;
+			for (i=0; i<nb_dash_inputs && !e; i++) {
+				char szOutName[GF_MAX_PATH], *segment_name;
+
+				if (dash_inputs[i].adaptation_set!=cur_adaptation_set+1)
+					continue;
+
+				segment_name = seg_name;
+
+				strcpy(szOutName, gf_url_get_resource_name(dash_inputs[i].file_name));
+				sep = strrchr(szOutName, '.');
+				if (sep) sep[0] = 0;
+
+				dash_opts.variable_seg_rad_name = 0;
+				if (seg_name) {
+					if (strstr(seg_name, "%s")) {
+						sprintf(szSolvedSegName, seg_name, szOutName);
+						dash_opts.variable_seg_rad_name = 1;
+						if (dash_inputs[i].single_track_num) {
+							char szTkNum[50];
+							sprintf(szTkNum, "_track%d_", dash_inputs[i].single_track_num);
+							strcat(szSolvedSegName, szTkNum);
+						}
+					} else {
+						strcpy(szSolvedSegName, seg_name);
+					}
+					segment_name = szSolvedSegName;
+				}
+				if ((dash_inputs[i].trackNum || dash_inputs[i].single_track_num)
+					&& (!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);
+				}
+				strcat(szOutName, "_dash");
+
+				if (gf_url_get_resource_path(mpdfile, tmp)) {
+					strcat(tmp, szOutName);
+					strcpy(szOutName, tmp);
+				}
+				if (segment_name && dash_inputs[i].trackNum && !strstr(seg_name, "$RepresentationID$") && !strstr(seg_name, "$ID$")) {
+					char tmp[10];
+					sprintf(tmp, "_track%d_", dash_inputs[i].trackNum);
+					strcat(segment_name, tmp);
+				}
+				dash_opts.seg_rad_name = segment_name;
+
+				/*in scalable case, we need also the bandwidth of dependent representation*/
+				if (strlen(dash_inputs[i].dependencyID)) {
+					dash_inputs[i].dependency_bandwidth = gf_dash_get_dependency_bandwidth(dash_inputs, nb_dash_inputs, dash_inputs[i].file_name, dash_inputs[i].lower_layer_track);
+				}
+
+				GF_LOG(GF_LOG_INFO, GF_LOG_DASH, ("DASHing file %s\n", dash_inputs[i].file_name));
+				e = dash_inputs[i].dasher_segment_file(&dash_inputs[i], szOutName, &dash_opts, is_first_rep);
+
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("Error while DASH-ing file: %s\n", gf_error_to_string(e)));
+					goto exit;
+				}
+				is_first_rep = 0;
+			}
+			/*close adaptation set*/
+			fprintf(period_mpd, "  </AdaptationSet>\n");
+		}
+
+		fprintf(period_mpd, " </Period>\n");
+		fclose(period_mpd);
+
+		if (xlink) {
+			write_period_header(mpd, id, 0.0, period_duration, dash_dynamic, xlink);
+		} else {
+			dash_insert_period_xml(mpd, szPeriodXML);
+		}
+
+		if (!dash_ctx && !xlink) {
+			gf_delete_file(szPeriodXML);
+		}
+
+		dash_opts.mpd = period_mpd;
+
+		//and add periods done to past periods, storing their start time
+		if (!id) id="";
+		if (last_period_rep_idx_plus_one && strcmp(id, dash_inputs[last_period_rep_idx_plus_one-1].periodID) ) {
+			sprintf(szOpt, "%g", active_period_start);
+			gf_cfg_set_key(dash_ctx, "PastPeriods", id, szOpt);
+			active_period_start += period_duration;
+
+			sprintf(szOpt, "%g", active_period_start);
+			gf_cfg_set_key(dash_ctx, "DASH", "LastActivePeriodStart", szOpt);
+
+			purge_dash_context(dash_ctx);
+		}
+	}
+	fprintf(mpd, "</MPD>");
+
+exit:
+	if (mpd) {
+		fclose(mpd);
+		if (!e && dash_dynamic)
+			gf_move_file(szTempMPD, mpdfile);
+	}
+	gf_free(dash_inputs);
+	return e;
+}
+
+
+

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/dsmcc.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/dsmcc.c Changed

@@ -1,1939 +1,1939 @@
-/*
- *			GPAC - Multimedia Framework C SDK
- *
- *			Authors: Jonathan Sillan
- *			Copyright (c) Telecom ParisTech 2011-2012
- *					All rights reserved
- *
- *  This file is part of GPAC / media tools sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-
-
-#include <gpac/dsmcc.h>
-
-#ifdef GPAC_ENABLE_DSMCC
-
-/* DSMCC */
-
-
-/* static functions */
-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);
-static GF_Err gf_m2ts_dsmcc_process_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc, char* data,GF_BitStream *bs,u32* data_shift);
-static GF_Err gf_m2ts_dsmcc_process_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader, char* data,GF_BitStream *bs,u32* data_shift,u32 mode);
-static GF_Err gf_m2ts_dsmcc_download_data(GF_M2TS_DSMCC_OVERLORD *dsmcc_overlord,GF_M2TS_DSMCC_SECTION *dsmcc, char  *data, GF_BitStream *bs,u32* data_shift);
-static GF_Err gf_m2ts_dsmcc_section_delete(GF_M2TS_DSMCC_SECTION *dsmcc);
-static GF_Err gf_m2ts_dsmcc_delete_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader);
-static GF_Err gf_m2ts_dsmcc_delete_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc);
-
-
-static GF_Err dsmcc_module_delete(GF_M2TS_DSMCC_MODULE* dsmcc_module);
-//static GF_Err dsmcc_module_state(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,u32 moduleId,u32 moduleVersion);
-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_module_complete(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,GF_M2TS_DSMCC_MODULE* dsmcc_module,u32 moduleIndex);
-static GF_Err dsmcc_get_biop_module_info(GF_M2TS_DSMCC_MODULE* dsmcc_module,char* data,u8 data_size);
-static GF_M2TS_DSMCC_MODULE* dsmcc_create_module(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord, GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC* DownloadInfoIndication);
-
-/* BIOP */
-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_M2TS_DSMCC_BIOP_HEADER* dsmcc_process_biop_header(GF_BitStream* bs);
-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_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_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_message(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway);
-
-/* Tools */
-static void dsmcc_biop_get_context(GF_BitStream* bs,GF_M2TS_DSMCC_SERVICE_CONTEXT* Context,u32 serviceContextList_count);
-static void dsmcc_biop_descriptor(GF_BitStream* bs,GF_List* list,u32 size);
-static GF_Err dsmcc_biop_get_ior(GF_BitStream* bs,GF_M2TS_DSMCC_IOR* IOR);
-static GF_M2TS_DSMCC_DIR* dsmcc_get_directory(GF_List* List, u32 objectKey_data);
-static GF_M2TS_DSMCC_FILE* dsmcc_get_file(GF_List* ServiceGatewayList,u16 moduleId,u32 downloadId,u32 objectKey_data);
-static GF_Err dsmcc_check_element_validation(GF_List* List,char* Parent_name,GF_M2TS_DSMCC_BIOP_NAME Name);
-static char* dsmcc_get_file_namepath(GF_M2TS_DSMCC_DIR* Dir,char* name);
-
-/* Free */
-static void dsmcc_free_biop_context(GF_M2TS_DSMCC_SERVICE_CONTEXT* Context,u32 serviceContextList_count);
-static void dsmcc_free_biop_name(GF_M2TS_DSMCC_BIOP_NAME* Name, u32 nb_name);
-static void dsmcc_free_biop_descriptor(GF_List* list);
-static void dsmcc_free_biop_ior(GF_M2TS_DSMCC_IOR* IOR);
-static void dsmcc_free_biop_header(GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header);
-static void dsmcc_free_biop_directory(GF_M2TS_DSMCC_BIOP_DIRECTORY* BIOP_Directory);
-static void dsmcc_free_biop_file(GF_M2TS_DSMCC_BIOP_FILE* BIOP_File);
-static void dsmcc_free_biop_stream_event(GF_M2TS_DSMCC_BIOP_STREAM_EVENT* BIOP_StreamEvent);
-static void dsmcc_free_biop_stream_message(GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage);
-
-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);	
-	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) 
-{
-	u16 nb_dsmcc,i;
-
-	nb_dsmcc = gf_list_count(Dsmcc_controller);
-
-	if(!nb_dsmcc){
-		return NULL;
-	}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){
-				return dsmcc_overlord;
-			}
-		}
-	}
-	return NULL;
-}
-
-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;
-	u32 u32_data_size;
-	u32 u32_table_id;
-	GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord;
-
-	dsmcc_overlord = gf_m2ts_get_dmscc_overlord(ts->dsmcc_controler,pck->stream->service_id);
-
-	if (dsmcc_overlord && evt_type == GF_M2TS_EVT_DSMCC_FOUND) {
-		GF_Err e;
-		GF_M2TS_DSMCC_SECTION* dsmcc;
-		data = pck->data;
-		u32_data_size = pck->data_len;
-		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);
-		if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_DSMCC_FOUND, pck);
-		assert(e == GF_OK);
-	}
-}
-
-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;	
-	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->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);
-	if (reserved_test != 3) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] test reserved flag is not at 3. Corrupted section, abording processing\n"));
-		return GF_CORRUPTED_DATA;
-	}
-	dsmcc->dsmcc_section_length = gf_bs_read_int(bs,12);
-	if (dsmcc->dsmcc_section_length > DSMCC_SECTION_LENGTH_MAX) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] section length should not exceed 4096. Wrong section, abording processing \n"));
-		return GF_CORRUPTED_DATA;
-	}
-	dsmcc->table_id_extension = gf_bs_read_int(bs,16);
-
-	/*bit shifting */
-	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)){
-		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);	
-	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;
-	}
-	dsmcc->section_number = gf_bs_read_int(bs,8);
-	/*if(dsmcc->section_number >0 && ((*first_section_received) == 0)){
-	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Wainting for the first section \n"));
-	return GF_CORRUPTED_DATA;
-	}
-	*first_section_received = 1;*/
-	dsmcc->last_section_number = gf_bs_read_int(bs,8);	
-	//fprintf(stderr, "\nsection_number %d last_section_number %d\n",dsmcc->section_number,dsmcc->last_section_number);
-	//fprintf(stderr, "dsmcc->table_id %d \n",dsmcc->table_id);
-	switch (dsmcc->table_id) {
-		case GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA:
-			{
-				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);	
-	} else {
-		dsmcc->CRC_32= gf_bs_read_int(bs,32);
-	}
-
-	data_shift = (u32)(gf_bs_get_position(bs));
-
-	/*if(data_shift != dsmcc->dsmcc_section_length){.
-	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] AIT processed length error. Difference between byte shifting %d and data size %d \n",data_shift,data_size));
-	return GF_CORRUPTED_DATA;
-	}*/
-
-	//gf_m2ts_dsmcc_extract_info(ts,dsmcc);
-	gf_m2ts_dsmcc_section_delete(dsmcc);
-
-	return GF_OK;
-}
-
-static GF_Err gf_m2ts_dsmcc_download_data(GF_M2TS_DSMCC_OVERLORD *dsmcc_overlord,GF_M2TS_DSMCC_SECTION *dsmcc, char  *data, GF_BitStream *bs,u32* data_shift)
-{
-	GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE* DataMessage;
-	GF_SAFEALLOC(DataMessage,GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE);
-
-	/* Header */
-	gf_m2ts_dsmcc_process_message_header(&DataMessage->DownloadDataHeader,data,bs,data_shift,1);
-	dsmcc->DSMCC_Extension = DataMessage;
-
-	//fprintf(stderr, "DataMessage->DownloadDataHeader.messageId %d \n",DataMessage->DownloadDataHeader.messageId);
-
-	switch (DataMessage->DownloadDataHeader.messageId)
-	{
-	case DOWNLOAD_INFO_REQUEST:
-		{
-			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));
-			}
-			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);
-			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));
-				}
-
-				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;
-		}
-	}
-
-	//dsmcc->DSMCC_Extension = DataMessage;
-
-	return GF_OK;
-}
-
-
-
-
-static GF_Err gf_m2ts_dsmcc_process_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader, char* data,GF_BitStream *bs,u32* data_shift,u32 mode)
-{
-	u32 byte_shift;
-
-	byte_shift = *data_shift;
-
-	MessageHeader->protocolDiscriminator = gf_bs_read_int(bs,8);
-	if (MessageHeader->protocolDiscriminator != 0x11) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] DataHeader Protocol Discriminator slot does not have the correct value, abording the processing \n"));
-		return GF_CORRUPTED_DATA;
-	}
-	MessageHeader->dsmccType = gf_bs_read_int(bs,8);
-	MessageHeader->messageId = gf_bs_read_int(bs,16);
-	/* mode 0 for Message Header - 1 for Download Data header */
-	if (mode == 0) {
-		MessageHeader->transactionId = gf_bs_read_int(bs,32);
-	} else if (mode == 1) {
-		MessageHeader->downloadId = gf_bs_read_int(bs,32);
-	}
-	//fprintf(stderr, "MessageHeader->downloadId %d \n",MessageHeader->downloadId);
-	MessageHeader->reserved = gf_bs_read_int(bs,8);
-	if (MessageHeader->reserved != 0xFF) {
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] DataHeader reserved slot does not have the correct value, abording the processing \n"));
-		return GF_CORRUPTED_DATA;
-	}
-	MessageHeader->adaptationLength = gf_bs_read_int(bs,8);
-	MessageHeader->header_length = ((u32)(gf_bs_get_position(bs)) - byte_shift);
-	MessageHeader->messageLength = gf_bs_read_int(bs,16);
-
-	if (MessageHeader->adaptationLength > 0) {
-		MessageHeader->DsmccAdaptationHeader = (GF_M2TS_DSMCC_ADAPTATION_HEADER*)gf_calloc(1, sizeof(GF_M2TS_DSMCC_ADAPTATION_HEADER));
-		MessageHeader->DsmccAdaptationHeader->adaptationType = gf_bs_read_int(bs,8);
-
-		MessageHeader->DsmccAdaptationHeader->adaptationDataByte = (char*)gf_calloc(MessageHeader->adaptationLength-1,sizeof(char));
-		gf_bs_read_data(bs,MessageHeader->DsmccAdaptationHeader->adaptationDataByte,(u32)(MessageHeader->adaptationLength));
-
-	}
-
-	*data_shift = (u32)(gf_bs_get_position(bs));
-
-	return GF_OK;
-}
-
-static GF_Err gf_m2ts_dsmcc_process_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc, char* data,GF_BitStream *bs,u32* data_shift)
-{
-	u32 i,j,byte_shift;
-
-	byte_shift = (u32)(gf_bs_get_position(bs));
-
-	CompatibilityDesc->compatibilityDescriptorLength = gf_bs_read_int(bs,16);
-
-	if(CompatibilityDesc->compatibilityDescriptorLength){
-		CompatibilityDesc->descriptorCount = gf_bs_read_int(bs,16);
-		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++){
-				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);
-				CompatibilityDesc->Descriptor[i].specifierData = gf_bs_read_int(bs,21);
-				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){
-					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++){
-						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){
-							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));
-						}
-
-					}
-				}
-			}
-		}
-	}
-
-	*data_shift = (u32)(gf_bs_get_position(bs));
-	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;
-	}
-
-	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){
-
-	u32 i;
-	for (i=0; i<nb_module; i++) {
-		GF_M2TS_DSMCC_PROCESSED dsmcc_process = dsmcc_overlord->processed[i];
-		if ((InfoModules->moduleId == dsmcc_process.moduleId) && (downloadId == dsmcc_process.downloadId)) {
-			if (InfoModules->moduleVersion <= dsmcc_process.version_number) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Module already intialized \n"));
-				return GF_CORRUPTED_DATA;
-			} else if (InfoModules->moduleVersion > dsmcc_process.version_number) {
-				GF_M2TS_DSMCC_MODULE* dsmcc_module = (GF_M2TS_DSMCC_MODULE*)gf_list_get(dsmcc_overlord->dsmcc_modules,i);
-				dsmcc_module_delete(dsmcc_module);
-				gf_list_rem(dsmcc_overlord->dsmcc_modules,i);
-				dsmcc_process.version_number = InfoModules->moduleVersion;
-				dsmcc_process.done = 0;
-				return GF_OK;
-			}
-		}
-	}
-	return  GF_OK;
-}
-
-//static GF_Err dsmcc_module_state(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,u32 moduleId,u32 moduleVersion){
-//
-//	u32 i,nb_module;
-//	nb_module = gf_list_count(dsmcc_overlord->dsmcc_modules);
-//	/* This test comes from the fact that the moduleVersion only borrow the least 5 significant bits of the moduleVersion conveys in DownloadDataBlock */
-//	/* If the moduleVersion is eq to 0x1F, it does not tell if it is clearly 0x1F or a superior value. So in this case it is better to process the data */
-//	/* If the moduleVersion is eq to 0x0, it means that the data conveys a DownloadDataResponse, so it has to be processed */
-//	if (moduleVersion != 0 || moduleVersion < 0x1F) {
-//		for (i=0; i<nb_module; i++) {
-//			GF_M2TS_DSMCC_PROCESSED dsmcc_process = dsmcc_overlord->processed[i];
-//			if ((moduleId == dsmcc_process.moduleId) && (moduleVersion <= dsmcc_process.version_number)) {
-//				if (dsmcc_process.done) {
-//					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;
-//}
-
-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 
-		If then Got_ServiceGateway = 1, all the module are processed */
-	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;
-		}
-	}
-	
-	return GF_CORRUPTED_DATA;
-}
-
-static GF_Err dsmcc_module_complete(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,GF_M2TS_DSMCC_MODULE* dsmcc_module,u32 moduleIndex)
-{
-	u32 i,nb_module;
-	GF_Err e;
-	e = GF_OK;
-	nb_module = gf_list_count(dsmcc_overlord->dsmcc_modules);
-	for (i=0; i<nb_module; i++) {
-		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){
-				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){
-					e = dsmcc_process_biop_data(dsmcc_overlord,dsmcc_module,uncompressed_data,dsmcc_module->original_size);
-				}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;
-					dsmcc_module->buffer = (char*)gf_calloc(dsmcc_module->size,sizeof(char));
-					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);				
-			}
-			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);
-			}
-		}
-	}
-
-	return  GF_OK;
-}
-
-/* Delete structure of the DSMCC data processing */
-
-static GF_Err gf_m2ts_dsmcc_delete_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc)
-{
-	u32 i,j;	
-	if (CompatibilityDesc->compatibilityDescriptorLength) {
-		if (CompatibilityDesc->descriptorCount) {
-			for (i=0; i<CompatibilityDesc->descriptorCount; i++) {
-				if (CompatibilityDesc->Descriptor[i].subDescriptorCount) {
-					for (j=0; j>CompatibilityDesc->Descriptor[i].subDescriptorCount; j++) {
-						if (CompatibilityDesc->Descriptor[i].SubDescriptor[j].subDescriptorLength) {
-							gf_free(CompatibilityDesc->Descriptor[i].SubDescriptor[j].additionalInformation);
-						}
-					}
-					gf_free(CompatibilityDesc->Descriptor[i].SubDescriptor);
-				}
-			}
-			gf_free(CompatibilityDesc->Descriptor);
-		}
-	}
-	return GF_OK;
-}
-
-static GF_Err gf_m2ts_dsmcc_delete_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader)
-{	
-	if (MessageHeader->adaptationLength > 0) {		
-		gf_free(MessageHeader->DsmccAdaptationHeader->adaptationDataByte);
-		gf_free(MessageHeader->DsmccAdaptationHeader);
-	}
-	return GF_OK;
-}
-
-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;	
-
-	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;
-		}
-	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;
-		}
-	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;
-		}
-	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;
-		}
-	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;
-		}
-	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;
-		}
-	default:
-		{
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unknown dataMessagePayload Type \n"));
-			break;
-		}
-	} 
-
-	/* Header */
-	gf_m2ts_dsmcc_delete_message_header(&DataMessage->DownloadDataHeader);
-	gf_free(DataMessage);
-	gf_free(dsmcc);
-	dsmcc = NULL;
-	return GF_OK;
-}
-
-
-static GF_Err dsmcc_module_delete(GF_M2TS_DSMCC_MODULE* dsmcc_module){
-
-	gf_free(dsmcc_module->buffer);
-	gf_free(dsmcc_module);
-	dsmcc_module = NULL;
-	return  GF_OK;
-}
-
-/* BIOP MESSAGE */
-
-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;
-	u8 i;
-
-
-	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
-	GF_SAFEALLOC(BIOP_ModuleInfo,GF_M2TS_DSMCC_BIOP_MODULE_INFO);
-	BIOP_ModuleInfo->descriptor = gf_list_new();
-
-	BIOP_ModuleInfo->moduleTimeOut = gf_bs_read_int(bs,32);
-	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){
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Corrupted payload for BIOP Module Info \n"));
-		gf_list_del(BIOP_ModuleInfo->descriptor);	
-		gf_free(BIOP_ModuleInfo);
-		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++){
-		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){
-			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)){
-			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;	
-		}
-	}
-	BIOP_ModuleInfo->userInfoLength = gf_bs_read_int(bs,8);
-	if(BIOP_ModuleInfo->userInfoLength){
-
-		u32 nb_desc,j;
-		u8* descr_tag;
-
-		dsmcc_biop_descriptor(bs,BIOP_ModuleInfo->descriptor,(u32)(BIOP_ModuleInfo->userInfoLength));		
-
-		nb_desc = gf_list_count(BIOP_ModuleInfo->descriptor);
-		j = 0;
-		while(j<nb_desc){
-
-			/* 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;	
-
-					}
-				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){
-			gf_free(BIOP_ModuleInfo->Taps[i].selector_data);
-		}		
-	}
-	gf_free(BIOP_ModuleInfo->Taps);
-	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){
-
-	GF_BitStream *bs;
-	GF_Err e;
-	Bool Error;
-	u32 byte_shift;
-	GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header;
-	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway = dsmcc_overlord->ServiceGateway;
-
-	e = GF_OK;
-	Error = 0;
-
-	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
-
-	byte_shift = (u32)(gf_bs_get_position(bs));
-
-	while(byte_shift < data_size){
-
-		BIOP_Header = dsmcc_process_biop_header(bs);
-
-		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")){
-				e = dsmcc_process_biop_directory(bs,BIOP_Header,dsmcc_overlord,0);
-			}else if(!strcmp(BIOP_Header->objectKind_data,"srg")){
-				e = dsmcc_process_biop_directory(bs,BIOP_Header,dsmcc_overlord,1);
-				if(e == GF_OK){
-					dsmcc_overlord->Got_ServiceGateway = 1;
-				}
-			}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")){
-				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"));				
-			}
-		}
-		byte_shift = (u32)(gf_bs_get_position(bs));
-		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){
-			dsmcc_free_biop_header(BIOP_Header);
-		}
-		
-	}
-
-	if(Error){
-		return GF_CORRUPTED_DATA;
-	}
-
-	return GF_OK;
-}
-
-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){
-		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Wrong BIOP Header, abording process \n"));
-		return NULL;
-	}
-	BIOP_Header->biop_version_major = gf_bs_read_int(bs,8);
-	BIOP_Header->biop_version_minor = gf_bs_read_int(bs,8);
-	BIOP_Header->byte_order = gf_bs_read_int(bs,8);
-	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){
-		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){
-		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));
-	}
-	BIOP_Header->objectInfo_length = gf_bs_read_int(bs,16);
-
-	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){
-
-	u32 nb_desc,descr_size;		
-	GF_M2TS_DSMCC_BIOP_FILE* BIOP_File;
-	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway;
-	GF_M2TS_DSMCC_FILE* File;
-	FILE* pFile;
-	u8* descr_tag;
-
-	GF_SAFEALLOC(BIOP_File,GF_M2TS_DSMCC_BIOP_FILE);
-
-	ServiceGateway = dsmcc_overlord->ServiceGateway;
-
-	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){
-		dsmcc_biop_descriptor(bs,BIOP_File->descriptor,descr_size);
-	}
-
-	 gf_bs_read_int(bs,(u32)(descr_size));
-
-	nb_desc = gf_list_count(BIOP_File->descriptor);
-
-	while(nb_desc){
-
-		/* get the descriptor tag */
-		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;
-					}
-		}		
-		nb_desc--;
-	}
-
-	BIOP_File->serviceContextList_count = gf_bs_read_int(bs,8);
-	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){
-		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){
-		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);			
-			fclose(pFile);
-			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Fichier créé \n\n"));
-			if(!strcmp(File->name,"index.html")){
-				dsmcc_overlord->get_index = 1;
-			}
-		}
-	}else{
-		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[DSMCC] File vould not be created\n"));
-	}
-
-	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){
-
-	GF_M2TS_DSMCC_BIOP_DIRECTORY* BIOP_Directory;
-	GF_M2TS_DSMCC_DIR* Dir;
-	u32 i;
-	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway;
-
-	GF_SAFEALLOC(BIOP_Directory,GF_M2TS_DSMCC_BIOP_DIRECTORY);
-
-	ServiceGateway = dsmcc_overlord->ServiceGateway;
-
-	/* Get the Header */
-	BIOP_Directory->Header = BIOP_Header;
-	
-	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 */			
-		Dir = (GF_M2TS_DSMCC_DIR*)ServiceGateway;
-		ServiceGateway->objectKey_data = BIOP_Directory->Header->objectKey_data;
-		ServiceGateway->parent = NULL;			
-		ServiceGateway->name = (char*)gf_strdup(dsmcc_overlord->root_dir);
-	}else{
-		/* get the dir related to the payload */
-		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){
-		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);
-	}
-	BIOP_Directory->messageBody_length = gf_bs_read_int(bs,32);
-	BIOP_Directory->bindings_count = gf_bs_read_int(bs,16);
-	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++){
-		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){
-			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){
-			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){
-			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){
-			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")){
-			BIOP_Directory->Name[i].ContentSize = gf_bs_read_int(bs,64);
-			descr_length = BIOP_Directory->Name[i].objectInfo_length - 8;
-		}else{
-			descr_length = BIOP_Directory->Name[i].objectInfo_length;
-		}
-
-		if(descr_length){
-			BIOP_Directory->Name[i].descriptor = gf_list_new();
-			dsmcc_biop_descriptor(bs,BIOP_Directory->Name[i].descriptor,descr_length);
-		}
-
-		gf_bs_read_int(bs,(u32)(descr_length));
-
-		nb_desc = gf_list_count(BIOP_Directory->Name[i].descriptor);
-		j = 0;
-		while(j<nb_desc){
-			/* get the descriptor tag */
-			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;
-						}
-			}				
-			j++;
-		}
-			
-		if(!strcmp(BIOP_Directory->Name[i].kind_data,"dir")){
-			if(!dsmcc_check_element_validation(ServiceGateway->Dir,ServiceGateway->name,BIOP_Directory->Name[i])){
-				GF_Err e;
-				GF_M2TS_DSMCC_DIR* Directory;
-				GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = (GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE*)gf_list_get(BIOP_Directory->Name[i].IOR.taggedProfile,0);					
-				GF_SAFEALLOC(Directory,GF_M2TS_DSMCC_DIR);
-				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->parent = Dir;
-				Directory->Path = dsmcc_get_file_namepath(Dir,Directory->name);
-				e = gf_mkdir(Directory->Path);
-				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])){
-				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_SAFEALLOC(File,GF_M2TS_DSMCC_FILE);
-				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->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){
-
-	u32 i;		
-	GF_M2TS_DSMCC_BIOP_STREAM_EVENT* BIOP_StreamEvent;
-	//GF_M2TS_DSMCC_FILE* File;	
-	u32 eventdata;
-
-	GF_SAFEALLOC(BIOP_StreamEvent,GF_M2TS_DSMCC_BIOP_STREAM_EVENT);
-
-	eventdata = 0;
-
-	BIOP_StreamEvent->Header = BIOP_Header;
-	/* Get Info */
-	BIOP_StreamEvent->Info.aDescription_length = gf_bs_read_int(bs,8);
-	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));
-	}
-	BIOP_StreamEvent->Info.duration_aSeconds = gf_bs_read_int(bs,32);
-	BIOP_StreamEvent->Info.duration_aMicroseconds = gf_bs_read_int(bs,32);
-	BIOP_StreamEvent->Info.audio = gf_bs_read_int(bs,8);
-	BIOP_StreamEvent->Info.video = gf_bs_read_int(bs,8);
-	BIOP_StreamEvent->Info.data = gf_bs_read_int(bs,8);
-
-	/* Event List */
-	BIOP_StreamEvent->eventNames_count = gf_bs_read_int(bs,16);
-	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++){
-			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){
-				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));
-			}
-		}
-	}
-
-	BIOP_StreamEvent->serviceContextList_count = gf_bs_read_int(bs,8);
-	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);		
-		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){
-			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){
-		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){
-		BIOP_StreamEvent->eventId = (u16*)gf_calloc(BIOP_StreamEvent->eventIds_count,sizeof(u16));
-		for(i =0;i<BIOP_StreamEvent->eventIds_count;i++){
-			BIOP_StreamEvent->eventId[i] = gf_bs_read_int(bs,16);
-		}
-	}
-
-	dsmcc_free_biop_stream_event(BIOP_StreamEvent);
-
-	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){
-
-	u32 i;		
-	GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage;
-
-	GF_SAFEALLOC(BIOP_StreamMessage,GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE);
-
-	BIOP_StreamMessage->Header = BIOP_Header;
-	/* Get Info */
-	BIOP_StreamMessage->Info.aDescription_length = gf_bs_read_int(bs,8);
-	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));
-	}
-	BIOP_StreamMessage->Info.duration_aSeconds = gf_bs_read_int(bs,32);
-	BIOP_StreamMessage->Info.duration_aMicroseconds = gf_bs_read_int(bs,32);
-	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){
-		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);		
-		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){
-			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);
-
-	return GF_OK;
-}
-
-
-/* Tools */
-
-static GF_M2TS_DSMCC_MODULE* dsmcc_create_module(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord, GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC* DownloadInfoIndication)
-{
-	u32 module_index;
-	GF_M2TS_DSMCC_MODULE* dsmcc_module;
-	GF_SAFEALLOC(dsmcc_module,GF_M2TS_DSMCC_MODULE);
-	dsmcc_module->downloadId = DownloadInfoIndication->downloadId;
-	dsmcc_module->moduleId = DownloadInfoIndication->Modules.moduleId;
-	dsmcc_module->size = DownloadInfoIndication->Modules.moduleSize;
-	dsmcc_module->version_number = DownloadInfoIndication->Modules.moduleVersion;
-	dsmcc_module->block_size = DownloadInfoIndication->blockSize;
-	dsmcc_module->buffer = (char*)gf_calloc(dsmcc_module->size,sizeof(char));
-	module_index = gf_list_count(dsmcc_overlord->dsmcc_modules);
-	dsmcc_overlord->processed[module_index].moduleId = dsmcc_module->moduleId;
-	dsmcc_overlord->processed[module_index].downloadId = dsmcc_module->downloadId;
-	dsmcc_overlord->processed[module_index].version_number = dsmcc_module->version_number;
-	gf_list_add(dsmcc_overlord->dsmcc_modules,dsmcc_module);
-
-	return dsmcc_module;
-}
-
-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;	
-
-					}
-				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;
-	}
-}
-
-static void dsmcc_biop_get_context(GF_BitStream* bs,GF_M2TS_DSMCC_SERVICE_CONTEXT* Context,u32 serviceContextList_count)
-{
-	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){
-			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 ));
-		}
-	}
-}
-
-static GF_Err dsmcc_biop_get_ior(GF_BitStream* bs,GF_M2TS_DSMCC_IOR* IOR)
-{
-	u32 i,j,left_lite_component;
-	/* IOR */
-	left_lite_component = 0;
-	IOR->type_id_length = gf_bs_read_int(bs,32);
-	if(IOR->type_id_length > 0xA){		
-		//return GF_CORRUPTED_DATA;
-	}
-	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++){
-		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){
-			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;
-						}
-		}
-		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);						
-			taggedProfile->LiteComponent[j].component_data_length = gf_bs_read_int(bs,8);
-			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));
- 			}
-		}
-
-	}
-	return GF_OK;
-}
-
-static GF_Err dsmcc_check_element_validation(GF_List* List,char* Parent_name,GF_M2TS_DSMCC_BIOP_NAME Name)
-{
-	u32 nb_elt,i;
-
-	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++){
-		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 or Dir already received */
-				return GF_BAD_PARAM;
-		}
-	}
-
-	return GF_OK;
-}
-
-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++){
-		GF_M2TS_DSMCC_DIR* TmpDir;
-		GF_M2TS_DSMCC_DIR* Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(List,i);
-		if(Dir->objectKey_data == objectKey_data){
-			return Dir;
-		}
-		if(gf_list_count(Dir->Dir)){
-			TmpDir = dsmcc_get_directory(Dir->Dir,objectKey_data);
-			if(TmpDir){
-				return TmpDir;
-			}
-		}
-	}
-	return NULL;
-}
-
-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++){		
-		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){
-			return File;
-		}		
-	}
-	return NULL;
-}
-
-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){
-		GF_M2TS_DSMCC_DIR* tempdir;
-		char* tempPath = gf_strdup(Path);
-		tempdir = (GF_M2TS_DSMCC_DIR*)directory->parent;
-		sprintf(Path,"%s%c%s",tempdir->name,GF_PATH_SEPARATOR,tempPath);
-		gf_free(tempPath);
-		directory = tempdir;
-	}
-	return Path;
-}
-
-
-/* Free struct */
-
-static void dsmcc_delete_module(GF_M2TS_DSMCC_MODULE* module)
-{
-	if(module->buffer){
-		gf_free(module->buffer);
-	}
-
-	gf_free(module);
-}
-
-static void dmscc_delete_file(GF_M2TS_DSMCC_FILE* File){
-
-	if(File->name){
-		gf_free(File->name);
-	}
-	if(File->Path){
-		gf_free(File->Path);
-	}
-}
-
-static void dmscc_delete_dir(GF_M2TS_DSMCC_DIR* Dir){
-
-	u32 nb_file, nb_dir,i;
-
-	if(Dir->name){
-		gf_free(Dir->name);
-	}
-	if(Dir->Path){
-		gf_free(Dir->Path);
-	}
-
-	nb_file = gf_list_count(Dir->File);
-	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++){
-		GF_M2TS_DSMCC_DIR* Sub_Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(Dir->Dir,i);
-		dmscc_delete_dir(Sub_Dir);
-	}
-	gf_list_del(Dir->Dir);
-	gf_free(Dir);
-}
-
-static void dmscc_delete_servicegateway(GF_M2TS_DSMCC_SERVICE_GATEWAY* Servicegateway){
-
-	u32 nb_file, nb_dir,i;
-
-	if(Servicegateway->name){
-		gf_free(Servicegateway->name);
-	}
-	nb_file = gf_list_count(Servicegateway->File);
-	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++){
-		GF_M2TS_DSMCC_DIR* Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(Servicegateway->Dir,i);
-		dmscc_delete_dir(Dir);
-	}
-	gf_list_del(Servicegateway->Dir);
-	gf_free(Servicegateway);
-}
-
-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++){
-		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++){
-		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){
-		gf_free(dsmcc_overlord->root_dir);
-	}
-
-	gf_free(dsmcc_overlord);
-}
-
-static void dsmcc_free_biop_header(GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header){	
-
-	gf_free(BIOP_Header->objectKind_data);	
-	gf_free(BIOP_Header);
-}
-
-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);
-	dsmcc_free_biop_name(BIOP_Directory->Name,BIOP_Directory->bindings_count);
-	gf_free(BIOP_Directory);
-}
-
-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){
-		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){
-
-	u32 i;
-
-	if(BIOP_StreamEvent->Info.aDescription_length){
-		gf_free(BIOP_StreamEvent->Info.aDescription_bytes);
-	}
-
-	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){
-				gf_free(BIOP_StreamEvent->EventList[i].eventName_data_byte);
-			}
-		}
-		gf_free(BIOP_StreamEvent->EventList);
-	}
-	
-	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){	
-		gf_free(BIOP_StreamEvent->eventId);
-	}
-}
-
-static void dsmcc_free_biop_stream_message(GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage){
-
-	if(BIOP_StreamMessage->Info.aDescription_length){
-		gf_free(BIOP_StreamMessage->Info.aDescription_bytes);
-	}
-	
-	if(BIOP_StreamMessage->objectInfo_byte){
-		gf_free(BIOP_StreamMessage->objectInfo_byte);
-	}	
-	
-	if(BIOP_StreamMessage->taps_count){	
-		gf_free(BIOP_StreamMessage->Taps);
-	}
-
-	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){		
-		gf_free(IOR->type_id_byte);
-	}	
-	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){
-				gf_free(taggedProfile->LiteComponent[i].component_data_byte);
-			}
-
-		}
-		gf_free(taggedProfile->LiteComponent);
-		gf_list_rem(IOR->taggedProfile,0);
-		gf_free(taggedProfile);
-	}
-	gf_list_del(IOR->taggedProfile);
-}
-
-static void dsmcc_free_biop_descriptor(GF_List* list)
-{
-	u8* descr_tag;
-
-	while(gf_list_count(list)) {
-
-		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 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;
-					}				
-		}			
-
-	}
-	gf_list_del(list);
-}
-
-
-static void dsmcc_free_biop_name(GF_M2TS_DSMCC_BIOP_NAME* Name, u32 nb_name){
-	u32 i;
-
-	for(i =0;i<nb_name;i++){
-
-		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);		
-	}
-}
-
-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);			
-		}
-	}
-	gf_free(Context);
-}
-
-#endif //GPAC_ENABLE_DSMCC
+/*
+ *			GPAC - Multimedia Framework C SDK
+ *
+ *			Authors: Jonathan Sillan
+ *			Copyright (c) Telecom ParisTech 2011-2012
+ *					All rights reserved
+ *
+ *  This file is part of GPAC / media tools sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+
+
+#include <gpac/dsmcc.h>
+
+#ifdef GPAC_ENABLE_DSMCC
+
+/* DSMCC */
+
+
+/* static functions */
+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);
+static GF_Err gf_m2ts_dsmcc_process_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc, char* data,GF_BitStream *bs,u32* data_shift);
+static GF_Err gf_m2ts_dsmcc_process_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader, char* data,GF_BitStream *bs,u32* data_shift,u32 mode);
+static GF_Err gf_m2ts_dsmcc_download_data(GF_M2TS_DSMCC_OVERLORD *dsmcc_overlord,GF_M2TS_DSMCC_SECTION *dsmcc, char  *data, GF_BitStream *bs,u32* data_shift);
+static GF_Err gf_m2ts_dsmcc_section_delete(GF_M2TS_DSMCC_SECTION *dsmcc);
+static GF_Err gf_m2ts_dsmcc_delete_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader);
+static GF_Err gf_m2ts_dsmcc_delete_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc);
+
+
+static GF_Err dsmcc_module_delete(GF_M2TS_DSMCC_MODULE* dsmcc_module);
+//static GF_Err dsmcc_module_state(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,u32 moduleId,u32 moduleVersion);
+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_module_complete(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,GF_M2TS_DSMCC_MODULE* dsmcc_module,u32 moduleIndex);
+static GF_Err dsmcc_get_biop_module_info(GF_M2TS_DSMCC_MODULE* dsmcc_module,char* data,u8 data_size);
+static GF_M2TS_DSMCC_MODULE* dsmcc_create_module(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord, GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC* DownloadInfoIndication);
+
+/* BIOP */
+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_M2TS_DSMCC_BIOP_HEADER* dsmcc_process_biop_header(GF_BitStream* bs);
+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_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_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_message(GF_BitStream* bs,GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header,GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway);
+
+/* Tools */
+static void dsmcc_biop_get_context(GF_BitStream* bs,GF_M2TS_DSMCC_SERVICE_CONTEXT* Context,u32 serviceContextList_count);
+static void dsmcc_biop_descriptor(GF_BitStream* bs,GF_List* list,u32 size);
+static GF_Err dsmcc_biop_get_ior(GF_BitStream* bs,GF_M2TS_DSMCC_IOR* IOR);
+static GF_M2TS_DSMCC_DIR* dsmcc_get_directory(GF_List* List, u32 objectKey_data);
+static GF_M2TS_DSMCC_FILE* dsmcc_get_file(GF_List* ServiceGatewayList,u16 moduleId,u32 downloadId,u32 objectKey_data);
+static GF_Err dsmcc_check_element_validation(GF_List* List,char* Parent_name,GF_M2TS_DSMCC_BIOP_NAME Name);
+static char* dsmcc_get_file_namepath(GF_M2TS_DSMCC_DIR* Dir,char* name);
+
+/* Free */
+static void dsmcc_free_biop_context(GF_M2TS_DSMCC_SERVICE_CONTEXT* Context,u32 serviceContextList_count);
+static void dsmcc_free_biop_name(GF_M2TS_DSMCC_BIOP_NAME* Name, u32 nb_name);
+static void dsmcc_free_biop_descriptor(GF_List* list);
+static void dsmcc_free_biop_ior(GF_M2TS_DSMCC_IOR* IOR);
+static void dsmcc_free_biop_header(GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header);
+static void dsmcc_free_biop_directory(GF_M2TS_DSMCC_BIOP_DIRECTORY* BIOP_Directory);
+static void dsmcc_free_biop_file(GF_M2TS_DSMCC_BIOP_FILE* BIOP_File);
+static void dsmcc_free_biop_stream_event(GF_M2TS_DSMCC_BIOP_STREAM_EVENT* BIOP_StreamEvent);
+static void dsmcc_free_biop_stream_message(GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage);
+
+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);	
+	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) 
+{
+	u16 nb_dsmcc,i;
+
+	nb_dsmcc = gf_list_count(Dsmcc_controller);
+
+	if(!nb_dsmcc){
+		return NULL;
+	}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){
+				return dsmcc_overlord;
+			}
+		}
+	}
+	return NULL;
+}
+
+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;
+	u32 u32_data_size;
+	u32 u32_table_id;
+	GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord;
+
+	dsmcc_overlord = gf_m2ts_get_dmscc_overlord(ts->dsmcc_controler,pck->stream->service_id);
+
+	if (dsmcc_overlord && evt_type == GF_M2TS_EVT_DSMCC_FOUND) {
+		GF_Err e;
+		GF_M2TS_DSMCC_SECTION* dsmcc;
+		data = pck->data;
+		u32_data_size = pck->data_len;
+		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);
+		if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_DSMCC_FOUND, pck);
+		assert(e == GF_OK);
+	}
+}
+
+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;	
+	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->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);
+	if (reserved_test != 3) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] test reserved flag is not at 3. Corrupted section, abording processing\n"));
+		return GF_CORRUPTED_DATA;
+	}
+	dsmcc->dsmcc_section_length = gf_bs_read_int(bs,12);
+	if (dsmcc->dsmcc_section_length > DSMCC_SECTION_LENGTH_MAX) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] section length should not exceed 4096. Wrong section, abording processing \n"));
+		return GF_CORRUPTED_DATA;
+	}
+	dsmcc->table_id_extension = gf_bs_read_int(bs,16);
+
+	/*bit shifting */
+	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)){
+		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);	
+	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;
+	}
+	dsmcc->section_number = gf_bs_read_int(bs,8);
+	/*if(dsmcc->section_number >0 && ((*first_section_received) == 0)){
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Wainting for the first section \n"));
+	return GF_CORRUPTED_DATA;
+	}
+	*first_section_received = 1;*/
+	dsmcc->last_section_number = gf_bs_read_int(bs,8);	
+	//fprintf(stderr, "\nsection_number %d last_section_number %d\n",dsmcc->section_number,dsmcc->last_section_number);
+	//fprintf(stderr, "dsmcc->table_id %d \n",dsmcc->table_id);
+	switch (dsmcc->table_id) {
+		case GF_M2TS_TABLE_ID_DSM_CC_ENCAPSULATED_DATA:
+			{
+				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);	
+	} else {
+		dsmcc->CRC_32= gf_bs_read_int(bs,32);
+	}
+
+	data_shift = (u32)(gf_bs_get_position(bs));
+
+	/*if(data_shift != dsmcc->dsmcc_section_length){.
+	GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process AIT] AIT processed length error. Difference between byte shifting %d and data size %d \n",data_shift,data_size));
+	return GF_CORRUPTED_DATA;
+	}*/
+
+	//gf_m2ts_dsmcc_extract_info(ts,dsmcc);
+	gf_m2ts_dsmcc_section_delete(dsmcc);
+
+	return GF_OK;
+}
+
+static GF_Err gf_m2ts_dsmcc_download_data(GF_M2TS_DSMCC_OVERLORD *dsmcc_overlord,GF_M2TS_DSMCC_SECTION *dsmcc, char  *data, GF_BitStream *bs,u32* data_shift)
+{
+	GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE* DataMessage;
+	GF_SAFEALLOC(DataMessage,GF_M2TS_DSMCC_DOWNLOAD_DATA_MESSAGE);
+
+	/* Header */
+	gf_m2ts_dsmcc_process_message_header(&DataMessage->DownloadDataHeader,data,bs,data_shift,1);
+	dsmcc->DSMCC_Extension = DataMessage;
+
+	//fprintf(stderr, "DataMessage->DownloadDataHeader.messageId %d \n",DataMessage->DownloadDataHeader.messageId);
+
+	switch (DataMessage->DownloadDataHeader.messageId)
+	{
+	case DOWNLOAD_INFO_REQUEST:
+		{
+			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));
+			}
+			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);
+			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));
+				}
+
+				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;
+		}
+	}
+
+	//dsmcc->DSMCC_Extension = DataMessage;
+
+	return GF_OK;
+}
+
+
+
+
+static GF_Err gf_m2ts_dsmcc_process_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader, char* data,GF_BitStream *bs,u32* data_shift,u32 mode)
+{
+	u32 byte_shift;
+
+	byte_shift = *data_shift;
+
+	MessageHeader->protocolDiscriminator = gf_bs_read_int(bs,8);
+	if (MessageHeader->protocolDiscriminator != 0x11) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] DataHeader Protocol Discriminator slot does not have the correct value, abording the processing \n"));
+		return GF_CORRUPTED_DATA;
+	}
+	MessageHeader->dsmccType = gf_bs_read_int(bs,8);
+	MessageHeader->messageId = gf_bs_read_int(bs,16);
+	/* mode 0 for Message Header - 1 for Download Data header */
+	if (mode == 0) {
+		MessageHeader->transactionId = gf_bs_read_int(bs,32);
+	} else if (mode == 1) {
+		MessageHeader->downloadId = gf_bs_read_int(bs,32);
+	}
+	//fprintf(stderr, "MessageHeader->downloadId %d \n",MessageHeader->downloadId);
+	MessageHeader->reserved = gf_bs_read_int(bs,8);
+	if (MessageHeader->reserved != 0xFF) {
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] DataHeader reserved slot does not have the correct value, abording the processing \n"));
+		return GF_CORRUPTED_DATA;
+	}
+	MessageHeader->adaptationLength = gf_bs_read_int(bs,8);
+	MessageHeader->header_length = ((u32)(gf_bs_get_position(bs)) - byte_shift);
+	MessageHeader->messageLength = gf_bs_read_int(bs,16);
+
+	if (MessageHeader->adaptationLength > 0) {
+		MessageHeader->DsmccAdaptationHeader = (GF_M2TS_DSMCC_ADAPTATION_HEADER*)gf_calloc(1, sizeof(GF_M2TS_DSMCC_ADAPTATION_HEADER));
+		MessageHeader->DsmccAdaptationHeader->adaptationType = gf_bs_read_int(bs,8);
+
+		MessageHeader->DsmccAdaptationHeader->adaptationDataByte = (char*)gf_calloc(MessageHeader->adaptationLength-1,sizeof(char));
+		gf_bs_read_data(bs,MessageHeader->DsmccAdaptationHeader->adaptationDataByte,(u32)(MessageHeader->adaptationLength));
+
+	}
+
+	*data_shift = (u32)(gf_bs_get_position(bs));
+
+	return GF_OK;
+}
+
+static GF_Err gf_m2ts_dsmcc_process_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc, char* data,GF_BitStream *bs,u32* data_shift)
+{
+	u32 i,j,byte_shift;
+
+	byte_shift = (u32)(gf_bs_get_position(bs));
+
+	CompatibilityDesc->compatibilityDescriptorLength = gf_bs_read_int(bs,16);
+
+	if(CompatibilityDesc->compatibilityDescriptorLength){
+		CompatibilityDesc->descriptorCount = gf_bs_read_int(bs,16);
+		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++){
+				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);
+				CompatibilityDesc->Descriptor[i].specifierData = gf_bs_read_int(bs,21);
+				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){
+					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++){
+						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){
+							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));
+						}
+
+					}
+				}
+			}
+		}
+	}
+
+	*data_shift = (u32)(gf_bs_get_position(bs));
+	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;
+	}
+
+	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){
+
+	u32 i;
+	for (i=0; i<nb_module; i++) {
+		GF_M2TS_DSMCC_PROCESSED dsmcc_process = dsmcc_overlord->processed[i];
+		if ((InfoModules->moduleId == dsmcc_process.moduleId) && (downloadId == dsmcc_process.downloadId)) {
+			if (InfoModules->moduleVersion <= dsmcc_process.version_number) {
+				GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Module already intialized \n"));
+				return GF_CORRUPTED_DATA;
+			} else if (InfoModules->moduleVersion > dsmcc_process.version_number) {
+				GF_M2TS_DSMCC_MODULE* dsmcc_module = (GF_M2TS_DSMCC_MODULE*)gf_list_get(dsmcc_overlord->dsmcc_modules,i);
+				dsmcc_module_delete(dsmcc_module);
+				gf_list_rem(dsmcc_overlord->dsmcc_modules,i);
+				dsmcc_process.version_number = InfoModules->moduleVersion;
+				dsmcc_process.done = 0;
+				return GF_OK;
+			}
+		}
+	}
+	return  GF_OK;
+}
+
+//static GF_Err dsmcc_module_state(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,u32 moduleId,u32 moduleVersion){
+//
+//	u32 i,nb_module;
+//	nb_module = gf_list_count(dsmcc_overlord->dsmcc_modules);
+//	/* This test comes from the fact that the moduleVersion only borrow the least 5 significant bits of the moduleVersion conveys in DownloadDataBlock */
+//	/* If the moduleVersion is eq to 0x1F, it does not tell if it is clearly 0x1F or a superior value. So in this case it is better to process the data */
+//	/* If the moduleVersion is eq to 0x0, it means that the data conveys a DownloadDataResponse, so it has to be processed */
+//	if (moduleVersion != 0 || moduleVersion < 0x1F) {
+//		for (i=0; i<nb_module; i++) {
+//			GF_M2TS_DSMCC_PROCESSED dsmcc_process = dsmcc_overlord->processed[i];
+//			if ((moduleId == dsmcc_process.moduleId) && (moduleVersion <= dsmcc_process.version_number)) {
+//				if (dsmcc_process.done) {
+//					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;
+//}
+
+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 
+		If then Got_ServiceGateway = 1, all the module are processed */
+	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;
+		}
+	}
+	
+	return GF_CORRUPTED_DATA;
+}
+
+static GF_Err dsmcc_module_complete(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord,GF_M2TS_DSMCC_MODULE* dsmcc_module,u32 moduleIndex)
+{
+	u32 i,nb_module;
+	GF_Err e;
+	e = GF_OK;
+	nb_module = gf_list_count(dsmcc_overlord->dsmcc_modules);
+	for (i=0; i<nb_module; i++) {
+		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){
+				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){
+					e = dsmcc_process_biop_data(dsmcc_overlord,dsmcc_module,uncompressed_data,dsmcc_module->original_size);
+				}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;
+					dsmcc_module->buffer = (char*)gf_calloc(dsmcc_module->size,sizeof(char));
+					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);				
+			}
+			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);
+			}
+		}
+	}
+
+	return  GF_OK;
+}
+
+/* Delete structure of the DSMCC data processing */
+
+static GF_Err gf_m2ts_dsmcc_delete_compatibility_descriptor(GF_M2TS_DSMCC_COMPATIBILITY_DESCRIPTOR *CompatibilityDesc)
+{
+	u32 i,j;	
+	if (CompatibilityDesc->compatibilityDescriptorLength) {
+		if (CompatibilityDesc->descriptorCount) {
+			for (i=0; i<CompatibilityDesc->descriptorCount; i++) {
+				if (CompatibilityDesc->Descriptor[i].subDescriptorCount) {
+					for (j=0; j>CompatibilityDesc->Descriptor[i].subDescriptorCount; j++) {
+						if (CompatibilityDesc->Descriptor[i].SubDescriptor[j].subDescriptorLength) {
+							gf_free(CompatibilityDesc->Descriptor[i].SubDescriptor[j].additionalInformation);
+						}
+					}
+					gf_free(CompatibilityDesc->Descriptor[i].SubDescriptor);
+				}
+			}
+			gf_free(CompatibilityDesc->Descriptor);
+		}
+	}
+	return GF_OK;
+}
+
+static GF_Err gf_m2ts_dsmcc_delete_message_header(GF_M2TS_DSMCC_MESSAGE_DATA_HEADER *MessageHeader)
+{	
+	if (MessageHeader->adaptationLength > 0) {		
+		gf_free(MessageHeader->DsmccAdaptationHeader->adaptationDataByte);
+		gf_free(MessageHeader->DsmccAdaptationHeader);
+	}
+	return GF_OK;
+}
+
+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;	
+
+	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;
+		}
+	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;
+		}
+	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;
+		}
+	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;
+		}
+	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;
+		}
+	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;
+		}
+	default:
+		{
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Unknown dataMessagePayload Type \n"));
+			break;
+		}
+	} 
+
+	/* Header */
+	gf_m2ts_dsmcc_delete_message_header(&DataMessage->DownloadDataHeader);
+	gf_free(DataMessage);
+	gf_free(dsmcc);
+	dsmcc = NULL;
+	return GF_OK;
+}
+
+
+static GF_Err dsmcc_module_delete(GF_M2TS_DSMCC_MODULE* dsmcc_module){
+
+	gf_free(dsmcc_module->buffer);
+	gf_free(dsmcc_module);
+	dsmcc_module = NULL;
+	return  GF_OK;
+}
+
+/* BIOP MESSAGE */
+
+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;
+	u8 i;
+
+
+	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
+	GF_SAFEALLOC(BIOP_ModuleInfo,GF_M2TS_DSMCC_BIOP_MODULE_INFO);
+	BIOP_ModuleInfo->descriptor = gf_list_new();
+
+	BIOP_ModuleInfo->moduleTimeOut = gf_bs_read_int(bs,32);
+	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){
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Corrupted payload for BIOP Module Info \n"));
+		gf_list_del(BIOP_ModuleInfo->descriptor);	
+		gf_free(BIOP_ModuleInfo);
+		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++){
+		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){
+			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)){
+			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;	
+		}
+	}
+	BIOP_ModuleInfo->userInfoLength = gf_bs_read_int(bs,8);
+	if(BIOP_ModuleInfo->userInfoLength){
+
+		u32 nb_desc,j;
+		u8* descr_tag;
+
+		dsmcc_biop_descriptor(bs,BIOP_ModuleInfo->descriptor,(u32)(BIOP_ModuleInfo->userInfoLength));		
+
+		nb_desc = gf_list_count(BIOP_ModuleInfo->descriptor);
+		j = 0;
+		while(j<nb_desc){
+
+			/* 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;	
+
+					}
+				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){
+			gf_free(BIOP_ModuleInfo->Taps[i].selector_data);
+		}		
+	}
+	gf_free(BIOP_ModuleInfo->Taps);
+	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){
+
+	GF_BitStream *bs;
+	GF_Err e;
+	Bool Error;
+	u32 byte_shift;
+	GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header;
+	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway = dsmcc_overlord->ServiceGateway;
+
+	e = GF_OK;
+	Error = 0;
+
+	bs = gf_bs_new(data,data_size,GF_BITSTREAM_READ);
+
+	byte_shift = (u32)(gf_bs_get_position(bs));
+
+	while(byte_shift < data_size){
+
+		BIOP_Header = dsmcc_process_biop_header(bs);
+
+		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")){
+				e = dsmcc_process_biop_directory(bs,BIOP_Header,dsmcc_overlord,0);
+			}else if(!strcmp(BIOP_Header->objectKind_data,"srg")){
+				e = dsmcc_process_biop_directory(bs,BIOP_Header,dsmcc_overlord,1);
+				if(e == GF_OK){
+					dsmcc_overlord->Got_ServiceGateway = 1;
+				}
+			}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")){
+				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"));				
+			}
+		}
+		byte_shift = (u32)(gf_bs_get_position(bs));
+		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){
+			dsmcc_free_biop_header(BIOP_Header);
+		}
+		
+	}
+
+	if(Error){
+		return GF_CORRUPTED_DATA;
+	}
+
+	return GF_OK;
+}
+
+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){
+		GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[Process DSMCC] Wrong BIOP Header, abording process \n"));
+		return NULL;
+	}
+	BIOP_Header->biop_version_major = gf_bs_read_int(bs,8);
+	BIOP_Header->biop_version_minor = gf_bs_read_int(bs,8);
+	BIOP_Header->byte_order = gf_bs_read_int(bs,8);
+	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){
+		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){
+		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));
+	}
+	BIOP_Header->objectInfo_length = gf_bs_read_int(bs,16);
+
+	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){
+
+	u32 nb_desc,descr_size;		
+	GF_M2TS_DSMCC_BIOP_FILE* BIOP_File;
+	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway;
+	GF_M2TS_DSMCC_FILE* File;
+	FILE* pFile;
+	u8* descr_tag;
+
+	GF_SAFEALLOC(BIOP_File,GF_M2TS_DSMCC_BIOP_FILE);
+
+	ServiceGateway = dsmcc_overlord->ServiceGateway;
+
+	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){
+		dsmcc_biop_descriptor(bs,BIOP_File->descriptor,descr_size);
+	}
+
+	 gf_bs_read_int(bs,(u32)(descr_size));
+
+	nb_desc = gf_list_count(BIOP_File->descriptor);
+
+	while(nb_desc){
+
+		/* get the descriptor tag */
+		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;
+					}
+		}		
+		nb_desc--;
+	}
+
+	BIOP_File->serviceContextList_count = gf_bs_read_int(bs,8);
+	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){
+		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){
+		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);			
+			fclose(pFile);
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("Fichier créé \n\n"));
+			if(!strcmp(File->name,"index.html")){
+				dsmcc_overlord->get_index = 1;
+			}
+		}
+	}else{
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[DSMCC] File vould not be created\n"));
+	}
+
+	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){
+
+	GF_M2TS_DSMCC_BIOP_DIRECTORY* BIOP_Directory;
+	GF_M2TS_DSMCC_DIR* Dir;
+	u32 i;
+	GF_M2TS_DSMCC_SERVICE_GATEWAY* ServiceGateway;
+
+	GF_SAFEALLOC(BIOP_Directory,GF_M2TS_DSMCC_BIOP_DIRECTORY);
+
+	ServiceGateway = dsmcc_overlord->ServiceGateway;
+
+	/* Get the Header */
+	BIOP_Directory->Header = BIOP_Header;
+	
+	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 */			
+		Dir = (GF_M2TS_DSMCC_DIR*)ServiceGateway;
+		ServiceGateway->objectKey_data = BIOP_Directory->Header->objectKey_data;
+		ServiceGateway->parent = NULL;			
+		ServiceGateway->name = (char*)gf_strdup(dsmcc_overlord->root_dir);
+	}else{
+		/* get the dir related to the payload */
+		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){
+		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);
+	}
+	BIOP_Directory->messageBody_length = gf_bs_read_int(bs,32);
+	BIOP_Directory->bindings_count = gf_bs_read_int(bs,16);
+	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++){
+		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){
+			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){
+			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){
+			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){
+			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")){
+			BIOP_Directory->Name[i].ContentSize = gf_bs_read_int(bs,64);
+			descr_length = BIOP_Directory->Name[i].objectInfo_length - 8;
+		}else{
+			descr_length = BIOP_Directory->Name[i].objectInfo_length;
+		}
+
+		if(descr_length){
+			BIOP_Directory->Name[i].descriptor = gf_list_new();
+			dsmcc_biop_descriptor(bs,BIOP_Directory->Name[i].descriptor,descr_length);
+		}
+
+		gf_bs_read_int(bs,(u32)(descr_length));
+
+		nb_desc = gf_list_count(BIOP_Directory->Name[i].descriptor);
+		j = 0;
+		while(j<nb_desc){
+			/* get the descriptor tag */
+			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;
+						}
+			}				
+			j++;
+		}
+			
+		if(!strcmp(BIOP_Directory->Name[i].kind_data,"dir")){
+			if(!dsmcc_check_element_validation(ServiceGateway->Dir,ServiceGateway->name,BIOP_Directory->Name[i])){
+				GF_Err e;
+				GF_M2TS_DSMCC_DIR* Directory;
+				GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE* taggedProfile = (GF_M2TS_DSMCC_BIOP_TAGGED_PROFILE*)gf_list_get(BIOP_Directory->Name[i].IOR.taggedProfile,0);					
+				GF_SAFEALLOC(Directory,GF_M2TS_DSMCC_DIR);
+				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->parent = Dir;
+				Directory->Path = dsmcc_get_file_namepath(Dir,Directory->name);
+				e = gf_mkdir(Directory->Path);
+				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])){
+				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_SAFEALLOC(File,GF_M2TS_DSMCC_FILE);
+				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->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){
+
+	u32 i;		
+	GF_M2TS_DSMCC_BIOP_STREAM_EVENT* BIOP_StreamEvent;
+	//GF_M2TS_DSMCC_FILE* File;	
+	u32 eventdata;
+
+	GF_SAFEALLOC(BIOP_StreamEvent,GF_M2TS_DSMCC_BIOP_STREAM_EVENT);
+
+	eventdata = 0;
+
+	BIOP_StreamEvent->Header = BIOP_Header;
+	/* Get Info */
+	BIOP_StreamEvent->Info.aDescription_length = gf_bs_read_int(bs,8);
+	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));
+	}
+	BIOP_StreamEvent->Info.duration_aSeconds = gf_bs_read_int(bs,32);
+	BIOP_StreamEvent->Info.duration_aMicroseconds = gf_bs_read_int(bs,32);
+	BIOP_StreamEvent->Info.audio = gf_bs_read_int(bs,8);
+	BIOP_StreamEvent->Info.video = gf_bs_read_int(bs,8);
+	BIOP_StreamEvent->Info.data = gf_bs_read_int(bs,8);
+
+	/* Event List */
+	BIOP_StreamEvent->eventNames_count = gf_bs_read_int(bs,16);
+	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++){
+			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){
+				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));
+			}
+		}
+	}
+
+	BIOP_StreamEvent->serviceContextList_count = gf_bs_read_int(bs,8);
+	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);		
+		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){
+			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){
+		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){
+		BIOP_StreamEvent->eventId = (u16*)gf_calloc(BIOP_StreamEvent->eventIds_count,sizeof(u16));
+		for(i =0;i<BIOP_StreamEvent->eventIds_count;i++){
+			BIOP_StreamEvent->eventId[i] = gf_bs_read_int(bs,16);
+		}
+	}
+
+	dsmcc_free_biop_stream_event(BIOP_StreamEvent);
+
+	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){
+
+	u32 i;		
+	GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage;
+
+	GF_SAFEALLOC(BIOP_StreamMessage,GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE);
+
+	BIOP_StreamMessage->Header = BIOP_Header;
+	/* Get Info */
+	BIOP_StreamMessage->Info.aDescription_length = gf_bs_read_int(bs,8);
+	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));
+	}
+	BIOP_StreamMessage->Info.duration_aSeconds = gf_bs_read_int(bs,32);
+	BIOP_StreamMessage->Info.duration_aMicroseconds = gf_bs_read_int(bs,32);
+	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){
+		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);		
+		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){
+			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);
+
+	return GF_OK;
+}
+
+
+/* Tools */
+
+static GF_M2TS_DSMCC_MODULE* dsmcc_create_module(GF_M2TS_DSMCC_OVERLORD* dsmcc_overlord, GF_M2TS_DSMCC_DOWNLOAD_INFO_RESP_INDIC* DownloadInfoIndication)
+{
+	u32 module_index;
+	GF_M2TS_DSMCC_MODULE* dsmcc_module;
+	GF_SAFEALLOC(dsmcc_module,GF_M2TS_DSMCC_MODULE);
+	dsmcc_module->downloadId = DownloadInfoIndication->downloadId;
+	dsmcc_module->moduleId = DownloadInfoIndication->Modules.moduleId;
+	dsmcc_module->size = DownloadInfoIndication->Modules.moduleSize;
+	dsmcc_module->version_number = DownloadInfoIndication->Modules.moduleVersion;
+	dsmcc_module->block_size = DownloadInfoIndication->blockSize;
+	dsmcc_module->buffer = (char*)gf_calloc(dsmcc_module->size,sizeof(char));
+	module_index = gf_list_count(dsmcc_overlord->dsmcc_modules);
+	dsmcc_overlord->processed[module_index].moduleId = dsmcc_module->moduleId;
+	dsmcc_overlord->processed[module_index].downloadId = dsmcc_module->downloadId;
+	dsmcc_overlord->processed[module_index].version_number = dsmcc_module->version_number;
+	gf_list_add(dsmcc_overlord->dsmcc_modules,dsmcc_module);
+
+	return dsmcc_module;
+}
+
+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;	
+
+					}
+				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;
+	}
+}
+
+static void dsmcc_biop_get_context(GF_BitStream* bs,GF_M2TS_DSMCC_SERVICE_CONTEXT* Context,u32 serviceContextList_count)
+{
+	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){
+			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 ));
+		}
+	}
+}
+
+static GF_Err dsmcc_biop_get_ior(GF_BitStream* bs,GF_M2TS_DSMCC_IOR* IOR)
+{
+	u32 i,j,left_lite_component;
+	/* IOR */
+	left_lite_component = 0;
+	IOR->type_id_length = gf_bs_read_int(bs,32);
+	if(IOR->type_id_length > 0xA){		
+		//return GF_CORRUPTED_DATA;
+	}
+	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++){
+		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){
+			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;
+						}
+		}
+		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);						
+			taggedProfile->LiteComponent[j].component_data_length = gf_bs_read_int(bs,8);
+			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));
+ 			}
+		}
+
+	}
+	return GF_OK;
+}
+
+static GF_Err dsmcc_check_element_validation(GF_List* List,char* Parent_name,GF_M2TS_DSMCC_BIOP_NAME Name)
+{
+	u32 nb_elt,i;
+
+	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++){
+		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 or Dir already received */
+				return GF_BAD_PARAM;
+		}
+	}
+
+	return GF_OK;
+}
+
+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++){
+		GF_M2TS_DSMCC_DIR* TmpDir;
+		GF_M2TS_DSMCC_DIR* Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(List,i);
+		if(Dir->objectKey_data == objectKey_data){
+			return Dir;
+		}
+		if(gf_list_count(Dir->Dir)){
+			TmpDir = dsmcc_get_directory(Dir->Dir,objectKey_data);
+			if(TmpDir){
+				return TmpDir;
+			}
+		}
+	}
+	return NULL;
+}
+
+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++){		
+		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){
+			return File;
+		}		
+	}
+	return NULL;
+}
+
+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){
+		GF_M2TS_DSMCC_DIR* tempdir;
+		char* tempPath = gf_strdup(Path);
+		tempdir = (GF_M2TS_DSMCC_DIR*)directory->parent;
+		sprintf(Path,"%s%c%s",tempdir->name,GF_PATH_SEPARATOR,tempPath);
+		gf_free(tempPath);
+		directory = tempdir;
+	}
+	return Path;
+}
+
+
+/* Free struct */
+
+static void dsmcc_delete_module(GF_M2TS_DSMCC_MODULE* module)
+{
+	if(module->buffer){
+		gf_free(module->buffer);
+	}
+
+	gf_free(module);
+}
+
+static void dmscc_delete_file(GF_M2TS_DSMCC_FILE* File){
+
+	if(File->name){
+		gf_free(File->name);
+	}
+	if(File->Path){
+		gf_free(File->Path);
+	}
+}
+
+static void dmscc_delete_dir(GF_M2TS_DSMCC_DIR* Dir){
+
+	u32 nb_file, nb_dir,i;
+
+	if(Dir->name){
+		gf_free(Dir->name);
+	}
+	if(Dir->Path){
+		gf_free(Dir->Path);
+	}
+
+	nb_file = gf_list_count(Dir->File);
+	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++){
+		GF_M2TS_DSMCC_DIR* Sub_Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(Dir->Dir,i);
+		dmscc_delete_dir(Sub_Dir);
+	}
+	gf_list_del(Dir->Dir);
+	gf_free(Dir);
+}
+
+static void dmscc_delete_servicegateway(GF_M2TS_DSMCC_SERVICE_GATEWAY* Servicegateway){
+
+	u32 nb_file, nb_dir,i;
+
+	if(Servicegateway->name){
+		gf_free(Servicegateway->name);
+	}
+	nb_file = gf_list_count(Servicegateway->File);
+	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++){
+		GF_M2TS_DSMCC_DIR* Dir = (GF_M2TS_DSMCC_DIR*)gf_list_get(Servicegateway->Dir,i);
+		dmscc_delete_dir(Dir);
+	}
+	gf_list_del(Servicegateway->Dir);
+	gf_free(Servicegateway);
+}
+
+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++){
+		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++){
+		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){
+		gf_free(dsmcc_overlord->root_dir);
+	}
+
+	gf_free(dsmcc_overlord);
+}
+
+static void dsmcc_free_biop_header(GF_M2TS_DSMCC_BIOP_HEADER* BIOP_Header){	
+
+	gf_free(BIOP_Header->objectKind_data);	
+	gf_free(BIOP_Header);
+}
+
+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);
+	dsmcc_free_biop_name(BIOP_Directory->Name,BIOP_Directory->bindings_count);
+	gf_free(BIOP_Directory);
+}
+
+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){
+		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){
+
+	u32 i;
+
+	if(BIOP_StreamEvent->Info.aDescription_length){
+		gf_free(BIOP_StreamEvent->Info.aDescription_bytes);
+	}
+
+	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){
+				gf_free(BIOP_StreamEvent->EventList[i].eventName_data_byte);
+			}
+		}
+		gf_free(BIOP_StreamEvent->EventList);
+	}
+	
+	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){	
+		gf_free(BIOP_StreamEvent->eventId);
+	}
+}
+
+static void dsmcc_free_biop_stream_message(GF_M2TS_DSMCC_BIOP_STREAM_MESSAGE* BIOP_StreamMessage){
+
+	if(BIOP_StreamMessage->Info.aDescription_length){
+		gf_free(BIOP_StreamMessage->Info.aDescription_bytes);
+	}
+	
+	if(BIOP_StreamMessage->objectInfo_byte){
+		gf_free(BIOP_StreamMessage->objectInfo_byte);
+	}	
+	
+	if(BIOP_StreamMessage->taps_count){	
+		gf_free(BIOP_StreamMessage->Taps);
+	}
+
+	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){		
+		gf_free(IOR->type_id_byte);
+	}	
+	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){
+				gf_free(taggedProfile->LiteComponent[i].component_data_byte);
+			}
+
+		}
+		gf_free(taggedProfile->LiteComponent);
+		gf_list_rem(IOR->taggedProfile,0);
+		gf_free(taggedProfile);
+	}
+	gf_list_del(IOR->taggedProfile);
+}
+
+static void dsmcc_free_biop_descriptor(GF_List* list)
+{
+	u8* descr_tag;
+
+	while(gf_list_count(list)) {
+
+		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 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;
+					}				
+		}			
+
+	}
+	gf_list_del(list);
+}
+
+
+static void dsmcc_free_biop_name(GF_M2TS_DSMCC_BIOP_NAME* Name, u32 nb_name){
+	u32 i;
+
+	for(i =0;i<nb_name;i++){
+
+		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);		
+	}
+}
+
+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);			
+		}
+	}
+	gf_free(Context);
+}
+
+#endif //GPAC_ENABLE_DSMCC

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/filestreamer.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/filestreamer.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/html5_media.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/html5_media.c Changed

@@ -1,200 +1,421 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Cyril COncolato
- *			Copyright (c) Telecom ParisTech 2013-
-*					All rights reserved
-*
-*  This file is part of GPAC / Media Source
-*
-*  GPAC is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU Lesser General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*
-*  GPAC is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU Lesser General Public License for more details.
-*
-*  You should have received a copy of the GNU Lesser General Public
-*  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*/
-
-#include <gpac/setup.h>
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#include <gpac/html5_media.h>
-#include <gpac/html5_mse.h>
-
-
-GF_Err gf_media_time_ranges_add(GF_HTML_MediaTimeRanges *timeranges, double start, double end)
-{
-    double *d;
-    if (!timeranges) return GF_BAD_PARAM;
-    d = (double *)gf_malloc(sizeof(double));
-    *d = start;
-    gf_list_add(timeranges->times, d);
-    d = (double *)gf_malloc(sizeof(double));
-    *d = end;
-    gf_list_add(timeranges->times, d);
-    return GF_OK;
-}
-
-void gf_html_timeranges_del(GF_HTML_MediaTimeRanges *range)
-{
-    while (gf_list_count(range->times))
-    {
-        double *d = (double *)gf_list_get(range->times, 0);
-        gf_free(d);
-        gf_list_rem(range->times, 0);
-    }
-}
-
-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_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 *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;
-}
-
-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_free(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;
-}
-
-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);
-
-    gf_mx_p(track->buffer_mutex);
-    while (gf_list_count(track->buffer))
-    {
-        GF_MSE_Packet *packet = (GF_MSE_Packet *)gf_list_get(track->buffer, 0);
-        gf_mse_packet_del(packet);
-        gf_list_rem(track->buffer, 0);
-    }
-    gf_mx_v(track->buffer_mutex);
-    gf_list_del(track->buffer);
-    gf_mx_del(track->buffer_mutex);
-}
-
-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.times          = gf_list_new();
-    me->played.times            = gf_list_new();
-    me->seekable.times          = gf_list_new();
-    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);
-}
-
-GF_HTML_MediaController *gf_html_media_controller_new()
-{
-    GF_HTML_MediaController *mc;
-    GF_SAFEALLOC(mc, GF_HTML_MediaController);
-    mc->buffered.times          = gf_list_new();
-    mc->played.times            = gf_list_new();
-    mc->seekable.times          = gf_list_new();
-    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);
-}
-
-#endif
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+ *			Authors: Cyril COncolato
+ *			Copyright (c) Telecom ParisTech 2013-
+*					All rights reserved
+*
+*  This file is part of GPAC / Media Source
+*
+*  GPAC is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU Lesser General Public License as published by
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*
+*  GPAC is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU Lesser General Public License for more details.
+*
+*  You should have received a copy of the GNU Lesser General Public
+*  License along with this library; see the file COPYING.  If not, write to
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
+
+#include <gpac/setup.h>
+#include <gpac/internal/scenegraph_dev.h>
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+#include <gpac/html5_media.h>
+#include <gpac/html5_mse.h>
+
+GF_HTML_MediaTimeRanges *gf_html_timeranges_new(u32 timescale)
+{
+	GF_HTML_MediaTimeRanges *ranges;
+	GF_SAFEALLOC(ranges, GF_HTML_MediaTimeRanges);
+	ranges->times = gf_list_new();
+	ranges->timescale = timescale;
+	return ranges;
+}
+
+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;
+}
+
+GF_Err gf_html_timeranges_add_start(GF_HTML_MediaTimeRanges *timeranges, u64 start)
+{
+	return gf_html_timeranges_add_time(timeranges, start);
+}
+
+GF_Err gf_html_timeranges_add_end(GF_HTML_MediaTimeRanges *timeranges, u64 end)
+{
+	return gf_html_timeranges_add_time(timeranges, end);
+}
+
+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);
+    }
+}
+
+void gf_html_timeranges_del(GF_HTML_MediaTimeRanges *ranges)
+{
+	gf_html_timeranges_reset(ranges);
+    gf_list_del(ranges->times);
+	ranges->times = NULL;
+	gf_free(ranges);
+}
+
+void gf_html_timeranges_merge(GF_HTML_MediaTimeRanges *ranges) {
+	u32 i, count;
+	u64 *start;
+	u64 *end;
+	u64 *prev_end;
+	GF_List *merged = gf_list_new();
+
+	prev_end = NULL;
+	count = gf_list_count(ranges->times);
+	for (i = 0; i < count; i+=2) {
+		start = (u64 *)gf_list_get(ranges->times, i);
+		end = (u64 *)gf_list_get(ranges->times, i+1);
+		if (prev_end == NULL || *start > *prev_end) {
+			if (prev_end) {
+				gf_list_add(merged, prev_end);
+			}
+			gf_list_add(merged, start);
+		} else if (*start == *prev_end) {
+			gf_free(start);
+		}
+		prev_end = end;
+	}
+	if (prev_end) {
+		gf_list_add(ranges->times, prev_end);
+	}
+	gf_list_del(ranges->times);
+	ranges->times = merged;
+}
+
+
+GF_HTML_MediaTimeRanges *gf_html_timeranges_union(GF_HTML_MediaTimeRanges *a, GF_HTML_MediaTimeRanges *b)
+{
+	GF_HTML_MediaTimeRanges *union_ranges;
+	u32 i, j, count_a, count_b;
+	union_ranges = gf_html_timeranges_new(a->timescale);
+	union_ranges->c = a->c;
+	union_ranges->_this = a->_this;
+
+	count_a = gf_list_count(a->times);
+	if (b) {
+		count_b = gf_list_count(b->times);
+	} else {
+		count_b = 0;
+	}
+	if (count_a == 0 && count_b == 0) {
+		return NULL;
+	} else if (count_a == 0) {		
+		GF_HTML_MediaTimeRanges *tmp = a;
+		a = b;
+		b = tmp;
+		count_a = count_b;
+		count_b = 0;
+	}
+	i = 0;
+	j = 0;
+	while (i < count_a) {
+		Bool add_a = GF_TRUE;
+		u64 *starta = (u64 *)gf_list_get(a->times, i);
+		u64 *enda = (u64 *)gf_list_get(a->times, i+1);
+		while (j < count_b) {
+			u64 *startb = (u64 *)gf_list_get(b->times, j);
+			u64 *endb = (u64 *)gf_list_get(b->times, j+1);
+			if (*enda*b->timescale < *startb*a->timescale) {
+				/* a ends before b starts, there is no overlap, we can add a to the union */
+				gf_list_add(union_ranges->times, starta);
+				gf_list_add(union_ranges->times, enda);
+				add_a = GF_FALSE;
+				/* force to get the next a */
+				i+=2;
+				break;
+			} else if (*endb*a->timescale < *starta*b->timescale) {
+				/* b ends before a starts, there is no overlap, we can add b to the union */
+				*startb = (u64)((*startb * a->timescale)*1.0 / b->timescale);
+				gf_list_add(union_ranges->times, startb);
+				*endb = (u64)((*endb * a->timescale)*1.0 / b->timescale);
+				gf_list_add(union_ranges->times, endb);
+				j+=2;
+			} else { /* there is some overlap */
+				if (*starta*b->timescale <= *startb*a->timescale) { /* the overlap is at the end of a */
+					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 */ 
+						/* update start of b */
+						*startb = (u64)((*starta * b->timescale)*1.0 / a->timescale);
+						/* ignore a, move on to the next a */
+						i+=2;
+						break;
+					}
+				} else { /* *starta > *startb, the overlap is at the end of b */
+					if (*enda*b->timescale <= *endb*a->timescale) { /* a is contained in b */
+						/* ignore a */
+						add_a = GF_FALSE;
+						/* force to get the next a */
+						i+=2;
+						break;
+					} else { /* *enda > *endb, the overlap is at the beginning of a */
+						/* update start of a */
+						*starta = (u64)((*startb * a->timescale)*1.0 / b->timescale);
+						/* ignore b, move on to the next b */
+						j+=2;
+					}
+				}
+			}
+		}
+		/* we've processed all b, but a has not been added */
+		/* first check if the next a is not contiguous */
+		if (add_a == GF_TRUE && i+2 < count_a) {
+			u64 *next_starta = (u64 *)gf_list_get(a->times, i+2);
+			//u64 *next_enda = (u64 *)gf_list_get(a->times, i+3);
+			if (*enda == *next_starta) {
+				*next_starta = *starta;
+			}
+			add_a = GF_FALSE;
+		}
+		if (add_a) {
+			gf_list_add(union_ranges->times, starta);
+			gf_list_add(union_ranges->times, enda);
+		}
+		i+=2;
+	}
+	gf_html_timeranges_merge(union_ranges);
+	return union_ranges;
+}
+
+GF_HTML_MediaTimeRanges *gf_html_timeranges_intersection(GF_HTML_MediaTimeRanges *a, GF_HTML_MediaTimeRanges *b)
+{
+	GF_HTML_MediaTimeRanges *intersection_ranges;
+	u32 i, j, count_a, count_b;
+	intersection_ranges = gf_html_timeranges_new(a->timescale);
+	intersection_ranges->c = a->c;
+	intersection_ranges->_this = a->_this;
+	count_a = 0;
+	count_b = 0;
+	if (a) count_a = gf_list_count(a->times);
+	if (b) count_b = gf_list_count(b->times);
+	if (count_a != 0 && count_b != 0) {
+		i = 0;
+		j = 0;
+		while (i < count_a) {
+			u64 *starta = (u64 *)gf_list_get(a->times, i);
+			u64 *enda = (u64 *)gf_list_get(a->times, i+1);
+			while (j < count_b) {
+				u64 *startb = (u64 *)gf_list_get(b->times, j);
+				u64 *endb = (u64 *)gf_list_get(b->times, j+1);
+				if (*enda*b->timescale < *startb*a->timescale) {
+					/* this is no intersection with this a */
+					/* force to get the next a */
+					i+=2;
+					break;
+				} else if (*endb*a->timescale < *starta*b->timescale) {
+					/* this is no intersection with this b */
+					j+=2;
+				} else { /* there is an intersection */
+					if (*starta*b->timescale <= *startb*a->timescale) { /* the intersection starts at the beginning of b */
+						gf_list_add(intersection_ranges->times, startb);
+						if (*endb*a->timescale <= *enda*b->timescale) { /* b is contained in a */
+							gf_list_add(intersection_ranges->times, endb);
+							*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 */ 
+							gf_list_add(intersection_ranges->times, enda);
+							/* update start of b */
+							*startb = (u64)((*enda * b->timescale)*1.0 / a->timescale);
+							/* move on to the next a */
+							i+=2;
+							break;
+						}
+					} else { /* *starta > *startb, the intersection starts at the beginning of a */
+						gf_list_add(intersection_ranges->times, startb);
+						if (*enda*b->timescale <= *endb*a->timescale) { /* a is contained in b */
+							gf_list_add(intersection_ranges->times, enda);
+							*startb = (u64)((*enda * b->timescale)*1.0 / a->timescale);
+							/* move on to the next a */
+							i+=2;
+							break;
+						} else { /* *enda > *endb, the intersection ends at the end of b */
+							gf_list_add(intersection_ranges->times, endb);
+							/* update start of a */
+							*starta = (u64)((*endb * a->timescale)*1.0 / b->timescale);
+							/* move on to the next b */
+							j+=2;
+						}
+					}
+				}
+			}
+		}
+	}
+	return intersection_ranges;
+}
+
+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_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 *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;
+}
+
+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);
+}
+
+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;
+}
+
+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->buffer_mutex) {
+		gf_mx_p(track->buffer_mutex);
+		while (gf_list_count(track->buffer))
+		{
+			GF_MSE_Packet *packet = (GF_MSE_Packet *)gf_list_get(track->buffer, 0);
+			gf_mse_packet_del(packet);
+			gf_list_rem(track->buffer, 0);
+		}
+		gf_mx_v(track->buffer_mutex);
+		gf_list_del(track->buffer);
+		gf_mx_del(track->buffer_mutex);
+	} else {
+		assert(track->buffer == NULL);
+	}
+	gf_free(track);
+}
+
+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;
+}
+
+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);
+}
+
+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;
+}
+
+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);
+}
+
+#endif
+

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/html5_mse.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/html5_mse.c Changed

@@ -1,705 +1,1057 @@
-/*
-*			GPAC - Multimedia Framework C SDK
-*
- *			Authors: Cyril COncolato
- *			Copyright (c) Telecom ParisTech 2013-
-*					All rights reserved
-*
-*  This file is part of GPAC / Media Source
-*
-*  GPAC is free software; you can redistribute it and/or modify
-*  it under the terms of the GNU Lesser General Public License as published by
-*  the Free Software Foundation; either version 2, or (at your option)
-*  any later version.
-*
-*  GPAC is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU Lesser General Public License for more details.
-*
-*  You should have received a copy of the GNU Lesser General Public
-*  License along with this library; see the file COPYING.  If not, write to
-*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-*
-*/
-#include <gpac/setup.h>
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-#include <gpac/html5_mse.h>
-
-GF_HTML_MediaSource *gf_mse_media_source_new()
-{
-    GF_HTML_MediaSource *p;
-    GF_SAFEALLOC(p, GF_HTML_MediaSource);
-    p->sourceBuffers.list = gf_list_new();
-    p->activeSourceBuffers.list = gf_list_new();
-    return p;
-}
-
-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.times = gf_list_new();
-    source->input_buffer = gf_list_new();
-    source->tracks = gf_list_new();
-    source->parser_thread = gf_th_new(name);
-    source->parser_mutex = gf_mx_new(name);
-    source->abort_mode = MEDIA_SOURCE_ABORT_MODE_NONE;
-    source->appendWindowStart = 0;
-    source->appendWindowEnd = GF_MAX_DOUBLE;
-    gf_list_add(mediasource->sourceBuffers.list, source);
-    return source;
-}
-
-void gf_mse_source_buffer_del(GF_HTML_SourceBuffer *sb)
-{
-    GF_HTML_TrackList tlist;
-    gf_html_timeranges_del(&sb->buffered);
-    gf_list_del(sb->buffered.times);
-    gf_list_del(sb->input_buffer);
-    tlist.tracks = sb->tracks;
-    gf_html_tracklist_del(&tlist);
-    gf_free(sb->parser_thread);
-    gf_free(sb->parser_mutex);
-    gf_free(sb);
-}
-
-/*locates input service (demuxer, parser) 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;
-
-    const char *sPlug;
-    if (mime) {
-        /* 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 (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;
-    }
-}
-
-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;
-}
-
-static GF_Err gf_mse_source_buffer_setup_tracks(GF_HTML_SourceBuffer *sb)
-{
-    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;
-    }
-}
-
-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;
-}
-
-void gf_mse_source_buffer_update_buffered(GF_HTML_SourceBuffer *sb)
-{
-    u32 i;
-    u32 track_count;
-    double start= 0;
-    double end = 0;
-    Bool start_set = GF_FALSE;
-    Bool end_set = GF_FALSE;
-
-    /* cleaning the current list */
-    gf_html_timeranges_del(&(sb->buffered));
-
-    /* merging the start and end for all tracks */
-    track_count = gf_list_count(sb->tracks);
-    for (i = 0; i < track_count; i++)
-    {
-        u32 j;
-        u32 packet_count;
-        GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
-        gf_mx_p(track->buffer_mutex);
-        packet_count = gf_list_count(track->buffer);
-        for (j = 0; j < packet_count; j++)
-        {
-            GF_MSE_Packet *packet = (GF_MSE_Packet *)gf_list_get(track->buffer, j);
-            if (packet) {
-                double packet_start = (packet->sl_header.compositionTimeStamp * 1.0 )/ track->timescale;
-                double packet_end = ((packet->sl_header.compositionTimeStamp + packet->sl_header.au_duration) * 1.0) / track->timescale;
-                if (!start_set) 
-                {
-                    start = packet_start;
-                    start_set = GF_TRUE;
-                } 
-                else 
-                {
-                    if (start > packet_start)
-                    {
-                        start = packet_start;
-                    }
-                }
-                if (!end_set) 
-                {
-                    end = packet_end;
-                    end_set = GF_TRUE;
-                }
-                else
-                {
-                    if (end < packet_end)
-                    {
-                        end = packet_end;
-                    }
-                }
-            }
-        }
-        gf_mx_v(track->buffer_mutex);
-    }
-
-    /* Creating only one range for now */
-    if (start_set && end_set) {
-        gf_media_time_ranges_add(&sb->buffered, start, end);
-    }
-}
-
-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->highest_end_timestamp_set = GF_FALSE;
-    while (gf_list_count(sb->input_buffer)) {
-        GF_MSE_Packet *packet = (GF_MSE_Packet *)gf_list_rem(sb->input_buffer, 0);
-        gf_mse_packet_del(packet);
-    }
-    sb->append_state = MEDIA_SOURCE_APPEND_STATE_WAITING_FOR_SEGMENT;
-}
-
-GF_Err gf_mse_source_buffer_abort(GF_HTML_SourceBuffer *sb, GF_HTML_MediaSource_AbortMode mode)
-{
-    if (sb->continuation_timestamp_flag == GF_FALSE)
-    {
-        if (sb->abort_mode == MEDIA_SOURCE_ABORT_MODE_CONTINUATION && !sb->highest_end_timestamp_set)
-        {
-            return GF_BAD_PARAM;
-        }
-
-        if (sb->highest_end_timestamp_set) {
-            sb->continuation_timestamp = sb->highest_end_timestamp;
-            sb->continuation_timestamp_flag = GF_TRUE;
-        }
-    }
-
-    if (sb->updating) 
-    {
-        sb->updating = GF_FALSE;
-    }
-    sb->abort_mode = mode;
-    sb->appendWindowStart = 0;
-    sb->appendWindowEnd = GF_MAX_DOUBLE;
-
-    gf_mse_source_buffer_reset_parser(sb);
-    return GF_OK;
-}
-
-void gf_mse_packet_del(GF_MSE_Packet *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)
-{
-    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) {
-            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)
-{
-    u32     i;
-    u32     frame_count;
-    //Bool    found_previous;
-
-    //found_previous = GF_FALSE;
-    gf_mx_p(track->buffer_mutex);
-    frame_count = gf_list_count(track->buffer);
-    for (i = 0; i < frame_count; i++)
-    {
-        GF_MSE_Packet *frame = (GF_MSE_Packet *)gf_list_get(track->buffer, i);
-        if (frame->sl_header.compositionTimeStamp >= from && frame->sl_header.compositionTimeStamp < to) 
-        {
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Removing frame %g (%d frames)\n", (frame->sl_header.compositionTimeStamp*1.0)/track->timescale, gf_list_count(track->buffer)));
-            gf_list_rem(track->buffer, i);
-        }
-    }
-    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)
-{
-    if (sb->abort_mode != MEDIA_SOURCE_ABORT_MODE_NONE) 
-    {
-        switch (sb->abort_mode)
-        {
-        case MEDIA_SOURCE_ABORT_MODE_CONTINUATION:
-            sb->timestampOffset = sb->continuation_timestamp - (frame->sl_header.compositionTimeStamp*1.0/track->timescale);
-            break;
-        case MEDIA_SOURCE_ABORT_MODE_OFFSET:
-            sb->timestampOffset -= (frame->sl_header.compositionTimeStamp*1.0/track->timescale);
-            break;
-        default:
-        	break;
-        }
-        sb->continuation_timestamp_flag = GF_FALSE;
-        sb->abort_mode = MEDIA_SOURCE_ABORT_MODE_NONE;
-    }
-
-    if (sb->timestampOffset < 0) {
-        u64 offset = (u64)((-sb->timestampOffset)*track->timescale);
-        if (offset > frame->sl_header.compositionTimeStamp || offset > frame->sl_header.decodingTimeStamp) 
-        {
-             return GF_NON_COMPLIANT_BITSTREAM;
-        }
-    }
-    frame->sl_header.compositionTimeStamp  += (u64)(sb->timestampOffset*track->timescale);
-    frame->sl_header.decodingTimeStamp     += (u64)(sb->timestampOffset*track->timescale);
-
-    if (track->last_dts_set) 
-    {
-        if (track->last_dts*track->timescale > frame->sl_header.decodingTimeStamp) 
-        {
-            return GF_NON_COMPLIANT_BITSTREAM;
-        }
-
-        /* why ??? 
-         * If last decode timestamp for track buffer is set and decode timestamp is less than last decode timestamp 
-         * or the difference between decode timestamp and last decode timestamp is greater than 100 milliseconds, 
-         * then call endOfStream("decode") and abort these steps.
-         */
-        if (frame->sl_header.decodingTimeStamp - track->last_dts*track->timescale > 0.1*track->timescale)
-        {
-            return GF_NON_COMPLIANT_BITSTREAM;
-        }
-    }
-
-    if (frame->sl_header.compositionTimeStamp < sb->appendWindowStart*track->timescale) {
-        track->needs_rap = GF_TRUE;
-        return GF_OK;
-    }
-
-    if (frame->sl_header.compositionTimeStamp /* + dur */ > sb->appendWindowEnd*track->timescale) {
-        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)(0.000001*track->timescale));
-        }
-    } 
-
-    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 /* + dur */);
-    } 
-    else if (track->highest_pts*track->timescale <= 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, (u64)(track->highest_pts*track->timescale), (u64)(track->highest_pts*track->timescale) /* + dur */);
-    }
-
-    /* remove dependencies: no way !! */
-
-    /* TODO: spliced frames */
-
-    gf_mx_p(track->buffer_mutex);
-    gf_list_add(track->buffer, frame);
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Adding frame %g (%d frames)\n", (frame->sl_header.compositionTimeStamp*1.0)/track->timescale, gf_list_count(track->buffer)));
-    gf_mx_v(track->buffer_mutex);
-
-    track->last_dts = (frame->sl_header.decodingTimeStamp*1.0/track->timescale);
-    track->last_dts_set = GF_TRUE;
-
-    if (!track->highest_pts_set || (frame->sl_header.compositionTimeStamp /* + dur */) > track->highest_pts*track->timescale)
-    {
-        track->highest_pts_set = GF_TRUE;
-        track->highest_pts = (frame->sl_header.compositionTimeStamp*1.0/track->timescale /* + dur */);
-    }
-
-    if (!sb->highest_end_timestamp_set || (frame->sl_header.compositionTimeStamp*1.0 /* + dur */) > sb->highest_end_timestamp * track->timescale)
-    {
-        sb->highest_end_timestamp_set = GF_TRUE;
-        sb->highest_end_timestamp = (frame->sl_header.compositionTimeStamp*1.0/track->timescale /* + dur */);
-    }
-
-    return GF_OK;
-}
-
-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;
-    u32                     step;
-
-    /* step 0 is for forcing the parser to query the next fragment (if any and if needed), step 1 is for actual parsing */
-    step = 0;
-
-    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 
-     */
-    track_count = gf_list_count(sb->tracks);
-    while (sb->updating)
-    {
-        u32 track_with_data = 0;
-        for (i = 0; i < track_count; i++)
-        {
-            GF_Err e;
-            track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
-            GF_SAFEALLOC(packet, GF_MSE_Packet);
-            e = sb->parser->ChannelGetSLP(sb->parser, track->channel, 
-                                          &packet->data, &packet->size, &packet->sl_header, 
-                                          &packet->is_compressed, &packet->status, &packet->is_new_data);
-            if (e == GF_OK && packet->is_new_data && packet->size) 
-            {
-                char *data = (char *)gf_malloc(packet->size);
-                GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] New AU parsed %g\n", (packet->sl_header.compositionTimeStamp*1.0/track->timescale)));
-                memcpy(data, packet->data, packet->size);
-                packet->data = data;
-                gf_mse_process_coded_frame(sb, track, packet);
-                track_with_data++;
-                sb->parser->ChannelReleaseSLP(sb->parser, track->channel);
-            }
-        }
-        if (!track_with_data)
-        {
-            if (step) 
-            {
-                /* try to delete the previous buffer */
-                gf_arraybuffer_del((GF_HTML_ArrayBuffer *)sb->prev_buffer, GF_FALSE);
-                /* get ready to receive a new segment and start a new thread */
-                sb->updating = GF_FALSE;
-                break;
-            }
-            step++; /* forcing a new call to the parser (the first call only fetched the next URL and did not parse anything)*/
-        }
-    }
-
-    /* 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"));
-    return 0;
-}
-
-
-void gf_mse_source_buffer_append_arraybuffer(GF_HTML_SourceBuffer *sb, GF_HTML_ArrayBuffer *buffer)
-{
-    if (!sb || !buffer || !sb->parser || sb->updating) {
-        /* TODO: throw invalid access err or invalid state exception */
-        /* TODO: handle buffer full flag */
-        /* TODO: check the status of the media source */
-        return;
-    } else {
-        sb->updating = GF_TRUE;
-        /* TODO: fire an updatestart event */
-
-        buffer->url = (char *)gf_malloc(256);
-        sprintf(buffer->url, "gmem://%d@%p", buffer->length, buffer->data);
-        buffer->reference_count++;
-        GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Appending segment %s\n", buffer->url));
-
-        /* TODO: detect if the buffer contains an initialization segment or a media segment */
-        if (!sb->parser_connected) 
-        {
-            /* we expect an initialization segment to connect the service */
-            sb->parser->ConnectService(sb->parser, sb->mediasource->service, buffer->url);
-        } else {
-            /* we expect a media segment */
-            gf_list_add(sb->input_buffer, buffer);
-            /* Call the parser (asynchronously) and return */
-            /* the updating attribute should be positioned back to 0 when the parser is done */
-            gf_th_run(sb->parser_thread, gf_mse_parse_segment, sb);
-        }
-
-    }
-}
-
-/*
-FIXME : Unused function, create warnings on debian
-static void gf_mse_source_buffer_append_error(GF_HTML_SourceBuffer *sb)
-{
-    sb->updating = GF_FALSE;
-    gf_mse_source_buffer_reset_parser(sb);
-    TODO: fire events
-}
-*/
-
-
-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;
-    //Bool                    end_set;
-
-    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);
-        //end_set = GF_FALSE;
-
-        /* 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*track->timescale) ||
-                 (j == frame_count - 1))
-            {
-                end = frame->sl_header.compositionTimeStamp;
-                //end_set = GF_TRUE;
-                break;
-            }
-        }
-        gf_mx_v(track->buffer_mutex);
-
-        /* remove up to the next RAP found */
-        gf_mse_remove_frames_from_to(track, (u64)sb->remove_start, end);
-    }
-    sb->updating = GF_FALSE;
-    return 0;
-}
-
-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:
-            /* The parser is asking for an initialization segment:
-               check for the media time and give the appropriate one */
-            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)
-                {
-                    GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] Next segment to parse %s\n", buffer->url));
-                    command->url_query.next_url = buffer->url;
-                    command->url_query.discontinuity_type = 0;
-                    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;
-                    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:
-            /* add media request from underlying parser */
-            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 */
-                    sb->updating = 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 */
-                    }
-                    /* TODO: fire an updateend 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;
-    }
-}
-#endif
+/*
+*			GPAC - Multimedia Framework C SDK
+*
+ *			Authors: Cyril COncolato
+ *			Copyright (c) Telecom ParisTech 2013-
+*					All rights reserved
+*
+*  This file is part of GPAC / Media Source
+*
+*  GPAC is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU Lesser General Public License as published by
+*  the Free Software Foundation; either version 2, or (at your option)
+*  any later version.
+*
+*  GPAC is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU Lesser General Public License for more details.
+*
+*  You should have received a copy of the GNU Lesser General Public
+*  License along with this library; see the file COPYING.  If not, write to
+*  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+*/
+#include <gpac/setup.h>
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+#include <gpac/html5_mse.h>
+#include <gpac/internal/isomedia_dev.h>
+
+GF_HTML_MediaSource *gf_mse_media_source_new()
+{
+	GF_HTML_MediaSource *ms;
+	GF_SAFEALLOC(ms, GF_HTML_MediaSource);
+	ms->sourceBuffers.list = gf_list_new();
+	ms->sourceBuffers.parent = ms;
+	ms->sourceBuffers.evt_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST, &ms->sourceBuffers);
+	ms->activeSourceBuffers.list = gf_list_new();
+	ms->activeSourceBuffers.parent = ms;
+	ms->activeSourceBuffers.evt_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST, &ms->activeSourceBuffers);
+	ms->reference_count = 1;
+	ms->evt_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_MSE_MEDIASOURCE, ms);
+	ms->durationType = DURATION_NAN;
+	return ms;
+}
+
+GF_EXPORT
+void gf_mse_mediasource_del(GF_HTML_MediaSource *ms, Bool del_js) 
+{
+	if (ms) {
+		if (del_js) {
+			/* finalize the object from the JS perspective */
+			ms->c = NULL;
+			ms->_this = NULL;
+		}
+		/* only delete the object if it is not used elsewhere */
+		if (ms->reference_count) {
+			ms->reference_count--;
+		}
+		if (!ms->reference_count) {
+			u32 i;
+			for (i = 0; i < gf_list_count(ms->sourceBuffers.list); i++) {
+				GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
+
+				if (sb->parser && sb->parser_connected)
+					sb->parser->CloseService(sb->parser);
+
+				gf_mse_source_buffer_del(sb);
+			}
+			gf_list_del(ms->sourceBuffers.list);
+			/* all source buffer should have been deleted in the deletion of sourceBuffers */
+			gf_list_del(ms->activeSourceBuffers.list); 
+			if (ms->blobURI) gf_free(ms->blobURI);
+			gf_free(ms->evt_target);
+			gf_free(ms);
+		}
+	}
+}
+
+void gf_mse_fire_event(GF_DOMEventTarget *target, GF_EventType event_type) 
+{
+	GF_SceneGraph *sg = NULL;
+    GF_DOM_Event  mse_event;
+	memset(&mse_event, 0, sizeof(GF_DOM_Event));
+    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;
+	case GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFERLIST:
+		{
+			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;
+	default:
+		break;
+	}
+	assert(sg);
+    gf_sg_fire_dom_event(target, &mse_event, sg, NULL);
+}
+
+GF_EXPORT
+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;
+	/* 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);
+	gf_mse_fire_event(ms->evt_target, GF_EVENT_HTML_MSE_SOURCE_OPEN);
+}
+
+GF_EXPORT
+void gf_mse_mediasource_close(GF_HTML_MediaSource *ms)
+{
+	if (!ms) return;
+    ms->readyState = MEDIA_SOURCE_READYSTATE_CLOSED;
+	gf_mse_fire_event(ms->evt_target, GF_EVENT_HTML_MSE_SOURCE_CLOSE);
+}
+
+GF_EXPORT
+void gf_mse_mediasource_end(GF_HTML_MediaSource *ms)
+{
+	if (!ms) return;
+    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();
+	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->evt_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_MSE_SOURCEBUFFER, source);
+	source->timescale = 1;
+    return source;
+}
+
+void gf_mse_mediasource_add_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *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) 
+{
+    gf_list_add(ms->activeSourceBuffers.list, sb);
+	gf_mse_fire_event(ms->activeSourceBuffers.evt_target, GF_EVENT_HTML_MSE_ADD_SOURCE_BUFFER);
+} */
+
+void gf_mse_remove_active_source_buffer(GF_HTML_MediaSource *ms, GF_HTML_SourceBuffer *sb) {
+	s32 activePos;
+	activePos = gf_list_find(ms->activeSourceBuffers.list, sb);
+	if (activePos >= 0) {
+		gf_list_rem(ms->activeSourceBuffers.list, activePos);
+		gf_mse_fire_event(ms->activeSourceBuffers.evt_target, GF_EVENT_HTML_MSE_REMOVE_SOURCE_BUFFER);
+	}
+}
+
+static void gf_mse_reset_input_buffer(GF_List *input_buffer)
+{
+	while (gf_list_count(input_buffer)) {
+		GF_HTML_ArrayBuffer *b = (GF_HTML_ArrayBuffer *)gf_list_get(input_buffer, 0);
+		gf_list_rem(input_buffer, 0);
+		gf_arraybuffer_del(b, GF_FALSE);
+	}
+}
+
+/* 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;
+}
+
+GF_Err gf_mse_source_buffer_abort(GF_HTML_SourceBuffer *sb)
+{
+	if (sb->updating) {
+		/* 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_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;
+	} else {
+		gf_mse_source_buffer_abort(sb);
+		/* TODO: update the audio/video/text tracks */
+		gf_mse_remove_active_source_buffer(ms, sb);
+		gf_list_rem(ms->sourceBuffers.list, pos);
+		gf_mse_fire_event(ms->sourceBuffers.evt_target, GF_EVENT_HTML_MSE_REMOVE_SOURCE_BUFFER);
+		gf_mse_source_buffer_del(sb);
+	}
+	return GF_OK;
+}
+
+/* TODO: not yet used
+void gf_mse_detach(GF_HTML_MediaSource *ms) {
+	u32 count;
+	u32 i;
+	GF_HTML_SourceBuffer *sb;
+	ms->readyState = MEDIA_SOURCE_READYSTATE_CLOSED;
+	ms->durationType = DURATION_NAN;
+	count = gf_list_count(ms->sourceBuffers.list);
+	for (i = 0; i < count; i++) {
+		sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
+		gf_mse_remove_source_buffer(ms, sb);
+	}
+} */
+
+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);
+
+	if (sb->prev_buffer) gf_arraybuffer_del((GF_HTML_ArrayBuffer *)sb->prev_buffer, GF_FALSE);
+
+	tlist.tracks = sb->tracks;
+    gf_html_tracklist_del(&tlist);
+	{
+		u32 i, count;
+		count = gf_list_count(sb->threads);
+		for(i = 0; i < count; i++) {
+			GF_Thread *t = (GF_Thread *)gf_list_get(sb->threads, i);
+			gf_th_del(t);
+		}
+		gf_list_del(sb->threads);
+	}
+    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);
+
+}
+
+void gf_mse_source_buffer_set_update(GF_HTML_SourceBuffer *sb, Bool update)
+{
+	if (sb->updating == update) return;
+	sb->updating = update;
+	if (update) {
+		gf_mse_fire_event(sb->evt_target, GF_EVENT_HTML_MSE_UPDATE_START);
+	} else {
+		gf_mse_fire_event(sb->evt_target, GF_EVENT_HTML_MSE_UPDATE);
+		gf_mse_fire_event(sb->evt_target, GF_EVENT_HTML_MSE_UPDATE_END);
+	}
+}
+
+/*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;
+
+    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);
+        }
+
+		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;
+    }
+}
+
+/* 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;
+}
+
+/* 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;
+    }
+}
+
+/* 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;
+}
+
+#define SECONDS_TO_TIMESCALE(s) ((s)*track->timescale)
+#define TIMESCALE_TO_SECONDS(u) ((u)*1.0/track->timescale)
+
+
+GF_HTML_MediaTimeRanges *gf_mse_timeranges_from_track_packets(GF_HTML_Track *track) {
+	u32 i, count;
+	GF_HTML_MediaTimeRanges *ranges;
+	u64 start;
+	u64 end=0;
+	Bool end_set = GF_FALSE;
+	GF_MSE_Packet *packet;
+
+	ranges = gf_html_timeranges_new(track->timescale);
+	count = gf_list_count(track->buffer);
+	for (i = 0; i < count; i++) {
+		packet = (GF_MSE_Packet *)gf_list_get(track->buffer, i);
+		if (end_set == GF_FALSE|| packet->sl_header.compositionTimeStamp > end) {
+			if (end_set == GF_TRUE) {
+				gf_html_timeranges_add_end(ranges, end);
+			}
+			start = packet->sl_header.compositionTimeStamp;
+			gf_html_timeranges_add_start(ranges, start);
+			end = packet->sl_header.compositionTimeStamp + packet->sl_header.au_duration;
+			end_set = GF_TRUE;
+		} else if (packet->sl_header.compositionTimeStamp == end) {
+			end = packet->sl_header.compositionTimeStamp + packet->sl_header.au_duration;
+		}
+	}
+	if (end_set == GF_TRUE) {
+		gf_html_timeranges_add_end(ranges, end);
+	}
+	return ranges;
+}
+
+/* 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;
+
+    track_count = gf_list_count(sb->tracks);
+	gf_html_timeranges_reset(sb->buffered);
+    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);
+		track_ranges = gf_mse_timeranges_from_track_packets(track);
+		if (i != 0) {
+			GF_HTML_MediaTimeRanges *tmp;
+			tmp = gf_html_timeranges_intersection(sb->buffered, track_ranges);
+			gf_html_timeranges_del(track_ranges);
+			gf_list_del(sb->buffered->times);
+			sb->buffered->times = tmp->times;
+			sb->buffered->timescale = tmp->timescale;
+			gf_free(tmp);
+		} else {
+			gf_list_del(sb->buffered->times);
+			sb->buffered->times = track_ranges->times;
+			sb->buffered->timescale = track_ranges->timescale;
+			gf_free(track_ranges);
+		}
+        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);
+	if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE) {
+		sb->group_start_timestamp_flag = GF_TRUE;
+		sb->group_start_timestamp = sb->timestampOffset;
+	}
+	for (i = 0; i < gf_list_count(sb->tracks); i++) {
+		GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(sb->tracks, i);
+		track->timestampOffset = sb->timestampOffset*track->timescale;
+	}
+}
+
+void gf_mse_source_buffer_set_timescale(GF_HTML_SourceBuffer *sb, u32 new_timescale) {
+	u32 old_timescale = sb->timescale;
+	if (old_timescale == new_timescale) return;
+	sb->timescale = new_timescale;
+	sb->timestampOffset = (s64)((sb->timestampOffset * new_timescale * 1.0)/old_timescale);
+	if (sb->group_start_timestamp_flag) {
+		sb->group_start_timestamp = (u64)((sb->group_start_timestamp * new_timescale * 1.0)/old_timescale);
+	}
+	if (sb->group_end_timestamp_set) {
+		sb->group_end_timestamp = (u64)((sb->group_end_timestamp * new_timescale * 1.0)/old_timescale);
+	}
+	sb->remove_start = (u64)((sb->remove_start * new_timescale * 1.0)/old_timescale);
+	sb->remove_end = (u64)((sb->remove_end * new_timescale * 1.0)/old_timescale);
+
+}
+
+void gf_mse_packet_del(GF_MSE_Packet *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)
+{
+    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)
+{
+    u32     i;
+
+    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);
+		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 {
+			i++;
+		}
+    }
+    gf_mx_v(track->buffer_mutex);
+}
+
+static void gf_mse_track_buffer_add_packet(GF_HTML_Track *track, GF_MSE_Packet *frame) 
+{
+	u32 i, count;
+	Bool inserted = GF_FALSE;
+
+	gf_mx_p(track->buffer_mutex);
+	/* TODO: improve insertion*/
+	count = gf_list_count(track->buffer);
+	for (i = 0; i < count; i++) {
+		GF_MSE_Packet *next_frame =  (GF_MSE_Packet *)gf_list_get(track->buffer, i);
+		if (frame->sl_header.decodingTimeStamp < next_frame->sl_header.decodingTimeStamp) {
+			gf_list_insert(track->buffer, frame, i);
+			/* if the frame had no duration, we can now tell its duration because of the next frame */
+			if (!frame->sl_header.au_duration) {
+				frame->sl_header.au_duration = (u32)(next_frame->sl_header.decodingTimeStamp - frame->sl_header.decodingTimeStamp);
+				/* we need also to check the duration of the previous frame */
+				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) {
+						prev_frame->sl_header.au_duration = (u32)(frame->sl_header.decodingTimeStamp - prev_frame->sl_header.decodingTimeStamp);
+					} 
+				}
+			}
+			inserted = GF_TRUE;
+			break;
+		}
+	}
+	if (!inserted) {
+		gf_list_add(track->buffer, frame);
+		/* if the frame is inserted last, we cannot know its duration until a new frame is appended or unless the transport format carried it */
+		count = gf_list_count(track->buffer);
+		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) {
+				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);
+}
+
+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) {
+		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);
+		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; 
+		}
+		sb->group_start_timestamp_flag = GF_FALSE;
+    }
+
+    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) {
+			/* 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 */
+				/* check if sb.timescale has to be adjusted first with gf_mse_source_buffer_set_timescale(sb, track->timescale);*/
+				sb->group_end_timestamp = PTS_with_offset;
+				sb->group_end_timestamp_set = GF_TRUE;
+			} else { /* sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE */
+				/* check if sb.timescale has to be adjusted first with gf_mse_source_buffer_set_timescale(sb, track->timescale);*/
+				sb->group_start_timestamp = sb->group_end_timestamp;
+				sb->group_start_timestamp_flag = GF_TRUE;
+			}
+			{
+				u32 i, count;
+				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->last_dts_set = GF_FALSE;
+					t->last_dts = 0;
+					t->last_dur = 0;
+					t->highest_pts_set = GF_FALSE;
+					t->highest_pts = 0;
+					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 */
+
+	*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_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 (!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;
+    }
+
+    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 
+ *
+ * \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;
+
+    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);		   
+		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->prev_buffer = buffer;
+    } 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 
+		 */
+		track_count = gf_list_count(sb->tracks);
+		while (sb->updating) {
+			u32 track_with_data = 0;
+			for (i = 0; i < track_count; i++) {
+				Bool stored = GF_FALSE;
+				GF_Err e;
+				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);
+				assert(e == GF_OK);
+				if (packet->status == GF_OK && packet->is_new_data && packet->size) {
+					char *data;
+					assert(packet->is_new_data && packet->size);
+					data = (char *)gf_malloc(packet->size);
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE] New AU parsed with PTS %g s\n", TIMESCALE_TO_SECONDS(packet->sl_header.compositionTimeStamp)));
+					memcpy(data, packet->data, packet->size);
+					packet->data = data;
+					gf_mse_process_coded_frame(sb, track, packet, &stored);
+					track_with_data++;
+					sb->parser->ChannelReleaseSLP(sb->parser, track->channel);
+				}
+
+				if (!stored) gf_free(packet);
+			}
+			if (!track_with_data) {
+				/* try to delete the previous buffer */
+				gf_arraybuffer_del((GF_HTML_ArrayBuffer *)sb->prev_buffer, GF_FALSE);
+				sb->prev_buffer = NULL;
+				/* get ready to receive a new segment and start a new thread */
+				break;
+			}
+		}
+		/* 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;
+}
+
+
+void gf_mse_source_buffer_append_arraybuffer(GF_HTML_SourceBuffer *sb, GF_HTML_ArrayBuffer *buffer)
+{
+	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->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_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);
+	}
+}
+
+/* Threaded function called upon request from JS
+   - 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_mse_source_buffer_set_update(sb, GF_TRUE);
+
+    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);
+		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);
+		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);
+    }
+	gf_mse_source_buffer_set_update(sb, GF_FALSE);
+    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);
+	}
+}
+
+/* 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:
+			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;
+						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 */
+					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;
+    }
+}
+
+/* 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 
+
+/* When an Access Unit can be released, we check if it needs to be kept or not in the track buffer */
+GF_EXPORT
+GF_Err gf_mse_track_buffer_release_packet(GF_HTML_Track *track) {
+	GF_MSE_Packet *packet;
+	gf_mx_p(track->buffer_mutex);
+	packet = (GF_MSE_Packet *)gf_list_get(track->buffer, track->packet_index);
+	if (packet) {
+		track->packet_index++;
+		if (gf_list_count(track->buffer) > MSE_TRACK_BUFFER_LENGTH) {
+			packet = (GF_MSE_Packet *)gf_list_get(track->buffer, 0);
+			track->packet_index--;
+			gf_list_rem(track->buffer, 0);
+			gf_free(packet->data);
+			gf_free(packet);
+		}
+	}
+	gf_mx_v(track->buffer_mutex);
+	return GF_OK;
+}
+
+/* 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)
+{
+	GF_MSE_Packet *packet;
+	u32 count;
+	gf_mx_p(track->buffer_mutex);
+	count = gf_list_count(track->buffer);
+	packet = (GF_MSE_Packet *)gf_list_get(track->buffer, track->packet_index);
+	if (packet) {
+		*out_data_ptr = packet->data;
+		*out_data_size = packet->size;
+		*out_sl_hdr = packet->sl_header;
+		*sl_compressed = packet->is_compressed;
+		*out_reception_status = packet->status;
+		*is_new_data = packet->is_new_data;
+		packet->is_new_data = GF_FALSE;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_IN] Sending AU #%d/%d to decoder with PTS %g s\n", track->packet_index, count, TIMESCALE_TO_SECONDS(packet->sl_header.compositionTimeStamp)));
+	} else {
+		*out_data_ptr = NULL;
+		*out_data_size = 0;
+		*sl_compressed = GF_FALSE;
+		*out_reception_status = GF_OK;
+		*is_new_data = GF_FALSE;
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_DASH, ("[MSE_In] No AU for decoder\n"));
+	}
+	gf_mx_v(track->buffer_mutex);
+	return GF_OK;
+}
+
+
+#endif

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/img.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/img.c Changed

@@ -286,7 +286,7 @@
 	jpx.src.resync_to_restart = jpeg_resync_to_restart;
 	jpx.src.term_source = gf_jpeg_stub;
 	jpx.skip = 0;
-	jpx.src.next_input_byte = jpg;
+	jpx.src.next_input_byte = (JOCTET *) jpg;
         jpx.src.bytes_in_buffer = jpg_size;
 	jpx.cinfo.src = (void *) &jpx.src;
 
@@ -653,6 +653,35 @@
 	return GF_OK;
 }
 
+/* write a png file */
+GF_EXPORT
+GF_Err gf_img_png_enc_file(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst_file)
+{
+	GF_Err e;
+	FILE *png;
+	u32 dst_size = width*height*4;
+	char *dst = (char*)gf_malloc(sizeof(char)*dst_size);
+	if (!dst) return GF_OUT_OF_MEM;
+
+	e = gf_img_png_enc(data, width, height, stride, pixel_format, dst, &dst_size);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[PNG]: Error encoding image %s\n", gf_error_to_string(e) ));
+		goto exit;
+	} 
+
+	png = gf_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);
+
+exit:
+	gf_free(dst);
+	return e;
+}
 #else
 GF_EXPORT
 GF_Err gf_img_png_dec(char *png, u32 png_size, u32 *width, u32 *height, u32 *pixel_format, char *dst, u32 *dst_size)
@@ -665,6 +694,11 @@
 	return GF_NOT_SUPPORTED;
 }
 
+GF_EXPORT
+GF_Err gf_img_png_enc_file(char *data, u32 width, u32 height, s32 stride, u32 pixel_format, char *dst_file)
+{
+	return GF_NOT_SUPPORTED;
+}
 #endif	/*GPAC_HAS_PNG*/

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/ismacryp.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/ismacryp.c Changed

@@ -29,8 +29,8 @@
 #include <gpac/xml.h>
 #include <gpac/base_coding.h>
 #include <gpac/constants.h>
-#include <gpac/internal/isomedia_dev.h>
 #include <gpac/crypt.h>
+#include <math.h>
 
 
 #if !defined(GPAC_DISABLE_MCRYPT)
@@ -40,20 +40,34 @@
 	GF_List *tcis;
 	Bool has_common_key;
 	Bool in_text_header;
-} ISMACrypInfo; 
+	/*1: ISMACrypt - 2: CENC AES-CTR - 3: CENC AES-CBC*/
+	u32 crypt_type;
+} 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)
 {
 	GF_XMLAttribute *att;
 	GF_TrackCryptInfo *tkc;
 	u32 i;
-	ISMACrypInfo *info = (ISMACrypInfo *)sax_cbck;
+	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
 	
 	if (!strcmp(node_name, "OMATextHeader")) {
 		info->in_text_header = 1;
 		return;
 	}
-	if (!strcmp(node_name, "ISMACrypTrack") || !strcmp(node_name, "OMATrack")) {
+	if (!strcmp(node_name, "GPACDRM")) {
+		for (i=0; i<nb_attributes; i++) {
+			att = (GF_XMLAttribute *) &attributes[i];
+			if (!stricmp(att->name, "type")) {
+				if (!stricmp(att->value, "ISMA"))info->crypt_type = 1;
+				else if (!stricmp(att->value, "CENC AES-CTR")) info->crypt_type = 2;
+				else if (!stricmp(att->value, "CENC AES-CBC")) info->crypt_type = 3;
+				else if (!stricmp(att->value, "ADOBE")) info->crypt_type = 4;
+			}
+		}
+		return;
+	}
+	if (!strcmp(node_name, "CrypTrack")) {
 		GF_SAFEALLOC(tkc, GF_TrackCryptInfo);
 		gf_list_add(info->tcis, tkc);
 
@@ -70,20 +84,7 @@
 				else tkc->trackID = atoi(att->value);
 			}
 			else if (!stricmp(att->name, "key")) {
-				char *sKey = att->value;
-				if (!strnicmp(sKey, "0x", 2)) sKey += 2;
-				if (strlen(sKey) == 32) {
-					u32 j;
-					for (j=0; j<32; j+=2) {
-						u32 v;
-						char szV[5];
-						sprintf(szV, "%c%c", sKey[j], sKey[j+1]);
-						sscanf(szV, "%x", &v);
-						tkc->key[j/2] = v;
-					}
-				} else {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISMA E&A] Key is not 16-bytes long - skipping\n"));
-				}
+				gf_bin128_parse(att->value, tkc->key);
 			}
 			else if (!stricmp(att->name, "salt")) {
 				u32 len, j;
@@ -102,23 +103,23 @@
 			else if (!stricmp(att->name, "rightsIssuerURL")) strcpy(tkc->KMS_URI, att->value);
 			else if (!stricmp(att->name, "scheme_URI")) strcpy(tkc->Scheme_URI, att->value);
 			else if (!stricmp(att->name, "selectiveType")) {
-				if (!stricmp(att->value, "Rap")) tkc->sel_enc_type = GF_ISMACRYP_SELENC_RAP;
-				else if (!stricmp(att->value, "Non-Rap")) tkc->sel_enc_type = GF_ISMACRYP_SELENC_NON_RAP;
-				else if (!stricmp(att->value, "Rand")) tkc->sel_enc_type = GF_ISMACRYP_SELENC_RAND;
+				if (!stricmp(att->value, "Rap")) tkc->sel_enc_type = GF_CRYPT_SELENC_RAP;
+				else if (!stricmp(att->value, "Non-Rap")) tkc->sel_enc_type = GF_CRYPT_SELENC_NON_RAP;
+				else if (!stricmp(att->value, "Rand")) tkc->sel_enc_type = GF_CRYPT_SELENC_RAND;
 				else if (!strnicmp(att->value, "Rand", 4)) {
-					tkc->sel_enc_type = GF_ISMACRYP_SELENC_RAND_RANGE;
+					tkc->sel_enc_type = GF_CRYPT_SELENC_RAND_RANGE;
 					tkc->sel_enc_range = atoi(&att->value[4]);
 				}
 				else if (sscanf(att->value, "%u", &tkc->sel_enc_range)==1) {
 					if (tkc->sel_enc_range==1) tkc->sel_enc_range = 0;
-					else tkc->sel_enc_type = GF_ISMACRYP_SELENC_RANGE;
+					else tkc->sel_enc_type = GF_CRYPT_SELENC_RANGE;
 				}
 				else if (!strnicmp(att->value, "Preview", 7)) {
-					tkc->sel_enc_type = GF_ISMACRYP_SELENC_PREVIEW;
+					tkc->sel_enc_type = GF_CRYPT_SELENC_PREVIEW;
 				}
 			}
 			else if (!stricmp(att->name, "Preview")) {
-				tkc->sel_enc_type = GF_ISMACRYP_SELENC_PREVIEW;
+				tkc->sel_enc_type = GF_CRYPT_SELENC_PREVIEW;
 				sscanf(att->value, "%u", &tkc->sel_enc_range);
 			}
 			else if (!stricmp(att->name, "ipmpType")) {
@@ -139,13 +140,74 @@
 			}
 			else if (!stricmp(att->name, "textualHeaders")) {
 			}
+			/*CENC extensions*/
+			else if (!stricmp(att->name, "IsEncrypted")) {
+				if (!stricmp(att->value, "1"))
+					tkc->IsEncrypted = 1;
+				else
+					tkc->IsEncrypted = 0;
+			}
+			else if (!stricmp(att->name, "IV_size")) {
+				tkc->IV_size = atoi(att->value);
+			}
+			else if (!stricmp(att->name, "first_IV")) {
+				char *sKey = att->value;
+				if (!strnicmp(sKey, "0x", 2)) sKey += 2;
+				if ((strlen(sKey) == 16) || (strlen(sKey) == 32)) {
+					u32 j;
+					for (j=0; j<strlen(sKey); j+=2) {
+						u32 v;
+						char szV[5];
+						sprintf(szV, "%c%c", sKey[j], sKey[j+1]);
+						sscanf(szV, "%x", &v);
+						tkc->first_IV[j/2] = v;
+					}
+				}
+			}
+			else if (!stricmp(att->name, "saiSavedBox")) {
+				if (!stricmp(att->value, "uuid_psec")) tkc->sai_saved_box_type = GF_ISOM_BOX_UUID_PSEC;
+				else if (!stricmp(att->value, "senc")) tkc->sai_saved_box_type = GF_ISOM_BOX_TYPE_SENC;
+			}
+			else if (!stricmp(att->name, "keyRoll")) {
+				if (!strncmp(att->value, "idx=", 4))
+					tkc->defaultKeyIdx = atoi(att->value+4);
+				else if (!strncmp(att->value, "roll=", 5))
+					tkc->keyRoll = atoi(att->value+5);
+			}
+			else if (!stricmp(att->name, "metadata")) {
+				tkc->metadata_len = gf_base64_encode(att->value, (u32) strlen(att->value), tkc->metadata, 5000);
+				tkc->metadata[tkc->metadata_len] = 0;
+			}
+		}
+
+		if ((info->crypt_type == 3) && (tkc->IV_size == 8)) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC] Using AES-128 CBC: IV_size should be 16\n"));
+			tkc->IV_size = 16;
+		}
+	}
+
+	if (!strcmp(node_name, "key")) {
+		tkc = (GF_TrackCryptInfo *)gf_list_last(info->tcis);
+		tkc->KIDs = (bin128 *)gf_realloc(tkc->KIDs, sizeof(bin128)*(tkc->KID_count+1));
+		tkc->keys = (bin128 *)gf_realloc(tkc->keys, sizeof(bin128)*(tkc->KID_count+1));
+		
+		for (i=0; i<nb_attributes; i++) {
+			att = (GF_XMLAttribute *) &attributes[i];
+			
+			if (!stricmp(att->name, "KID")) {
+				gf_bin128_parse(att->value, tkc->KIDs[tkc->KID_count]);
+			}
+			else if (!stricmp(att->name, "value")) {
+				gf_bin128_parse(att->value, tkc->keys[tkc->KID_count]);
+			}
 		}
+		tkc->KID_count++;
 	}
 }
 
 void isma_ea_node_end(void *sax_cbck, const char *node_name, const char *name_space)
 {
-	ISMACrypInfo *info = (ISMACrypInfo *)sax_cbck;
+	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
 	if (!strcmp(node_name, "OMATextHeader")) {
 		info->in_text_header = 0;
 		return;
@@ -156,7 +218,7 @@
 {
 	u32 len;
 	GF_TrackCryptInfo *tkc;
-	ISMACrypInfo *info = (ISMACrypInfo *)sax_cbck;
+	GF_CryptInfo *info = (GF_CryptInfo *)sax_cbck;
 
 	if (!info->in_text_header) return;
 
@@ -174,10 +236,12 @@
 	tkc->TextualHeaders[tkc->TextualHeadersLen] = 0;
 }
 
-static void del_crypt_info(ISMACrypInfo *info)
+static void del_crypt_info(GF_CryptInfo *info)
 {
 	while (gf_list_count(info->tcis)) {
 		GF_TrackCryptInfo *tci = (GF_TrackCryptInfo *)gf_list_last(info->tcis);
+		if (tci->KIDs) gf_free(tci->KIDs);
+		if (tci->keys) gf_free(tci->keys);
 		gf_list_rem_last(info->tcis);
 		gf_free(tci);
 	}
@@ -185,12 +249,12 @@
 	gf_free(info);
 }
 
-static ISMACrypInfo *load_crypt_file(const char *file)
+static GF_CryptInfo *load_crypt_file(const char *file)
 {
 	GF_Err e;
-	ISMACrypInfo *info;
+	GF_CryptInfo *info;
 	GF_SAXParser *sax;
-	GF_SAFEALLOC(info, ISMACrypInfo);
+	GF_SAFEALLOC(info, GF_CryptInfo);
 	info->tcis = gf_list_new();
 	sax = gf_xml_sax_new(isma_ea_node_start, isma_ea_node_end, isma_ea_text, info);
 	e = gf_xml_sax_parse_file(sax, file, NULL);
@@ -208,7 +272,7 @@
 {
 	GF_Err e;
 	u32 i, count;
-	ISMACrypInfo *info;
+	GF_CryptInfo *info;
 	GF_TrackCryptInfo *tci;
 
 	e = GF_OK;
@@ -262,7 +326,9 @@
 
 #ifndef GPAC_DISABLE_ISOM_WRITE
 
-static GFINLINE void resync_IV(GF_Crypt *mc, u64 BSO, char *salt)
+/*ISMACrypt*/
+
+static GFINLINE void isma_resync_IV(GF_Crypt *mc, u64 BSO, char *salt)
 {
 	char IV[17];
 	u64 count;
@@ -307,7 +373,7 @@
 
 	mc = gf_crypt_open("AES-128", "CTR");
 	if (!mc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot open AES-128 CTR cryptography\n", tci->trackID));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR cryptography\n", tci->trackID));
 		return GF_IO_ERR;
 	}
 
@@ -316,30 +382,30 @@
 	e = gf_crypt_init(mc, tci->key, 16, IV);
 	if (e) {
 		gf_crypt_close(mc);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)));
 		return GF_IO_ERR;
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ISMA E&A] Decrypting track ID %d - KMS: %s%s\n", tci->trackID, tci->KMS_URI, use_sel_enc ? " - Selective Decryption" : ""));
+	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] Decrypting track ID %d - KMS: %s%s\n", tci->trackID, tci->KMS_URI, use_sel_enc ? " - Selective Decryption" : ""));
 
 	/*start as initialized*/
 	prev_sample_encrypted = 1;
 	/* decrypt each sample */
 	count = gf_isom_get_sample_count(mp4, track);
+	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
 	for (i = 0; i < count; i++) {
 		samp = gf_isom_get_sample(mp4, track, i+1, &si); 
 		ismasamp = gf_isom_get_ismacryp_sample(mp4, track, samp, si);
 
 		gf_free(samp->data);
-		samp->data = ismasamp->data;
+		samp->data = (char *)gf_malloc(ismasamp->dataLength);
+		memmove(samp->data, ismasamp->data, ismasamp->dataLength);
 		samp->dataLength = ismasamp->dataLength;
-		ismasamp->data = NULL;
-		ismasamp->dataLength = 0;
 
 		/* Decrypt payload */
 		if (ismasamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
 			/*restore IV*/
-			if (!prev_sample_encrypted) resync_IV(mc, ismasamp->IV, (char *) tci->salt);
+			if (!prev_sample_encrypted) isma_resync_IV(mc, ismasamp->IV, (char *) tci->salt);
 			gf_crypt_decrypt(mc, samp->data, samp->dataLength);
 		}
 		prev_sample_encrypted = (ismasamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED);
@@ -361,6 +427,7 @@
 					start[3] = (nalu_size)&0xFF;
 					start = end;
 					end = start+4;
+					remain -= 4;
 					continue;
 				}
 				end++;
@@ -380,9 +447,9 @@
 
 	gf_crypt_close(mc);
 	/*and remove protection info*/
-	e = gf_isom_remove_ismacryp_protection(mp4, track, 1);
+	e = gf_isom_remove_track_protection(mp4, track, 1);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Error ISMACryp signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Error ISMACryp signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
 	}
 
 	/*remove all IPMP ptrs*/
@@ -425,132 +492,13 @@
 		gf_isom_sample_del(&samp);
 
 		/*remove IPMPToolList if any*/	
-		if (mp4->moov->iods && (mp4->moov->iods->descriptor->tag == GF_ODF_ISOM_IOD_TAG) ) {
-			GF_IsomInitialObjectDescriptor *iod = (GF_IsomInitialObjectDescriptor *)mp4->moov->iods->descriptor;
-			if (iod->IPMPToolList) gf_odf_desc_del((GF_Descriptor*) iod->IPMPToolList);
-			iod->IPMPToolList = NULL;
-		}
+		gf_isom_ipmpx_remove_tool_list(mp4);
 		break;
 	}
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_ismacryp_decrypt_file(GF_ISOFile *mp4, const char *drm_file)
-{
-	GF_Err e;
-	u32 i, idx, count, common_idx, nb_tracks, scheme_type;
-	const char *scheme_URI, *KMS_URI;
-	ISMACrypInfo *info;
-	Bool is_oma;
-	GF_TrackCryptInfo *a_tci, tci;
-
-	is_oma = 0;
-	count = 0;
-	info = NULL;
-	if (drm_file) {
-		info = load_crypt_file(drm_file);
-		if (!info) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot open or validate xml file %s\n", drm_file));
-			return GF_NOT_SUPPORTED;
-		}
-		count = gf_list_count(info->tcis);
-	}
-
-	common_idx=0;
-	if (info && info->has_common_key) {
-		for (common_idx=0; common_idx<count; common_idx++) {
-			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, common_idx);
-			if (!a_tci->trackID) break;
-		}
-	}
-	
-	nb_tracks = gf_isom_get_track_count(mp4);
-	e = GF_OK;
-	for (i=0; i<nb_tracks; i++) {
-		u32 trackID = gf_isom_get_track_id(mp4, i+1);
-		scheme_type = gf_isom_is_media_encrypted(mp4, i+1, 1);
-		if (!scheme_type) continue;
-
-		for (idx=0; idx<count; idx++) {
-			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
-			if (a_tci->trackID == trackID) break;
-		}
-		if (idx==count) {
-			if (!drm_file || info->has_common_key) idx = common_idx;
-			/*no available KMS info for this track*/
-			else continue;
-		}
-		if (count) {
-			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
-			memcpy(&tci, a_tci, sizeof(GF_TrackCryptInfo));
-		} else {
-			memset(&tci, 0, sizeof(GF_TrackCryptInfo));
-			tci.trackID = trackID;
-		}
-
-		if (gf_isom_is_ismacryp_media(mp4, i+1, 1)) {
-			e = gf_isom_get_ismacryp_info(mp4, i+1, 1, NULL, &scheme_type, NULL, &scheme_URI, &KMS_URI, NULL, NULL, NULL);
-		} else if (gf_isom_is_omadrm_media(mp4, i+1, 1)) {
-			if (!drm_file) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot decrypt OMA (P)DCF file without GPAC's DRM file & keys\n"));
-				continue;
-			}
-			KMS_URI = "OMA DRM";
-			is_oma = 1;
-		} else {
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISMA E&A] TrackID %d encrypted with unknown scheme %s - skipping\n", trackID, gf_4cc_to_str(scheme_type) ));
-			continue;
-		}
-		/*get key and salt from KMS*/
-		/*GPAC*/
-		if (!strnicmp(KMS_URI, "(key)", 5)) {
-			char data[100];
-			gf_base64_decode((char*)KMS_URI+5, (u32) strlen(KMS_URI)-5, data, 100);
-			memcpy(tci.key, data, sizeof(char)*16);
-			memcpy(tci.salt, data+16, sizeof(char)*8);
-		}
-		/*MPEG4IP*/
-		else if (!stricmp(KMS_URI, "AudioKey") || !stricmp(KMS_URI, "VideoKey")) {
-			if (!gf_ismacryp_mpeg4ip_get_info((char *) KMS_URI, (char *) tci.key, (char *) tci.salt)) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Couldn't load MPEG4IP ISMACryp keys for TrackID %d\n", trackID));
-				continue;
-			}
-		} else if (!drm_file) {
-			FILE *test = NULL;
-			if (!stricmp(scheme_URI, "urn:gpac:isma:encryption_scheme")) test = gf_f64_open(KMS_URI, "rt");
-
-			if (!test) {
-				GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ISMA E&A] TrackID %d does not contain decryption keys - skipping\n", trackID));
-				continue;
-			}
-			fclose(test);
-			if (gf_ismacryp_gpac_get_info(tci.trackID, (char *) KMS_URI, (char *) tci.key, (char *) tci.salt) != GF_OK) {
-				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Couldn't load TrackID %d keys in GPAC DRM file %s\n", tci.trackID, KMS_URI));
-				continue;
-			}
-		}
-
-		if (KMS_URI && strlen(tci.KMS_URI) && strcmp(KMS_URI, tci.KMS_URI) )
-			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISMA E&A] KMS URI for TrackID %d Mismatch: \"%s\" in file vs \"%s\" in licence\n", trackID, KMS_URI, tci.KMS_URI));
-
-		if (drm_file || (KMS_URI && strncmp(KMS_URI, "(key)", 5)) ) {
-			strcpy(tci.KMS_URI, KMS_URI ? KMS_URI : "");
-		} else {
-			strcpy(tci.KMS_URI, "self-contained");
-		}
-		e = gf_ismacryp_decrypt_track(mp4, &tci, NULL, NULL);
-		if (e) break;
-	}
-	if (is_oma) {
-		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) del_crypt_info(info);
-	return e;
-}
-
-GF_EXPORT
 GF_Err gf_ismacryp_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
 {
 	char IV[16];
@@ -572,13 +520,13 @@
 	avc_size_length = 0;
 	track = gf_isom_get_track_by_id(mp4, tci->trackID);
 	if (!track) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
 		return GF_OK;
 	}
 	esd = gf_isom_get_esd(mp4, track, 1);
 	if (esd && (esd->decoderConfig->streamType==GF_STREAM_OD)) {
 		gf_odf_desc_del((GF_Descriptor *) esd);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot encrypt OD tracks - skipping"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot encrypt OD tracks - skipping"));
 		return GF_NOT_SUPPORTED;
 	}
 	if (esd) {
@@ -590,7 +538,7 @@
 		avc_size_length = avccfg->nal_unit_size;
 		gf_odf_avc_cfg_del(avccfg);
 		if (avc_size_length != 4) {
-			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot encrypt AVC/H264 track with %d size_length field - onmy 4 supported\n", avc_size_length));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot encrypt AVC/H264 track with %d size_length field - onmy 4 supported\n", avc_size_length));
 			return GF_NOT_SUPPORTED;
 		}
 	}
@@ -598,11 +546,11 @@
 	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_ISMACRYP_SELENC_RAP) || (tci->sel_enc_type==GF_ISMACRYP_SELENC_NON_RAP)) ) {
-		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[ISMA E&A] All samples in trackID %d are random access - disabling selective encryption\n", tci->trackID));
-		tci->sel_enc_type = GF_ISMACRYP_SELENC_NONE;
+	((tci->sel_enc_type==GF_CRYPT_SELENC_RAP) || (tci->sel_enc_type==GF_CRYPT_SELENC_NON_RAP)) ) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] All samples in trackID %d are random access - disabling selective encryption\n", tci->trackID));
+		tci->sel_enc_type = GF_CRYPT_SELENC_NONE;
 	}
-	else if ((tci->sel_enc_type==GF_ISMACRYP_SELENC_RAND) || (tci->sel_enc_type==GF_ISMACRYP_SELENC_RAND_RANGE)) {
+	else if ((tci->sel_enc_type==GF_CRYPT_SELENC_RAND) || (tci->sel_enc_type==GF_CRYPT_SELENC_RAND_RANGE)) {
 		gf_rand_init(1);
 	}
 
@@ -616,19 +564,19 @@
 		IV_size = 16;
 	}
 
-	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[ISMA E&A] Encrypting track ID %d - KMS: %s%s\n", tci->trackID, tci->KMS_URI, tci->sel_enc_type ? " - Selective Encryption" : ""));
+	GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] Encrypting track ID %d - KMS: %s%s\n", tci->trackID, tci->KMS_URI, tci->sel_enc_type ? " - Selective Encryption" : ""));
 
 	/*init crypto*/
 	memset(IV, 0, sizeof(char)*16);
 	memcpy(IV, tci->salt, sizeof(char)*8);
 	mc = gf_crypt_open("AES-128", "CTR");
 	if (!mc) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot open AES-128 CTR\n"));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
 		return GF_IO_ERR;
 	}
 	e = gf_crypt_init(mc, tci->key, 16, IV);
 	if (e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)) );
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)) );
 		gf_crypt_close(mc);
 		return GF_IO_ERR;
 	}
@@ -648,7 +596,7 @@
 		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_ISMACRYP_SELENC_PREVIEW) && tci->sel_enc_range) {
+		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;
@@ -667,13 +615,14 @@
 	BSO = 0;
 	prev_sample_encryped = 1;
 	range_end = 0;
-	if (tci->sel_enc_type==GF_ISMACRYP_SELENC_PREVIEW) {
+	if (tci->sel_enc_type==GF_CRYPT_SELENC_PREVIEW) {
 		range_end = gf_isom_get_media_timescale(mp4, track) * tci->sel_enc_range;
 	}
 
 	if (gf_isom_has_time_offset(mp4, track)) gf_isom_set_cts_packing(mp4, track, 1);
 
 	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); 
 
@@ -682,19 +631,19 @@
 		isamp->KI_length = 0;
 
 		switch (tci->sel_enc_type) {
-		case GF_ISMACRYP_SELENC_RAP:
+		case GF_CRYPT_SELENC_RAP:
 			if (samp->IsRAP) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
 			break;
-		case GF_ISMACRYP_SELENC_NON_RAP:
+		case GF_CRYPT_SELENC_NON_RAP:
 			if (!samp->IsRAP) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
 			break;
 		/*random*/
-		case GF_ISMACRYP_SELENC_RAND:
+		case GF_CRYPT_SELENC_RAND:
 			rand = gf_rand();
 			if (rand%2) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
 			break;
 		/*random every sel_freq samples*/
-		case GF_ISMACRYP_SELENC_RAND_RANGE:
+		case GF_CRYPT_SELENC_RAND_RANGE:
 			if (!(i%tci->sel_enc_range)) has_crypted_samp = 0;
 			if (!has_crypted_samp) {
 				rand = gf_rand();
@@ -707,10 +656,10 @@
 			}
 			break;
 		/*every sel_freq samples*/
-		case GF_ISMACRYP_SELENC_RANGE:
+		case GF_CRYPT_SELENC_RANGE:
 			if (!(i%tci->sel_enc_type)) isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
 			break;
-		case GF_ISMACRYP_SELENC_PREVIEW:
+		case GF_CRYPT_SELENC_PREVIEW:
 			if (samp->DTS + samp->CTS_Offset >= range_end) 
 				isamp->flags |= GF_ISOM_ISMA_IS_ENCRYPTED;
 			break;
@@ -736,7 +685,7 @@
 
 		if (isamp->flags & GF_ISOM_ISMA_IS_ENCRYPTED) {
 			/*resync IV*/
-			if (!prev_sample_encryped) resync_IV(mc, BSO, (char *) tci->salt);
+			if (!prev_sample_encryped) isma_resync_IV(mc, BSO, (char *) tci->salt);
 			gf_crypt_encrypt(mc, samp->data, samp->dataLength);
 			prev_sample_encryped = 1;
 		} else {
@@ -833,49 +782,1249 @@
 	return e;
 }
 
-GF_EXPORT
-GF_Err gf_ismacryp_crypt_file(GF_ISOFile *mp4, const char *drm_file)
+/*Common Encryption*/
+static void cenc_resync_IV(GF_Crypt *mc, char IV[16], u64 BSO, u8 IV_size, Bool isNewSample) {
+	char next_IV[17];
+	GF_BitStream *bs, *tmp;
+	u64 prev_block_count;
+	u32 remain;
+	/*for log*/
+	u8 digest[33];
+	char t[3];
+
+	if (isNewSample) {
+		prev_block_count = BSO % 16 ? BSO / 16 + 1 : BSO / 16;
+		remain = 0;
+	}
+	else {
+		prev_block_count = BSO / 16;
+		remain = (u32) (BSO % 16);
+	}
+
+	tmp = gf_bs_new(IV, 16, GF_BITSTREAM_READ);
+	bs = gf_bs_new(next_IV, 17, GF_BITSTREAM_WRITE);
+	gf_bs_write_u8(bs, 0);	/*begin of counter*/
+	if (isNewSample && (IV_size == 8)) {
+		u64 IV_value;
+		IV_value = gf_bs_read_u64(tmp);
+		if (IV_value == 0xFFFFFFFFFFFFFFFFULL)
+			IV_value = 0x0;
+		else
+			IV_value++;
+		gf_bs_write_u64(bs, IV_value);
+		gf_bs_write_u64(bs, 0x0);
+	}
+	else {
+		u64 salt_portion, block_count_portion;
+		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(mc, next_IV, 17);
+	/*decrypt remain bytes*/
+	if (remain) {
+		char dummy[20];
+		gf_crypt_decrypt(mc, dummy, remain);
+	}
+
+	/* IV for subsequence sample*/
+	if (isNewSample) {
+		memset(IV, 0, 16*sizeof(char));
+		memmove(IV, next_IV+1, 16*sizeof(char));
+	}
+	else {
+		u32 j;
+		digest[0] = 0;				
+		for ( j=0; j<16; j++ ) {
+			t[2] = 0;
+			sprintf ( t, "%02X", (u8) next_IV[j+1] );
+			strcat ( (char*)digest, t );
+		}
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_AUTHOR, ("[CENC] \t  next NALU: %s \n", digest) );
+	}
+	gf_bs_del(bs);
+	gf_bs_del(tmp);
+}
+
+static GF_Err gf_cenc_encrypt_sample_ctr(GF_Crypt *mc, GF_ISOSample *samp, Bool is_nalu_video, u32 nalu_size_length, char IV[16], u32 IV_size, char **sai, u32 *saiz, u32 bytes_in_nalhr) {
+	GF_BitStream *pleintext_bs, *cyphertext_bs, *sai_bs;
+	char *buffer;
+	u32 max_size, size;
+	u64 BSO;
+	GF_Err e = GF_OK;
+	GF_List *subsamples;
+
+	pleintext_bs = cyphertext_bs = sai_bs = NULL;
+	max_size = 4096;
+	BSO = 0;
+	buffer = (char*)gf_malloc(sizeof(char) * max_size);
+	memset(buffer, 0, max_size);
+	pleintext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+	cyphertext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	sai_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_data(sai_bs, IV, IV_size);
+	subsamples = gf_list_new();
+	if (!subsamples) {
+		e = GF_IO_ERR;
+		goto exit; 
+	}
+	while (gf_bs_available(pleintext_bs)) {
+		GF_CENCSubSampleEntry *entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
+
+		if (is_nalu_video) {
+			char nal_hdr[2];
+			size = gf_bs_read_int(pleintext_bs, 8*nalu_size_length);
+			if (size>max_size) {
+				buffer = (char*)gf_realloc(buffer, sizeof(char)*size);
+				max_size = size;
+			}
+			gf_bs_read_data(pleintext_bs, (char *)nal_hdr, bytes_in_nalhr);
+
+			gf_bs_read_data(pleintext_bs, buffer, size-bytes_in_nalhr);
+			gf_crypt_encrypt(mc, buffer, size-bytes_in_nalhr);
+			BSO += size-1;
+
+			/*write clear data and encrypted data to bitstream*/
+			gf_bs_write_int(cyphertext_bs, size, 8*nalu_size_length);
+			gf_bs_write_data(cyphertext_bs, nal_hdr, bytes_in_nalhr);
+			gf_bs_write_data(cyphertext_bs, buffer, size-bytes_in_nalhr);
+
+			entry->bytes_clear_data = nalu_size_length + bytes_in_nalhr;
+			entry->bytes_encrypted_data = size - bytes_in_nalhr;
+
+		} else {
+			gf_bs_read_data(pleintext_bs, buffer, samp->dataLength);
+			gf_crypt_encrypt(mc, buffer, samp->dataLength);
+			gf_bs_write_data(cyphertext_bs, buffer, samp->dataLength);
+
+			BSO += samp->dataLength;			
+			entry->bytes_clear_data = 0;
+			entry->bytes_encrypted_data = samp->dataLength;
+		}
+
+
+		gf_list_add(subsamples, entry);
+
+
+		/*update IV for next sub-samples*/
+		if (gf_bs_available(pleintext_bs))
+			cenc_resync_IV(mc, IV, BSO, IV_size, GF_FALSE);
+	}
+
+	if (samp->data) {
+		gf_free(samp->data);
+		samp->data = NULL;
+		samp->dataLength = 0;
+	}
+	gf_bs_get_content(cyphertext_bs, &samp->data, &samp->dataLength);
+	gf_bs_write_u16(sai_bs, gf_list_count(subsamples));
+	while (gf_list_count(subsamples)) {
+		GF_CENCSubSampleEntry *ptr = (GF_CENCSubSampleEntry *)gf_list_get(subsamples, 0);
+		gf_list_rem(subsamples, 0);
+		gf_bs_write_u16(sai_bs, ptr->bytes_clear_data);
+		gf_bs_write_u32(sai_bs, ptr->bytes_encrypted_data);
+		gf_free(ptr);
+	}
+	gf_list_del(subsamples);
+	gf_bs_get_content(sai_bs, sai, saiz);
+	cenc_resync_IV(mc, IV, BSO, IV_size, GF_TRUE);
+
+exit:
+	if (buffer) gf_free(buffer);
+	if (pleintext_bs) gf_bs_del(pleintext_bs);
+	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
+	if (sai_bs) gf_bs_del(sai_bs);
+	return e;
+}
+
+static GF_Err gf_cenc_encrypt_sample_cbc(GF_Crypt *mc, GF_ISOSample *samp, Bool is_nalu_video, u32 nalu_size_length, char IV[16], u32 IV_size, char **sai, u32 *saiz, u32 bytes_in_nalhr) {
+	GF_BitStream *pleintext_bs, *cyphertext_bs, *sai_bs;
+	char *buffer;
+	u32 max_size, size;
+	GF_Err e = GF_OK;
+	GF_List *subsamples;
+
+	pleintext_bs = cyphertext_bs = sai_bs = NULL;
+	max_size = 4096;
+	buffer = (char*)gf_malloc(sizeof(char) * max_size);
+	memset(buffer, 0, max_size);
+	pleintext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+	cyphertext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	sai_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_data(sai_bs, IV, 16);
+	subsamples = gf_list_new();
+	if (!subsamples) {
+		e = GF_IO_ERR;
+		goto exit; 
+	}
+	while (gf_bs_available(pleintext_bs)) {
+		u32 ret;
+		GF_CENCSubSampleEntry *entry = (GF_CENCSubSampleEntry *)gf_malloc(sizeof(GF_CENCSubSampleEntry));
+
+		if (is_nalu_video) {
+			char nal_hdr[2];
+			size = gf_bs_read_int(pleintext_bs, 8*nalu_size_length);
+			if (size+1 > max_size) {
+				buffer = (char*)gf_realloc(buffer, sizeof(char)*(size+1));
+				memset(buffer, 0, sizeof(char)*(size+1));
+				max_size = size + 1;
+			}
+			gf_bs_write_int(cyphertext_bs, size, 8*nalu_size_length);
+
+			gf_bs_read_data(pleintext_bs, (char *)nal_hdr, bytes_in_nalhr);
+			gf_bs_write_data(cyphertext_bs, nal_hdr, bytes_in_nalhr);
+
+			gf_bs_read_data(pleintext_bs, buffer, size-bytes_in_nalhr);
+
+			ret = (size-bytes_in_nalhr)  % 16;
+			if (ret) {
+				gf_bs_write_data(cyphertext_bs, buffer, ret);
+			}
+
+			if (size-bytes_in_nalhr >= 16) {
+				gf_crypt_encrypt(mc, buffer+ret, size - bytes_in_nalhr -ret);
+				gf_bs_write_data(cyphertext_bs, buffer+ret, size - bytes_in_nalhr - ret);
+			}
+
+			entry->bytes_clear_data = nalu_size_length + bytes_in_nalhr + ret;
+			entry->bytes_encrypted_data = (size-bytes_in_nalhr >= 16) ? size - bytes_in_nalhr - ret : 0  ;
+		} else {
+			gf_bs_read_data(pleintext_bs, buffer, samp->dataLength);
+			ret = samp->dataLength % 16;
+			if (ret) {
+				gf_bs_write_data(cyphertext_bs, buffer, ret);
+			}
+			if (samp->dataLength >= 16) {
+				gf_crypt_encrypt(mc, buffer, samp->dataLength);
+				gf_bs_write_data(cyphertext_bs, buffer, samp->dataLength);
+			}
+
+			entry->bytes_clear_data = ret;
+			entry->bytes_encrypted_data = (samp->dataLength >= 16) ? samp->dataLength - ret : 0;
+		}
+
+		gf_list_add(subsamples, entry);
+	}
+
+	if (samp->data) {
+		gf_free(samp->data);
+		samp->data = NULL;
+		samp->dataLength = 0;
+	}
+	gf_bs_get_content(cyphertext_bs, &samp->data, &samp->dataLength);
+	gf_bs_write_u16(sai_bs, gf_list_count(subsamples));
+	while (gf_list_count(subsamples)) {
+		GF_CENCSubSampleEntry *ptr = (GF_CENCSubSampleEntry *)gf_list_get(subsamples, 0);
+		gf_list_rem(subsamples, 0);
+		gf_bs_write_u16(sai_bs, ptr->bytes_clear_data);
+		gf_bs_write_u32(sai_bs, ptr->bytes_encrypted_data);
+		gf_free(ptr);
+	}
+	gf_list_del(subsamples);
+	gf_bs_get_content(sai_bs, sai, saiz);
+
+exit:
+	if (buffer) gf_free(buffer);
+	if (pleintext_bs) gf_bs_del(pleintext_bs);
+	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
+	if (sai_bs) gf_bs_del(sai_bs);
+	return e;
+}
+
+
+/*encrypts track - logs, progress: info callbacks, NULL for default*/
+GF_Err gf_cenc_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
 {
 	GF_Err e;
-	u32 i, count, nb_tracks, common_idx, idx;
-	ISMACrypInfo *info;
-	Bool is_oma;
-	GF_TrackCryptInfo *tci;
+	char IV[16];
+	GF_ISOSample *samp;
+	GF_Crypt *mc;
+	Bool all_rap = GF_FALSE;
+	u32 i, count, di, track, len, nb_samp_encrypted, nalu_size_length, idx, bytes_in_nalhr;
+	GF_ESD *esd;
+	Bool has_crypted_samp;
+	Bool is_nalu_video = GF_FALSE;
+	char *buf;
+	GF_BitStream *bs;
 
-	is_oma = 0;
+	e = GF_OK;
+	nalu_size_length = 0;
+	mc = NULL;
+	buf = NULL;
+	bs = NULL;
+	idx = 0;
+	bytes_in_nalhr = 0;
 
-	info = load_crypt_file(drm_file);
-	if (!info) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ISMA E&A] Cannot open or validate xml file %s\n", drm_file));
-		return GF_NOT_SUPPORTED;
+	track = gf_isom_get_track_by_id(mp4, tci->trackID);
+	if (!track) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
+		return GF_OK;
 	}
-	e = GF_OK;
-	count = gf_list_count(info->tcis);
 
-	common_idx=0;
-	if (info && info->has_common_key) {
-		for (common_idx=0; common_idx<count; common_idx++) {
-			tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, common_idx);
-			if (!tci->trackID) break;
-		}
+	esd = gf_isom_get_esd(mp4, track, 1);
+	if (esd && (esd->decoderConfig->streamType == GF_STREAM_OD)) {
+		gf_odf_desc_del((GF_Descriptor *) esd);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot encrypt OD tracks - skipping"));
+		return GF_NOT_SUPPORTED;
 	}
-	nb_tracks = gf_isom_get_track_count(mp4);
-	for (i=0; i<nb_tracks; i++) {
-		u32 trackID = gf_isom_get_track_id(mp4, i+1);
-		for (idx=0; idx<count; idx++) {
-			tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
-			if (tci->trackID==trackID) break;
+	if (esd) {
+		if ((esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_AVC) || (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_SVC)) {
+			GF_AVCConfig *avccfg = gf_isom_avc_config_get(mp4, track, 1);
+			GF_AVCConfig *svccfg = gf_isom_svc_config_get(mp4, track, 1);
+			if (avccfg)
+				nalu_size_length = avccfg->nal_unit_size;
+			else if (svccfg)
+				nalu_size_length = svccfg->nal_unit_size;
+			if (avccfg) gf_odf_avc_cfg_del(avccfg);
+			if (svccfg) gf_odf_avc_cfg_del(svccfg);
+			is_nalu_video = GF_TRUE;
+			bytes_in_nalhr = 1;
 		}
-		if (idx==count) {
-			if (!info->has_common_key) continue;
-			idx = common_idx;
+		else if (esd->decoderConfig->objectTypeIndication==GPAC_OTI_VIDEO_HEVC) {
+			GF_HEVCConfig *hevccfg = gf_isom_hevc_config_get(mp4, track, 1);
+			if (hevccfg)
+				nalu_size_length = hevccfg->nal_unit_size;
+			if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+			is_nalu_video = GF_TRUE;
+			bytes_in_nalhr = 2;
 		}
-		tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
+		gf_odf_desc_del((GF_Descriptor*) esd);
+	}
+
+	samp = NULL;
+
+	if (tci->enc_type == 2)
+		mc = gf_crypt_open("AES-128", "CTR");
+	else if (tci->enc_type == 3)
+		mc = gf_crypt_open("AES-128", "CBC");
+	if (!mc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot open AES-128 %s\n", (tci->enc_type == 2) ? "CTR" : "CBC"));
+		e = GF_IO_ERR;
+		goto exit;
+	}
+
+	/*select key*/
+	if (tci->defaultKeyIdx && (tci->defaultKeyIdx < tci->KID_count)) {
+		memcpy(tci->key, tci->keys[tci->defaultKeyIdx], 16);
+		memcpy(tci->default_KID, tci->KIDs[tci->defaultKeyIdx], 16);
+		idx = tci->defaultKeyIdx;
+	} else {
+		memcpy(tci->key, tci->keys[0], 16);
+		memcpy(tci->default_KID, tci->KIDs[0], 16);
+		idx = 0;
+	}
+
+	/*create CENC protection*/
+	e = gf_isom_set_cenc_protection(mp4, track, 1, (tci->enc_type == 2) ? GF_ISOM_CENC_SCHEME : GF_ISOM_CBC_SCHEME, 0x00010000, tci->IsEncrypted, tci->IV_size, tci->default_KID);
+	if (e) goto  exit;
+
+
+	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)) 
+		all_rap = GF_TRUE;
+
+	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);
+		if (!samp)
+		{
+			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;
+
+					//alreaduy 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;
+			default:
+				break;
+		}
+
+		/*generate initialization vector for the first sample in track ... */
+		if (!has_crypted_samp) {
+			memset(IV, 0, sizeof(char)*16);
+			if (tci->IV_size == 8) {
+				memcpy(IV, tci->first_IV, sizeof(char)*8);
+				memset(IV+8, 0, sizeof(char)*8);
+			} 
+			else if (tci->IV_size == 16) {
+				memcpy(IV, tci->first_IV, sizeof(char)*16);
+			}
+			else 
+				return GF_NOT_SUPPORTED;
+
+			e = gf_crypt_init(mc, tci->key, 16, IV);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 %s (%s)\n", (tci->enc_type == 2) ? "CTR" : "CBC", gf_error_to_string(e)) );
+				gf_crypt_close(mc);
+				mc = NULL;
+				e = GF_IO_ERR;
+				goto exit;
+			}
+			has_crypted_samp = GF_TRUE;
+		}
+		else {
+			if (tci->keyRoll) {
+				idx = (nb_samp_encrypted / tci->keyRoll) % tci->KID_count;
+				memcpy(tci->key, tci->keys[idx], 16);
+				e = gf_crypt_set_key(mc, tci->key, 16, IV);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", (tci->enc_type == 2) ? "CTR" : "CBC", gf_error_to_string(e)) );
+					gf_crypt_close(mc);
+					mc = NULL;
+					e = GF_IO_ERR;
+					goto exit;
+				}
+			}
+		}
+
+		/*add this sample to sample encryption group*/
+		e = gf_isom_set_sample_cenc_group(mp4, track, i+1, 1, tci->IV_size, tci->KIDs[idx]);
+		if (e) goto exit;
+
+		if (tci->enc_type == 2)
+			gf_cenc_encrypt_sample_ctr(mc, samp, is_nalu_video, nalu_size_length, IV, tci->IV_size, &buf, &len, bytes_in_nalhr);
+		else if (tci->enc_type == 3) {
+			int IV_size = 16;
+			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) 
+			goto exit;
+		gf_free(buf);
+		buf = NULL;
+
+		nb_samp_encrypted++;
+		gf_set_progress("CENC Encrypt", i+1, count);
+
+	}
+
+exit:
+	if (samp) gf_isom_sample_del(&samp);
+	if (mc) gf_crypt_close(mc);
+	if (buf) gf_free(buf);
+	if (bs) gf_bs_del(bs);
+	return e;
+}
+
+/*decrypts track - logs, progress: info callbacks, NULL for default*/
+GF_Err gf_cenc_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
+{
+	GF_Err e;
+	u32 track, count, i, j, si, max_size, subsample_count, nb_samp_decrypted;
+	u64 BSO;
+	GF_ISOSample *samp = NULL;
+	GF_Crypt *mc;
+	char IV[17];
+	Bool prev_sample_encrypted;
+	GF_BitStream *pleintext_bs, *cyphertext_bs;
+	GF_CENCSampleAuxInfo *sai;
+	char *buffer;
+
+	e = GF_OK;
+	pleintext_bs = cyphertext_bs = NULL;
+	mc = NULL;
+	buffer = NULL;
+	max_size = 4096;
+	nb_samp_decrypted = 0;
+	sai = NULL;
+
+	track = gf_isom_get_track_by_id(mp4, tci->trackID);
+	if (!track) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
+		return GF_OK;
+	}
+
+
+	if (tci->enc_type == 2)
+		mc = gf_crypt_open("AES-128", "CTR");
+	else if (tci->enc_type == 3)
+		mc = gf_crypt_open("AES-128", "CBC");
+	if (!mc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot open AES-128 %s\n", (tci->enc_type == 2) ? "CTR" : "CBC"));
+		e = GF_IO_ERR;
+		goto exit;
+	}
+
+	/* decrypt each sample */
+	count = gf_isom_get_sample_count(mp4, track);
+	buffer = (char*)gf_malloc(sizeof(char) * max_size);
+	prev_sample_encrypted = GF_FALSE;
+	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+	for (i = 0; i < count; i++) {
+		u32 Is_Encrypted;
+		u8 IV_size;
+		bin128 KID;
+
+		gf_isom_get_sample_cenc_info(mp4, track, i+1, &Is_Encrypted, &IV_size, &KID);
+		if (!Is_Encrypted)
+			continue;
+
+		/*select key*/
+		for (j = 0; j < tci->KID_count; j++) {
+			if (!strncmp((const char *)tci->KIDs[j], (const char *)KID, 16)) {
+				memcpy(tci->key, tci->keys[j], 16);
+				break;
+			}
+		}
+		if (j == tci->KID_count)
+			memcpy(tci->key, tci->keys[tci->defaultKeyIdx], 16);
+
+		memset(IV, 0, 17);
+		memset(buffer, 0, max_size);
+		BSO = 0;
+
+		samp = gf_isom_get_sample(mp4, track, i+1, &si);
+		if (!samp)
+		{
+			e = GF_IO_ERR;
+			goto exit;
+		}
+
+		e = gf_isom_cenc_get_sample_aux_info(mp4, track, i+1, &sai, NULL);
+		if (e) {
+			goto exit;
+		}
+
+		cyphertext_bs = gf_bs_new(samp->data, samp->dataLength, GF_BITSTREAM_READ);
+		pleintext_bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+		sai->IV_size = IV_size;
+		if (!prev_sample_encrypted) {
+			memmove(IV, sai->IV, sai->IV_size);
+			if (sai->IV_size == 8)
+				memset(IV+8, 0, sizeof(char)*8);
+			e = gf_crypt_init(mc, tci->key, 16, IV);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot initialize AES-128 CTR (%s)\n", gf_error_to_string(e)) );
+				gf_crypt_close(mc);
+				mc = NULL;
+				e = GF_IO_ERR;
+				goto exit;
+			}
+			prev_sample_encrypted = GF_TRUE;
+		}
+		else {
+			if (tci->enc_type == 2) {
+				GF_BitStream *bs;
+				bs = gf_bs_new(IV, 17, GF_BITSTREAM_WRITE);
+				gf_bs_write_u8(bs, 0);	/*begin of counter*/
+				gf_bs_write_data(bs, (char *)sai->IV, sai->IV_size);
+				if (sai->IV_size == 8)
+					gf_bs_write_u64(bs, 0);
+				gf_bs_del(bs);
+				gf_crypt_set_state(mc, IV, 17);
+			}
+			else if (tci->enc_type == 3) {
+				memmove(IV, sai->IV, 16);
+				gf_crypt_set_state(mc, IV, 16);
+			}
+			e = gf_crypt_set_key(mc, tci->key, 16, IV);
+			if (e) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Cannot set key AES-128 %s (%s)\n", (tci->enc_type == 2) ? "CTR" : "CBC", gf_error_to_string(e)) );
+				gf_crypt_close(mc);
+				mc = NULL;
+				e = GF_IO_ERR;
+				goto exit;
+			}
+		}
+
+		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);
+
+			/*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);
+			}
+
+			subsample_count++;
+		}
+
+		gf_isom_cenc_samp_aux_info_del(sai);
+		sai = NULL;
+		
+		gf_bs_del(cyphertext_bs);
+		cyphertext_bs = NULL;
+		if (samp->data) {
+			gf_free(samp->data);
+			samp->data = NULL;
+			samp->dataLength = 0;
+		}
+		gf_bs_get_content(pleintext_bs, &samp->data, &samp->dataLength);
+		gf_bs_del(pleintext_bs);
+		pleintext_bs = NULL;
+		gf_isom_update_sample(mp4, track, i+1, samp, 1);
+		gf_isom_sample_del(&samp);
+		samp = NULL;
+		nb_samp_decrypted++;
+
+		gf_set_progress("CENC Decrypt", i+1, count);
+	}
+
+	/*remove protection info*/
+	e = gf_isom_remove_track_protection(mp4, track, 1);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC] Error CENC signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
+	}
+
+	gf_isom_remove_cenc_saiz(mp4, track);
+	gf_isom_remove_cenc_saio(mp4, track);
+	gf_isom_remove_samp_enc_box(mp4, track);
+	gf_isom_remove_samp_group_box(mp4, track);
+
+exit:
+	if (mc) gf_crypt_close(mc);
+	if (pleintext_bs) gf_bs_del(pleintext_bs);
+	if (cyphertext_bs) gf_bs_del(cyphertext_bs);
+	if (samp) gf_isom_sample_del(&samp);
+	if (buffer) gf_free(buffer);
+	if (sai) gf_isom_cenc_samp_aux_info_del(sai);
+	return e;
+}
+
+GF_Err gf_adobe_encrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
+{
+	GF_Err e;
+	char IV[16];
+	GF_ISOSample *samp;
+	GF_Crypt *mc;
+	Bool all_rap = GF_FALSE;
+	u32 i, count, di, track, len;
+	Bool has_crypted_samp;
+	char *buf;
+	GF_BitStream *bs;
+	int IV_size;
+
+	e = GF_OK;
+	samp = NULL;
+	mc = NULL;
+	buf = NULL;
+	bs = NULL;
+
+	track = gf_isom_get_track_by_id(mp4, tci->trackID);
+	if (!track) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Adobe] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
+		return GF_OK;
+	}
+
+	mc = gf_crypt_open("AES-128", "CBC");
+	if (!mc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[Adobe] Cannot open AES-128 CBC \n"));
+		e = GF_IO_ERR;
+		goto exit;
+	}
+
+	/*Adobe's protection scheme does not support selective key*/
+	memcpy(tci->key, tci->keys[0], 16);
+
+	e = gf_isom_set_adobe_protection(mp4, track, 1, GF_ISOM_ADOBE_SCHEME, 1, GF_TRUE, tci->metadata, tci->metadata_len);
+	if (e) goto  exit;
+
+	count = gf_isom_get_sample_count(mp4, track);	
+	has_crypted_samp = GF_FALSE;
+	if (! gf_isom_has_sync_points(mp4, track)) 
+		all_rap = GF_TRUE;
+
+	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+	for (i = 0; i < count; i++) {
+		Bool is_encrypted_au = GF_TRUE;
+		samp = gf_isom_get_sample(mp4, track, i+1, &di);
+		if (!samp)
+		{
+			e = GF_IO_ERR;
+			goto exit;
+		}
+
+		len = samp->dataLength;
+		buf = (char *) gf_malloc(len*sizeof(char));
+		memmove(buf, samp->data, len);
+		gf_free(samp->data);
+		samp->dataLength = 0;
+		
+		switch (tci->sel_enc_type) {
+			case GF_CRYPT_SELENC_RAP:
+				if (!samp->IsRAP && !all_rap) {
+					is_encrypted_au = GF_FALSE;
+				}
+				break;
+			case GF_CRYPT_SELENC_NON_RAP:
+				if (samp->IsRAP || all_rap) {
+					is_encrypted_au = GF_FALSE;
+				}
+				break;
+			default:
+				break;
+		}
+
+		if (is_encrypted_au) {
+			u32 padding_bytes;
+			if (!has_crypted_samp) {
+				memset(IV, 0, sizeof(char)*16);
+				memcpy(IV, tci->first_IV, sizeof(char)*16);
+				e = gf_crypt_init(mc, tci->key, 16, IV);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot initialize AES-128 CBC (%s)\n",  gf_error_to_string(e)) );
+					gf_crypt_close(mc);
+					mc = NULL;
+					e = GF_IO_ERR;
+					goto exit;
+				}
+				has_crypted_samp = GF_TRUE;
+			}
+			else {
+				IV_size = 16;
+				e = gf_crypt_get_state(mc, IV, &IV_size);
+			}
+
+			padding_bytes = 16 - len % 16;
+			len += padding_bytes;
+			buf = (char *)gf_realloc(buf, len);
+			memset(buf+len-padding_bytes, padding_bytes, padding_bytes);
+
+			gf_crypt_encrypt(mc, buf, len);
+		}
+
+		/*rewrite sample with AU header*/
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		if (is_encrypted_au) {
+			gf_bs_write_u8(bs, 0x10);
+			gf_bs_write_data(bs, (char *) IV, 16);
+		}
+		else {
+			gf_bs_write_u8(bs, 0x0);
+		}
+		gf_bs_write_data(bs, buf, len);
+		gf_bs_get_content(bs, &samp->data, &samp->dataLength);
+		gf_bs_del(bs);
+		bs = NULL;
+		gf_isom_update_sample(mp4, track, i+1, samp, 1);
+		gf_isom_sample_del(&samp);
+		samp = NULL;
+		gf_free(buf);
+		buf = NULL;
+
+		gf_set_progress("Adobe's protection scheme Encrypt", i+1, count);
+	}
+
+exit:
+	if (samp) gf_isom_sample_del(&samp);
+	if (mc) gf_crypt_close(mc);
+	if (buf) gf_free(buf);
+	if (bs) gf_bs_del(bs);
+	return e;
+}
+
+GF_Err gf_adobe_decrypt_track(GF_ISOFile *mp4, GF_TrackCryptInfo *tci, void (*progress)(void *cbk, u64 done, u64 total), void *cbk)
+{
+	GF_Err e;
+	u32 track, count, len, i, prev_sample_decrypted, si;
+	u8 encrypted_au;
+	GF_Crypt *mc;
+	GF_ISOSample *samp;
+	char IV[17];
+	char *ptr;
+	GF_BitStream *bs;
+
+	e = GF_OK;
+	mc = NULL;
+	samp = NULL;
+	bs = NULL;
+	prev_sample_decrypted = GF_FALSE;
+
+	track = gf_isom_get_track_by_id(mp4, tci->trackID);
+	if (!track) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot find TrackID %d in input file - skipping\n", tci->trackID));
+		return GF_OK;
+	}
+
+	mc = gf_crypt_open("AES-128", "CBC");
+	if (!mc) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot open AES-128 CBC\n"));
+		e = GF_IO_ERR;
+		goto exit;
+	}
+
+	memcpy(tci->key, tci->keys[0], 16);
+
+	count = gf_isom_get_sample_count(mp4, track);
+	gf_isom_set_nalu_extract_mode(mp4, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+	for (i = 0; i < count; i++) {
+		u32 trim_bytes = 0;
+		samp = gf_isom_get_sample(mp4, track, i+1, &si);
+		if (!samp)
+		{
+			e = GF_IO_ERR;
+			goto exit;
+		}
+
+		ptr = samp->data;
+		len = samp->dataLength;
+
+		encrypted_au = ptr[0];
+		if (encrypted_au) {
+			memmove(IV, ptr+1, 16);
+			if (!prev_sample_decrypted) {
+				e = gf_crypt_init(mc, tci->key, 16, IV);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot initialize AES-128 CBC (%s)\n", gf_error_to_string(e)) );
+					gf_crypt_close(mc);
+					mc = NULL;
+					e = GF_IO_ERR;
+					goto exit;
+				}
+				prev_sample_decrypted = GF_TRUE;
+			}
+			else {
+				e = gf_crypt_set_state(mc, IV, 16);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Cannot set state AES-128 CBC (%s)\n", gf_error_to_string(e)) );
+					gf_crypt_close(mc);
+					mc = NULL;
+					e = GF_IO_ERR;
+					goto exit;
+				}
+			}
+
+			ptr += 17;
+			len -= 17;
+
+			gf_crypt_decrypt(mc, ptr, len);
+			trim_bytes = ptr[len-1];
+		}
+		else {
+			ptr += 1;
+			len -= 1;
+		}
+
+		//rewrite decrypted sample
+		bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+		gf_bs_write_data(bs, ptr, len - trim_bytes);
+		gf_free(samp->data);
+		samp->dataLength = 0;
+		gf_bs_get_content(bs, &samp->data, &samp->dataLength);
+		gf_isom_update_sample(mp4, track, i+1, samp, 1);
+		gf_bs_del(bs);
+		bs = NULL;
+		gf_isom_sample_del(&samp);
+		samp = NULL;
+		gf_set_progress("Adobe's protection scheme Decrypt", i+1, count);
+	}
+
+	/*remove protection info*/
+	e = gf_isom_remove_track_protection(mp4, track, 1);
+	if (e) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[ADOBE] Error Adobe's protection scheme signature from trackID %d: %s\n", tci->trackID, gf_error_to_string(e)));
+	}
+
+exit:
+	if (mc) gf_crypt_close(mc);
+	if (samp) gf_isom_sample_del(&samp);
+	if (bs) gf_bs_del(bs);
+	return e;
+}
+
+
+GF_EXPORT
+GF_Err gf_decrypt_file(GF_ISOFile *mp4, const char *drm_file)
+{
+	GF_Err e;
+	u32 i, idx, count, common_idx, nb_tracks, scheme_type;
+	const char *scheme_URI, *KMS_URI;
+	GF_CryptInfo *info;
+	Bool is_oma;
+	GF_TrackCryptInfo *a_tci, tci;
+
+	is_oma = 0;
+	count = 0;
+	info = NULL;
+	if (drm_file) {
+		info = load_crypt_file(drm_file);
+		if (!info) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open or validate xml file %s\n", drm_file));
+			return GF_NOT_SUPPORTED;
+		}
+		count = gf_list_count(info->tcis);
+	}
+
+	common_idx=0;
+	if (info && info->has_common_key) {
+		for (common_idx=0; common_idx<count; common_idx++) {
+			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, common_idx);
+			if (!a_tci->trackID) break;
+		}
+	}
+	
+	nb_tracks = gf_isom_get_track_count(mp4);
+	e = GF_OK;
+	for (i=0; i<nb_tracks; i++) {
+		u32 trackID = gf_isom_get_track_id(mp4, i+1);
+		scheme_type = gf_isom_is_media_encrypted(mp4, i+1, 1);
+		if (!scheme_type) continue;
+
+		for (idx=0; idx<count; idx++) {
+			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
+			if (a_tci->trackID == trackID) break;
+		}
+		if (idx==count) {
+			if (!drm_file || info->has_common_key) idx = common_idx;
+			/*no available KMS info for this track*/
+			else continue;
+		}
+		if (count) {
+			a_tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
+			memcpy(&tci, a_tci, sizeof(GF_TrackCryptInfo));
+		} else {
+			memset(&tci, 0, sizeof(GF_TrackCryptInfo));
+			tci.trackID = trackID;
+		}
+
+		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;;
+		}
+
+		if (gf_isom_is_ismacryp_media(mp4, i+1, 1)) {
+			e = gf_isom_get_ismacryp_info(mp4, i+1, 1, NULL, &scheme_type, NULL, &scheme_URI, &KMS_URI, NULL, NULL, NULL);
+		} else if (gf_isom_is_omadrm_media(mp4, i+1, 1)) {
+			if (!drm_file) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot decrypt OMA (P)DCF file without GPAC's DRM file & keys\n"));
+				continue;
+			}
+			KMS_URI = "OMA DRM";
+			is_oma = 1;
+		} else if (!gf_isom_is_cenc_media(mp4, i+1, 1) && !gf_isom_is_adobe_protection_media(mp4, i+1, 1)){
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] TrackID %d encrypted with unknown scheme %s - skipping\n", trackID, gf_4cc_to_str(scheme_type) ));
+			continue;
+		}
+
+		if (info->crypt_type == 1) {
+			/*get key and salt from KMS*/
+			/*GPAC*/
+			if (!strnicmp(KMS_URI, "(key)", 5)) {
+				char data[100];
+				gf_base64_decode((char*)KMS_URI+5, (u32) strlen(KMS_URI)-5, data, 100);
+				memcpy(tci.key, data, sizeof(char)*16);
+				if (info->crypt_type == 1) memcpy(tci.salt, data+16, sizeof(char)*8);
+			}
+			/*MPEG4IP*/
+			else if (!stricmp(KMS_URI, "AudioKey") || !stricmp(KMS_URI, "VideoKey")) {
+				if (!gf_ismacryp_mpeg4ip_get_info((char *) KMS_URI, (char *) tci.key, (char *) tci.salt)) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Couldn't load MPEG4IP ISMACryp keys for TrackID %d\n", trackID));
+					continue;
+				}
+			} else if (!drm_file) {
+				FILE *test = NULL;
+				if (!stricmp(scheme_URI, "urn:gpac:isma:encryption_scheme")) test = gf_f64_open(KMS_URI, "rt");
+
+				if (!test) {
+					GF_LOG(GF_LOG_INFO, GF_LOG_AUTHOR, ("[CENC/ISMA] TrackID %d does not contain decryption keys - skipping\n", trackID));
+					continue;
+				}
+				fclose(test);
+				if (gf_ismacryp_gpac_get_info(tci.trackID, (char *) KMS_URI, (char *) tci.key, (char *) tci.salt) != GF_OK) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Couldn't load TrackID %d keys in GPAC DRM file %s\n", tci.trackID, KMS_URI));
+					continue;
+				}
+			}
+
+			if (KMS_URI && strlen(tci.KMS_URI) && strcmp(KMS_URI, tci.KMS_URI) )
+				GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] KMS URI for TrackID %d Mismatch: \"%s\" in file vs \"%s\" in licence\n", trackID, KMS_URI, tci.KMS_URI));
+
+			if (drm_file || (KMS_URI && strncmp(KMS_URI, "(key)", 5)) ) {
+				strcpy(tci.KMS_URI, KMS_URI ? KMS_URI : "");
+			} else {
+				strcpy(tci.KMS_URI, "self-contained");
+			}
+		}
+		e = gf_decrypt_track(mp4, &tci, NULL, NULL);
+		if (e) break;
+	}
+	if (is_oma) {
+		e = gf_isom_set_brand_info(mp4, GF_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)) 
+		e = gf_isom_remove_pssh_box(mp4);
+	if (info) del_crypt_info(info);
+	return e;
+}
+
+static GF_Err gf_cenc_parse_drm_system_info(GF_ISOFile *mp4, const char *drm_file) {
+	GF_DOMParser *parser;
+	GF_XMLNode *root, *node;
+	u32 i;
+	GF_Err e = GF_OK;
+
+	parser = gf_xml_dom_new();
+	e = gf_xml_dom_parse(parser, drm_file, NULL, NULL);
+	if (e) {
+		gf_xml_dom_del(parser);
+		return e;
+	}
+	root = gf_xml_dom_get_root(parser);
+	if (!root) {
+		gf_xml_dom_del(parser);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open or validate xml file %s\n", drm_file));
+		return GF_NOT_SUPPORTED;
+	}
+	i=0;
+	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
+		Bool is_pssh;
+		u32 version, cypherMode, specInfoSize, len, KID_count, j;
+		bin128 cypherKey, cypherIV, systemID;
+		GF_XMLAttribute *att;
+		char *data, *specInfo;
+		GF_BitStream *bs;
+		bin128 *KIDs;
+		s32 cypherOffset = -1;
+		Bool has_key = GF_FALSE, has_IV = GF_FALSE;
+
+		if (strcmp(node->name, "DRMInfo")) continue;
+
+		j = 0;
+		is_pssh = GF_FALSE;
+		version = cypherMode = 0;
+		data = specInfo = NULL;
+		bs = NULL;
+
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+			if (!strcmp(att->name, "type")) {
+				if (!strcmp(att->value, "pssh")) 
+					is_pssh = GF_TRUE;
+			} else if (!strcmp(att->name, "version")) {
+				version = atoi(att->value);
+			} else if (!strcmp(att->name, "cypher-mode")) {
+				/*cypher-mode: 0: data (default mode) -  1: all - 2: clear*/
+				if (!strcmp(att->value, "data")) 
+					cypherMode = 0;
+				else if (!strcmp(att->value, "all")) 
+					cypherMode = 1;
+				else if (!strcmp(att->value, "clear")) 
+					cypherMode = 2;
+			} else if (!strcmp(att->name, "cypherKey")) {
+				gf_bin128_parse(att->value, cypherKey);
+				has_key = GF_TRUE;
+			} else if (!strcmp(att->name, "cypherIV")) {
+				gf_bin128_parse(att->value, cypherIV);
+				has_IV = GF_TRUE;
+			} else if (!strcmp(att->name, "cypherOffset")) {
+				cypherOffset = atoi(att->value);
+			}
+		}
+
+		if (!is_pssh) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("[CENC/ISMA] Not a Protection System Specific Header Box - skipping\n"));
+			continue;
+		}
+
+
+
+		e = gf_xml_parse_bit_sequence(node, &specInfo, &specInfoSize);
+		if (e) {
+			if (specInfo) gf_free(specInfo);
+			gf_xml_dom_del(parser);
+			return e;
+		}
+
+		bs = gf_bs_new(specInfo, specInfoSize, GF_BITSTREAM_READ);
+		gf_bs_read_data(bs, (char *)systemID, 16);
+		if (version) {
+			KID_count = gf_bs_read_u32(bs);
+			KIDs = (bin128 *)gf_malloc(KID_count*sizeof(bin128));
+			for (j = 0; j < KID_count; j++) {
+				gf_bs_read_data(bs, (char *)KIDs[j], 16);
+			}
+		}
+		else {
+			KID_count = 0;
+			KIDs = NULL;
+		}
+
+		len = specInfoSize - 16 - (version ? 4 + 16*KID_count : 0);
+		data = (char *)gf_malloc(len*sizeof(char));
+		gf_bs_read_data(bs, data, len);
+
+		if (has_key && has_IV && (cypherOffset >= 0)) {
+			/*TODO*/
+			GF_Crypt *mc;
+			mc = gf_crypt_open("AES-128", "CTR");
+			if (!mc) {
+				GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open AES-128 CTR\n"));
+				return GF_IO_ERR;
+			}
+			e = gf_crypt_init(mc, cypherKey, 16, cypherIV);
+			gf_crypt_encrypt(mc, data+cypherOffset, len-cypherOffset);
+			gf_crypt_close(mc);
+		}
+		e = gf_cenc_set_pssh(mp4, systemID, version, KID_count, KIDs, data, len);
+		if (specInfo) gf_free(specInfo);
+		if (data) gf_free(data);
+		if (KIDs) gf_free(KIDs);
+		if (bs) gf_bs_del(bs);
+		if (e) {
+			gf_xml_dom_del(parser);
+			return e;
+		}
+	}
+
+	gf_xml_dom_del(parser);
+	return GF_OK;
+}
+
+
+GF_EXPORT
+GF_Err gf_crypt_file(GF_ISOFile *mp4, const char *drm_file)
+{
+	GF_Err e;
+	u32 i, count, nb_tracks, common_idx, idx;
+	GF_CryptInfo *info;
+	Bool is_oma;
+	GF_TrackCryptInfo *tci;
+
+	is_oma = 0;
+
+	info = load_crypt_file(drm_file);
+	if (!info) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("[CENC/ISMA] Cannot open or validate xml file %s\n", drm_file));
+		return GF_NOT_SUPPORTED;
+	}
+
+	/*write pssh box in case of CENC*/
+	if ((info->crypt_type == 2) || (info->crypt_type == 3)) {
+		e = gf_cenc_parse_drm_system_info(mp4, drm_file);
+		if (e) return e;
+	}
+
+	e = GF_OK;
+	count = gf_list_count(info->tcis);
+
+	common_idx=0;
+	if (info && info->has_common_key) {
+		for (common_idx=0; common_idx<count; common_idx++) {
+			tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, common_idx);
+			if (!tci->trackID) break;
+		}
+	}
+	nb_tracks = gf_isom_get_track_count(mp4);
+	for (i=0; i<nb_tracks; i++) {
+		u32 trackID = gf_isom_get_track_id(mp4, i+1);
+		for (idx=0; idx<count; idx++) {
+			tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
+			if (tci->trackID==trackID) break;
+		}
+		if (idx==count) {
+			if (!info->has_common_key) continue;
+			idx = common_idx;
+		}
+		tci = (GF_TrackCryptInfo *)gf_list_get(info->tcis, idx);
+
+		switch (info->crypt_type) {
+		case 1:
+			gf_encrypt_track = gf_ismacryp_encrypt_track;
+			break;
+		case 2:
+			tci->enc_type = 2;
+			gf_encrypt_track = gf_cenc_encrypt_track;
+			break;
+		case 3:
+			tci->enc_type = 3;
+			gf_encrypt_track = gf_cenc_encrypt_track;
+			break;
+		case 4:
+			gf_encrypt_track = gf_adobe_encrypt_track;
+			break;
+		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);
 
-		e = gf_ismacryp_encrypt_track(mp4, tci, NULL, NULL);
+		e = gf_encrypt_track(mp4, tci, NULL, NULL);
 		if (e) break;
 
 		if (tci->enc_type==1) is_oma = 1;

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/isom_hinter.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/isom_hinter.c Changed

@@ -462,6 +462,24 @@
 			gf_odf_avc_cfg_del(svcc);
 		}
 			break;
+		case GF_ISOM_SUBTYPE_HVC1:
+		case GF_ISOM_SUBTYPE_HEV1:
+		case GF_ISOM_SUBTYPE_HVC2:
+		case GF_ISOM_SUBTYPE_HEV2:
+		{
+			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;			
+			streamType = GF_STREAM_VISUAL;
+			avc_nalu_size = hevcc->nal_unit_size;
+			oti = GPAC_OTI_VIDEO_HEVC;
+			PL_ID = 0x0F;
+			flags |= GP_RTP_PCK_USE_MULTI;
+			gf_odf_hevc_cfg_del(hevcc);
+			break;
+		}
+			break;
 		case GF_ISOM_SUBTYPE_3GP_QCELP:
 			required_rate = 8000;
 			hintType = GF_RTP_PAYT_QCELP;
@@ -734,6 +752,10 @@
 					if (v) size<<=8;
 				}
 				tkHint->base_offset_in_sample = samp->dataLength-remain;
+				if (remain < size) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_RTP, ("[rtp hinter] Broken AVC nalu encapsulation: NALU size is %d but only %d bytes left in sample %d\n", size, remain, tkHint->CurrentSample));
+					break;
+				}
 				remain -= size;
 				tkHint->rtp_p->sl_header.accessUnitEndFlag = remain ? 0 : 1;
 				e = gf_rtp_builder_process(tkHint->rtp_p, ptr, size, (u8) !remain, samp->dataLength, duration, (u8) (descIndex + GF_RTP_TX3G_SIDX_OFFSET) );

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/isom_tools.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/isom_tools.c Changed

@@ -53,6 +53,15 @@
 		if (e) return e;
 #endif
 	}
+#if !defined(GPAC_DISABLE_HEVC) && !defined(GPAC_DISABLE_AV_PARSERS)
+	else if (stype==GF_4CC('h','v','c','1')) {
+		GF_HEVCConfig *hvcc = gf_isom_hevc_config_get(file, track, 1);
+		gf_media_hevc_change_par(hvcc, ar_num, ar_den);
+		e = gf_isom_hevc_config_update(file, track, 1, hvcc);
+		gf_odf_hevc_cfg_del(hvcc);
+		if (e) return e;
+	}
+#endif
 	else if (stype==GF_ISOM_SUBTYPE_MPEG4) {
 		GF_ESD *esd = gf_isom_get_esd(file, track, 1);
 		if (!esd || !esd->decoderConfig || (esd->decoderConfig->streamType!=4) ) {
@@ -68,6 +77,9 @@
 		}
 #endif
 	} else {
+		if (gf_isom_get_media_type(file, track)==GF_ISOM_MEDIA_VISUAL) {
+			return GF_NOT_SUPPORTED;
+		}
 		return GF_BAD_PARAM;
 	}
 
@@ -762,6 +774,10 @@
 	case GF_ISOM_SUBTYPE_3GP_SMV:
 	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:
+	case GF_ISOM_SUBTYPE_SHV1:
 		return gf_isom_get_esd(mp4, track, 1);
 	}
 
@@ -1878,6 +1894,309 @@
 	return e;
 }
 
+
+/* Split SHVC layers */
+static GF_HEVCParamArray *alloc_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type) 
+{
+	GF_HEVCParamArray *ar;
+	u32 i, count = hevc_cfg->param_array ? gf_list_count(hevc_cfg->param_array) : 0;
+	for (i=0; i<count; i++) {
+		GF_HEVCParamArray *ar = gf_list_get(hevc_cfg->param_array, i);
+		if (ar->type==type) return ar;
+	}
+	GF_SAFEALLOC(ar, GF_HEVCParamArray);
+	ar->nalus = gf_list_new();
+	ar->type = type;
+	gf_list_add(hevc_cfg->param_array, ar);
+	return ar;
+}
+
+typedef struct
+{
+	u32 track_num;
+	u32 layer_id;
+	GF_HEVCConfig *shvccfg;
+	GF_BitStream *bs;
+	u32 data_offset, data_size;
+	u32 temporal_id;
+} SHVCTrackInfo;
+
+GF_EXPORT
+GF_Err gf_media_split_shvc(GF_ISOFile *file, u32 track, Bool splitAll, Bool use_extractors)
+{
+	SHVCTrackInfo sti[64];
+	GF_HEVCConfig *hevccfg, *shvccfg;
+	u32 i, count, cur_extract_mode, j, k, max_layer_id;
+	char *nal_data=NULL;
+	u32 nal_alloc_size;
+	GF_Err e = GF_OK;
+
+	hevccfg = gf_isom_hevc_config_get(file, track, 1);
+	shvccfg = gf_isom_shvc_config_get(file, track, 1);
+	if (!shvccfg) {
+		if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+		return GF_OK;
+	}
+
+	cur_extract_mode = gf_isom_get_nalu_extract_mode(file, track);
+	gf_isom_set_nalu_extract_mode(file, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+
+	memset(sti, 0, sizeof(sti));
+	sti[0].track_num = track;
+	max_layer_id = 0;
+	//split all SPS/PPS/VPS from svccfg
+	count = gf_list_count(shvccfg->param_array);
+	for (i=0; i<count; i++) {
+		u32 count2;
+		GF_HEVCParamArray *s_ar;
+		GF_HEVCParamArray *ar = gf_list_get(shvccfg->param_array, i);
+		count2 = gf_list_count(ar->nalus);
+		for (j=0; j<count2; j++) {
+			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;
+
+			if (!splitAll) layer_id = 1;
+
+			if (max_layer_id < layer_id)
+				max_layer_id = layer_id;
+
+			if (!sti[layer_id].shvccfg) {
+				GF_List *backup_list;
+				sti[layer_id].shvccfg = gf_odf_hevc_cfg_new();
+				backup_list = sti[layer_id].shvccfg->param_array;
+				memcpy(sti[layer_id].shvccfg , shvccfg ? shvccfg : hevccfg, sizeof(GF_HEVCConfig));
+				sti[layer_id].shvccfg->param_array = backup_list;
+
+				sti[layer_id].shvccfg->is_shvc = 1;
+				sti[layer_id].shvccfg->complete_representation = 1;
+				sti[layer_id].shvccfg->num_layers = 1;
+				//TODO - set scalability mask flag
+			}
+
+			s_ar = alloc_hevc_param_array(sti[layer_id].shvccfg, ar->type);
+			gf_list_add(s_ar->nalus, sl);
+			gf_list_rem(ar->nalus, j);
+			j--;
+			count2--;
+		}
+	}
+
+	//CLARIFY wether this is correct: we duplicate all VPS in the enhancement layer ...
+	//we do this because if we split the tracks some info for setting up the enhancement layer
+	//is in the VPS
+	count = gf_list_count(hevccfg->param_array);
+	for (i=0; i<count; i++) {
+		u32 k, count2;
+		GF_HEVCParamArray *s_ar;
+		GF_HEVCParamArray *ar = gf_list_get(hevccfg->param_array, i);
+		if (ar->type != GF_HEVC_NALU_VID_PARAM) continue;
+		count2 = gf_list_count(ar->nalus);
+		for (j=0; j<count2; j++) {
+			GF_AVCConfigSlot *sl = gf_list_get(ar->nalus, j);
+			u8 layer_id = ((sl->data[0] & 0x1) << 5) | (sl->data[1] >> 3);
+			if (layer_id) continue;
+
+			for (k=0; k <= max_layer_id; k++) {
+				GF_AVCConfigSlot *sl2;
+				if (!sti[k].shvccfg) continue;
+
+				s_ar = alloc_hevc_param_array(sti[k].shvccfg, ar->type);
+				s_ar->array_completeness = ar->array_completeness;
+
+				GF_SAFEALLOC(sl2, GF_AVCConfigSlot);
+				sl2->data = gf_malloc(sl->size);
+				memcpy(sl2->data, sl->data, sl->size);
+				sl2->id = sl->id;
+				sl2->size = sl->size;
+				gf_list_add(s_ar->nalus, sl2);
+			}
+		}
+	}
+
+	//update shvc config
+	e = gf_isom_shvc_config_update(file, track, 1, NULL, 0);
+	if (e) goto exit;
+
+	nal_alloc_size = 10000;
+	nal_data = gf_malloc(sizeof(char) * nal_alloc_size);
+	//parse all samples
+	count = gf_isom_get_sample_count(file, track);
+	for (i=0; i<count; i++) {
+		GF_BitStream *bs;
+		u32 di;
+		GF_ISOSample *sample;
+		u8 max_layer_id = 0;
+		
+		sample = gf_isom_get_sample(file, track, i+1, &di);
+		
+		bs = gf_bs_new(sample->data, sample->dataLength, GF_BITSTREAM_READ);
+		while (gf_bs_available(bs)) {
+			u8 orig_layer_id;
+			u32 size = gf_bs_read_int(bs, shvccfg->nal_unit_size*8);
+			u8 fzero = gf_bs_read_int(bs, 1);
+			u8 nal_type = gf_bs_read_int(bs, 6);
+			u8 layer_id = orig_layer_id = gf_bs_read_int(bs, 6);
+			u8 temporal_id = gf_bs_read_int(bs, 3);
+
+			if (!splitAll) layer_id = 1;
+
+			if (max_layer_id < layer_id) 
+				max_layer_id = layer_id;
+
+			if (!sti[layer_id].bs)
+				sti[layer_id].bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+
+			gf_bs_write_int(sti[layer_id].bs, size, shvccfg->nal_unit_size*8);
+			gf_bs_write_int(sti[layer_id].bs, fzero, 1);
+			gf_bs_write_int(sti[layer_id].bs, nal_type, 6);
+			gf_bs_write_int(sti[layer_id].bs, orig_layer_id, 6);
+			gf_bs_write_int(sti[layer_id].bs, temporal_id, 3);
+			size -= 2;
+
+			if (!sti[layer_id].temporal_id || (sti[layer_id].temporal_id < temporal_id)) {
+				sti[layer_id].temporal_id = temporal_id;
+			}
+
+			if (size>nal_alloc_size) {
+				nal_alloc_size = size;
+				nal_data = gf_realloc(nal_data, nal_alloc_size);
+			}
+
+			gf_bs_read_data(bs, nal_data, size);
+			gf_bs_write_data(sti[layer_id].bs, nal_data, size);
+		}
+		gf_bs_del(bs);
+
+
+		gf_free(sample->data);
+		sample->data = NULL;
+		sample->dataLength = 0;
+		//reset all samples on scalable layers
+		for (j=0; j<=max_layer_id; j++) {
+			if (! sti[j].bs) {
+				sti[j].data_offset =  sti[j].data_size = 0;
+				continue;
+			}
+
+			//clone track
+			if (! sti[j].track_num) {
+				u32 track_id = gf_isom_get_track_id(file, track);
+				e = gf_isom_clone_track(file, track, file, 0, &sti[j].track_num);
+				if (e) goto exit;
+
+				e = gf_isom_shvc_config_update(file, sti[j].track_num, 1, sti[j].shvccfg, 0);
+				if (e) goto exit;
+
+				gf_isom_set_track_reference(file, sti[j].track_num, GF_4CC('s','b','a','s'), track_id);
+
+				gf_isom_set_nalu_extract_mode(file, sti[j].track_num, GF_ISOM_NALU_EXTRACT_INSPECT);
+
+				//get lower layer
+				for (k=j; k>0; k--) {
+					if (sti[k-1].track_num) {
+						u32 track_id = gf_isom_get_track_id(file, sti[k-1].track_num);
+						gf_isom_set_track_reference(file, sti[j].track_num, GF_4CC('s','c','a','l'), track_id);
+						if (!use_extractors) break;
+					}
+				}
+
+				//add empty sample at DTS 0 
+				if (sample->DTS ) {
+					u64 dts = sample->DTS;
+					s32 cts = sample->CTS_Offset;
+					sample->DTS = 0;
+					sample->CTS_Offset = 0;
+					gf_isom_add_sample(file, sti[j].track_num, 1, sample);
+					sample->DTS = dts;
+					sample->CTS_Offset = cts;
+				}
+			}
+
+			if (j && use_extractors) {
+				GF_BitStream *xbs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				//get all lower layers
+				for (k=0; k<j; k++) {
+					u8 trefidx;
+					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);
+					gf_bs_write_int(xbs, 49, 6); //extractor
+					gf_bs_write_int(xbs, k, 6);
+					gf_bs_write_int(xbs, sti[k].temporal_id, 3);
+					//set ref track index
+					trefidx = (u8) gf_isom_has_track_reference(file, sti[j].track_num, GF_ISOM_REF_SCAL, gf_isom_get_track_id(file, sti[k].track_num) );
+					gf_bs_write_int(xbs, trefidx, 8);
+					// no sample offset
+					gf_bs_write_int(xbs, 0, 8);
+					// data offset: we start from begining of the sample data, not the extractor
+					gf_bs_write_int(xbs, sti[k].data_offset, 8*shvccfg->nal_unit_size);
+					gf_bs_write_int(xbs, sti[k].data_size, 8*shvccfg->nal_unit_size);
+				}
+
+				gf_bs_get_content(xbs, &sample->data, &sample->dataLength);
+				gf_bs_del(xbs);
+
+				//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;
+				gf_free(sample->data);
+
+				//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;
+
+
+			} else {
+				//get sample content
+				gf_bs_get_content(sti[j].bs, &sample->data, &sample->dataLength);
+				sti[j].data_offset = 0;
+				sti[j].data_size = sample->dataLength;
+
+
+				//add sample
+				if (j) {
+					e = gf_isom_add_sample(file, sti[j].track_num, 1, sample);
+				} else {
+					e = gf_isom_update_sample(file, sti[j].track_num, i+1, sample, 1);
+				}
+				if (e) goto exit;
+			}
+			
+			gf_bs_del(sti[j].bs);
+			sti[j].bs = NULL;
+				
+
+			gf_free(sample->data);
+			sample->data = NULL;
+			sample->dataLength = 0;
+		}
+		gf_isom_sample_del(&sample);
+
+		//reset all scalable info
+		for (j=0; j<=max_layer_id; j++) {
+			sti[j].temporal_id = 0;
+		}
+	}
+
+exit:
+	//reset all scalable info
+	for (j=0; j<=max_layer_id; j++) {
+		if (sti[j].shvccfg) gf_odf_hevc_cfg_del(sti[j].shvccfg);
+	}
+	gf_isom_set_nalu_extract_mode(file, track, cur_extract_mode);
+	if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
+	if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+	if (nal_data) gf_free(nal_data);
+	return e;
+}
+
 GF_EXPORT
 GF_Err gf_media_change_pl(GF_ISOFile *file, u32 track, u32 profile, u32 level)
 {
@@ -1914,6 +2233,9 @@
 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;
 	GF_Err e;
@@ -1972,8 +2294,7 @@
 		GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
 		GF_ISOSample *sample = gf_isom_get_sample(file, track, i+1, &di);
 
-	
-		data = sample->data;
+		data = (u8 *) sample->data;
 		size = sample->dataLength;
 		sample->data = NULL;
 		sample->dataLength = 0;
@@ -1983,7 +2304,7 @@
 			if (e)
 				goto err_exit;
 		}
-		sample->data = data;
+		sample->data = (char *) data;
 		cur_tile = 0;
 
 		while (size) {
@@ -2009,13 +2330,13 @@
 			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], data, nalu_size + nalu_size_length);
+				e = gf_isom_append_sample_data(file, tiles_track[cur_tile], (char *) data, nalu_size + nalu_size_length);
 				if (e)
 					goto err_exit;
 				cur_tile++;
 				break;
 			default:
-				gf_bs_write_data(bs, data, nalu_size + nalu_size_length);
+				gf_bs_write_data(bs, (char *) data, nalu_size + nalu_size_length);
 				break;
 			}
 			data += nalu_size + nalu_size_length;
@@ -2033,6 +2354,7 @@
 err_exit:
 	gf_free(tiles_track);
 	return e;
+#endif
 }
 
 #endif /*GPAC_DISABLE_MEDIA_IMPORT*/
@@ -2170,10 +2492,18 @@
 		}
 		sample = NULL;
 
+		/*copy PSSHs from moov to the first moof*/
+		if (!nb_done) {
+			e = gf_isom_clone_pssh(output, input, GF_TRUE);
+			if (e) goto err_exit;
+		}
+
 		//process track by track
 		for (i=0; i<count; i++) {
 			tf = (GF_TrackFragmenter *)gf_list_get(fragmenters, i);
 
+			gf_isom_set_nalu_extract_mode(input, tf->OriginalTrack, GF_ISOM_NALU_EXTRACT_INSPECT);
+
 			//ok write samples
 			while (1) {
 				if (!sample) {
@@ -2191,6 +2521,14 @@
 				e = gf_isom_fragment_add_sample(output, tf->TrackID, sample, descIndex, defaultDuration, NbBits, 0, 0);
 				if (e) goto err_exit;
 
+				e = gf_isom_fragment_add_sai(output, input, tf->TrackID, tf->SampleNum + 1);
+				if (e) goto err_exit;
+
+				/*copy subsample information*/
+				e = gf_isom_fragment_copy_subsample(output, tf->TrackID, input, tf->OriginalTrack, tf->SampleNum + 1, GF_FALSE);
+				if (e) 
+					goto err_exit;
+
 				gf_set_progress("ISO File Fragmenting", nb_done, nb_samp);
 				nb_done++;
 
@@ -2235,7 +2573,7 @@
 GF_EXPORT
 GF_Err gf_media_split_tiles(GF_ISOFile *file)
 {
-#ifdef GPAC_DISABLE_HEVC
+#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;
@@ -2281,7 +2619,7 @@
 	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 = malloc(sizeof(u32) * nb_tracks);
+	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] );
 	}
@@ -2294,7 +2632,7 @@
 		GF_ISOSample *sample = gf_isom_get_sample(file, track, i+1, &di);
 
 	
-		data = sample->data;
+		data = (u8 *) sample->data;
 		size = sample->dataLength;
 		sample->data = NULL;
 		sample->dataLength = 0;
@@ -2326,10 +2664,10 @@
 			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, data, nalu_size + nalu_size_length);
+				gf_isom_append_sample_data(file, track, (char *) data, nalu_size + nalu_size_length);
 				break;
 			default:
-				gf_bs_write_data(bs, data, nalu_size + nalu_size_length);
+				gf_bs_write_data(bs, (char *) data, nalu_size + nalu_size_length);
 				break;
 			}
 			data += nalu_size + nalu_size_length;

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/m2ts_mux.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/m2ts_mux.c Changed

@@ -37,6 +37,10 @@
 #define ADAPTATION_LENGTH_LENGTH 1
 /* discontinuty flag, random access flag ... */
 #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 
 /* length of encoded pcr */
 #define PCR_LENGTH 6
 
@@ -404,12 +408,18 @@
 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)
+				   u32 padding_length,
+				   char *af_descriptors, u32 af_descriptors_size)
 {
 	u32 adaptation_length;
 
 	adaptation_length = ADAPTATION_FLAGS_LENGTH + (has_pcr?PCR_LENGTH:0) + padding_length;
 
+
+	if (af_descriptors_size && af_descriptors) {
+		adaptation_length += ADAPTATION_EXTENSION_LENGTH_LENGTH + ADAPTATION_EXTENSION_FLAGS_LENGTH + af_descriptors_size;
+	}
+
 	gf_bs_write_int(bs,	adaptation_length, 8);
 	gf_bs_write_int(bs,	0, 1);			// discontinuity indicator
 	gf_bs_write_int(bs,	is_rap, 1);		// random access indicator
@@ -418,7 +428,7 @@
 	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
-	gf_bs_write_int(bs,	0, 1);			// adaptation field extension flag
+	gf_bs_write_int(bs,	af_descriptors_size ? 1 : 0, 1);			// adaptation field extension flag
 	if (has_pcr) {
 		u64 PCR_base, PCR_ext;
 		PCR_base = pcr_time/300;
@@ -439,6 +449,18 @@
 
 	}
 
+	if (af_descriptors_size) {
+		gf_bs_write_int(bs,	ADAPTATION_EXTENSION_FLAGS_LENGTH + af_descriptors_size, 8);
+
+		gf_bs_write_int(bs,	0, 1);			// ltw_flag
+		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_data(bs, af_descriptors, af_descriptors_size);
+	}
+
 	gf_bs_write_byte(bs, 0xFF, padding_length); // stuffing byte
 	
 	return adaptation_length + ADAPTATION_LENGTH_LENGTH;
@@ -499,7 +521,7 @@
 	else stream->continuity_counter=0;
 
 	if (adaptation_field_control != GF_M2TS_ADAPTATION_NONE)
-		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, 0, 0, 0, padding_length);
+		gf_m2ts_add_adaptation(stream->program, bs, stream->pid, 0, 0, 0, padding_length, NULL, 0);
 
 	/*pointer field*/
 	if (!stream->current_section_offset) {
@@ -646,17 +668,33 @@
 
 		es = stream->program->streams;
 		while (es) {
+			Bool has_lang = 0;
+			u8 type = es->mpeg2_stream_type;
 			nb_streams++;
-			gf_bs_write_int(bs,	es->mpeg2_stream_type, 8);
+			es_info_length = 0;
+
+
+			switch (es->mpeg2_stream_type) {
+			case GF_M2TS_AUDIO_AC3:
+			case GF_M2TS_VIDEO_VC1:
+				es_info_length += 2 + 4;
+				type = GF_M2TS_PRIVATE_DATA;
+				break;
+			case GF_M2TS_AUDIO_EC3:
+				es_info_length += 2;
+				type = GF_M2TS_PRIVATE_DATA;
+				break;
+			}
+
+			gf_bs_write_int(bs,	type, 8);
 			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;
-			else
-				es_info_length = 0;
+				es_info_length += 4;
+
 			/*another loop descriptors*/
 			if (es->loop_descriptors)
 			{
@@ -666,6 +704,12 @@
 					es_info_length += 2 +desc->data_len;
 				}
 			}
+
+			if (es->ifce && es->ifce->lang && (es->ifce->lang  != GF_4CC('u', 'n', 'd', ' ')) ) {
+				es_info_length += 2 + 3;
+				has_lang = 1;
+			}
+
 			gf_bs_write_int(bs,	es_info_length, 12);
 
 			if (stream->program->iod && !(es->ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS)) {
@@ -674,6 +718,37 @@
 				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); 
+			}
+
+			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); 
+				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); 
+				break;
+			case GF_M2TS_AUDIO_EC3:
+				gf_bs_write_int(bs,	GF_M2TS_DVB_EAC3_DESCRIPTOR, 8); 
+				gf_bs_write_int(bs,	0, 8); //check what is in this desc
+				break;
+			}
+
 			if (es->loop_descriptors)
 			{
 				for (i=0; i<gf_list_count(es->loop_descriptors); i++)
@@ -705,7 +780,7 @@
 	return 0;
 }
 
-static void gf_m2ts_remap_timestamps_for_pes(GF_M2TS_Mux_Stream *stream, u32 pck_flags, u64 *dts, u64 *cts)
+static void gf_m2ts_remap_timestamps_for_pes(GF_M2TS_Mux_Stream *stream, u32 pck_flags, u64 *dts, u64 *cts, u32 *duration)
 {
 	u64 pcr_offset;
 
@@ -713,6 +788,8 @@
 	if (stream->ts_scale) {
 		*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;
@@ -733,6 +810,8 @@
 	else if (*dts < stream->last_dts) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS Muxer] PID %d: DTS "LLD" is less than last sent DTS "LLD"\n", stream->pid, *dts, stream->last_dts));
 		stream->last_dts = *dts;
+	} else {
+		stream->last_dts = *dts;
 	}
 
 	/*offset our timestamps*/
@@ -745,6 +824,28 @@
 	*dts = *dts - stream->program->initial_ts + pcr_offset;
 }
 
+static void id3_tag_create(char **input, u32 *len)
+{
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_u8(bs, 'I');
+	gf_bs_write_u8(bs, 'D');
+	gf_bs_write_u8(bs, '3');
+	gf_bs_write_u8(bs, 4);
+	gf_bs_write_u8(bs, 0);
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_int(bs, 0, 1);
+	gf_bs_write_int(bs, 0x1F, 5);
+	gf_bs_write_u32(bs, GF_4CC('T','X','X','X'));
+	gf_bs_write_u32(bs, *len); /* size of the text */
+	gf_bs_write_u8(bs, 0);
+	gf_bs_write_u8(bs, 0);
+	gf_bs_write_data(bs, *input, *len);
+	gf_free(*input);
+	gf_bs_get_content(bs, input, len);
+	gf_bs_del(bs);
+}
+
 u32 gf_m2ts_stream_process_stream(GF_M2TS_Mux *muxer, GF_M2TS_Mux_Stream *stream)
 {
 	Bool ret = 0;
@@ -805,7 +906,10 @@
 		stream->curr_pck.data = curr_pck->data;
 		stream->curr_pck.data_len = curr_pck->data_len;
 		stream->curr_pck.dts = curr_pck->dts;
+		stream->curr_pck.duration = curr_pck->duration;
 		stream->curr_pck.flags = curr_pck->flags;
+		stream->curr_pck.mpeg2_af_descriptors = curr_pck->mpeg2_af_descriptors;
+		stream->curr_pck.mpeg2_af_descriptors_size = curr_pck->mpeg2_af_descriptors_size;
 
 		/*discard first packet*/
 		stream->pck_first = curr_pck->next;
@@ -995,6 +1099,13 @@
 		/*since we reallocated the packet data buffer, force a discard in pull mode*/
 		stream->discard_data = 1;
 		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;
 	}
 
 	if (stream->start_pes_at_rap && (stream->curr_pck.flags & GF_ESI_DATA_AU_RAP)
@@ -1004,7 +1115,7 @@
 	}
 
 	/*rewrite timestamps for PES header*/
-	gf_m2ts_remap_timestamps_for_pes(stream, stream->curr_pck.flags, &stream->curr_pck.dts, &stream->curr_pck.cts);
+	gf_m2ts_remap_timestamps_for_pes(stream, stream->curr_pck.flags, &stream->curr_pck.dts, &stream->curr_pck.cts, &stream->curr_pck.duration);
 
 
 	/*compute next interesting time in TS unit: this will be DTS of next packet*/
@@ -1029,7 +1140,7 @@
 		stream->bytes_since_last_time = 0;
 		stream->pes_since_last_time = 0;
 	} else {
-		u32 time_diff = (u32) (stream->curr_pck.dts - stream->last_br_time - 1 );
+		u32 time_diff = (u32) (stream->curr_pck.dts + 1 - stream->last_br_time );
 		if ((stream->pes_since_last_time > 4) && (time_diff >= BITRATE_UPDATE_WINDOW)) {
 			u32 bitrate;
 			u64 r = 8*stream->bytes_since_last_time;
@@ -1042,6 +1153,22 @@
 			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;
 }
@@ -1116,7 +1243,7 @@
 	if (stream->next_payload_size) {
 		stream->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);
+		gf_m2ts_remap_timestamps_for_pes(stream, stream->next_pck_flags, &stream->next_pck_dts, &stream->next_pck_cts, NULL);
 	}
 }
 
@@ -1226,13 +1353,11 @@
 	if ( flags & GF_ESI_DATA_AU_START) {
 		if (flags & GF_ESI_DATA_HAS_CTS) hdr_len += 5;
 		if (flags & GF_ESI_DATA_HAS_DTS) hdr_len += 5;
-	} else {
-		hdr_len = hdr_len;
 	}
 	return hdr_len;
 }
 
-u32 gf_m2ts_stream_add_pes_header(GF_BitStream *bs, GF_M2TS_Mux_Stream *stream, u32 payload_length)
+u32 gf_m2ts_stream_add_pes_header(GF_BitStream *bs, GF_M2TS_Mux_Stream *stream)
 {
 	u64 t, dts, cts;
 	u32 pes_len;
@@ -1306,7 +1431,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 (%d) - has DTS %d (%d)\n", stream->pid, gf_m2ts_get_pcr(stream->program)/300, use_pts, cts, use_dts, dts));
+	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));
 
 	return pes_len+4; // 4 = start code + stream_id
 }
@@ -1352,6 +1477,13 @@
 			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) {
+				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 
+		}
 		
 		if (hdr_len) {
 			assert(!stream->pes_data_remain);
@@ -1435,14 +1567,19 @@
 			stream->pcr_priority = 0;
 		}
 		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);
-	
+		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);
+
+		if (stream->curr_pck.mpeg2_af_descriptors) {
+			gf_free(stream->curr_pck.mpeg2_af_descriptors);
+			stream->curr_pck.mpeg2_af_descriptors = NULL;
+			stream->curr_pck.mpeg2_af_descriptors_size = 0;
+		}
+
 		if (padding_length) 
 			stream->program->mux->tot_pes_pad_bytes += padding_length;
-
 	}
 
-	if (hdr_len) gf_m2ts_stream_add_pes_header(bs, stream, payload_length);
+	if (hdr_len) gf_m2ts_stream_add_pes_header(bs, stream);
 
 	pos = (u32) gf_bs_get_position(bs);
 	gf_bs_del(bs);
@@ -1457,14 +1594,18 @@
 //	gf_m2ts_time_inc(&stream->time, payload_to_copy + pos - 4, stream->bit_rate);
 	
 	if (stream->pck_offset == stream->curr_pck.data_len) {
+		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));
+		} 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));
+		}
+
 		/*PES has been sent, discard internal buffer*/
 		if (stream->discard_data) gf_free(stream->curr_pck.data);
 		stream->curr_pck.data = NULL;
 		stream->curr_pck.data_len = 0;
 		stream->pck_offset = 0;
 
-		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));
-
 #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)
@@ -1575,6 +1716,12 @@
 			GF_SAFEALLOC(stream->pck_reassembler, GF_M2TS_Packet);
 			stream->pck_reassembler->cts = esi_pck->cts;
 			stream->pck_reassembler->dts = esi_pck->dts;
+			stream->pck_reassembler->duration = esi_pck->duration;
+			if (esi_pck->mpeg2_af_descriptors) {
+				stream->pck_reassembler->mpeg2_af_descriptors = gf_realloc(stream->pck_reassembler->mpeg2_af_descriptors, sizeof(u8)* (stream->pck_reassembler->mpeg2_af_descriptors_size + esi_pck->mpeg2_af_descriptors_size) );
+				memcpy(stream->pck_reassembler->mpeg2_af_descriptors + stream->pck_reassembler->mpeg2_af_descriptors_size, esi_pck->mpeg2_af_descriptors, sizeof(u8)* esi_pck->mpeg2_af_descriptors_size );
+				stream->pck_reassembler->mpeg2_af_descriptors_size += esi_pck->mpeg2_af_descriptors_size;
+			}
 		}
 
 		stream->force_new = esi_pck->flags & GF_ESI_DATA_AU_END ? 1 : 0;
@@ -1632,7 +1779,6 @@
 {
 	GF_M2TSDescriptor *desc;
 	GF_BitStream *bs;
-	char *data;
 	u32 data_len;
 
 	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
@@ -1650,7 +1796,7 @@
 	gf_bs_write_int(bs, 3, 2);
 	/*hierarchy_layer_index*/
 	gf_bs_write_int(bs, stream->pid - stream->program->pmt->pid, 6);
-	/*tref_present_flag*/
+	/*tref_present_flag = 1 : NOT PRESENT*/
 	gf_bs_write_int(bs, 1, 1);
 	/*reserved*/
 	gf_bs_write_int(bs, 1, 1);
@@ -1663,12 +1809,54 @@
 
 	GF_SAFEALLOC(desc, GF_M2TSDescriptor);
 	desc->tag = (u8) GF_M2TS_HIERARCHY_DESCRIPTOR;
-	gf_bs_get_content(bs, &data, &data_len);
+	gf_bs_get_content(bs, &desc->data, &data_len);
 	gf_bs_del(bs);
-	desc->data_len = data_len;
-	desc->data = (char *)gf_malloc(data_len*sizeof(char));
-	memcpy(desc->data, data, data_len);
+	desc->data_len = (u8) data_len;
+	gf_list_add(stream->loop_descriptors, desc);
+}
 
+static void gf_m2ts_stream_add_metadata_pointer_descriptor(GF_M2TS_Mux_Program *program)
+{
+	GF_M2TSDescriptor *desc;
+	GF_BitStream *bs;
+	u32 data_len;
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_u16(bs, 0xFFFF);
+	gf_bs_write_u32(bs, GF_4CC('I','D','3',' '));
+	gf_bs_write_u8(bs, 0xFF);
+	gf_bs_write_u32(bs, GF_4CC('I','D','3',' '));
+	gf_bs_write_u8(bs, 0); /* service id */
+	gf_bs_write_int(bs, 0, 1); /* locator */
+	gf_bs_write_int(bs, 0, 2); /* carriage flags */
+	gf_bs_write_int(bs, 0x1F, 5); /* reserved */
+	gf_bs_write_u16(bs, program->number);
+	GF_SAFEALLOC(desc, GF_M2TSDescriptor);
+	desc->tag = (u8) GF_M2TS_METADATA_POINTER_DESCRIPTOR;
+	gf_bs_get_content(bs, &desc->data, &data_len);
+	gf_bs_del(bs);
+	desc->data_len = (u8) data_len;
+	gf_list_add(program->loop_descriptors, desc);
+}
+
+static void gf_m2ts_stream_add_metadata_descriptor(GF_M2TS_Mux_Stream *stream)
+{
+	GF_M2TSDescriptor *desc;
+	GF_BitStream *bs;
+	u32 data_len;
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_bs_write_u16(bs, 0xFFFF);
+	gf_bs_write_u32(bs, GF_4CC('I','D','3',' '));
+	gf_bs_write_u8(bs, 0xFF);
+	gf_bs_write_u32(bs, GF_4CC('I','D','3',' '));
+	gf_bs_write_u8(bs, 0); /* service id */
+	gf_bs_write_int(bs, 0, 3); /* decoder config flags */
+	gf_bs_write_int(bs, 0, 1); /* dsmcc flag */
+	gf_bs_write_int(bs, 0xF, 4); /* reserved */
+	GF_SAFEALLOC(desc, GF_M2TSDescriptor);
+	desc->tag = (u8) GF_M2TS_METADATA_DESCRIPTOR;
+	gf_bs_get_content(bs, &desc->data, &data_len);
+	gf_bs_del(bs);
+	desc->data_len = (u8) data_len;
 	gf_list_add(stream->loop_descriptors, desc);
 }
 
@@ -1719,19 +1907,28 @@
 			+ 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) 
+			+ 4 byte start code + first nal header*/
+			stream->min_bytes_copy_from_next = 11;
+			gf_m2ts_stream_add_hierarchy_descriptor(stream);
+			break;	
 		case GPAC_OTI_VIDEO_HEVC:
 			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)
 			+ 4 byte start code + first nal header*/
 			stream->min_bytes_copy_from_next = 12;
 			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) 
+		case GPAC_OTI_VIDEO_SHVC:
+			stream->mpeg2_stream_type = GF_M2TS_VIDEO_SHVC;
+			/*make sure we send AU delim NALU in same PES as first VCL NAL: 7 bytes (4 start code + 2 nal header + 1 AU delim)
 			+ 4 byte start code + first nal header*/
-			stream->min_bytes_copy_from_next = 11;
+			stream->min_bytes_copy_from_next = 12;
 			gf_m2ts_stream_add_hierarchy_descriptor(stream);
-			break;	
+			//force by default with SHVC since we don't have any delimiter / layer yet
+			stream->program->mux->one_au_per_pes = 1;
+			break;
 		case GPAC_OTI_VIDEO_MPEG1:
 			stream->mpeg2_stream_type = GF_M2TS_VIDEO_MPEG1;
 			break;
@@ -1770,6 +1967,9 @@
 			stream->mpeg2_stream_type = GF_M2TS_AUDIO_AAC;
 			if (!ifce->repeat_rate) ifce->repeat_rate = 500;
 			break;
+		case GPAC_OTI_AUDIO_AC3:
+			stream->mpeg2_stream_type = GF_M2TS_AUDIO_AC3;
+			break;
 		}
 		/*just pick first valid stream_id in audio range*/
 		stream->mpeg2_stream_id = 0xC0;
@@ -1797,9 +1997,13 @@
 			stream->mpeg2_stream_type = GF_M2TS_SYSTEMS_MPEG4_SECTIONS;
 		}
 		break;
+	case GF_STREAM_TEXT:
+		stream->mpeg2_stream_id = 0xBD;
+		stream->mpeg2_stream_type = GF_M2TS_METADATA_PES;
+		gf_m2ts_stream_add_metadata_pointer_descriptor(stream->program);
+		gf_m2ts_stream_add_metadata_descriptor(stream);
 	}
 
-
 	if (! (ifce->caps & GF_ESI_STREAM_WITHOUT_MPEG4_SYSTEMS)) {
 		/*override signaling for all streams except BIFS/OD, to use MPEG-4 PES*/
 		if (program->mpeg4_signaling==GF_M2TS_MPEG4_SIGNALING_FULL) {
@@ -1838,7 +2042,8 @@
 	program->mux = muxer;
 	program->mpeg4_signaling = mpeg4_signaling;
 	program->pcr_offset = pcr_offset;
-	
+	program->loop_descriptors = gf_list_new();
+
 	program->number = program_number;
 	if (muxer->programs) {
 		GF_M2TS_Mux_Program *p = muxer->programs;
@@ -1910,7 +2115,7 @@
 		while (gf_list_count(st->loop_descriptors) ) {
 			GF_M2TSDescriptor *desc = gf_list_last(st->loop_descriptors);
 			gf_list_rem_last(st->loop_descriptors);
-			//if (desc->data) gf_free(desc->data);
+			if (desc->data) gf_free(desc->data);
 			gf_free(desc);
 		}
 		gf_list_del(st->loop_descriptors);

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/media_export.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/media_export.c Changed

@@ -294,6 +294,7 @@
 				gf_export_message(dumper, GF_OK, "Dumping MPEG-4 AVC-H264 Visual sample%s", szNum);
 				break;
 			case GPAC_OTI_VIDEO_HEVC:
+			case GPAC_OTI_VIDEO_SHVC:
 				strcpy(szEXT, ".hvc");
 				gf_export_message(dumper, GF_OK, "Dumping MPEG-H HEVC Visual sample%s", szNum);
 				break;
@@ -404,6 +405,9 @@
 		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) {
+		gf_export_message(dumper, GF_OK, "Extracting Simple Text sample%s", szNum);
+		strcpy(szEXT, ".txt");
 	} else if (m_type==GF_ISOM_MEDIA_HINT) {
 		return gf_export_hint(dumper);
 	} else if (m_stype==GF_4CC('m','j','p','2')) {
@@ -450,6 +454,7 @@
 		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);
@@ -458,7 +463,9 @@
                     u32 timescale = gf_isom_get_media_timescale(dumper->file, track);
                     gf_webvtt_dump_iso_sample(out, timescale, samp);
                 }
-            } else {
+            } else 
+#endif
+            {
                 gf_bs_write_data(bs, samp->data, samp->dataLength);
             }
         }
@@ -499,6 +506,7 @@
 		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);
@@ -507,7 +515,9 @@
                     u32 timescale = gf_isom_get_media_timescale(dumper->file, track);
                     gf_webvtt_dump_iso_sample(out, timescale, samp);
                 }
-            } else {
+            } else 
+#endif
+            {
                 gf_bs_write_data(bs, samp->data, samp->dataLength);
             }
         }
@@ -664,7 +674,7 @@
 	FILE *out;
 	unsigned int *qcp_rates, rt_cnt;	/*contains constants*/
 	GF_AVCConfig *avccfg, *svccfg;
-	GF_HEVCConfig *hevccfg;
+	GF_HEVCConfig *hevccfg, *shvccfg;
 	GF_M4ADecSpecInfo a_cfg;
 	GF_BitStream *bs;
 	u32 track, i, di, count, m_type, m_stype, dsi_size, qcp_type;
@@ -680,6 +690,7 @@
 	hevccfg = NULL;
 	avccfg = NULL;
 	svccfg = NULL;
+	shvccfg = 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)));
@@ -726,7 +737,9 @@
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-4 AVC-H264 stream to h264");
 				break;
 			case GPAC_OTI_VIDEO_HEVC:
+			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) 
 					strcat(szName, ".hvc");
 				gf_export_message(dumper, GF_OK, "Extracting MPEG-H HEVC stream to hevc");
@@ -904,8 +917,13 @@
 			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) 
 			) {
 			hevccfg = gf_isom_hevc_config_get(dumper->file, track, 1);
+			shvccfg = gf_isom_shvc_config_get(dumper->file, track, 1);
 			if (add_ext) 
 				strcat(szName, ".hvc");
 			gf_export_message(dumper, GF_OK, "Extracting MPEG-H HEVC stream to hevc");
@@ -921,6 +939,9 @@
 			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");
 		} else {
 			if (add_ext) {
 				strcat(szName, ".");
@@ -946,6 +967,7 @@
 		if (avccfg) gf_odf_avc_cfg_del(avccfg);
 		if (svccfg) gf_odf_avc_cfg_del(svccfg);
 		if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+		if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
 		return GF_OK;
 	}
 	if (dumper->flags & GF_EXPORT_SVC_LAYER)
@@ -956,8 +978,12 @@
 	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));
+#else
+        return GF_NOT_SUPPORTED;
+#endif
     }
 
     if (qcp_type>1) {
@@ -989,6 +1015,7 @@
 		if (avccfg) gf_odf_avc_cfg_del(avccfg);
 		if (svccfg) gf_odf_avc_cfg_del(svccfg);
 		if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+		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);
 	}
 	bs = gf_bs_from_file(out, GF_BITSTREAM_WRITE);
@@ -1003,47 +1030,60 @@
 		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) {
-		count = gf_list_count(avccfg->sequenceParameterSets);
-		for (i=0;i<count;i++) {
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(avccfg->sequenceParameterSets, i);
-			gf_bs_write_u32(bs, 1);
-			gf_bs_write_data(bs, sl->data, sl->size);
-		}
-		count = gf_list_count(avccfg->pictureParameterSets);
-		for (i=0;i<count;i++) {
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(avccfg->pictureParameterSets, i);
-			gf_bs_write_u32(bs, 1);
-			gf_bs_write_data(bs, sl->data, sl->size);
-		}
+		DUMP_AVCPARAM(avccfg->sequenceParameterSets);
+		DUMP_AVCPARAM(avccfg->pictureParameterSets);
+	}
+
+	if (hevccfg) {
+		DUMP_HEVCPARAM(hevccfg);
 	}
-	if (svccfg) {
+
+	if (svccfg || shvccfg) {
 		if (!(dumper->flags & GF_EXPORT_SVC_LAYER))
 		{
 			GF_AVCConfig *cfg;
+			GF_HEVCConfig *hcfg;
 			u32 ref_track = 0, t;
 			s32 countRef;
 
 			// copy avcC and svcC from base layer
 			gf_isom_get_reference(dumper->file, track, GF_ISOM_REF_BASE, 1, &ref_track);
 			cfg = gf_isom_avc_config_get(dumper->file, ref_track, 1);
-			if (cfg)
-			{
-				count = gf_list_count(cfg->sequenceParameterSets);
-				for (i  =0; i < count; i++) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, i);
-					gf_bs_write_u32(bs, 1);
-					gf_bs_write_data(bs, sl->data, sl->size);
-				}
-				count = gf_list_count(cfg->pictureParameterSets);
-				for (i = 0; i < count; i++) {
-					GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, i);
-					gf_bs_write_u32(bs, 1);
-					gf_bs_write_data(bs, sl->data, sl->size);
-				}
+			hcfg = gf_isom_hevc_config_get(dumper->file, ref_track, 1);
+			if (cfg) {
+				DUMP_AVCPARAM(cfg->sequenceParameterSets);
+				DUMP_AVCPARAM(cfg->pictureParameterSets);
 				gf_odf_avc_cfg_del(cfg);
 				cfg = NULL;
 			}
+			if (hcfg) {
+				DUMP_HEVCPARAM(hcfg);
+				DUMP_HEVCPARAM(hcfg);
+				gf_odf_hevc_cfg_del(hcfg);
+				hcfg = NULL;
+			}
 
 			// copy avcC and svcC from lower layer
 			countRef = gf_isom_get_reference_count(dumper->file, track, GF_ISOM_REF_SCAL);
@@ -1056,54 +1096,30 @@
 			{
 				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)
-				{
-					count = gf_list_count(cfg->sequenceParameterSets);
-					for (i  = 0; i < count; i++) {
-						GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->sequenceParameterSets, i);
-						gf_bs_write_u32(bs, 1);
-						gf_bs_write_data(bs, sl->data, sl->size);
-					}
-					count = gf_list_count(cfg->pictureParameterSets);
-					for (i = 0; i < count; i++) {
-						GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(cfg->pictureParameterSets, i);
-						gf_bs_write_u32(bs, 1);
-						gf_bs_write_data(bs, sl->data, sl->size);
-					}
+				if (cfg) {
+					DUMP_AVCPARAM(cfg->sequenceParameterSets);
+					DUMP_AVCPARAM(cfg->pictureParameterSets);
 					gf_odf_avc_cfg_del(cfg);
 					cfg = NULL;
 				}
+				hcfg = gf_isom_shvc_config_get(dumper->file, ref_track, 1);
+				if (hcfg) {
+					DUMP_HEVCPARAM(hcfg);
+					gf_odf_hevc_cfg_del(hcfg);
+					hcfg = NULL;
+				}
 			}
 		}
-
-		count = gf_list_count(svccfg->sequenceParameterSets);
-		for (i=0;i<count;i++) {
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(svccfg->sequenceParameterSets, i);
-			gf_bs_write_u32(bs, 1);
-			gf_bs_write_data(bs, sl->data, sl->size);
+		if (svccfg) {
+			DUMP_AVCPARAM(svccfg->sequenceParameterSets);
+			DUMP_AVCPARAM(svccfg->pictureParameterSets);
 		}
-		count = gf_list_count(svccfg->pictureParameterSets);
-		for (i=0;i<count;i++) {
-			GF_AVCConfigSlot *sl = (GF_AVCConfigSlot *)gf_list_get(svccfg->pictureParameterSets, i);
-			gf_bs_write_u32(bs, 1);
-			gf_bs_write_data(bs, sl->data, sl->size);
+		if (shvccfg) {
+			DUMP_HEVCPARAM(shvccfg);
 		}
 	}
 
 
-	if (hevccfg) {
-		count = gf_list_count(hevccfg->param_array);
-		for (i=0;i<count;i++) {
-			u32 j;
-			GF_HEVCParamArray *ar = gf_list_get(hevccfg->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);
-			}
-		}
-	}
-
 	qcp_rates = NULL;
 	count = gf_isom_get_sample_count(dumper->file, track);
 	rt_cnt = 0;
@@ -1217,13 +1233,14 @@
 			break;
 		}
 		/*AVC sample to NALU*/
-		if (avccfg || svccfg || hevccfg) {
+		if (avccfg || svccfg || hevccfg || shvccfg) {
 			u32 j, nal_size, remain, nal_unit_size;
 			char *ptr = samp->data;
 			nal_unit_size = 0;
 			if (avccfg) nal_unit_size= avccfg->nal_unit_size;
 			else if (svccfg) nal_unit_size = svccfg->nal_unit_size;
 			else if (hevccfg) nal_unit_size = hevccfg->nal_unit_size;
+			else if (shvccfg) nal_unit_size = shvccfg->nal_unit_size;
 			remain = samp->dataLength;
 			while (remain) {
 				nal_size = 0;
@@ -1272,7 +1289,7 @@
 				}
 			}
 		}
-		if (!avccfg && !svccfg && !hevccfg &!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;
@@ -1281,6 +1298,8 @@
 exit:
 	if (avccfg) gf_odf_avc_cfg_del(avccfg);
 	if (svccfg) gf_odf_avc_cfg_del(svccfg);
+	if (hevccfg) gf_odf_hevc_cfg_del(hevccfg);
+	if (shvccfg) gf_odf_hevc_cfg_del(shvccfg);
 	gf_bs_del(bs);
 	if (!is_stdout) 
 		fclose(out);
@@ -1566,7 +1585,7 @@
 			gf_isom_get_visual_info(infile, inTrackNum, 1, &w, &h);
 #ifndef GPAC_DISABLE_AV_PARSERS
 			/*this is because so many files have reserved values of 320x240 from v1 ... */
-			if ((esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_MPEG4_PART2) ) {
+			if (esd->decoderConfig->objectTypeIndication == GPAC_OTI_VIDEO_MPEG4_PART2) {
 				GF_M4VDecSpecInfo dsi;
 				gf_m4v_get_config(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, &dsi);
 				w = dsi.width;
@@ -1771,7 +1790,12 @@
 	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_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);
 	}
@@ -1806,6 +1830,11 @@
 		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)){
+		gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
+		v4CC = "hevc";
+	} 
 	/*MPEG4*/
 	else {
 #ifndef GPAC_DISABLE_AV_PARSERS
@@ -2101,6 +2130,354 @@
 	return GF_OK;
 }
 
+/* Required for base64 encoding of DecoderSpecificInfo */
+#include <gpac/base_coding.h>
+/* Required for timestamp generation */
+#include <gpac/webvtt.h>
+
+GF_Err gf_media_export_webvtt_metadata(GF_MediaExporter *dumper)
+{
+	GF_ESD *esd;
+	char szName[1000], szMedia[1000];
+	FILE *med, *vtt;
+	u32 w, h;
+	u32 track, i, di, count, pos;
+	u32 mtype, mstype;
+	Bool isText; 
+	char *mime = NULL;
+	Bool useBase64 = GF_FALSE;
+	u32 headerLength = 0;
+
+	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
+		return GF_BAD_PARAM;
+	}
+	if (!track) return gf_export_message(dumper, GF_BAD_PARAM, "Invalid track ID %d", dumper->trackID);
+
+	if (dumper->flags & GF_EXPORT_PROBE_ONLY) {
+		return GF_OK;
+	}
+	esd = gf_isom_get_esd(dumper->file, track, 1);
+	med = NULL;
+	if (dumper->flags & GF_EXPORT_WEBVTT_META_EMBEDDED) {
+	} else {
+		sprintf(szMedia, "%s.media", dumper->out_name);
+		med = gf_f64_open(szMedia, "wb");
+		if (!med) {
+			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", szMedia);
+		}
+	}
+
+	sprintf(szName, "%s.vtt", dumper->out_name);
+	vtt = gf_f64_open(szName, "wt");
+	if (!vtt) {
+		fclose(med);
+		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_MPEG_SUBT || mtype == GF_ISOM_MEDIA_SUBT) {
+		isText = GF_TRUE;
+	} else {
+		isText = GF_FALSE;
+	}
+	mstype = gf_isom_get_media_subtype(dumper->file, track, 1);
+
+	/*write header*/
+	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);
+		fprintf(vtt, "language:%s\n", 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);	
+	if (med) {
+		fprintf(vtt, "baseMediaFile: %s\n", szMedia);
+	}
+	if (esd) {
+		/* TODO: export the MPEG-4 Stream type only if it is not a GPAC internal value */
+		fprintf(vtt, "MPEG-4-streamType: %d\n", esd->decoderConfig->streamType);
+		/* TODO: export the MPEG-4 Object Type Indication only if it is not a GPAC internal value */
+		fprintf(vtt, "MPEG-4-objectTypeIndication: %d\n", esd->decoderConfig->objectTypeIndication);
+		if (mtype==GF_ISOM_MEDIA_VISUAL) {
+			gf_isom_get_visual_info(dumper->file, track, 1, &w, &h);
+			fprintf(vtt, "width:%d\n", w);
+			fprintf(vtt, "height:%d\n", h);
+		}
+		else if (mtype==GF_ISOM_MEDIA_AUDIO) {
+			u32 sr, nb_ch;
+			u8 bps;
+			gf_isom_get_audio_info(dumper->file, track, 1, &sr, &nb_ch, &bps);
+			fprintf(vtt, "sampleRate: %d\n", sr);
+			fprintf(vtt, "numChannels: %d\n", nb_ch);
+		} else if (isText) {
+			u32 w, h;
+			s32 tx, ty;
+			s16 layer;
+			gf_isom_get_track_layout_info(dumper->file, track, &w, &h, &tx, &ty, &layer);
+			fprintf(vtt, "width:%d\n", w);
+			fprintf(vtt, "height:%d\n", h);
+			if (tx || ty) fprintf(vtt, "translation:%d,%d\n", tx, ty);
+			if (layer) fprintf(vtt, "layer:%d\n", layer);
+		}
+		if (esd->decoderConfig->decoderSpecificInfo  && esd->decoderConfig->decoderSpecificInfo->data) {
+#ifndef GPAC_DISABLE_TTXT
+			if (isText) {
+				if (mstype == GF_ISOM_SUBTYPE_WVTT) {
+					/* Warning: Just use -raw export */
+					mime = "text/vtt";
+				} else if (mstype == GF_ISOM_SUBTYPE_STSE) {
+					/* TODO: find the mime type from the ESD, assume SVG for now */
+					mime = "image/svg+xml";
+				} else if (mstype == GF_ISOM_SUBTYPE_STPP) {
+					/* TODO: find the mime type from the ESD, assume TTML for now */
+					mime = "application/ttml+xml";
+				}
+				if (dumper->flags & GF_EXPORT_WEBVTT_META_EMBEDDED) {
+					if (mstype == GF_ISOM_SUBTYPE_STSE) {
+						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);
+						}
+					}
+				} else {
+					gf_webvtt_dump_header_boxed(med, esd->decoderConfig->decoderSpecificInfo->data+4, esd->decoderConfig->decoderSpecificInfo->dataLength, &headerLength);
+					fprintf(vtt, "text-header-length: %d\n", headerLength);
+				}
+			} else
+#endif
+            {
+				char b64[200];
+				u32 size = gf_base64_encode(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, b64, 200);
+				useBase64 = GF_TRUE;
+				if (size != (u32)-1 && size != 0) {
+					b64[size] = 0;
+					fprintf(vtt, "MPEG-4-DecoderSpecificInfo: %s\n", b64);
+				}
+			}
+		}
+		gf_odf_desc_del((GF_Descriptor *) esd);
+	} else {
+		GF_GenericSampleDescription *sdesc = gf_isom_get_generic_sample_description(dumper->file, track, 1);
+		fprintf(vtt, "mediaType: %s\n", gf_4cc_to_str(mtype));
+		fprintf(vtt, "mediaSubType: %s\n", gf_4cc_to_str(mstype ));
+		if (sdesc) {
+			if (mtype==GF_ISOM_MEDIA_VISUAL) {
+				fprintf(vtt, "codecVendor: %s\n", gf_4cc_to_str(sdesc->vendor_code));
+				fprintf(vtt, "codecVersion: %d\n", sdesc->version);
+				fprintf(vtt, "codecRevision: %d\n", sdesc->revision);
+				fprintf(vtt, "width: %d\n", sdesc->width);
+				fprintf(vtt, "height: %d\n", sdesc->height);
+				fprintf(vtt, "compressorName: %s\n", sdesc->compressor_name);
+				fprintf(vtt, "temporalQuality: %d\n", sdesc->temporal_quality);
+				fprintf(vtt, "spatialQuality: %d\n", sdesc->spatial_quality);
+				fprintf(vtt, "horizontalResolution: %d\n", sdesc->h_res);
+				fprintf(vtt, "verticalResolution: %d\n", sdesc->v_res);
+				fprintf(vtt, "bitDepth: %d\n", sdesc->depth);
+			} else if (mtype==GF_ISOM_MEDIA_AUDIO) {
+				fprintf(vtt, "codecVendor: %s\n", gf_4cc_to_str(sdesc->vendor_code));
+				fprintf(vtt, "codecVersion: %d\n", sdesc->version);
+				fprintf(vtt, "codecRevision: %d\n", sdesc->revision);
+				fprintf(vtt, "sampleRate: %d\n", sdesc->samplerate);
+				fprintf(vtt, "numChannels: %d\n", sdesc->nb_channels);
+				fprintf(vtt, "bitsPerSample: %d\n", sdesc->bits_per_sample);
+			}
+			if (sdesc->extension_buf) {
+				char b64[200];
+				u32 size = gf_base64_encode(sdesc->extension_buf, sdesc->extension_buf_size, b64, 200);
+				useBase64 = GF_TRUE;
+				if (size != (u32)-1) {
+					b64[size] = 0;
+					fprintf(vtt, "specificInfo: %s\n", b64);
+					gf_free(sdesc->extension_buf);
+				}
+			}
+			gf_free(sdesc);
+		}
+	}
+	fprintf(vtt, "inBandMetadataTrackDispatchType: %s\n", (mime ? mime : (isText? "text/plain" : "application/octet-stream")));
+	if (useBase64) fprintf(vtt, "encoding: base64\n");
+
+	fprintf(vtt, "\n");
+
+	pos = 0;
+	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) break;
+
+#ifndef GPAC_DISABLE_TTXT
+		{
+			GF_WebVTTTimestamp start, end;
+			u64 dur = gf_isom_get_sample_duration(dumper->file, track, i+1);
+			gf_webvtt_timestamp_set(&start, samp->DTS);
+			gf_webvtt_timestamp_set(&end, samp->DTS+dur);
+			gf_webvtt_timestamp_dump(&start, vtt, GF_TRUE);
+			fprintf(vtt, " --> ");
+			gf_webvtt_timestamp_dump(&end, vtt, GF_TRUE);
+			fprintf(vtt, " ");
+			if (med) {
+				fprintf(vtt, "mediaOffset:%d ", pos+headerLength);
+				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 ");
+			else fprintf(vtt, "isRAP:false ");
+			fprintf(vtt, "\n");
+		}
+#endif
+		if (med) {
+			gf_fwrite(samp->data, samp->dataLength, 1, med);
+		} else if (dumper->flags & GF_EXPORT_WEBVTT_META_EMBEDDED) {
+			if (isText) {
+				samp->data = (char *)gf_realloc(samp->data, samp->dataLength+1);
+				samp->data[samp->dataLength] = 0;
+				fprintf(vtt, "%s\n", samp->data);
+			} else {
+				u32 b64_size;
+				char *b64;
+				b64 = (char *)gf_malloc(samp->dataLength*3);
+				b64_size = gf_base64_encode(samp->data, samp->dataLength, b64, samp->dataLength*3);
+				if (b64_size != (u32)-1) {
+					b64[b64_size] = 0;
+					fprintf(vtt, "%s\n", b64);
+				}
+				gf_free(b64);
+			}
+		}
+		fprintf(vtt, "\n");
+
+		pos += samp->dataLength;
+		gf_isom_sample_del(&samp);
+		gf_set_progress("WebVTT metadata Export", i+1, count);
+		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
+	}
+	if (med) fclose(med);
+	fclose(vtt);
+	return GF_OK;
+}
+
+/* Experimental Streaming Instructions XML export */
+GF_Err gf_media_export_six(GF_MediaExporter *dumper)
+{
+	GF_ESD *esd;
+	char szName[1000], szMedia[1000];
+	FILE *media, *six;
+	u32 track, i, di, count, pos, header_size;
+	//u32 mtype;
+	u32 mstype;
+	const char *szRootName;
+	//Bool isText;
+
+	if (!(track = gf_isom_get_track_by_id(dumper->file, dumper->trackID))) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_AUTHOR, ("Wrong track ID %d for file %s \n", dumper->trackID, gf_isom_get_filename(dumper->file)));
+		return GF_BAD_PARAM;
+	}
+	if (!track) return gf_export_message(dumper, GF_BAD_PARAM, "Invalid track ID %d", dumper->trackID);
+
+	if (dumper->flags & GF_EXPORT_PROBE_ONLY) {
+		dumper->flags |= GF_EXPORT_NHML_FULL;
+		return GF_OK;
+	}
+	esd = gf_isom_get_esd(dumper->file, track, 1);
+	media = NULL;
+	sprintf(szMedia, "%s.media", dumper->out_name);
+	media = gf_f64_open(szMedia, "wb");
+	if (!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", szMedia);
+	}
+
+	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;
+	}
+*/
+	mstype = gf_isom_get_media_subtype(dumper->file, track, 1);
+
+	/*write header*/
+	fprintf(six, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n");
+	fprintf(six, "<%s timescale=\"%d\" ", szRootName, gf_isom_get_media_timescale(dumper->file, track) );
+	fprintf(six, "file=\"%s\" ", szMedia);
+	fprintf(six, ">\n");
+	header_size = 0;
+	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);
+			} else
+#endif
+            {
+				gf_fwrite(esd->decoderConfig->decoderSpecificInfo->data, esd->decoderConfig->decoderSpecificInfo->dataLength, 1, media);
+				header_size = esd->decoderConfig->decoderSpecificInfo->dataLength;
+			}
+		}
+		gf_odf_desc_del((GF_Descriptor *) esd);
+	} else {
+		GF_GenericSampleDescription *sdesc = gf_isom_get_generic_sample_description(dumper->file, track, 1);
+		if (sdesc) {
+			header_size = sdesc->extension_buf_size;
+			gf_free(sdesc);
+		}
+	}
+	fprintf(six, "<header range-begin=\"0\" range-end=\"%d\"/>\n", header_size-1);
+
+	pos = header_size;
+	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) break;
+
+		if (media) {
+			gf_fwrite(samp->data, samp->dataLength, 1, media);
+		}
+
+		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\" ");
+		fprintf(six, "range-begin=\"%d\" ", pos);
+		fprintf(six, "range-end=\"%d\" ", pos+samp->dataLength-1);
+		fprintf(six, "/>\n");
+
+		pos += samp->dataLength;
+		gf_isom_sample_del(&samp);
+		gf_set_progress("SIX Export", i+1, count);
+		if (dumper->flags & GF_EXPORT_DO_ABORT) break;
+	}
+	fprintf(six, "</%s>\n", szRootName);
+	if (media) fclose(media);
+	fclose(six);
+	return GF_OK;
+
+}
+
 typedef struct 
 {
 	u32 track_num, stream_id, last_sample, nb_samp;
@@ -2334,6 +2711,10 @@
 		strcat(szFile, ".264");
 		gf_export_message(dumper, GF_OK, "Extracting H264-SVC Visual stream to h264");
 		break;
+	case GF_M2TS_METADATA_ID3_HLS:
+		strcat(szFile, ".txt");
+		gf_export_message(dumper, GF_OK, "Extracting ID3 tags from metadata stream");
+		break;
 	default:
 		strcat(szFile, ".raw");
 		gf_export_message(dumper, GF_OK, "Extracting Unknown stream to raw");
@@ -2404,6 +2785,8 @@
 #endif /*GPAC_DISABLE_AVILIB*/
 	else if (dumper->flags & GF_EXPORT_NHML) return gf_media_export_nhml(dumper, 0);
 	else if (dumper->flags & GF_EXPORT_SAF) return gf_media_export_saf(dumper);
+	else if (dumper->flags & GF_EXPORT_WEBVTT_META) return gf_media_export_webvtt_metadata(dumper);
+	else if (dumper->flags & GF_EXPORT_SIX) return gf_media_export_six(dumper);
 	else return GF_NOT_SUPPORTED;
 }

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/media_import.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/media_import.c Changed

@@ -551,10 +551,11 @@
 	u32 profile, sr_idx, nb_ch, frame_size;
 } ADTSHeader;
 
-static Bool ADTS_SyncFrame(GF_BitStream *bs, ADTSHeader *hdr)
+static Bool ADTS_SyncFrame(GF_BitStream *bs, ADTSHeader *hdr, u32 *frame_skipped)
 {
 	u32 val, hdr_size;
 	u64 pos;
+	*frame_skipped = 0;
 	while (gf_bs_available(bs)) {
 		val = gf_bs_read_u8(bs);
 		if (val!=0xFF) continue;
@@ -580,6 +581,7 @@
 		if (!hdr->no_crc) gf_bs_read_int(bs, 16);
 		if (hdr->frame_size < hdr_size) {
 			gf_bs_seek(bs, pos+1);
+			*frame_skipped += 1;
 			continue;
 		}
 		hdr->frame_size -= hdr_size;
@@ -589,12 +591,14 @@
 		val = gf_bs_read_u8(bs);
 		if (val!=0xFF) {
 			gf_bs_seek(bs, pos+1);
+			*frame_skipped += 1;
 			continue;
 		}
 		val = gf_bs_read_int(bs, 4);
 		if (val!=0x0F) {
 			gf_bs_read_int(bs, 4);
 			gf_bs_seek(bs, pos+2);
+			*frame_skipped += 1;
 			continue;
 		}
 		gf_bs_seek(bs, pos+hdr_size);
@@ -603,6 +607,227 @@
 	return 0;
 }
 
+static Bool LOAS_LoadFrame(GF_BitStream *bs, GF_M4ADecSpecInfo *acfg, u32 *nb_bytes, u8 *buffer)
+{
+	u32 val, size;
+	u64 pos, mux_size;
+	while (gf_bs_available(bs)) {
+		val = gf_bs_read_u8(bs);
+		if (val!=0x56) continue;
+		val = gf_bs_read_int(bs, 3);
+		if (val != 0x07) {
+			gf_bs_read_int(bs, 5);
+			continue;
+		}
+		mux_size = gf_bs_read_int(bs, 13);
+		pos = gf_bs_get_position(bs);
+
+		/*use same stream mux*/
+		if (!gf_bs_read_int(bs, 1)) {
+			Bool amux_version, amux_versionA;
+
+			amux_version = gf_bs_read_int(bs, 1);
+			amux_versionA = 0;
+			if (amux_version) amux_versionA = gf_bs_read_int(bs, 1);
+			if (!amux_versionA) {
+				u32 i, allStreamsSameTimeFraming, numProgram;
+				if (amux_version) gf_latm_get_value(bs);
+
+				allStreamsSameTimeFraming = gf_bs_read_int(bs, 1);
+				/*numSubFrames = */gf_bs_read_int(bs, 6);
+				numProgram = gf_bs_read_int(bs, 4);
+				for (i=0; i<=numProgram; i++) {
+					u32 j, num_lay;
+					num_lay = gf_bs_read_int(bs, 3);
+					for (j=0;j<=num_lay; j++) {
+						u32 frameLengthType;
+						Bool same_cfg = 0;
+						if (i || j) same_cfg = gf_bs_read_int(bs, 1);
+
+						if (!same_cfg) {
+							if (amux_version==1) gf_latm_get_value(bs);
+							gf_m4a_parse_config(bs, acfg, 0);
+						}
+						frameLengthType = gf_bs_read_int(bs, 3);
+						if (!frameLengthType) {
+							/*latmBufferFullness = */gf_bs_read_int(bs, 8);
+							if (!allStreamsSameTimeFraming) {
+							}
+						} else {
+							/*not supported*/
+						}
+					}
+
+				}
+				/*other data present*/
+				if (gf_bs_read_int(bs, 1)) {
+//					u32 k = 0;
+				}
+				/*CRCcheck present*/
+				if (gf_bs_read_int(bs, 1)) {
+				}
+			}
+		}
+
+		size = 0;
+		while (1) {
+			u32 tmp = gf_bs_read_int(bs, 8);
+			size += tmp;
+			if (tmp!=255) break;
+		}
+		if (nb_bytes && buffer) {
+			*nb_bytes = (u32) size;
+			gf_bs_read_data(bs, (char *) buffer, size);
+		} else {
+			gf_bs_skip_bytes(bs, size);
+		}
+
+		/*parse amux*/
+		gf_bs_seek(bs, pos + mux_size);
+
+		if (gf_bs_peek_bits(bs, 11, 0) != 0x2B7) {
+			gf_bs_seek(bs, pos + 1);
+			continue;
+		}
+
+		return 1;
+	}
+	return 0;
+}
+
+GF_Err gf_import_aac_loas(GF_MediaImporter *import)
+{
+	u8 oti;
+	Bool destroy_esd;
+	GF_Err e;
+	Bool sync_frame;
+	u16 sr, dts_inc;
+	u32 timescale;
+	GF_BitStream *bs, *dsi;
+	GF_M4ADecSpecInfo acfg;
+	FILE *in;
+	u32 nbbytes;
+	u8 aac_buf[4096];
+	u64 tot_size, done, duration;
+	u32 track, di;
+	GF_ISOSample *samp;
+
+	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);
+
+	sync_frame = LOAS_LoadFrame(bs, &acfg, &nbbytes, (u8 *)aac_buf);
+
+	/*keep MPEG-2 AAC OTI even for HE-SBR (that's correct according to latest MPEG-4 audio spec)*/
+	oti = GPAC_OTI_AUDIO_AAC_MPEG4;
+	timescale = sr = acfg.base_sr;
+
+	if (import->flags & GF_IMPORT_PROBE_ONLY) {
+		import->tk_info[0].track_num = 1;
+		import->tk_info[0].type = GF_ISOM_MEDIA_AUDIO;
+		import->tk_info[0].flags = GF_IMPORT_SBR_IMPLICIT | GF_IMPORT_SBR_EXPLICIT | GF_IMPORT_PS_IMPLICIT | GF_IMPORT_PS_EXPLICIT | GF_IMPORT_FORCE_MPEG4;
+		import->nb_tracks = 1;
+		import->tk_info[0].audio_info.sample_rate = sr;
+		import->tk_info[0].audio_info.nb_channels = acfg.nb_chan;
+		gf_bs_del(bs);
+		fclose(in);
+		return GF_OK;
+	}
+
+	dsi = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	gf_m4a_write_config_bs(dsi, &acfg);
+
+	if (import->flags & GF_IMPORT_PS_EXPLICIT) {
+		import->flags &= ~GF_IMPORT_PS_IMPLICIT;
+		import->flags |= GF_IMPORT_SBR_EXPLICIT;
+		import->flags &= ~GF_IMPORT_SBR_IMPLICIT;
+	}
+
+	dts_inc = 1024;
+
+	e = GF_OK;
+	destroy_esd = 0;
+	if (!import->esd) {
+		import->esd = gf_odf_desc_esd_new(2);
+		destroy_esd = 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);
+	import->esd->decoderConfig->streamType = GF_STREAM_AUDIO;
+	import->esd->decoderConfig->objectTypeIndication = oti;
+	import->esd->decoderConfig->bufferSizeDB = 20;
+	import->esd->slConfig->timestampResolution = timescale;
+	if (!import->esd->decoderConfig->decoderSpecificInfo) import->esd->decoderConfig->decoderSpecificInfo = (GF_DefaultDescriptor *) gf_odf_desc_new(GF_ODF_DSI_TAG);
+	if (import->esd->decoderConfig->decoderSpecificInfo->data) gf_free(import->esd->decoderConfig->decoderSpecificInfo->data);
+	gf_bs_get_content(dsi, &import->esd->decoderConfig->decoderSpecificInfo->data, &import->esd->decoderConfig->decoderSpecificInfo->dataLength);
+	gf_bs_del(dsi);
+
+	samp = NULL;
+	gf_import_message(import, GF_OK, "MPEG-4 AAC in LOAS import - sample rate %d - %d channel%s", sr, acfg.nb_chan, (acfg.nb_chan > 1) ? "s" : "");
+
+	track = gf_isom_new_track(import->dest, import->esd->ESID, GF_ISOM_MEDIA_AUDIO, timescale);
+	if (!track) {
+		e = gf_isom_last_error(import->dest);
+		goto exit;
+	}
+	gf_isom_set_track_enabled(import->dest, track, 1);
+	if (!import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
+	import->final_trackID = import->esd->ESID;
+	gf_isom_new_mpeg4_description(import->dest, track, import->esd, (import->flags & GF_IMPORT_USE_DATAREF) ? import->in_name : NULL, NULL, &di);
+	gf_isom_set_audio_info(import->dest, track, di, timescale, (acfg.nb_chan>2) ? 2 : acfg.nb_chan, 16);
+
+	e = GF_OK;
+	/*add first sample*/
+	samp = gf_isom_sample_new();
+	samp->IsRAP = 1;
+	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;
+
+	duration = import->duration;
+	duration *= sr;
+	duration /= 1000;
+
+	tot_size = gf_bs_get_size(bs);
+	done = 0;
+	while (gf_bs_available(bs) ) {
+		sync_frame = LOAS_LoadFrame(bs, &acfg, &nbbytes, (u8 *)aac_buf);
+		if (!sync_frame) break;
+
+		samp->data = (char*)aac_buf;
+		samp->dataLength = nbbytes;
+
+		e = gf_isom_add_sample(import->dest, track, di, samp);
+		if (e) break;
+
+		gf_set_progress("Importing AAC", done, tot_size);
+		samp->DTS += dts_inc;
+		done += samp->dataLength;
+		if (duration && (samp->DTS > duration)) break;
+		if (import->flags & GF_IMPORT_DO_ABORT) break;
+	}
+	MP4T_RecomputeBitRate(import->dest, track);
+	gf_isom_set_pl_indication(import->dest, GF_ISOM_PL_AUDIO, acfg.audioPL);
+	gf_set_progress("Importing AAC", tot_size, tot_size);
+
+exit:
+	if (import->esd && destroy_esd) {
+		gf_odf_desc_del((GF_Descriptor *) import->esd);
+		import->esd = NULL;
+	}
+	if (samp) {
+		samp->data = NULL;
+		gf_isom_sample_del(&samp);
+	}
+	gf_bs_del(bs);
+	fclose(in);
+	return e;
+}
+
 GF_Err gf_import_aac_adts(GF_MediaImporter *import)
 {
 	u8 oti;
@@ -611,6 +836,7 @@
 	Bool sync_frame;
 	u16 sr, sbr_sr, sbr_sr_idx, dts_inc;
 	u32 timescale;
+	u32 frames_skipped = 0;
 	GF_BitStream *bs, *dsi;
 	ADTSHeader hdr;
 	GF_M4ADecSpecInfo acfg;
@@ -624,12 +850,23 @@
 
 	bs = gf_bs_from_file(in, GF_BITSTREAM_READ);
 
-	sync_frame = ADTS_SyncFrame(bs, &hdr);
+	sync_frame = ADTS_SyncFrame(bs, &hdr, &frames_skipped);
 	if (!sync_frame) {
 		gf_bs_del(bs);
 		fclose(in);
 		return gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Audio isn't MPEG-2/4 AAC with ADTS");
 	}
+
+	if (frames_skipped) {
+		gf_bs_seek(bs, 0);
+		sync_frame = LOAS_LoadFrame(bs, &acfg, NULL, NULL);
+		if (sync_frame) {
+			gf_bs_del(bs);
+			fclose(in);
+			return gf_import_aac_loas(import);
+		}
+	}
+
 	if (import->flags & GF_IMPORT_FORCE_MPEG4) hdr.is_mp2 = 0;
 
 	/*keep MPEG-2 AAC OTI even for HE-SBR (that's correct according to latest MPEG-4 audio spec)*/
@@ -765,7 +1002,7 @@
 	gf_bs_del(dsi);
 
 	samp = NULL;
-	gf_import_message(import, GF_OK, "AAC import %s%s%s- sample rate %d - %s audio - %d channel%s",
+	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) " : " "),
@@ -809,7 +1046,7 @@
 	tot_size = gf_bs_get_size(bs);
 	done = 0;
 	while (gf_bs_available(bs) ) {
-		sync_frame = ADTS_SyncFrame(bs, &hdr);
+		sync_frame = ADTS_SyncFrame(bs, &hdr, &frames_skipped);
 		if (!sync_frame) break;
 		if (hdr.frame_size>max_size) {
 			samp->data = (char*)gf_realloc(samp->data, sizeof(char) * hdr.frame_size);
@@ -1651,7 +1888,7 @@
 GF_Err gf_import_isomedia(GF_MediaImporter *import)
 {
 	GF_Err e;
-	u64 offset, sampDTS, duration;
+	u64 offset, sampDTS, duration, dts_offset;
 	u32 track, di, trackID, track_in, i, num_samples, mtype, w, h, sr, sbr_sr, ch, mstype, cur_extract_mode;
 	s32 trans_x, trans_y;
 	s16 layer;
@@ -1662,6 +1899,7 @@
 	GF_ISOSample *samp;
 	GF_ESD *origin_esd;
 	GF_InitialObjectDescriptor *iod;
+	Bool is_cenc;
 	sampDTS = 0;
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		for (i=0; i<gf_isom_get_track_count(import->orig); i++) {
@@ -1798,9 +2036,28 @@
 		break;
 	}
 
+	//this may happen with fragmented files
+	dts_offset = 0;
+	samp = gf_isom_get_sample_info(import->orig, track_in, 1, &di, &offset);
+	if (samp) {
+		dts_offset = samp->DTS;
+		gf_isom_sample_del(&samp);
+	}
+
 	duration = (u64) (((Double)import->duration * gf_isom_get_media_timescale(import->orig, track_in)) / 1000);
 	gf_isom_set_nalu_extract_mode(import->orig, track_in, GF_ISOM_NALU_EXTRACT_INSPECT);
 	num_samples = gf_isom_get_sample_count(import->orig, track_in);
+	is_cenc = gf_isom_is_cenc_media(import->orig, track_in, 1);
+	if (is_cenc) {
+		u32 container_type;
+		e = gf_isom_cenc_get_sample_aux_info(import->orig, track_in, 0, NULL, &container_type);
+		if (e)
+			goto exit;
+		e = gf_isom_cenc_allocate_storage(import->dest, track, container_type, 0, 0, NULL);
+		if (e) goto exit;
+		e = gf_isom_clone_pssh(import->dest, import->orig, GF_FALSE);
+		if (e) goto exit;
+	}
 	for (i=0; i<num_samples; i++) {
 		if (import->flags & GF_IMPORT_USE_DATAREF) {
 			samp = gf_isom_get_sample_info(import->orig, track_in, i+1, &di, &offset);
@@ -1808,6 +2065,7 @@
 				e = gf_isom_last_error(import->orig);
 				goto exit;
 			}
+			samp->DTS -= dts_offset;
 			e = gf_isom_add_sample_reference(import->dest, track, di, samp, offset);
 		} else {
 			samp = gf_isom_get_sample(import->orig, track_in, i+1, &di);
@@ -1815,6 +2073,7 @@
 				/*couldn't get the sample, but still move on*/
 				goto exit;
 			}
+			samp->DTS -= dts_offset;
 			/*if not first sample and same DTS as previous sample, force DTS++*/
 			if (i && (samp->DTS<=sampDTS)) {
 				if (i+1 < num_samples) {
@@ -1831,6 +2090,43 @@
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 		if (e)
 			goto exit;
+		if (is_cenc) {
+			GF_CENCSampleAuxInfo *sai;
+			u32 container_type, len, j, Is_Encrypted;
+			u8 IV_size;
+			bin128 KID;
+			GF_BitStream *bs;
+			char *buffer;
+
+			sai = NULL;
+			e = gf_isom_cenc_get_sample_aux_info(import->orig, track_in, i+1, &sai, &container_type);
+			if (e)
+				goto exit;
+
+			e = gf_isom_get_sample_cenc_info(import->orig, track_in, i+1, &Is_Encrypted, &IV_size, &KID);
+			if (e) goto exit;
+
+			if (Is_Encrypted) {
+				bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+				gf_bs_write_data(bs, (const char *)sai->IV, IV_size);
+				gf_bs_write_u16(bs, sai->subsample_count);
+				for (j = 0; j < sai->subsample_count; j++) {
+					gf_bs_write_u16(bs, sai->subsamples[j].bytes_clear_data);
+					gf_bs_write_u32(bs, sai->subsamples[j].bytes_encrypted_data);
+				}
+				gf_isom_cenc_samp_aux_info_del(sai);
+				gf_bs_get_content(bs, &buffer, &len);
+				gf_bs_del(bs);
+				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, buffer, len);
+				gf_free(buffer);
+			} else {
+				e = gf_isom_track_cenc_add_sample_info(import->dest, track, container_type, IV_size, NULL, 0);
+			}
+			if (e) goto exit;
+
+			e = gf_isom_set_sample_cenc_group(import->dest, track, i+1, Is_Encrypted, IV_size, KID);
+			if (e) goto exit;
+		}
 	}
 
 	if (gf_isom_has_time_offset(import->orig, track_in)==2) {
@@ -2602,83 +2898,6 @@
 	}\
 
 
-static GF_Err nhml_parse_bit_sequence(GF_XMLNode *bsroot, char **specInfo, u32 *specInfoSize)
-{
-	u32 i, j;
-	GF_XMLNode *node;
-	GF_XMLAttribute *att;
-	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-	if (!bs) return GF_OUT_OF_MEM;
-
-	i=0;
-	while ((node = (GF_XMLNode *) gf_list_enum(bsroot->content, &i))) {
-		u32 nb_bits = 0;
-		u32 size = 0;
-		u64 offset = 0;
-		s64 value = 0;
-		const char *szFile = NULL;
-		const char *szString = NULL;
-		if (node->type) continue;
-		if (stricmp(node->name, "BS") ) continue;
-
-		j=0;
-		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
-			if (!stricmp(att->name, "bits")) {
-				NHML_SCAN_INT("%d", nb_bits);
-			} else if (!stricmp(att->name, "value")) {
-				NHML_SCAN_INT(LLD, value);
-			} else if (!stricmp(att->name, "mediaOffset")) {
-				NHML_SCAN_INT(LLU, offset);
-			} else if (!stricmp(att->name, "dataLength")) {
-				NHML_SCAN_INT("%u", size);
-			} else if (!stricmp(att->name, "mediaFile")) {
-				szFile = att->value;
-			} else if (!stricmp(att->name, "text")) {
-				szString = att->value;
-			} else if (!stricmp(att->name, "fcc")) {
-				value = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
-				nb_bits = 32;
-			}
-		}
-		if (szString) {
-			u32 len = (u32) strlen(szString);
-			if (nb_bits)
-				gf_bs_write_int(bs, len, nb_bits);
-
-			gf_bs_write_data(bs, szString, len);
-		} else if (nb_bits) {
-			if (nb_bits<33) gf_bs_write_int(bs, (s32) value, nb_bits);
-			else gf_bs_write_long_int(bs, value, nb_bits);
-		} else if (szFile && size) {
-			char block[1024];
-			FILE *_tmp = gf_f64_open(szFile, "rb");
-			if (_tmp) {
-				u32 read, remain;
-				if (!size) {
-					gf_f64_seek(_tmp, 0, SEEK_END);
-					size = (u32) gf_f64_tell(_tmp);
-					//if offset only copy from offset until end
-					if ((u64) size > offset)
-						size -= (u32) offset;
-				}
-				remain = size;
-				gf_f64_seek(_tmp, offset, SEEK_SET);
-				while (remain) {
-					read = (u32) fread(block, 1, (remain>1024) ? 1024 : remain, _tmp);
-					gf_bs_write_data(bs, block, read);
-					remain -= size;
-				}
-				fclose(_tmp);
-			}
-		}
-	}
-	gf_bs_align(bs);
-	gf_bs_get_content(bs, specInfo, specInfoSize);
-	gf_bs_del(bs);
-	return GF_OK;
-
-}
-
 /*FIXME - need LARGE FILE support in NHNT - add a new version*/
 GF_Err gf_import_nhml_dims(GF_MediaImporter *import, Bool dims_doc)
 {
@@ -2689,9 +2908,9 @@
 	GF_ISOSample *samp;
 	GF_XMLAttribute *att;
 	s64 media_size, media_done, offset;
-	u64 duration;
+	u64 duration, sample_duration;
 	FILE *nhml, *mdia, *info;
-	char *dictionary;
+	char *dictionary = NULL;
 	char *ext, szName[1000], szMedia[1000], szMediaTemp[1000], szInfo[1000], szXmlFrom[1000], szXmlTo[1000], *specInfo;
 	GF_GenericSampleDescription sdesc;
 	GF_DOMParser *parser;
@@ -2753,7 +2972,6 @@
 		e = gf_import_message(import, GF_BAD_PARAM, "Error parsing %s file - \"%s\" root expected, got \"%s\"", szImpName, szRootName, root->name);
 		goto exit;
 	}
-	dictionary = NULL;
 	use_dict = 0;
 	memset(&sdesc, 0, sizeof(GF_GenericSampleDescription));
 	tkID = mtype = streamType = oti = par_den = par_num = 0;
@@ -2834,6 +3052,8 @@
 		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;
@@ -2870,7 +3090,7 @@
 		if (node->type) continue;
 		if (stricmp(node->name, "DecoderSpecificInfo") ) continue;
 
-		e = nhml_parse_bit_sequence(node, &specInfo, &specInfoSize);
+		e = gf_xml_parse_bit_sequence(node, &specInfo, &specInfoSize);
 		break;
 	}
 
@@ -2948,13 +3168,12 @@
 		if (e) goto exit;
 
 		gf_import_message(import, GF_OK, "3GPP DIMS import");
-    } else if (mtype == GF_ISOM_MEDIA_SUBM) {
+    } 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_generic_subtitle_description(import->dest, track, 
-                                                    (char *)dims.contentEncoding, (char *)dims.xml_schema_loc, (char *)dims.mime_type, 
-                                                    (sdesc.codec_tag == GF_4CC( 'm', 'e', 't', 'x' ) ? 1 : 0), 
-                                                    (import->flags & GF_IMPORT_USE_DATAREF) ? szMedia : NULL, NULL, &di);
+		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 {
@@ -3007,7 +3226,7 @@
 	i=0;
 	while ((node = (GF_XMLNode *) gf_list_enum(root->content, &i))) {
 		u32 j, dims_flags;
-		Bool append, compress, has_subbs ;
+		Bool append, compress, has_subbs;
 		if (node->type) continue;
 		if (stricmp(node->name, szSampleName) ) continue;
 
@@ -3021,6 +3240,7 @@
 		dims_flags = 0;
 		append = 0;
 		compress = do_compress;
+		sample_duration = 0;
 
 		j=0;
 		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
@@ -3058,7 +3278,8 @@
 				dims_flags |= GF_DIMS_UNIT_P;
 			else if (!stricmp(att->name, "compress") && !stricmp(att->value, "yes"))
 				dims_flags |= GF_DIMS_UNIT_C;
-
+			else if (!stricmp(att->name, "duration") )
+				sscanf(att->value, ""LLU, &sample_duration);
 		}
 		if (samp->IsRAP==1)
 			dims_flags |= GF_DIMS_UNIT_M;
@@ -3111,7 +3332,7 @@
 			if (samp->data) gf_free(samp->data );
 			samp->data = 0;
 			samp->dataLength = 0;
-			e = nhml_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;
@@ -3205,12 +3426,20 @@
 		if (e) goto exit;
 		samp->IsRAP = 0;
 		samp->CTS_Offset = 0;
-		samp->DTS += dts_inc;
+		if (sample_duration) 
+			samp->DTS += sample_duration;
+		else
+			samp->DTS += dts_inc;
 		media_done += samp->dataLength;
 		gf_set_progress(is_dims ? "Importing DIMS" : "Importing NHML", (u32) media_done, (u32) (media_size ? media_size : media_done+1) );
 		if (duration && (samp->DTS > duration)) break;
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 	}
+
+	if (sample_duration) {
+		gf_isom_set_last_sample_duration(import->dest, track, (u32) sample_duration);
+	}
+
 	if (media_done!=media_size) gf_set_progress(is_dims ? "Importing DIMS" : "Importing NHML", (u32) media_size, (u32) media_size);
 	MP4T_RecomputeBitRate(import->dest, track);
 
@@ -3964,7 +4193,7 @@
 	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;
-	Bool use_opengop_gdr = 0;
+	u32 use_opengop_gdr = 0;
 	u32 last_svc_sps;
 	u32 prev_nalu_prefix_size, res_prev_nalu_prefix;
 	u8 priority_prev_nalu_prefix;
@@ -4045,6 +4274,8 @@
 	e = gf_isom_avc_config_new(import->dest, track, avccfg, NULL, NULL, &di);
 	if (e) goto exit;
 
+	gf_isom_set_nalu_extract_mode(import->dest, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+
 	sample_data = NULL;
 	sample_is_rap = 0;
 	sample_has_islice = 0;
@@ -4825,29 +5056,79 @@
 	return e;
 }
 
+#ifndef GPAC_DISABLE_HEVC
+static GF_HEVCParamArray *get_hevc_param_array(GF_HEVCConfig *hevc_cfg, u8 type) 
+{
+	u32 i, count = hevc_cfg->param_array ? gf_list_count(hevc_cfg->param_array) : 0;
+	for (i=0; i<count; i++) {
+		GF_HEVCParamArray *ar = gf_list_get(hevc_cfg->param_array, i);
+		if (ar->type==type) return ar;
+	}
+	return NULL;
+}
+
+
+static void hevc_set_parall_type(GF_HEVCConfig *hevc_cfg)
+{
+	u32 use_tiles, use_wpp, nb_pps;
+	HEVCState hevc;
+	GF_HEVCParamArray *ar = get_hevc_param_array(hevc_cfg, GF_HEVC_NALU_PIC_PARAM);
+	u32 i, count = gf_list_count(ar->nalus);
+	
+	memset(&hevc, 0, sizeof(HEVCState));
+	hevc.sps_active_idx = -1;
+
+	use_tiles = 0;
+	use_wpp = 0;
+	nb_pps = 0;
+
+
+	for (i=0; i<count; i++) {
+		HEVC_PPS *pps;
+		GF_AVCConfigSlot *slc = gf_list_get(ar->nalus, i);
+		s32 idx = gf_media_hevc_read_pps(slc->data, slc->size, &hevc);
+
+		if (idx>=0) {
+			nb_pps++;
+			pps = &hevc.pps[idx];
+			if (!pps->entropy_coding_sync_enabled_flag && pps->tiles_enabled_flag)
+				use_tiles++;
+			else if (pps->entropy_coding_sync_enabled_flag && !pps->tiles_enabled_flag)
+				use_wpp++;
+		}
+	}
+	if (!use_tiles && !use_wpp) hevc_cfg->parallelismType = 1;
+	else if (!use_wpp && (use_tiles==nb_pps) ) hevc_cfg->parallelismType = 2;
+	else if (!use_tiles && (use_wpp==nb_pps) ) hevc_cfg->parallelismType = 3;
+	else hevc_cfg->parallelismType = 0;
+}
+
+#endif
 
 static GF_Err gf_import_hevc(GF_MediaImporter *import)
 {
 #ifdef GPAC_DISABLE_HEVC
 	return GF_NOT_SUPPORTED;
 #else
+	Bool detect_fps;
 	u64 nal_start, nal_end, total_size;
-	u32 nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay;
+	u32 i, nal_size, track, trackID, di, cur_samp, nb_i, nb_idr, nb_p, nb_b, nb_sp, nb_si, nb_sei, max_w, max_h, max_total_delay;
 	s32 idx, sei_recovery_frame_count;
 	u64 duration;
 	GF_Err e;
 	FILE *mdia;
 	HEVCState hevc;
 	GF_AVCConfigSlot *slc;
-	GF_HEVCConfig *hevccfg;
+	GF_HEVCConfig *hevc_cfg, *shvc_cfg, *dst_cfg;
 	GF_HEVCParamArray *spss, *ppss, *vpss;
 	GF_BitStream *bs;
 	GF_BitStream *sample_data;
-	Bool flush_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, 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_avc;
-	Bool use_opengop_gdr = 0;
+	Bool first_hevc;
+	u32 use_opengop_gdr = 0;
+	u8 layer_ids[64];
 
 	Double FPS;
 	char *buffer;
@@ -4866,7 +5147,7 @@
 	mdia = gf_f64_open(import->in_name, "rb");
 	if (!mdia) return gf_import_message(import, GF_URL_ERROR, "Cannot find file %s", import->in_name);
 
-	//detect_fps = 1;
+	detect_fps = GF_TRUE;
 	FPS = (Double) import->video_fps;
 	if (!FPS) {
 		FPS = GF_IMPORT_DEFAULT_FPS;
@@ -4875,22 +5156,24 @@
 			import->video_fps = GF_IMPORT_DEFAULT_FPS;	/*fps=auto is handled as auto-detection is h264*/
 		} else {
 			/*fps is forced by the caller*/
-			//detect_fps = 0;
+			detect_fps = GF_FALSE;
 		}	
 	}
 	get_video_timing(FPS, &timescale, &dts_inc);
 
 	poc_diff = 0;
 
-
-//restart_import:
+restart_import:
 
 	memset(&hevc, 0, sizeof(HEVCState));
 	hevc.sps_active_idx = -1;
-	hevccfg = gf_odf_hevc_cfg_new();
+	dst_cfg = hevc_cfg = gf_odf_hevc_cfg_new();
+	shvc_cfg = gf_odf_hevc_cfg_new();
+	shvc_cfg->complete_representation = 1;
+	shvc_cfg->non_hevc_base_layer = 0;
 	buffer = (char*)gf_malloc(sizeof(char) * max_size);
 	sample_data = NULL;
-	first_avc = 1;
+	first_hevc = 1;
 	sei_recovery_frame_count = -1;
 	spss = ppss = vpss = NULL;
 
@@ -4922,9 +5205,12 @@
 		gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_DECODE, import->esd->dependsOnESID);
 	}
 
-	e = gf_isom_hevc_config_new(import->dest, track, hevccfg, NULL, NULL, &di);
+	e = gf_isom_hevc_config_new(import->dest, track, hevc_cfg, NULL, NULL, &di);
 	if (e) goto exit;
 
+	gf_isom_set_nalu_extract_mode(import->dest, track, GF_ISOM_NALU_EXTRACT_INSPECT);
+	memset(layer_ids, 0, sizeof(u8)*64);
+
 	sample_data = NULL;
 	sample_is_rap = 0;
 	sample_has_islice = 0;
@@ -4945,11 +5231,17 @@
 	has_cts_offset = 0;
 	min_poc = 0;
 	poc_shift = 0;
+	flush_next_sample = 0;
+	is_empty_sample = 1;
 
 	while (gf_bs_available(bs)) {
 		s32 res;
-		u8 nal_unit_type, temporal_id;
-		Bool skip_nal, add_sps, is_slice;
+		Bool force_shvc = 0;
+		GF_HEVCConfig *prev_cfg;
+		u8 nal_unit_type, temporal_id, layer_id;
+		Bool skip_nal, add_sps, is_slice, has_vcl_nal;
+
+		has_vcl_nal = 0;
 		nal_size = gf_media_nalu_next_start_code_bs(bs);
 
 		if (nal_size>max_size) {
@@ -4962,7 +5254,25 @@
 
 		gf_bs_seek(bs, nal_start);
 
-		res = gf_media_hevc_parse_nalu(bs, &hevc, &nal_unit_type, &temporal_id);
+		res = gf_media_hevc_parse_nalu(bs, &hevc, &nal_unit_type, &temporal_id, &layer_id);
+
+		if (layer_id && (import->flags & GF_IMPORT_SVC_NONE)) {
+			goto next_nal;
+		}
+		
+		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 
+			dst_cfg = layer_id ? shvc_cfg : hevc_cfg;
+
+		if (prev_cfg != dst_cfg) {
+			vpss = get_hevc_param_array(dst_cfg, GF_HEVC_NALU_VID_PARAM);
+			spss = get_hevc_param_array(dst_cfg, GF_HEVC_NALU_SEQ_PARAM);
+			ppss = get_hevc_param_array(dst_cfg, GF_HEVC_NALU_PIC_PARAM);
+		}
 
 		skip_nal = 0;
 		copy_size = flush_sample = 0;
@@ -4982,6 +5292,12 @@
 		default:
 			break;
 		}
+
+		if (! layer_id && flush_next_sample && (nal_unit_type!=GF_HEVC_NALU_SEI_SUFFIX)) {
+			flush_next_sample = 0;
+			flush_sample = 1;
+		}
+
 		switch (nal_unit_type) {
 		case GF_HEVC_NALU_VID_PARAM:
 			idx = gf_media_hevc_read_vps(buffer, nal_size , &hevc);
@@ -4993,6 +5309,7 @@
 			if (hevc.vps[idx].state == 2) {
 				if (hevc.vps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
+					has_vcl_nal = 1;
 					assert(vpss);
 					vpss->array_completeness = 0;
 				}
@@ -5002,15 +5319,16 @@
 				hevc.vps[idx].state = 2;
 				hevc.vps[idx].crc = gf_crc_32(buffer, nal_size);
 
-				hevccfg->avgFrameRate = hevc.vps[idx].rates[0].avg_pic_rate;
-				hevccfg->constantFrameRate = hevc.vps[idx].rates[0].constand_pic_rate_idc;
-				hevccfg->numTemporalLayers = hevc.vps[idx].max_sub_layer;
-				hevccfg->temporalIdNested = hevc.vps[idx].temporal_id_nesting;
+				dst_cfg->avgFrameRate = hevc.vps[idx].rates[0].avg_pic_rate;
+				dst_cfg->constantFrameRate = hevc.vps[idx].rates[0].constand_pic_rate_idc;
+				dst_cfg->numTemporalLayers = hevc.vps[idx].max_sub_layers;
+				dst_cfg->temporalIdNested = hevc.vps[idx].temporal_id_nesting;
+				//TODO set scalability mask
 
 				if (!vpss) {
 					GF_SAFEALLOC(vpss, GF_HEVCParamArray);
 					vpss->nalus = gf_list_new();
-					gf_list_add(hevccfg->param_array, vpss);
+					gf_list_add(dst_cfg->param_array, vpss);
 					vpss->array_completeness = 1;
 					vpss->type = GF_HEVC_NALU_VID_PARAM;
 				}
@@ -5028,7 +5346,7 @@
 			idx = gf_media_hevc_read_sps(buffer, nal_size, &hevc);
 			if (idx<0) {
 				e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Error parsing SeqInfo");
-				goto exit;
+				break;
 			}
 			add_sps = 0;
 			if ((hevc.sps[idx].state & AVC_SPS_PARSED) && !(hevc.sps[idx].state & AVC_SPS_DECLARED)) {
@@ -5041,39 +5359,34 @@
 			else if (hevc.sps[idx].state & AVC_SPS_DECLARED) {
 				if (hevc.sps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
+					has_vcl_nal = 1;
 					assert(spss);
 					spss->array_completeness = 0;
 				}
 			}
 
 			if (add_sps) {
-				hevccfg->configurationVersion = 1;
-				hevccfg->profile_space = hevc.sps[idx].ptl.profile_space;
-				hevccfg->tier_flag = hevc.sps[idx].ptl.tier_flag;
-				hevccfg->profile_idc = hevc.sps[idx].ptl.profile_idc;
-				hevccfg->profile_compatibility_indications = hevc.sps[idx].ptl.profile_compatibility_flag;
-				hevccfg->progressive_source_flag = hevc.sps[idx].ptl.general_progressive_source_flag;
-				hevccfg->interlaced_source_flag = hevc.sps[idx].ptl.general_interlaced_source_flag;
-				hevccfg->non_packed_constraint_flag = hevc.sps[idx].ptl.general_non_packed_constraint_flag;
-				hevccfg->frame_only_constraint_flag = hevc.sps[idx].ptl.general_frame_only_constraint_flag;
-
-				hevccfg->constraint_indicator_flags = hevc.sps[idx].ptl.general_reserved_44bits;
-				hevccfg->level_idc = hevc.sps[idx].ptl.level_idc;
-
-				hevccfg->chromaFormat = hevc.sps[idx].chroma_format_idc;
-				hevccfg->luma_bit_depth = hevc.sps[idx].bit_depth_luma;
-				hevccfg->chroma_bit_depth = hevc.sps[idx].bit_depth_chroma;
-
-				//need VUI for these ...
-				//u16 min_spatial_segmentation_idc;
-				//u8 parallelismType;
-				//u16 avgFrameRate;
-				//u8 constantFrameRate;
+				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(hevccfg->param_array, spss);
+					gf_list_add(dst_cfg->param_array, spss);
 					spss->array_completeness = 1;
 					spss->type = GF_HEVC_NALU_SEQ_PARAM;
 				}
@@ -5085,12 +5398,38 @@
 				memcpy(slc->data, buffer, sizeof(char)*slc->size);
 				gf_list_add(spss->nalus, slc);
 
-				if (first_avc) {
-					first_avc = 0;
+				/*disable frame rate scan, most bitstreams have wrong values there*/
+				if (detect_fps && hevc.sps[idx].has_timing_info 
+					/*if detected FPS is greater than 1000, assume wrong timing info*/
+					&& (hevc.sps[idx].time_scale <= 1000*hevc.sps[idx].num_units_in_tick)
+					) {
+					timescale = hevc.sps[idx].time_scale;
+					dts_inc =   hevc.sps[idx].num_units_in_tick;
+					FPS = (Double)timescale / dts_inc;
+					detect_fps = 0;
+					gf_isom_remove_track(import->dest, track);
+					if (sample_data) gf_bs_del(sample_data);
+					gf_odf_hevc_cfg_del(hevc_cfg);
+					hevc_cfg = NULL;
+					gf_odf_hevc_cfg_del(shvc_cfg);
+					shvc_cfg = NULL;
+					gf_free(buffer);
+					buffer = NULL;
+					gf_bs_del(bs);
+					bs = NULL;
+					gf_f64_seek(mdia, 0, SEEK_SET);
+					goto restart_import;
+				}
+
+				if (first_hevc) {
+					first_hevc = 0;
 					gf_import_message(import, GF_OK, "HEVC import - frame size %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
+				} else {
+					gf_import_message(import, GF_OK, "SHVC detected - %d x %d at %02.3f FPS", hevc.sps[idx].width, hevc.sps[idx].height, FPS);
 				}
 
-				if ((max_w <= hevc.sps[idx].width) && (max_h <= hevc.sps[idx].height)) {
+				//width and height only for base layer if HEVC
+				if ((force_shvc || (dst_cfg==hevc_cfg)) && (max_w <= hevc.sps[idx].width) && (max_h <= hevc.sps[idx].height)) {
 					max_w = hevc.sps[idx].width;
 					max_h = hevc.sps[idx].height;
 				}
@@ -5107,6 +5446,7 @@
 			if (hevc.pps[idx].state == 2) {
 				if (hevc.pps[idx].crc != gf_crc_32(buffer, nal_size)) {
 					copy_size = nal_size;
+					has_vcl_nal = 1;
 					assert(ppss);
 					ppss->array_completeness = 0;
 				}
@@ -5119,7 +5459,7 @@
 				if (!ppss) {
 					GF_SAFEALLOC(ppss, GF_HEVCParamArray);
 					ppss->nalus = gf_list_new();
-					gf_list_add(hevccfg->param_array, ppss);
+					gf_list_add(dst_cfg->param_array, ppss);
 					ppss->array_completeness = 1;
 					ppss->type = GF_HEVC_NALU_PIC_PARAM;
 				}
@@ -5133,8 +5473,9 @@
 				gf_list_add(ppss->nalus, slc);
 			}
 			break;
-		case GF_HEVC_NALU_SEI_PREFIX:
 		case GF_HEVC_NALU_SEI_SUFFIX:
+			if (!layer_id) flush_next_sample = 1;
+		case GF_HEVC_NALU_SEI_PREFIX:
 			if (hevc.sps_active_idx != -1) {
 				/*TODO*/
 				//copy_size = gf_media_avc_reformat_sei(buffer, nal_size, &hevc);
@@ -5144,24 +5485,13 @@
 			}
 			break;
 
-		/*slice_layer_rbsp*/
-//		case GF_HEVC_NALU_SLICE_STSA_N:
-//		case GF_HEVC_NALU_SLICE_STSA_R:
-		case GF_HEVC_NALU_SLICE_RADL_N:
-//		case GF_HEVC_NALU_SLICE_RADL_R:
-		case GF_HEVC_NALU_SLICE_RASL_N:
-//		case GF_HEVC_NALU_SLICE_RASL_R:		
-			is_slice = 1;
-			if (! skip_nal) {
-				copy_size = nal_size;
-			}
-			break;
-
 		/*slice_segment_layer_rbsp*/
 		case GF_HEVC_NALU_SLICE_STSA_N:
 		case GF_HEVC_NALU_SLICE_STSA_R:
 		case GF_HEVC_NALU_SLICE_RADL_R:
 		case GF_HEVC_NALU_SLICE_RASL_R:		
+		case GF_HEVC_NALU_SLICE_RADL_N:
+		case GF_HEVC_NALU_SLICE_RASL_N:
 		case GF_HEVC_NALU_SLICE_TRAIL_N:
 		case GF_HEVC_NALU_SLICE_TRAIL_R:
 		case GF_HEVC_NALU_SLICE_TSA_N:
@@ -5180,6 +5510,7 @@
 */
 			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++; 
@@ -5205,6 +5536,9 @@
 
 		if (!nal_size) break;
 
+		if (flush_sample && is_empty_sample)
+			flush_sample = 0;
+
 		if (flush_sample && sample_data) {
 			GF_ISOSample *samp = gf_isom_sample_new();
 			samp->DTS = (u64)dts_inc*cur_samp;
@@ -5255,6 +5589,7 @@
 
 			sample_has_islice = 0;
 			sei_recovery_frame_count = -1;
+			is_empty_sample = 1;
 		}
 
 		if (copy_size) {
@@ -5300,7 +5635,14 @@
 				gf_isom_add_subsample(import->dest, track, cur_samp+1, copy_size+size_length/8, 0, 0, 0);
 			}
 
-			if (is_slice) {
+			if (has_vcl_nal) {
+				is_empty_sample = 0;
+			}
+			layer_ids[layer_id] = 1;
+
+
+			//fixme with latest SHVC syntax
+			if (!layer_id && is_slice) {
 				slice_is_ref = gf_media_hevc_slice_is_IDR(&hevc);
 				if (slice_is_ref) 
 					nb_idr++;
@@ -5399,6 +5741,7 @@
 			}
 		}
 
+next_nal:
 		gf_bs_align(bs);
 		nal_end = gf_bs_get_position(bs);
 		assert(nal_start <= nal_end);
@@ -5447,7 +5790,7 @@
 
 	/*recompute all CTS offsets*/
 	if (has_cts_offset) {
-		u32 i, last_cts_samp;
+		u32 last_cts_samp;
 		u64 last_dts, max_cts;
 		if (!poc_diff) poc_diff = 1;
 		/*no b-frame references, no need to cope with negative poc*/
@@ -5524,9 +5867,32 @@
 	gf_set_progress("Importing HEVC", (u32) cur_samp, cur_samp);
 
 	gf_isom_set_visual_info(import->dest, track, di, max_w, max_h);
-	hevccfg->nal_unit_size = size_length/8;
+	hevc_cfg->nal_unit_size = shvc_cfg->nal_unit_size = size_length/8;
+
+	shvc_cfg->num_layers = 0;
+	for (i=1; i<64; i++) {
+		if (layer_ids[i]) 
+			shvc_cfg->num_layers ++;
+	}
+
+	if (gf_list_count(hevc_cfg->param_array) || !gf_list_count(shvc_cfg->param_array) ) {
+		hevc_set_parall_type(hevc_cfg);
+		gf_isom_hevc_config_update(import->dest, track, 1, hevc_cfg);
+		if (gf_list_count(shvc_cfg->param_array)) {
+			hevc_set_parall_type(shvc_cfg);
+
+			shvc_cfg->avgFrameRate = hevc_cfg->avgFrameRate;
+			shvc_cfg->constantFrameRate = hevc_cfg->constantFrameRate;
+			shvc_cfg->numTemporalLayers = hevc_cfg->numTemporalLayers;
+			shvc_cfg->temporalIdNested = hevc_cfg->temporalIdNested;
+
+			gf_isom_shvc_config_update(import->dest, track, 1, shvc_cfg, 1);
+		}
+	} else {
+		hevc_set_parall_type(shvc_cfg);
+		gf_isom_shvc_config_update(import->dest, track, 1, shvc_cfg, 0);
+	}
 
-	gf_isom_hevc_config_update(import->dest, track, 1, hevccfg);
 	gf_media_update_par(import->dest, track);
 	MP4T_RecomputeBitRate(import->dest, track);
 
@@ -5535,7 +5901,7 @@
 	gf_isom_modify_alternate_brand(import->dest, GF_ISOM_BRAND_ISOM, 0);
 	gf_isom_modify_alternate_brand(import->dest, GF_4CC('h','v','c','1'), 1);
 
-	if (!vpss || !ppss || !spss) {
+	if (!vpss && !ppss && !spss) {
 		e = gf_import_message(import, GF_NON_COMPLIANT_BITSTREAM, "Import results: No SPS or PPS found in the bitstream ! Nothing imported\n");
 	} else {
 		if (nb_sp || nb_si) {
@@ -5568,7 +5934,8 @@
 
 exit:
 	if (sample_data) gf_bs_del(sample_data);
-	gf_odf_hevc_cfg_del(hevccfg);
+	gf_odf_hevc_cfg_del(hevc_cfg);
+	gf_odf_hevc_cfg_del(shvc_cfg);
 	gf_free(buffer);
 	gf_bs_del(bs);
 	fclose(mdia);
@@ -6206,7 +6573,14 @@
 				switch (oti) {
 				case GPAC_OTI_VIDEO_AVC: 
 				case GPAC_OTI_VIDEO_SVC:
-					name = "AVC/H264 Video"; stype = GF_4CC('H','2','6','4'); break;
+					name = "AVC/H264 Video"; 
+					stype = GF_4CC('H','2','6','4');
+					break;
+				case GPAC_OTI_VIDEO_HEVC: 
+				case GPAC_OTI_VIDEO_SHVC:
+					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: 
@@ -6503,14 +6877,14 @@
 }
 
 /*rewrite last AVC sample currently stored in Annex-B format to ISO format (rewrite start code)*/
-void m2ts_rewrite_avc_sample(GF_MediaImporter *import, GF_TSImport *tsimp)
+void m2ts_rewrite_nalu_sample(GF_MediaImporter *import, GF_TSImport *tsimp)
 {
 	GF_Err e;
 	u32 sc_pos, start;
 	GF_BitStream *bs;
 	GF_ISOSample *samp;
 	u32 count = gf_isom_get_sample_count(import->dest, tsimp->track);
-	if (!count || !tsimp->avccfg) return;
+	if (!count) return;
 
 	samp = gf_isom_get_sample(import->dest, tsimp->track, count, NULL);
 	sc_pos = 1;
@@ -6554,13 +6928,14 @@
 		ar->array_completeness = 1;
 		ar->type = nal_type;
 		ar->nalus = gf_list_new();
+		gf_list_add(hevccfg->param_array, ar);
 	}
-	GF_SAFEALLOC(sl, GF_AVCConfigSlot);
 	if (data) {
+		GF_SAFEALLOC(sl, GF_AVCConfigSlot);
 		sl->data = gf_malloc(sizeof(char)*data_len);
 		sl->size = data_len;
 		memcpy(sl->data, data, data_len);
-		gf_list_add(ar->nalus, ar);
+		gf_list_add(ar->nalus, sl);
 	} else {
 		ar->array_completeness = 0;
 	}
@@ -6595,6 +6970,14 @@
 		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:
+		prog = (GF_M2TS_Program*)par;
+
+		if (import->flags & GF_IMPORT_PROBE_ONLY) {
+			import->probe_duration = ((GF_M2TS_PES_PCK *) par)->PTS;
+			//import->flags |= GF_IMPORT_DO_ABORT;
+		}
+		break;
 
 	/*case GF_M2TS_EVT_SDT_FOUND:
 		import->nb_progs = gf_list_count(ts->SDTs);
@@ -6660,7 +7043,8 @@
 					tsimp->nb_video++;
 					break;
 				case GF_M2TS_VIDEO_HEVC:
-					import->tk_info[idx].media_type = GF_4CC('h','e','v','c');
+				case GF_M2TS_VIDEO_SHVC:
+					import->tk_info[idx].media_type = (es->stream_type==GF_M2TS_VIDEO_SHVC) ? GF_4CC('S','H','V','C') : GF_4CC('H','E','V','C');
 					import->tk_info[idx].type = GF_ISOM_MEDIA_VISUAL;
 					import->tk_info[idx].lang = pes->lang;
 					import->nb_tracks++;
@@ -6702,6 +7086,13 @@
 					import->nb_tracks++;
 					tsimp->nb_audio++;
 					break;
+				case GF_M2TS_AUDIO_DTS:
+					import->tk_info[idx].media_type = GF_4CC('D','T','S',' ');
+					import->tk_info[idx].type = GF_ISOM_MEDIA_AUDIO;
+					import->tk_info[idx].lang = pes->lang;
+					import->nb_tracks++;
+					tsimp->nb_audio++;
+					break;					
 				case GF_M2TS_SYSTEMS_MPEG4_PES:
 				case GF_M2TS_SYSTEMS_MPEG4_SECTIONS:
 					if (es->stream_type == GF_M2TS_SYSTEMS_MPEG4_PES) {
@@ -6720,6 +7111,14 @@
 					}
 					import->nb_tracks++;
 					break;
+				case GF_M2TS_METADATA_ID3_HLS:
+					import->tk_info[idx].media_type = GF_4CC('I','D','3',' ');
+					import->tk_info[idx].type = GF_ISOM_MEDIA_META;
+					import->tk_info[idx].lang = pes->lang;
+					import->nb_tracks++;
+					break;
+				default:
+					gf_import_message(import, GF_OK, "[MPEG-2 TS] Ignoring stream of type %d", es->stream_type); 
 				}
 			}
 		} else {
@@ -6764,7 +7163,7 @@
 				//ses = (GF_M2TS_SECTION_ES *)es;
 			} else {
 				pes = (GF_M2TS_PES *)es;
-				gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_DEFAULT);
+				gf_m2ts_set_pes_framing(pes, GF_M2TS_PES_FRAMING_DEFAULT_NAL);
 			}
 
 			mtype = stype = oti = 0;
@@ -6792,6 +7191,7 @@
 				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; 
 				oti = GPAC_OTI_VIDEO_HEVC;
@@ -6866,24 +7266,41 @@
 							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++;
-						} else {
-							/*unpack AVC config*/
-							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]);
-								}
+						} 
+						/*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]);
 							}
-							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_VIDEO_HEVC) {
+							u32 nal_type = (pck->data[4] & 0x7E) >> 1;
+							if (nal_type == GF_HEVC_NALU_SEQ_PARAM) {
+								//todo ..;
+								sprintf(import->tk_info[i].szCodecProfile, "hvc1");
 							}
 						}
+						else if ((pck->stream->stream_type==GF_M2TS_AUDIO_EC3) || (pck->stream->stream_type==GF_M2TS_AUDIO_AC3) || (pck->stream->stream_type==GF_M2TS_AUDIO_DTS)) {
+							if (!import->tk_info[i].audio_info.sample_rate) {
+								//todo ...
+								import->tk_info[i].audio_info.sample_rate = 44100;
+								import->tk_info[i].audio_info.nb_channels = 2;
+								tsimp->nb_audio_configured++;
+								}
+						}
+
+						if (pck->stream->vid_w && ! import->tk_info[i].video_info.width ) {
+							import->tk_info[i].video_info.width = pck->stream->vid_w;
+							import->tk_info[i].video_info.height = pck->stream->vid_h;
+							tsimp->nb_video_configured++;
+						}
+
 						/*consider we are done if not using 4 on 2*/
 						if (!ts->has_4on2 
 							&& (tsimp->nb_video_configured == tsimp->nb_video)
 							&& (tsimp->nb_audio_configured == tsimp->nb_audio)
+							&& import->probe_duration
 							) {
 							import->flags |= GF_IMPORT_DO_ABORT;
 						}
@@ -6891,7 +7308,7 @@
 					}
 				}
 				if (!ts->has_4on2 && (import->trackID==pck->stream->pid) && (pck->stream->vid_h || pck->stream->aud_sr) )
-					//import->flags |= GF_IMPORT_DO_ABORT;
+					import->flags |= GF_IMPORT_DO_ABORT;
 				return;
 			}
 
@@ -7025,7 +7442,7 @@
 							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->profile_compatibility_indications = tsimp->hevc.sps[idx].ptl.profile_compatibility_flag;
+							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;
@@ -7052,7 +7469,7 @@
 						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_layer;
+						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;
@@ -7146,7 +7563,8 @@
 					e = gf_isom_append_sample_data(import->dest, tsimp->track, (char*)pck->data, pck->data_len);
 				} else {
 
-					if (tsimp->avccfg) m2ts_rewrite_avc_sample(import, tsimp);
+					if (tsimp->avccfg || tsimp->hevccfg) m2ts_rewrite_nalu_sample(import, tsimp);
+
 					e = gf_isom_add_sample(import->dest, tsimp->track, 1, samp);
 				}
 				if (e) {
@@ -7347,6 +7765,7 @@
 	ts = gf_m2ts_demux_new();
 	ts->on_event = on_m2ts_import_data;
 	ts->user = &tsimp;
+	ts->file_size = fsize;
 
 	ts->dvb_h_demux = (import->flags & GF_IMPORT_MPE_DEMUX) ? 1 : 0;
 
@@ -7361,6 +7780,7 @@
 			break;
 
 		gf_m2ts_process_data(ts, data, size);
+		ts->nb_pck++;
 		if (import->flags & GF_IMPORT_DO_ABORT) break;
 		done += size;
 		if (do_import) gf_set_progress(progress, (u32) (done/1024), (u32) (fsize/1024));
@@ -7371,6 +7791,7 @@
 		GF_Err e = import->last_error;
 		import->last_error = GF_OK;
 		if (tsimp.avccfg) gf_odf_avc_cfg_del(tsimp.avccfg);
+		if (tsimp.hevccfg) gf_odf_hevc_cfg_del(tsimp.hevccfg);
   		gf_m2ts_demux_del(ts);
   		fclose(mts);
 		return e;
@@ -7398,11 +7819,24 @@
 			gf_isom_set_track_layout_info(import->dest, tsimp.track, w<<16, h<<16, 0, 0, 0);
 
 
-			m2ts_rewrite_avc_sample(import, &tsimp);
+			m2ts_rewrite_nalu_sample(import, &tsimp);
 
 			gf_odf_avc_cfg_del(tsimp.avccfg);
 		}
 
+		if (tsimp.hevccfg) {
+			u32 w = ((GF_M2TS_PES*)es)->vid_w;
+			u32 h = ((GF_M2TS_PES*)es)->vid_h;
+			hevc_set_parall_type(tsimp.hevccfg);
+			gf_isom_hevc_config_update(import->dest, tsimp.track, 1, tsimp.hevccfg);
+			gf_isom_set_visual_info(import->dest, tsimp.track, 1, w, h);
+			gf_isom_set_track_layout_info(import->dest, tsimp.track, w<<16, h<<16, 0, 0, 0);
+
+			m2ts_rewrite_nalu_sample(import, &tsimp);
+
+			gf_odf_hevc_cfg_del(tsimp.hevccfg);
+		}
+
 
 		if (tsimp.track) {
 			MP4T_RecomputeBitRate(import->dest, tsimp.track);
@@ -7410,14 +7844,20 @@
 			if ((es->first_dts != es->program->first_dts) && gf_isom_get_sample_count(import->dest, tsimp.track) ){
 				u32 media_ts, moov_ts, offset;
 				u64 dur;
+				Double pdur, poffset;
 				media_ts = gf_isom_get_media_timescale(import->dest, tsimp.track);
 				moov_ts = gf_isom_get_timescale(import->dest);
 				assert(es->program->first_dts <= es->first_dts);
-				offset = (u32)(es->first_dts - es->program->first_dts) * moov_ts / media_ts;
-				dur = gf_isom_get_media_duration(import->dest, tsimp.track) * moov_ts / media_ts;
+				poffset = (es->first_dts - es->program->first_dts) * 1.0 * moov_ts / media_ts;
+				offset = (u32)poffset;
+				pdur = gf_isom_get_media_duration(import->dest, tsimp.track) * 1.0 * moov_ts / media_ts;
+				dur = (u64)pdur;
+				if (poffset != offset || pdur != dur) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_AUTHOR, ("Movie timescale not precise enough to store edit\n"));
+				}
 				gf_isom_set_edit_segment(import->dest, tsimp.track, 0, offset, 0, GF_ISOM_EDIT_EMPTY);
 				gf_isom_set_edit_segment(import->dest, tsimp.track, offset, dur, 0, GF_ISOM_EDIT_NORMAL);
-				gf_import_message(import, GF_OK, "Timeline offset: %d ms", offset);
+				gf_import_message(import, GF_OK, "Timeline offset: %d ms", (offset * 1000) / moov_ts);
 			}
 
 			if (tsimp.nb_p) {
@@ -8172,8 +8612,8 @@
 		|| !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)
-		|| !stricmp(fmt, "HEVC") || !stricmp(fmt, "H265") )
+	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") )
 		return gf_import_hevc(importer);
 	/*AC3*/
 	if (!strnicmp(ext, ".ac3", 4) || !stricmp(fmt, "AC3") )
@@ -8200,8 +8640,8 @@
 	if (!strnicmp(ext, ".saf", 4) || !strnicmp(ext, ".lsr", 4) || !stricmp(fmt, "SAF") )
 		return gf_import_saf(importer);
 	/*text subtitles*/
-	if (!strnicmp(ext, ".srt", 4) || !strnicmp(ext, ".sub", 4) || !strnicmp(ext, ".ttxt", 5) || !strnicmp(ext, ".vtt", 4)
-		|| !stricmp(fmt, "SRT") || !stricmp(fmt, "SUB") || !stricmp(fmt, "TEXT") || !stricmp(fmt, "VTT")) {
+	if (!strnicmp(ext, ".srt", 4) || !strnicmp(ext, ".sub", 4) || !strnicmp(ext, ".ttxt", 5) || !strnicmp(ext, ".vtt", 4) || !strnicmp(ext, ".ttml", 5)
+		|| !stricmp(fmt, "SRT") || !stricmp(fmt, "SUB") || !stricmp(fmt, "TEXT") || !stricmp(fmt, "VTT") || !stricmp(fmt, "TTML")) {
 #ifndef GPAC_DISABLE_TTXT
 			return gf_import_timed_text(importer);
 #else
@@ -8225,6 +8665,13 @@
 	if (!strnicmp(ext, ".txt", 4) || !strnicmp(ext, ".chap", 5) || !stricmp(fmt, "CHAP") )
 		return gf_media_import_chapters_file(importer);
 
+	if (!strnicmp(ext, ".swf", 4) || !strnicmp(ext, ".SWF", 4)) {
+#ifndef GPAC_DISABLE_TTXT
+		return gf_import_timed_text(importer);
+#else
+		return GF_NOT_SUPPORTED;
+#endif
+	}
 	/*try XML things*/
 	xml_type = gf_xml_get_root_type(importer->in_name, &e);
 	if (xml_type) {

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/mpd.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/mpd.c Changed

@@ -97,92 +97,7 @@
 
 static u64 gf_mpd_parse_date(char *attr)
 {
-	Bool ok = 0;
-	Bool neg_time_zone = 0;
-	u32 year, month, day, h, m, ms;
-	s32 oh, om;
-	Float s;
-	u64 res;
-#ifdef _WIN32_WCE
-	SYSTEMTIME syst;
-	FILETIME filet;
-#else
-	struct tm _t;
-#endif
-
-	h = m = 0;
-	s = 0;
-	oh = om = 0;
-	if (sscanf(attr, "%d-%d-%dT%d:%d:%gZ", &year, &month, &day, &h, &m, &s) == 6) 
-		ok = 1;
-	else if (sscanf(attr, "%d-%d-%dT%d:%d:%g-%d:%d", &year, &month, &day, &h, &m, &s, &oh, &om) == 8) {
-		neg_time_zone = 1;
-		ok = 1;
-	} else if (sscanf(attr, "%d-%d-%dT%d:%d:%g+%d:%d", &year, &month, &day, &h, &m, &s, &oh, &om) == 8) {
-		ok = 1;
-	}
-
-	if (!ok) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_DASH, ("[MPD] Failed to parse MPD date %s - format not supported\n", attr));
-		return 0;
-	}
-
-#ifdef _WIN32_WCE
-	memset(&syst, 0, sizeof(SYSTEMTIME));
-	syst.wYear = year;
-	syst.wMonth = month;
-	syst.wDay = day;
-	syst.wHour = h;
-	syst.wMinute = m;
-	syst.wSecond = (u32) s;
-	SystemTimeToFileTime(&syst, &filet);
-
-#define TIMESPEC_TO_FILETIME_OFFSET (((LONGLONG)27111902 << 32) + (LONGLONG)3577643008)
-
-	res = (u64) ((*(LONGLONG *) &filet - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
-
-#undef TIMESPEC_TO_FILETIME_OFFSET 
-
-
-#else
-	memset(&_t, 0, sizeof(struct tm));
-	_t.tm_year = (year > 1900) ? year - 1900 : 0;
-	_t.tm_mon = month ? month - 1 : 0;
-	_t.tm_mday = day;
-	_t.tm_hour = h;
-	_t.tm_min = m;
-	_t.tm_sec = (u32) s;
-
-#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;
-	res = mktime(&_t) - t_timezone;
-	}
-#else
-	{
-		s32 val = timezone;
-		res = mktime(&_t) - val;
-	}
-#endif
-
-#endif
-
-	if (om || oh) {
-		s32 diff = (60*oh + om)*60;
-		if (neg_time_zone) diff = -diff;
-		res = res + diff;
-	}
-	res *= 1000;
-	ms = (u32) ( (s - (u32)s) * 1000);
-	return res + ms;
+	return gf_net_parse_date(attr);
 }
 
 static u32 gf_mpd_parse_duration(char *duration) {
@@ -358,6 +273,7 @@
 		else if (!strcmp(att->name, "presentationTimeOffset")) seg->presentation_time_offset = gf_mpd_parse_long_int(att->value);
 		else if (!strcmp(att->name, "indexRange")) seg->index_range = gf_mpd_parse_byte_range(att->value);
 		else if (!strcmp(att->name, "indexRangeExact")) seg->index_range_exact = gf_mpd_parse_bool(att->value);
+		else if (!strcmp(att->name, "availabilityTimeOffset")) seg->availability_time_offset = gf_mpd_parse_double(att->value);
 		else if (!strcmp(att->name, "timeShiftBufferDepth")) seg->time_shift_buffer_depth = gf_mpd_parse_duration(att->value);
 	}
 
@@ -1028,6 +944,8 @@
 			mpd->availabilityStartTime = gf_mpd_parse_date(att->value);
 		} else if (!strcmp(att->name, "availabilityEndTime")) {
 			mpd->availabilityEndTime = gf_mpd_parse_date(att->value);
+		} else if (!strcmp(att->name, "publishTime")) {
+			mpd->publishTime = gf_mpd_parse_date(att->value);
 		} else if (!strcmp(att->name, "mediaPresentationDuration")) {
 			mpd->media_presentation_duration = gf_mpd_parse_duration(att->value);
 		} else if (!strcmp(att->name, "minimumUpdatePeriod")) {

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/mpegts.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/mpegts.c Changed

@@ -54,7 +54,6 @@
 
 #define DEBUG_TS_PACKET 0
 
-
 GF_EXPORT
 const char *gf_m2ts_get_stream_name(u32 streamType)
 {
@@ -68,8 +67,9 @@
 	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_HEVC: return "MPEG-H HEVC 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";
@@ -78,11 +78,67 @@
 	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)";
+
 	default: return "Unknown";
 	}
 }
 
-static u32 gf_m2ts_reframe_default(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static void gf_m2ts_estimate_duration(GF_M2TS_Demuxer *ts, u64 PCR, u16 pcr_pid)
+{
+	u64 file_size = 0;
+//	if (ts->duration>0) return;
+
+	if (ts->file || ts->file_size) {
+		file_size = ts->file_size;
+	} else if (ts->dnload) {
+		u32 size;
+		gf_dm_sess_get_stats(ts->dnload, NULL, NULL, &size, NULL, NULL, NULL);
+		file_size = size;
+	} else {
+		return;
+	}
+
+	if (!ts->first_pcr_found) {
+		ts->first_pcr_found = PCR;
+		ts->pcr_pid = pcr_pid;
+		ts->nb_pck_at_pcr = ts->nb_pck;
+	} else if (ts->pcr_pid == pcr_pid) {
+		if (PCR < ts->first_pcr_found) {
+			ts->first_pcr_found = PCR;
+			ts->pcr_pid = pcr_pid;
+			ts->nb_pck_at_pcr = ts->nb_pck;
+		} else if (PCR-ts->first_pcr_found > 2*27000000) {
+			Bool changed = GF_FALSE;
+			Double pck_dur = (Double) (PCR-ts->first_pcr_found);
+			pck_dur /= (ts->nb_pck - ts->nb_pck_at_pcr);
+			pck_dur /= 27000000;
+
+			pck_dur *= file_size;
+			pck_dur /= 188.0;
+			if ((u32) ts->duration != (u32) pck_dur) {
+				ts->duration = pck_dur;
+				changed = GF_TRUE;
+			}
+
+			ts->first_pcr_found = PCR;
+			ts->pcr_pid = pcr_pid;
+			ts->nb_pck_at_pcr = ts->nb_pck;
+
+			GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] Estimated duration based on instant bitrate: %g\n", ts->duration));
+
+			if (ts->on_event && changed) {
+				GF_M2TS_PES_PCK pck;
+				memset(&pck, 0, sizeof(GF_M2TS_PES_PCK));
+				pck.PTS = (u64) (ts->duration*1000);
+				ts->on_event(ts, GF_M2TS_EVT_DURATION_ESTIMATED, &pck);
+			}
+		}
+	}
+}
+
+static u32 gf_m2ts_reframe_default(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
 	GF_M2TS_PES_PCK pck;
 	pck.flags = 0;
@@ -98,13 +154,13 @@
 	return 0;
 }
 
-static u32 gf_m2ts_reframe_reset(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static u32 gf_m2ts_reframe_reset(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
-	if (pes->data) {
-		gf_free(pes->data);
-		pes->data = NULL;
+	if (pes->pck_data) {
+		gf_free(pes->pck_data);
+		pes->pck_data = NULL;
 	}
-	pes->data_len = 0;
+	pes->pck_data_len = pes->pck_alloc_len = 0;
 	if (pes->prev_data) {
 		gf_free(pes->prev_data);
 		pes->prev_data = NULL;
@@ -117,16 +173,18 @@
 	return 0;
 }
 
-static u32 gf_m2ts_reframe_nalu_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, Bool is_hevc)
+static u32 gf_m2ts_reframe_nalu_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr, Bool is_hevc)
 {
 	Bool au_start_in_pes=0;
 	Bool prev_is_au_delim=0;
 	Bool force_new_au=0;
-	Bool start_code_found = 0;
+	u32 start_code_found = 0;
 	Bool short_start_code = 0;
 	Bool esc_code_found = 0;
 	u32 nal_type, sc_pos = 0;
-
+	u32 first_nal_offset_in_pck = 0;
+	Bool full_au_pes_mode = 0;
+	u8 *au_start = NULL;
 	GF_M2TS_PES_PCK pck;
 
 	if (!same_pts) 
@@ -178,6 +236,7 @@
 				}
 
 				data += sc_pos;
+				first_nal_offset_in_pck += sc_pos;
 				data_len -= sc_pos;
 			}
 			start_code_found = short_start_code ? 2 : 1;
@@ -216,30 +275,49 @@
 				/*check AU start type*/
 				if (nal_type==GF_HEVC_NALU_ACCESS_UNIT) {
 					if (!prev_is_au_delim) {
+						//this was not a one AU per PES config, dispatch 
+						if (au_start) {
+							pck.data = (char *)au_start;
+							pck.data_len = (u32) (data - au_start);
+							ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+							au_start = NULL;
+							full_au_pes_mode = 0;
+						}
+
 						if (au_start_in_pes) {
 							/*FIXME - we should check the AVC framerate to update the timing ...*/
 							pck.DTS += 3000;
 							pck.PTS += 3000;
 	//						GF_LOG(GF_LOG_INFO, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID%d: Two AVC AUs start in this PES packet - cannot recompute non-first AU timing\n", pes->pid));
 						}
+
 						pck.flags = GF_M2TS_PES_PCK_AU_START;
 						force_new_au = 0;
 						au_start_in_pes = 1;
-						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+						if (pes_hdr->data_alignment && !first_nal_offset_in_pck && !pes->single_nal_mode) {
+							full_au_pes_mode = GF_TRUE;
+							au_start = (u8 *) pck.data;
+						} else {
+							ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+						}
 						prev_is_au_delim=1;
 					}
-				} else if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP)
-					|| (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)
-				) {
-					pck.flags = GF_M2TS_PES_PCK_RAP;
-					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+				} else if ((nal_type>=GF_HEVC_NALU_SLICE_BLA_W_LP) && (nal_type<=GF_HEVC_NALU_SLICE_CRA)) {
+					if (!full_au_pes_mode) {
+						pck.flags = GF_M2TS_PES_PCK_RAP;
+						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					} else {
+						pck.flags |= GF_M2TS_PES_PCK_RAP;
+					}
 					prev_is_au_delim=0;
 				} 
 				else
 #endif //GPAC_DISABLE_HEVC
 				{
-					pck.flags = 0;
-					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					if (!full_au_pes_mode) {
+						pck.flags = 0;
+						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					}
 					prev_is_au_delim=0;
 				}
 			} else {
@@ -263,6 +341,16 @@
 				/*check AU start type*/
 				if ((nal_type==GF_AVC_NALU_ACCESS_UNIT) || (nal_type==GF_AVC_NALU_VDRD)) {
 					if (!prev_is_au_delim) {
+
+						//this was not a one AU per PES config, dispatch 
+						if (au_start) {
+							pck.data = (char *)au_start;
+							pck.data_len = (u32) (data - au_start);
+							ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+							au_start = NULL;
+							full_au_pes_mode = 0;
+						}
+
 						if (au_start_in_pes) {
 							/*FIXME - we should check the AVC framerate to update the timing ...*/
 							pck.DTS += 3000;
@@ -272,18 +360,28 @@
 						pck.flags = GF_M2TS_PES_PCK_AU_START;
 						force_new_au = 0;
 						au_start_in_pes = 1;
-						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+						if (pes_hdr->data_alignment && !first_nal_offset_in_pck && !pes->single_nal_mode) {
+							full_au_pes_mode = GF_TRUE;
+							au_start = (u8 *) pck.data;
+						} else {
+							ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+						}
 						prev_is_au_delim=1;
 					}
 				} else {
-					pck.flags = (nal_type==GF_AVC_NALU_IDR_SLICE) ? GF_M2TS_PES_PCK_RAP : 0;
-					ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					if (!full_au_pes_mode) {
+						pck.flags = (nal_type==GF_AVC_NALU_IDR_SLICE) ? GF_M2TS_PES_PCK_RAP : 0;
+						ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+					} else {
+						if (nal_type==GF_AVC_NALU_IDR_SLICE) pck.flags |= GF_M2TS_PES_PCK_RAP;
+					}
 					prev_is_au_delim=0;
 				}
 			}
 
 			data += sc_pos;
 			data_len -= sc_pos;
+			first_nal_offset_in_pck += sc_pos;
 			sc_pos = 0;
 
 			if (esc_code_found) {
@@ -297,12 +395,27 @@
 	/*we did not consume all data*/
 	if (!start_code_found) {
 		u32 min_size = is_hevc ? 6 : 5;
+		
+		if (au_start) {
+			pck.data = (char *)au_start;
+			pck.data_len = (u32) (data - au_start);
+			ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+			au_start = NULL;
+		}
+
 		/*if not enough data to locate start code, store it*/
 		if (data_len < min_size ) 
 			return data_len;
 		/*otherwise this is the middle of a frame, let's dispatch it*/
 	}
 
+	if (au_start) {
+		pck.data = (char *)au_start;
+		pck.data_len = (u32) (data - au_start) + data_len;
+		ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+		return 0;
+	}
+
 	if (data_len) {
 		pck.flags = 0;
 		pck.data = (char *)data;
@@ -320,7 +433,9 @@
 					pck.flags = GF_M2TS_PES_PCK_AU_START;
 				} else if ((nal_type==GF_HEVC_NALU_SLICE_IDR_W_DLP) || (nal_type==GF_HEVC_NALU_SLICE_IDR_N_LP)) {
 					pck.flags = GF_M2TS_PES_PCK_RAP;
-				} 
+				} else if (nal_type==GF_HEVC_NALU_FILLER_DATA) {
+					return 0;
+				}
 #endif
 			} else {
 				nal_type = pck.data[4] & 0x1F;
@@ -341,17 +456,17 @@
 	return 0;
 }
 
-static u32 gf_m2ts_reframe_avc_h264(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static u32 gf_m2ts_reframe_avc_h264(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
-	return gf_m2ts_reframe_nalu_video(ts, pes, same_pts, data, data_len, 0);
+	return gf_m2ts_reframe_nalu_video(ts, pes, same_pts, data, data_len, pes_hdr, 0);
 }
 
-static u32 gf_m2ts_reframe_hevc(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static u32 gf_m2ts_reframe_hevc(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
-	return gf_m2ts_reframe_nalu_video(ts, pes, same_pts, data, data_len, 1);
+	return gf_m2ts_reframe_nalu_video(ts, pes, same_pts, data, data_len, pes_hdr, 1);
 }
 
-static u32 gf_m2ts_reframe_mpeg_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static u32 gf_m2ts_reframe_mpeg_video(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
 	u32 sc_pos = 0;
 	u32 to_send = data_len;
@@ -433,25 +548,13 @@
 
 #ifndef GPAC_DISABLE_AV_PARSERS
 
-static u32 latm_get_value(GF_BitStream *bs)
-{
-	u32 i, tmp, value = 0;
-	u32 bytesForValue = gf_bs_read_int(bs, 2);
-	for (i=0; i <= bytesForValue; i++) {
-		value <<= 8;
-		tmp = gf_bs_read_int(bs, 8);
-		value += tmp;
-	}
-	return value;
-}
-
 typedef struct
 {
 	Bool is_mp2, no_crc;
 	u32 profile, sr_idx, nb_ch, frame_size;
 } ADTSHeader;
 
-static u32 gf_m2ts_reframe_aac_adts(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static u32 gf_m2ts_reframe_aac_adts(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
 	ADTSHeader hdr;
 	u32 sc_pos = 0;
@@ -604,7 +707,7 @@
 	return data_len - sc_pos;
 }
 
-static u32 gf_m2ts_reframe_aac_latm(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static u32 gf_m2ts_reframe_aac_latm(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
 	u32 sc_pos = 0;
 	u32 start = 0;
@@ -649,7 +752,7 @@
 			if (amux_version) amux_versionA = gf_bs_read_int(bs, 1);
 			if (!amux_versionA) {
 				u32 i, allStreamsSameTimeFraming, numProgram;
-				if (amux_version) latm_get_value(bs);
+				if (amux_version) gf_latm_get_value(bs);
 
 				allStreamsSameTimeFraming = gf_bs_read_int(bs, 1);
 				/*numSubFrames = */gf_bs_read_int(bs, 6);
@@ -664,7 +767,7 @@
 						if (i || j) same_cfg = gf_bs_read_int(bs, 1);
 
 						if (!same_cfg) {
-							if (amux_version==1) latm_get_value(bs);
+							if (amux_version==1) gf_latm_get_value(bs);
 							gf_m4a_parse_config(bs, &cfg, 0);
 
 							if (!pes->aud_sr) {
@@ -743,17 +846,24 @@
 
 
 #ifndef GPAC_DISABLE_AV_PARSERS
-static u32 gf_m2ts_reframe_mpeg_audio(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len)
+static u32 gf_m2ts_reframe_mpeg_audio(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
 {
 	GF_M2TS_PES_PCK pck;
 	u32 pos, frame_size, remain;
 	u64 PTS;
+	u32 next_hdr = 0;
 
 	pck.flags = GF_M2TS_PES_PCK_RAP;
 	pck.stream = pes;
 	remain = pes->frame_state;
 	PTS = pes->PTS;
 
+	/*check we don't find a sync point within what we should flush - this happens with looping TS streams and other nasty scenarii*/
+	next_hdr = gf_mp3_get_next_header_mem((char *)data, data_len, &pos);
+	if (next_hdr && remain && (pos<remain) ) {
+		remain = pos;
+	}
+
 	if (remain) {
 		/*dispatch end of prev frame*/
 		pck.DTS = pck.PTS = PTS;
@@ -823,7 +933,186 @@
 	/*we consumed all data*/
 	return 0;
 }
+
 #endif /*GPAC_DISABLE_AV_PARSERS*/
+typedef enum {
+	ID3V2_FRAME_AENC = GF_4CC('A','E','N','C'),
+	ID3V2_FRAME_APIC = GF_4CC('A','P','I','C'),
+	ID3V2_FRAME_COMM = GF_4CC('C','O','M','M'),
+	ID3V2_FRAME_COMR = GF_4CC('C','O','M','R'),
+	ID3V2_FRAME_ENCR = GF_4CC('E','N','C','R'),
+	ID3V2_FRAME_EQUA = GF_4CC('E','Q','U','A'),
+	ID3V2_FRAME_ETCO = GF_4CC('E','T','C','O'),
+	ID3V2_FRAME_GEOB = GF_4CC('G','E','O','B'),
+	ID3V2_FRAME_GRID = GF_4CC('G','R','I','D'),
+	ID3V2_FRAME_IPLS = GF_4CC('I','P','L','S'),
+	ID3V2_FRAME_LINK = GF_4CC('L','I','N','K'),
+	ID3V2_FRAME_MCDI = GF_4CC('M','C','D','I'),
+	ID3V2_FRAME_MLLT = GF_4CC('M','L','L','T'),
+	ID3V2_FRAME_OWNE = GF_4CC('O','W','N','E'),
+	ID3V2_FRAME_PRIV = GF_4CC('P','R','I','V'),
+	ID3V2_FRAME_PCNT = GF_4CC('P','C','N','T'),
+	ID3V2_FRAME_POPM = GF_4CC('P','O','P','M'),
+	ID3V2_FRAME_POSS = GF_4CC('P','O','S','S'),
+	ID3V2_FRAME_RBUF = GF_4CC('R','B','U','F'),
+	ID3V2_FRAME_RVAD = GF_4CC('R','V','A','D'),
+	ID3V2_FRAME_RVRB = GF_4CC('R','V','R','B'),
+	ID3V2_FRAME_SYLT = GF_4CC('S','Y','L','T'),
+	ID3V2_FRAME_SYTC = GF_4CC('S','Y','T','C'),
+	ID3V2_FRAME_TALB = GF_4CC('T','E','N','C'),
+	ID3V2_FRAME_TBPM = GF_4CC('T','B','P','M'),
+	ID3V2_FRAME_TCOM = GF_4CC('T','C','O','M'),
+	ID3V2_FRAME_TCON = GF_4CC('T','C','O','N'),
+	ID3V2_FRAME_TCOP = GF_4CC('T','C','O','P'),
+	ID3V2_FRAME_TDAT = GF_4CC('T','D','A','T'),
+	ID3V2_FRAME_TDLY = GF_4CC('T','D','L','Y'),
+	ID3V2_FRAME_TENC = GF_4CC('T','E','N','C'),
+	ID3V2_FRAME_TEXT = GF_4CC('T','E','X','T'),
+	ID3V2_FRAME_TFLT = GF_4CC('T','F','L','T'),
+	ID3V2_FRAME_TIME = GF_4CC('T','I','M','E'),
+	ID3V2_FRAME_TIT1 = GF_4CC('T','I','T','1'),
+	ID3V2_FRAME_TIT2 = GF_4CC('T','I','T','2'),
+	ID3V2_FRAME_TIT3 = GF_4CC('T','I','T','3'),
+	ID3V2_FRAME_TKEY = GF_4CC('T','K','E','Y'),
+	ID3V2_FRAME_TLAN = GF_4CC('T','L','A','N'),
+	ID3V2_FRAME_TLEN = GF_4CC('T','L','E','N'),
+	ID3V2_FRAME_TMED = GF_4CC('T','M','E','D'),
+	ID3V2_FRAME_TOAL = GF_4CC('T','O','A','L'),
+	ID3V2_FRAME_TOFN = GF_4CC('T','O','F','N'),
+	ID3V2_FRAME_TOLY = GF_4CC('T','O','L','Y'),
+	ID3V2_FRAME_TOPE = GF_4CC('T','O','P','E'),
+	ID3V2_FRAME_TORY = GF_4CC('T','O','R','Y'),
+	ID3V2_FRAME_TOWN = GF_4CC('T','O','W','N'),
+	ID3V2_FRAME_TPE1 = GF_4CC('T','P','E','1'),
+	ID3V2_FRAME_TPE2 = GF_4CC('T','P','E','2'),
+	ID3V2_FRAME_TPE3 = GF_4CC('T','P','E','3'),
+	ID3V2_FRAME_TPE4 = GF_4CC('T','P','E','4'),
+	ID3V2_FRAME_TPOS = GF_4CC('T','P','E','5'),
+	ID3V2_FRAME_TPUB = GF_4CC('T','P','U','B'),
+	ID3V2_FRAME_TRCK = GF_4CC('T','R','C','K'),
+	ID3V2_FRAME_TRDA = GF_4CC('T','R','D','A'),
+	ID3V2_FRAME_TRSN = GF_4CC('T','R','S','N'),
+	ID3V2_FRAME_TRSO = GF_4CC('T','R','S','O'),
+	ID3V2_FRAME_TSIZ = GF_4CC('T','S','I','Z'),
+	ID3V2_FRAME_TSRC = GF_4CC('T','S','R','C'),
+	ID3V2_FRAME_TSSE = GF_4CC('T','S','S','E'),
+	ID3V2_FRAME_TYER = GF_4CC('T','Y','E','R'),
+	ID3V2_FRAME_TXXX = GF_4CC('T','X','X','X'),
+	ID3V2_FRAME_UFID = GF_4CC('U','F','I','D'),
+	ID3V2_FRAME_USER = GF_4CC('U','S','E','R'),
+	ID3V2_FRAME_USLT = GF_4CC('U','S','L','T'),
+	ID3V2_FRAME_WCOM = GF_4CC('W','C','O','M'),
+	ID3V2_FRAME_WCOP = GF_4CC('W','C','O','P'),
+	ID3V2_FRAME_WOAF = GF_4CC('W','O','A','F'),
+	ID3V2_FRAME_WOAR = GF_4CC('W','O','A','R'),
+	ID3V2_FRAME_WOAS = GF_4CC('W','O','A','S'),
+	ID3V2_FRAME_WORS = GF_4CC('W','O','R','S'),
+	ID3V2_FRAME_WPAY = GF_4CC('W','P','A','Y'),
+	ID3V2_FRAME_WPUB = GF_4CC('W','P','U','B'),
+	ID3V2_FRAME_WXXX = GF_4CC('W','X','X','X')
+} GF_ID3v2FrameType;
+
+static void add_text(char **buffer, u32 *size, u32 *pos, char *msg, u32 msg_len)
+{
+	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;
+}
+
+static GF_Err id3_parse_tag(char *data, u32 length, char **output, u32 *output_size, u32 *output_pos)
+{
+	u32 size;
+	u32 pos = 0;
+	/* ID3VVFFFFSIZE = 13bytes
+         * ID3 string
+	 * VV = Version
+         * F = Flags
+         * SIZE = 32bits size with first Most Significant bit set to 0 -> 28 bits
+	 * Size starts AFTER this header, meaning we have to add 10 bytes
+	 */
+	if (data[pos] == 'I' && data[pos+1] == 'D' && data[pos+2] == '3') {
+		//u16 version = (data[pos+3]<<8)+data[pos+4];
+		//Bool unsync_flag = ((data[pos+5]>>7 & 0x1) ? GF_TRUE: GF_FALSE);
+		Bool extended_header_flag = ((data[pos+5]>>6 & 0x1) ? GF_TRUE: GF_FALSE);
+		//Bool experimental_flag = ((data[pos+5]>>5 & 0x1) ? GF_TRUE: GF_FALSE);
+		if (data[pos+5] & 0x1F) {
+			return GF_NOT_SUPPORTED;
+		} else {
+			size = 10 + ((data[pos+9] & 0x7f) + ((data[pos+8] & 0x7f) << 7) + ((data[pos+7] & 0x7f) << 14) + ((data[pos+6] & 0x7f) << 21));
+		}
+		pos += 10;
+
+		if (extended_header_flag) {
+			u32 extended_size = 4 + ((data[pos]) + ((data[pos+1]) << 8) + ((data[pos+2]) << 16) + ((data[pos+3]) << 24));
+			pos += extended_size;
+		}
+
+		while (pos < size) {
+			GF_ID3v2FrameType type;
+			u32 frame_size, frame_pos;
+			Bool compression_flag, encryption_flag/*, tag_alter_preservation_flag, file_alter_preservation_flag, readonly_flag, grouping_flag*/;
+			frame_pos = pos;
+			/* parsing a frame */
+			type = (GF_ID3v2FrameType)(((data[pos+3]) + ((data[pos+2]) << 8) + ((data[pos+1]) << 16) + ((data[pos]) << 24)));
+			pos+=4;
+			frame_size = 10 + ((data[pos+3]) + ((data[pos+2]) << 8) + ((data[pos+1]) << 16) + ((data[pos]) << 24));
+			pos+=4;
+			//tag_alter_preservation_flag = ((data[pos]>>7 & 0x1) ? GF_TRUE: GF_FALSE);
+			//file_alter_preservation_flag = ((data[pos]>>6 & 0x1) ? GF_TRUE: GF_FALSE);
+			//readonly_flag = ((data[pos]>>5 & 0x1) ? GF_TRUE: GF_FALSE);
+			pos++;
+			compression_flag = ((data[pos]>>7 & 0x1) ? GF_TRUE: GF_FALSE);
+			encryption_flag = ((data[pos]>>6 & 0x1) ? GF_TRUE: GF_FALSE);
+			//grouping_flag = ((data[pos]>>5 & 0x1) ? GF_TRUE: GF_FALSE);
+			if (compression_flag || encryption_flag) {
+				/* unsupported, skip */
+				pos = frame_pos + frame_size;
+			} else {
+				switch (type) {
+				case ID3V2_FRAME_TXXX:
+					add_text(output, output_size, output_pos, data+pos+3, frame_size-10-3);
+					pos = frame_pos + frame_size;
+					break;
+				default:
+					/* unsupported, skip */
+					pos = frame_pos + frame_size;
+				}
+			}
+		}
+
+		return GF_OK;
+	} else {
+		return GF_NOT_SUPPORTED;
+	}
+}
+
+static u32 gf_m2ts_reframe_id3_pes(GF_M2TS_Demuxer *ts, GF_M2TS_PES *pes, Bool same_pts, unsigned char *data, u32 data_len, GF_M2TS_PESHeader *pes_hdr)
+{
+	char frame_header[256];
+	char *output_text = NULL;
+	u32 output_len = 0;
+	u32 pos = 0;
+	GF_M2TS_PES_PCK pck;
+	pck.flags = 0;
+	if (pes->rap) pck.flags |= GF_M2TS_PES_PCK_RAP;
+	if (!same_pts) pck.flags |= GF_M2TS_PES_PCK_AU_START;
+	pck.DTS = pes->DTS;
+	pck.PTS = pes->PTS;
+	sprintf(frame_header, LLU" --> NEXT\n", pes->PTS);
+	add_text(&output_text, &output_len, &pos, frame_header, (u32)strlen(frame_header));
+	id3_parse_tag((char *)data, data_len, &output_text, &output_len, &pos);
+	add_text(&output_text, &output_len, &pos, "\n\n", 2);
+	pck.data = (char *)output_text;
+	pck.data_len = pos;
+	pck.stream = pes;
+	ts->on_event(ts, GF_M2TS_EVT_PES_PCK, &pck);
+	gf_free(output_text);
+	/*we consumed all data*/
+	return 0;
+}
 
 static u32 gf_m2ts_sync(GF_M2TS_Demuxer *ts, Bool simple_check)
 {
@@ -846,7 +1135,7 @@
 {
     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) ? 1 : 0;
+	return (crc==crc_val) ? GF_TRUE : GF_FALSE;
 }
 
 
@@ -922,7 +1211,7 @@
 		if ((pes->flags & GF_M2TS_INHERIT_PCR) && ts->ess[es->program->pcr_pid]==es)
 			ts->ess[es->program->pcr_pid] = NULL;
 
-		if (pes->data) gf_free(pes->data);
+		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);
 	}
@@ -943,6 +1232,15 @@
 
 static void gf_m2ts_section_complete(GF_M2TS_Demuxer *ts, GF_M2TS_SectionFilter *sec, GF_M2TS_SECTION_ES *ses)
 {
+	//seek mode, only process PAT and PMT
+	if (ts->start_range && (sec->section[0] != GF_M2TS_TABLE_ID_PAT) && (sec->section[0] != GF_M2TS_TABLE_ID_PMT)) {
+		/*clean-up (including broken sections)*/
+		if (sec->section) gf_free(sec->section);
+		sec->section = NULL;
+		sec->length = sec->received = 0;
+		return; 
+	}
+
 	if (!sec->process_section) {
 		if ((ts->on_event && (sec->section[0]==GF_M2TS_TABLE_ID_AIT)) ) {				
 #ifdef GPAC_ENABLE_DSMCC
@@ -1036,6 +1334,7 @@
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] Creating table %d %d\n", table_id, extended_table_id));
 			t->table_id = table_id;
 			t->ex_table_id = extended_table_id;
+			t->last_version_number = 0xFF;
 			t->sections = gf_list_new();
 			if (prev_t) prev_t->next = t;
 			else sec->table = t;
@@ -1515,6 +1814,117 @@
 	return;
 }
 
+static GF_M2TS_MetadataPointerDescriptor *gf_m2ts_read_metadata_pointer_descriptor(GF_BitStream *bs, u32 length)
+{
+	u32 size;
+	GF_M2TS_MetadataPointerDescriptor *d;
+	GF_SAFEALLOC(d, GF_M2TS_MetadataPointerDescriptor);
+	d->application_format = gf_bs_read_u16(bs);
+	size = 2;
+	if (d->application_format == 0xFFFF) {
+		d->application_format_identifier = gf_bs_read_u32(bs);
+		size += 4;
+	}
+	d->format = gf_bs_read_u8(bs);
+	size += 1;
+	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);
+	gf_bs_read_int(bs, 5); /*reserved */
+	size += 2;
+	if (d->locator_record_flag) {
+		d->locator_length = gf_bs_read_u8(bs);
+		d->locator_data = (char *)gf_malloc(d->locator_length);
+		size += 1 + d->locator_length;
+		gf_bs_read_data(bs, d->locator_data, d->locator_length);
+	}
+	if (d->carriage_flag != 3) {
+		d->program_number = gf_bs_read_u16(bs);
+		size += 2;
+	}
+	if (d->carriage_flag == 1) {
+		d->ts_location = gf_bs_read_u16(bs);
+		d->ts_id = gf_bs_read_u16(bs);
+		size += 4;
+	}
+	if (length-size > 0) {
+		d->data_size = length-size;
+		d->data = (char *)gf_malloc(d->data_size); 
+		gf_bs_read_data(bs, d->data, d->data_size);
+	}
+	return d;
+}
+
+void gf_m2ts_metadata_pointer_descriptor_del(GF_M2TS_MetadataPointerDescriptor *metapd)
+{
+	if (metapd) {
+		if (metapd->locator_data) gf_free(metapd->locator_data);
+		if (metapd->data) gf_free(metapd->data);
+		gf_free(metapd);
+	}
+}
+
+static GF_M2TS_MetadataDescriptor *gf_m2ts_read_metadata_descriptor(GF_BitStream *bs, u32 length)
+{
+	u32 size;
+	GF_M2TS_MetadataDescriptor *d;
+	GF_SAFEALLOC(d, GF_M2TS_MetadataDescriptor);
+	d->application_format = gf_bs_read_u16(bs);
+	size = 2;
+	if (d->application_format == 0xFFFF) {
+		d->application_format_identifier = gf_bs_read_u32(bs);
+		size += 4;
+	}
+	d->format = gf_bs_read_u8(bs);
+	size += 1;
+	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);
+	gf_bs_read_int(bs, 4); /* reserved */
+	size += 2;
+	if (d->dsmcc_flag) {
+		d->service_id_record_length = gf_bs_read_u8(bs);
+		d->service_id_record = (char *)gf_malloc(d->service_id_record_length);
+		size += 1 + d->service_id_record_length;
+		gf_bs_read_data(bs, d->service_id_record, d->service_id_record_length);
+	}
+	if (d->decoder_config_flags == 1) {
+		d->decoder_config_length = gf_bs_read_u8(bs);
+		d->decoder_config = (char *)gf_malloc(d->decoder_config_length);
+		size += 1 + d->decoder_config_length;
+		gf_bs_read_data(bs, d->decoder_config, d->decoder_config_length);
+	}
+	if (d->decoder_config_flags == 3) {
+		d->decoder_config_id_length = gf_bs_read_u8(bs);
+		d->decoder_config_id = (char *)gf_malloc(d->decoder_config_id_length);
+		size += 1 + d->decoder_config_id_length;
+		gf_bs_read_data(bs, d->decoder_config_id, d->decoder_config_id_length);
+	}
+	if (d->decoder_config_flags == 4) {
+		d->decoder_config_service_id = gf_bs_read_u8(bs);
+		size++;
+	}
+	return d;
+}
+
+void gf_m2ts_metadata_descriptor_del(GF_M2TS_MetadataDescriptor *metad)
+{
+	if (metad) {
+		if (metad->service_id_record) gf_free(metad->service_id_record);
+		if (metad->decoder_config) gf_free(metad->decoder_config);
+		if (metad->decoder_config_id) gf_free(metad->decoder_config_id);
+		gf_free(metad);
+	}
+}
+
 static void gf_m2ts_process_pmt(GF_M2TS_Demuxer *ts, GF_M2TS_SECTION_ES *pmt, GF_List *sections, u8 table_id, u16 ex_table_id, u8 version_number, u8 last_section_number, u32 status)
 {
 	u32 info_length, pos, desc_len, evt_type, nb_es,i;
@@ -1570,6 +1980,21 @@
 					gf_odf_desc_del((GF_Descriptor *)pmt->program->pmt_iod);
 					pmt->program->pmt_iod = NULL;
 				}
+			} else if (tag == GF_M2TS_METADATA_POINTER_DESCRIPTOR) {
+				GF_BitStream *metadatapd_bs;
+				GF_M2TS_MetadataPointerDescriptor *metapd;
+				metadatapd_bs = gf_bs_new((char *)data+6, len, GF_BITSTREAM_READ);
+				metapd = gf_m2ts_read_metadata_pointer_descriptor(metadatapd_bs, len);
+				gf_bs_del(metadatapd_bs);
+				if (metapd->application_format_identifier == GF_4CC('I', 'D', '3', ' ') &&
+					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 */
+					gf_m2ts_metadata_pointer_descriptor_del(metapd);
+				}
 			} else {
 #else
 			{
@@ -1617,6 +2042,7 @@
 		case GF_M2TS_VIDEO_H264:
 		case GF_M2TS_VIDEO_SVC:
 		case GF_M2TS_VIDEO_HEVC:
+		case GF_M2TS_VIDEO_SHVC:
 			inherit_pcr = 1;
 		case GF_M2TS_AUDIO_MPEG1:
 		case GF_M2TS_AUDIO_MPEG2:
@@ -1625,6 +2051,7 @@
 		case GF_M2TS_AUDIO_AC3:
 		case GF_M2TS_AUDIO_DTS:
 		case GF_M2TS_SUBTITLE_DVB:
+		case GF_M2TS_METADATA_PES:
 			GF_SAFEALLOC(pes, GF_M2TS_PES);
 			pes->cc = -1;
 			pes->flags = GF_M2TS_ES_IS_PES;
@@ -1723,10 +2150,10 @@
 					reg_desc_format = GF_4CC(data[2], data[3], data[4], data[5]);
 					/*cf http://www.smpte-ra.org/mpegreg/mpegreg.html*/
 					switch (reg_desc_format) {
-					case GF_4CC(0x41, 0x43, 0x2D, 0x33):
+					case GF_4CC('A', 'C', '-', '3'):
 						es->stream_type = GF_M2TS_AUDIO_AC3;
 						break;
-					case GF_4CC(0x56, 0x43, 0x2D, 0x31):
+					case GF_4CC('V', 'C', '-', '1'):
 						es->stream_type = GF_M2TS_VIDEO_VC1;
 						break;
 					}
@@ -1768,6 +2195,25 @@
 					if (pes)
 						pes->depends_on_pid = (data[4] & 0x3F) + es->program->pmt_pid;
 					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;
+
 				default:
 					GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] skipping descriptor (0x%x) not supported\n", tag));
 					break;
@@ -1828,7 +2274,7 @@
 	}
 }
 
-
+static u32 nb_pat=0;
 static void gf_m2ts_process_pat(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)
 {
 	GF_M2TS_Program *prog;
@@ -1838,6 +2284,8 @@
 	u32 data_size;
 	unsigned char *data;
 	GF_M2TS_Section *section;
+	
+	nb_pat++;
 
 	/*wait for the last section */
 	if (!(status&GF_M2TS_TABLE_END)) return;
@@ -1857,6 +2305,11 @@
 	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));
+		return;
+	}
+
 	nb_progs = data_size / 4;	
 
 	for (i=0; i<nb_progs; i++) {
@@ -2021,19 +2474,20 @@
 	GF_M2TS_PESHeader pesh;
 
 	/*we need at least a full, valid start code !!*/
-	if ((pes->data_len >= 4) && !pes->data[0] && !pes->data[1] && (pes->data[2]==0x1)) {
+	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->data[3] | 0x100;
+        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->data[3]==0xfa) 
+			  ((u8) pes->pck_data[3]==0xfa) 
 		) {
 			Bool same_pts = 0;
 
 			/*OK read header*/
-			gf_m2ts_pes_header(pes, pes->data+3, pes->data_len-3, &pesh);
+			gf_m2ts_pes_header(pes, pes->pck_data+3, pes->pck_data_len-3, &pesh);
 			
 			/*send PES timing*/
 			if (ts->notify_pes_timing) {
@@ -2082,52 +2536,53 @@
 			/*3-byte start-code + 6 bytes header + hdr extensions*/
 			len = 9 + pesh.hdr_data_len;
 
-			if ((u8) pes->data[3]==0xfa) {
+			if ((u8) pes->pck_data[3]==0xfa) {
 				GF_M2TS_SL_PCK sl_pck;
 
 				GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] SL Packet in PES for %d - ES ID %d\n", pes->pid, pes->mpeg4_es_id));
 
-				if (pes->data_len > len) {
-					sl_pck.data = (char *)pes->data + len;
-					sl_pck.data_len = pes->data_len - len;
+				if (pes->pck_data_len > len) {
+					sl_pck.data = (char *)pes->pck_data + len;
+					sl_pck.data_len = pes->pck_data_len - len;
 					sl_pck.stream = (GF_M2TS_ES *)pes;
 					if (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_SL_PCK, &sl_pck);
 				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Bad SL Packet size: (%d indicated < %d header)\n", pes->pid, pes->data_len, len));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] Bad SL Packet size: (%d indicated < %d header)\n", pes->pid, pes->pck_data_len, len));
 				}
 			} else if (pes->reframe) {
-				u32 remain;
+				u32 remain = 0;
 				u32 offset = len;
 
-				if (pesh.pck_len && (pesh.pck_len-3-pesh.hdr_data_len != pes->data_len-len)) {
-					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES payload size %d but received %d bytes\n", pes->pid, (u32) ( pesh.pck_len-3-pesh.hdr_data_len), pes->data_len-len));
+				if (pesh.pck_len && (pesh.pck_len-3-pesh.hdr_data_len != pes->pck_data_len-len)) {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d PES payload size %d but received %d bytes\n", pes->pid, (u32) ( pesh.pck_len-3-pesh.hdr_data_len), pes->pck_data_len-len));
 				}
-
+				//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->data + offset, pes->prev_data, pes->prev_data_len);
+					memcpy(pes->pck_data + offset, pes->prev_data, pes->prev_data_len);
 				}
-				remain = pes->reframe(ts, pes, same_pts, pes->data+offset, pes->data_len-offset);
 
+				if (! ts->start_range)
+					remain = pes->reframe(ts, pes, same_pts, pes->pck_data+offset, pes->pck_data_len-offset, &pesh);
+
+				//CLEANUP alloc stuff
 				if (pes->prev_data) gf_free(pes->prev_data);
 				pes->prev_data = NULL;
 				pes->prev_data_len = 0;
 				if (remain) {
 					pes->prev_data = gf_malloc(sizeof(char)*remain);
-					memcpy(pes->prev_data, pes->data + pes->data_len - remain, remain);
+					memcpy(pes->prev_data, pes->pck_data + pes->pck_data_len - remain, remain);
 					pes->prev_data_len = remain;
 				}
 			}
 		} else {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: unknown stream ID %08X\n", pes->pid, stream_id));
 		}
-	} else if (pes->data) {
+	} else if (pes->pck_data_len) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Bad PES Header, discarding packet (maybe stream is encrypted ?)\n", pes->pid));
 	}
-	if (pes->data) gf_free(pes->data);
-	pes->data = NULL;
-	pes->data_len = 0;
+	pes->pck_data_len = 0;
 	pes->pes_len = 0;
 	pes->rap = 0;
 }
@@ -2156,16 +2611,14 @@
 			disc = 0;
 		if (disc) {
 			if (hdr->payload_start) {
-				if (pes->data) {
+				if (pes->pck_data_len) {
 					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Packet discontinuity (%d expected - got %d) - may have lost end of previous PES\n", pes->pid, expect_cc, hdr->continuity_counter));
 				}
 			} else {
-				if (pes->data) {
+				if (pes->pck_data_len) {
 					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PES %d: Packet discontinuity (%d expected - got %d) - trashing PES packet\n", pes->pid, expect_cc, hdr->continuity_counter));
-					gf_free(pes->data);
-					pes->data = NULL;
 				}
-				pes->data_len = 0;
+				pes->pck_data_len = 0;
 				pes->pes_len = 0;
 				pes->cc = -1;
 				return;
@@ -2182,44 +2635,44 @@
 		pes->before_last_pcr_value_pck_number = pes->program->before_last_pcr_value_pck_number;
 		pes->last_pcr_value = pes->program->last_pcr_value;
 		pes->last_pcr_value_pck_number = pes->program->last_pcr_value_pck_number;
-	} else if (pes->pes_len && (pes->data_len + data_size == pes->pes_len + 6)) {
+	} else if (pes->pes_len && (pes->pck_data_len + data_size == pes->pes_len + 6)) {
 		/* 6 = startcode+stream_id+length*/
 		/*reassemble pes*/
-		if (pes->data) pes->data = (u8*)gf_realloc(pes->data, pes->data_len+data_size);
-		else pes->data = (u8*)gf_malloc(data_size);
-		memcpy(pes->data+pes->data_len, data, data_size);
-		pes->data_len += data_size;
+		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);
+		}
+		memcpy(pes->pck_data+pes->pck_data_len, data, data_size);
+		pes->pck_data_len += data_size;
 		/*force discard*/
 		data_size = 0;
 		flush_pes = 1;
 	}
 
 	/*PES first fragment: flush previous packet*/
-	if (flush_pes && pes->data) {
+	if (flush_pes && pes->pck_data_len) {
 		gf_m2ts_flush_pes(ts, pes);
 		if (!data_size) return;
 	}
 	/*we need to wait for first packet of PES*/
-	if (!pes->data_len && !hdr->payload_start) {
+	if (!pes->pck_data_len && !hdr->payload_start) {
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Waiting for PES header, trashing data\n", hdr->pid));
 		return;
 	}
 	/*reassemble*/
-	if (pes->data){
-		pes->data = (u8*)gf_realloc(pes->data, pes->data_len+data_size);
-		//fprintf(stderr, "[MPEG-2 TS] REALLOC \n");
-	}else{
-		pes->data = (u8*)gf_malloc(data_size);
+	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);
 	}
-	memcpy(pes->data+pes->data_len, data, data_size);
-	pes->data_len += data_size;
+	memcpy(pes->pck_data + pes->pck_data_len, data, data_size);
+	pes->pck_data_len += data_size;
 
 	if (paf && paf->random_access_indicator) pes->rap = 1;
-	if (hdr->payload_start && !pes->pes_len && (pes->data_len>=6)) {
-		pes->pes_len = (pes->data[4]<<8) | pes->data[5];
+	if (hdr->payload_start && !pes->pes_len && (pes->pck_data_len>=6)) {
+		pes->pes_len = (pes->pck_data[4]<<8) | pes->pck_data[5];
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Got PES packet len %d\n", pes->pid, pes->pes_len));
 
-		if (pes->pes_len + 6 == pes->data_len) {
+		if (pes->pes_len + 6 == pes->pck_data_len) {
 			gf_m2ts_flush_pes(ts, pes);
 		}
 	}
@@ -2228,6 +2681,7 @@
 
 static void gf_m2ts_get_adaptation_field(GF_M2TS_Demuxer *ts, GF_M2TS_AdaptationField *paf, unsigned char *data, u32 size, u32 pid)
 {
+	unsigned char *af_extension;
 	paf->discontinuity_indicator = (data[0] & 0x80) ? 1 : 0;
 	paf->random_access_indicator = (data[0] & 0x40) ? 1 : 0;
 	paf->priority_indicator = (data[0] & 0x20) ? 1 : 0;
@@ -2237,23 +2691,112 @@
 	paf->transport_private_data_flag = (data[0] & 0x2) ? 1 : 0;
 	paf->adaptation_field_extension_flag = (data[0] & 0x1) ? 1 : 0;
 
+	af_extension = data + 1;
 	if (paf->PCR_flag == 1){
 		u32 base = (data[1] << 24) | (data[2] << 16) | (data[3] << 8) | data[4];
 		u64 PCR = (u64) base;
 		paf->PCR_base = (PCR << 1) | (data[5] >> 7);
 		paf->PCR_ext = ((data[5] & 1) << 8) | data[6];
+		af_extension += 6;
 	}
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Adaptation Field found: Discontinuity %d - RAP %d - PCR: "LLD"\n", pid, paf->discontinuity_indicator, paf->random_access_indicator, paf->PCR_flag ? paf->PCR_base * 300 + paf->PCR_ext : 0));
+	if (paf->adaptation_field_extension_flag) {
+		u32 afext_bytes;
+		Bool ltw_flag, pwr_flag, seamless_flag, af_desc_not_present;
+		if (paf->OPCR_flag) {
+			af_extension += 6;
+		}
+		if (paf->splicing_point_flag) {
+			af_extension += 1;
+		}
+		if (paf->transport_private_data_flag) {
+			u32 priv_bytes = af_extension[0];
+			af_extension += 1 + priv_bytes;
+		}
+
+		afext_bytes = af_extension[0];
+		ltw_flag = af_extension[1] & 0x80 ? 1 : 0;
+		pwr_flag = af_extension[1] & 0x40 ? 1 : 0;
+		seamless_flag = af_extension[1] & 0x20 ? 1 : 0;
+		af_desc_not_present = af_extension[1] & 0x10 ? 1 : 0;
+		af_extension += 2;
+		afext_bytes-=1;
+		if (ltw_flag) {
+			af_extension += 2;
+			afext_bytes-=2;
+		}
+		if (pwr_flag) {
+			af_extension += 3;
+			afext_bytes-=3;
+		}
+		if (seamless_flag) {
+			af_extension += 3;
+			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];
+				u8 desc_len = af_extension[1];
+				if ((u32) desc_len+2 > afext_bytes) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Bad Adaptation Descriptor found (tag %d) size is %d but only %d bytes available\n", pid, desc_tag, desc_len, afext_bytes));
+					break;
+				}
+				desc = (char *) af_extension+2;
 
-#if 0
-	if (paf->OPCR_flag == 1){
-		u32 base = (data[7] << 24) | (data[8] << 16) | (data[9] << 8) | data[10];
-		u64 PCR = (u64) base;
-		paf->PCR_base = (PCR << 1) | (data[11] >> 7);
-		paf->PCR_ext = ((data[11] & 1) << 8) | data[12];
+				bs = gf_bs_new(desc, desc_len, GF_BITSTREAM_READ);
+				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);
+					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_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d AF Location descriptor found - URL %s\n", pid, URL));
+					break;
+				case GF_M2TS_AFDESC_TIMELINE_DESCRIPTOR:
+
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d AF Timeline descriptor found\n", pid));
+					break;
+				}
+				gf_bs_del(bs);
+
+				af_extension += 2+desc_len;
+				afext_bytes -= 2+desc_len;
+			}
+
+		}
 	}
-#endif
+
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_CONTAINER, ("[MPEG-2 TS] PID %d: Adaptation Field found: Discontinuity %d - RAP %d - PCR: "LLD"\n", pid, paf->discontinuity_indicator, paf->random_access_indicator, paf->PCR_flag ? paf->PCR_base * 300 + paf->PCR_ext : 0));
 }
 
 static void gf_m2ts_process_packet(GF_M2TS_Demuxer *ts, unsigned char *data)
@@ -2298,8 +2841,8 @@
 		paf = &af;
 		memset(paf, 0, sizeof(GF_M2TS_AdaptationField));
 		//this will stop you when processing invalid (yet existing) mpeg2ts streams in debug
-		assert(af_size>=0 && af_size<=182);
-		if ( !(af_size>=0 && af_size<=182))
+		assert( af_size<=182);
+		if (af_size>182)
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CONTAINER, ("[MPEG-2 TS] Detected wrong adaption field size %u when control value is 3\n", af_size));
 		if (af_size) gf_m2ts_get_adaptation_field(ts, paf, data+5, af_size, hdr.pid);
 		pos += 1+af_size;
@@ -2365,7 +2908,10 @@
 				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 (ts->on_event) ts->on_event(ts, GF_M2TS_EVT_PES_PCR, &pck);
+				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);
+				}
 			}
 		}
 
@@ -2515,9 +3061,7 @@
 			if (!pes || (pes->pid==pes->program->pmt_pid)) continue;
 			pes->cc = -1;
 			pes->frame_state = 0;
-			if (pes->data) gf_free(pes->data);
-			pes->data = NULL;
-			pes->data_len = 0;
+			pes->pck_data_len = 0;
 			if (pes->prev_data) gf_free(pes->prev_data);
 			pes->prev_data = NULL;
 			pes->prev_data_len = 0;
@@ -2578,6 +3122,7 @@
 	case GF_M2TS_PES_FRAMING_SKIP_NO_RESET:
 		pes->reframe = NULL;
 		break;
+	case GF_M2TS_PES_FRAMING_DEFAULT_NAL:
 	case GF_M2TS_PES_FRAMING_DEFAULT:
 	default:
 		switch (pes->stream_type) {
@@ -2593,9 +3138,12 @@
 		case GF_M2TS_VIDEO_H264:
 		case GF_M2TS_VIDEO_SVC:
 			pes->reframe = gf_m2ts_reframe_avc_h264;
+			pes->single_nal_mode = (mode==GF_M2TS_PES_FRAMING_DEFAULT_NAL) ? 1 : 0;
 			break;
 		case GF_M2TS_VIDEO_HEVC:
+		case GF_M2TS_VIDEO_SHVC:
 			pes->reframe = gf_m2ts_reframe_hevc;
+			pes->single_nal_mode = (mode==GF_M2TS_PES_FRAMING_DEFAULT_NAL) ? 1 : 0;
 			break;
 		case GF_M2TS_AUDIO_AAC:
 			pes->reframe = gf_m2ts_reframe_aac_adts;
@@ -2607,6 +3155,10 @@
 
 		case GF_M2TS_PRIVATE_DATA:
 			/* TODO: handle DVB subtitle streams */
+			break;
+		case GF_M2TS_METADATA_ID3_HLS:
+			pes->reframe = gf_m2ts_reframe_id3_pes;
+			break;
 		default:
 			pes->reframe = gf_m2ts_reframe_default;
 			break;
@@ -2739,6 +3291,8 @@
 		gf_list_del(ts->requested_pids);
 	}
 
+	if (ts->th)
+		gf_th_del(ts->th);
 	gf_free(ts);
 }
 
@@ -2750,7 +3304,114 @@
 }
 
 
-/* DVB fonction */
+GF_EXPORT
+GF_Err gf_m2ts_demux_file(GF_M2TS_Demuxer *ts, const char *fileName, u64 start_byterange, u64 end_byterange, u32 refresh_type, Bool signal_end_of_stream)
+{
+	u32 i;
+	GF_Err e;
+	u32 size;
+	u64 read;
+	GF_BitStream *bs = NULL;
+	FILE *f = NULL;
+
+	if (fileName && !strnicmp(fileName, "gmem://", 7)) {
+		void *mem_address;
+		u32 remain;
+		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", fileName));
+			return GF_URL_ERROR;
+		} 
+		if (refresh_type==0) 
+			ts->pos_in_stream = 0;
+
+		//resume where we left
+		mem_address = (u8 *) mem_address + ts->pos_in_stream;
+		size -= (u32) ts->pos_in_stream;
+
+		remain = (size % 188);
+		size -= remain;
+
+		/*process chunk*/			
+		e = gf_m2ts_process_data(ts, mem_address, size);
+
+		if (refresh_type==2) 
+			ts->pos_in_stream = 0;
+		else
+			ts->pos_in_stream += size;
+
+	} else if (fileName) {
+		char data[188000];
+
+		f = gf_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;
+		}
+		bs = gf_bs_from_file(f, GF_BITSTREAM_READ);
+
+		if (refresh_type) {
+			if (ts->pos_in_stream) {
+				gf_bs_seek(bs, ts->pos_in_stream);
+			}
+		} else {
+			if (start_byterange) {
+				gf_bs_seek(bs, start_byterange);
+			}
+		}
+		read = 0;
+		while (1) {
+			u32 to_read = 188000;
+			Bool done = 0;
+			u64 avail = gf_bs_available(bs);
+			
+			if (avail < 188) 
+				break;
+
+			if (end_byterange && (read + to_read > end_byterange)) {
+				to_read = (u32) (end_byterange - read);
+				done = 1;
+			}
+			if (to_read > avail) {
+				u32 skip = avail % 188;
+				to_read = (u32) (avail - skip);
+				done = 1;
+			}
+			size = gf_bs_read_data(bs, data, to_read);
+			if (size) {
+				e = gf_m2ts_process_data(ts, data, size);
+				if (e) {
+					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Error %s while demuxing %s\n", gf_error_to_string(e), fileName));
+				}
+			}
+			read += size;
+			if (done) break;
+		}
+
+		if ((refresh_type==2) || !gf_bs_available(bs)) {
+			ts->pos_in_stream = 0;
+		} else {
+			ts->pos_in_stream = gf_bs_get_position(bs);
+		}
+	
+		gf_bs_del(bs);
+		fclose(f);
+
+	}
+
+	if (signal_end_of_stream && !ts->pos_in_stream) {
+		for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
+			if (ts->ess[i]) {
+				if (ts->ess[i]->flags & GF_M2TS_ES_IS_PES) {
+					gf_m2ts_flush_pes(ts, (GF_M2TS_PES *) ts->ess[i]);
+					ts->on_event(ts, GF_M2TS_EVT_EOS, (GF_M2TS_PES *) ts->ess[i]);
+				} 
+			}
+		}
+	}
+	return GF_OK;
+}
+
 
 static u32 gf_m2ts_demuxer_run(void *_p)
 {
@@ -2853,31 +3514,27 @@
 		u32 pos = 0;
 		GF_BitStream *ts_bs = NULL;
 
-		if (ts->segment_switch || (!ts->file && !ts->ts_data_chunk) ) {
-			ts->segment_switch = 0;
-			goto next_segment_setup;
-		} 
-		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*/
-			while (pos%188) pos++;
-			if (pos>=ts->file_size) {
-				ts->start_range = 0;
-				pos = 0;
-			}
-		}
-
-restart_stream:
-
 		if (ts->file)
 			ts_bs = gf_bs_from_file(ts->file, GF_BITSTREAM_READ);
 		else
 			ts_bs = gf_bs_new(ts->ts_data_chunk, ts->ts_data_chunk_size, GF_BITSTREAM_READ);
 
-		gf_bs_seek(ts_bs, ts->start_byterange);
+		while (ts->run_state && gf_bs_available(ts_bs) && !ts->force_file_refresh) {
+
+			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);
+			}
 
-		while (ts->run_state && gf_bs_available(ts_bs)) {
 			/*m2ts chunks by chunks*/
 			size = gf_bs_read_data(ts_bs, data, 188);
 			if (!size && (ts->loop_demux == 1)) {
@@ -2893,8 +3550,6 @@
 			gf_m2ts_process_data(ts, data, size);
 
 			ts->nb_pck++;
-			if (ts->end_byterange && (gf_bs_get_position(ts_bs) >= ts->end_byterange))
-				break;
 
 			//gf_sleep(0);
 			/*if asked to regulate, wait until we get a play request*/
@@ -2909,51 +3564,13 @@
 				gf_sleep(3000);
             }
 		}
+		ts->force_file_refresh = 0;
 
-next_segment_setup:
 		if (ts_bs) {
 			pos = (u32) gf_bs_get_position(ts_bs);
 			gf_bs_del(ts_bs);
 			ts_bs = NULL;
 		}
-		if (ts->run_state && ts->query_next) {
-			u32 query_type = (!ts->file && !ts->ts_data_chunk) ? 2 : 1;
-			Bool is_refresh = GF_FALSE;
-			const char *next_url = NULL;
-			e = ts->query_next(ts->query_udta, query_type, &next_url, &ts->start_byterange, &ts->end_byterange, &is_refresh);
-			
-			/*not ready, wait ...*/
-			while ((e==GF_BUFFER_TOO_SMALL) && !next_url && ts->run_state) {
-				gf_sleep(10);
-				e = ts->query_next(ts->query_udta, query_type, &next_url, &ts->start_byterange, &ts->end_byterange, &is_refresh);
-			}
-
-			if (next_url) {
-				/*TODO we need to know if we had a seek or not, to fluh remaining PES data*/
-				if (is_refresh) {
-					ts->start_byterange = pos;
-				} else { 
-					gf_m2ts_set_segment_switch(ts);
-				}
-
-				if (!strncmp(next_url, "gmem://", 7)) {
-					u32 size;
-					void *mem_address;
-					if (sscanf(next_url, "gmem://%d@%p", &size, &mem_address) != 2) {
-						GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", next_url));
-					} else {
-						ts->ts_data_chunk_size = size;
-						ts->ts_data_chunk = mem_address;
-						if (ts->ts_data_chunk_size) goto restart_stream;
-					}
-				} else {
-					if (ts->file) fclose(ts->file);
-					ts->file = gf_f64_open(next_url, "rb");
-					if (ts->file) goto restart_stream;
-					GF_LOG(GF_LOG_ERROR, GF_LOG_CONTAINER, ("[M2TSDemux] Cannot open next file %s\n", next_url));
-				}
-			}
-		}
 	}
 
 	for (i=0; i<GF_M2TS_MAX_STREAMS; i++) {
@@ -3277,20 +3894,13 @@
 
 			gf_f64_seek(ts->file, 0, SEEK_END);
 			ts->file_size = gf_f64_tell(ts->file);
-
+			gf_f64_seek(ts->file, 0, SEEK_SET);
 		}
 	}
 
 	/* reinitialization for seek */
 	ts->end_range = ts->start_range = 0;
 	ts->nb_playing = 0;	
-
-	ts->start_byterange = ts->end_byterange = 0;
-	if (ts->query_next) {
-		ts->query_next(ts->query_udta, 0, NULL, &ts->start_byterange, &ts->end_byterange, NULL);
-	}
-
-
 	return  gf_m2ts_demuxer_play(ts);
 
 }
@@ -3381,7 +3991,7 @@
 		u32 size;
 		u8 *mem_address;
 		if (sscanf(fileName, "gmem://%d@%p", &size, &mem_address) != 2) {
-			return GF_URL_ERROR;
+			return GF_FALSE;
 		} 
 		while (size>188 && count) {
 			if (mem_address[0] != 0x47)
@@ -3390,7 +4000,7 @@
 			size-=188;
 			count--;
 		}
-		return 1;
+		return GF_TRUE;
 	}
 
 	t = gf_f64_open(fileName, "rb");
@@ -3407,7 +4017,7 @@
 		else count--;
 	}
 	if (t) fclose(t);
-	return count ? 0 : 1;
+	return count ? GF_FALSE : GF_TRUE;
 }
 
 static void rewrite_pts_dts(unsigned char *ptr, u64 TS)

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/reedsolomon.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/reedsolomon.c Changed

@@ -322,7 +322,7 @@
     if (sum == 0) 
       { 
 	ErrorLocs[NErrors] = (255-r); NErrors++; 
-	if (DEBUG) fprintf(stderr, "Root found at r = %d, (255-r) = %d\n", r, (255-r));
+	if (RS_DEBUG) fprintf(stderr, "Root found at r = %d, (255-r) = %d\n", r, (255-r));
       }
   }
 }
@@ -363,7 +363,7 @@
     /* first check for illegal error locs */
     for (r = 0; r < NErrors; r++) {
       if (ErrorLocs[r] >= csize) {
-	if (DEBUG) fprintf(stderr, "Error loc i=%d outside of codeword length %d\n", i, csize);
+	if (RS_DEBUG) fprintf(stderr, "Error loc i=%d outside of codeword length %d\n", i, csize);
 	return(0);
       }
     }
@@ -384,14 +384,14 @@
       }
       
       err = gmult(num, ginv(denom));
-      if (DEBUG) fprintf(stderr, "Error magnitude %#x at loc %d\n", err, csize-i);
+      if (RS_DEBUG) fprintf(stderr, "Error magnitude %#x at loc %d\n", err, csize-i);
       
       codeword[csize-i-1] ^= err;
     }
     return(1);
   }
   else {
-    if (DEBUG && NErrors) fprintf(stderr, "Uncorrectable codeword\n");
+    if (RS_DEBUG && NErrors) fprintf(stderr, "Uncorrectable codeword\n");
     return(0);
   }
 }
@@ -413,7 +413,7 @@
  /* generator polynomial */  
  int genPoly[MAXDEG*2];  
    
- int DEBUG = FALSE;  
+ int RS_DEBUG = FALSE;  
    
  static void  
  compute_genpoly (int nbytes, int genpoly[]);

gpac-0.5.0.svn4668.tar.bz2/src/media_tools/text_import.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/text_import.c Changed

@@ -42,6 +42,8 @@
 	GF_TEXT_IMPORT_TTXT,
 	GF_TEXT_IMPORT_TEXML,
     GF_TEXT_IMPORT_WEBVTT,
+    GF_TEXT_IMPORT_TTML,
+    GF_TEXT_IMPORT_SWF_SVG,
 };
 
 #define REM_TRAIL_MARKS(__str, __sep) while (1) {	\
@@ -110,6 +112,7 @@
 	else if (!strnicmp(szLine, "<?xml ", 6)) {
 		char *ext = strrchr(filename, '.');
 		if (!strnicmp(ext, ".ttxt", 5)) *fmt = GF_TEXT_IMPORT_TTXT;
+		else if (!strnicmp(ext, ".ttml", 5)) *fmt = GF_TEXT_IMPORT_TTML;
 		ext = strstr(szLine, "?>");
 		if (ext) ext += 2;
 		if (!ext[0]){
@@ -118,6 +121,7 @@
 		}
 		if (strstr(szLine, "x-quicktime-tx3g") || strstr(szLine, "text3GTrack")) *fmt = GF_TEXT_IMPORT_TEXML;
 		else if (strstr(szLine, "TextStream")) *fmt = GF_TEXT_IMPORT_TTXT;
+		else if (strstr(szLine, "tt")) *fmt = GF_TEXT_IMPORT_TTML;
 	}
 	else if (strstr(szLine, "WEBVTT") )
         *fmt = GF_TEXT_IMPORT_WEBVTT;
@@ -133,7 +137,8 @@
 #define TTXT_DEFAULT_HEIGHT	60
 #define TTXT_DEFAULT_FONT_SIZE	18
 
-static void gf_text_get_video_size(GF_MediaImporter *import, u32 *width, u32 *height)
+#ifndef GPAC_DISABLE_MEDIA_IMPORT
+void gf_text_get_video_size(GF_MediaImporter *import, u32 *width, u32 *height)
 {
 	u32 w, h, f_w, f_h, i;
 	GF_ISOFile *dest = import->dest;
@@ -163,8 +168,7 @@
 }
 
 
-#ifndef GPAC_DISABLE_MEDIA_IMPORT
-static void gf_text_import_set_language(GF_MediaImporter *import, u32 track)
+void gf_text_import_set_language(GF_MediaImporter *import, u32 track)
 {
 	if (import->esd && import->esd->langDesc) {
 		char lang[4];
@@ -309,7 +313,8 @@
 		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating text track");
 	}
 	gf_isom_set_track_enabled(import->dest, track, 1);
-	if (import->esd && !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
+	import->final_trackID = gf_isom_get_track_id(import->dest, track);
+	if (import->esd && !import->esd->ESID) import->esd->ESID = import->final_trackID;
 
 	if (OCR_ES_ID) gf_isom_set_track_reference(import->dest, track, GF_ISOM_REF_OCR, OCR_ES_ID);
 
@@ -613,29 +618,31 @@
 	return e;
 }
 
+/* Structure used to pass importer and track data to the parsers without exposing the GF_MediaImporter structure 
+   used by WebVTT and Flash->SVG */
 typedef struct {
     GF_MediaImporter *import;
     u32 timescale;
     u32 track;
     u32 descriptionIndex;
-} GF_WebVTTISOFlusher;
+} GF_ISOFlusher;
 
 static GF_Err gf_webvtt_import_report(void *user, GF_Err e, char *message, const char *line)
 {
-    GF_WebVTTISOFlusher     *flusher = (GF_WebVTTISOFlusher *)user;
+    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_WebVTTISOFlusher     *flusher = (GF_WebVTTISOFlusher *)user;
+    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_WebVTTISOFlusher     *flusher = (GF_WebVTTISOFlusher *)user;
+    GF_ISOFlusher     *flusher = (GF_ISOFlusher *)user;
     //gf_webvtt_dump_sample(stdout, samp);
     s = gf_isom_webvtt_to_sample(samp);
     if (s) {
@@ -658,7 +665,7 @@
 	u32							OCR_ES_ID;
 	GF_GenericSubtitleConfig	*cfg;
 	GF_WebVTTParser				*vttparser;
-	GF_WebVTTISOFlusher			flusher;
+	GF_ISOFlusher				flusher;
 
 	cfg	= NULL;
 	if (import->esd) {
@@ -687,8 +694,9 @@
 	if (!track)	{
 		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating WebVTT track");
 	}
-	gf_isom_set_track_enabled(import->dest,	track, 1);
-	if (import->esd	&& !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
+	gf_isom_set_track_enabled(import->dest, track, 1);
+	import->final_trackID = gf_isom_get_track_id(import->dest, track);
+	if (import->esd && !import->esd->ESID) import->esd->ESID = import->final_trackID;
 
 	if (OCR_ES_ID) gf_isom_set_track_reference(import->dest, track,	GF_ISOM_REF_OCR, OCR_ES_ID);
 
@@ -742,6 +750,278 @@
     return e;
 }
 
+static GF_Err gf_text_import_ttml(GF_MediaImporter *import)
+{
+	GF_Err e;
+	e = GF_OK;
+
+	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_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) {
+		return GF_BAD_PARAM;
+	} else {
+		switch (stse->type) {
+		case GF_ISOM_BOX_TYPE_STSE:
+			break;
+		default:
+			return GF_BAD_PARAM;
+		}
+		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);
+		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_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;
+    }
+	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;
+}
+
+
+#ifndef GPAC_DISABLE_SWF_IMPORT
+
+/* SWF Importer */
+#include <gpac/internal/swf_dev.h>
+
+static GF_Err swf_svg_add_iso_sample(void *user, const char *data, u32 length, u64 timestamp, Bool isRap)
+{
+	GF_Err				e = GF_OK;
+	GF_ISOFlusher		*flusher = (GF_ISOFlusher *)user;
+	GF_ISOSample		*s;
+	GF_BitStream		*bs;
+
+	bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (!bs) return GF_BAD_PARAM;
+	gf_bs_write_data(bs, data, length);
+	s = gf_isom_sample_new();
+	if (s) {
+		gf_bs_get_content(bs, &s->data, &s->dataLength);
+		s->DTS = (u64) (flusher->timescale*timestamp/1000);
+		s->IsRAP = isRap;
+		gf_isom_add_sample(flusher->import->dest, flusher->track, flusher->descriptionIndex, s);
+		gf_isom_sample_del(&s);
+	} else {
+		e = GF_BAD_PARAM;
+	}
+	gf_bs_del(bs);
+	return e;
+}
+
+static GF_Err swf_svg_add_iso_header(void *user, const char *data, u32 length)
+{
+	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);
+}
+
+GF_EXPORT
+GF_Err gf_text_import_swf(GF_MediaImporter *import)
+{
+	GF_Err						e = GF_OK;
+	u32							track;
+	u32							timescale;
+	//u32							duration;
+	u32							descIndex;
+	u32							ID;
+	u32							OCR_ES_ID;
+	GF_GenericSubtitleConfig	*cfg;
+	SWFReader					*read;
+	GF_ISOFlusher				flusher;
+	char						*mime;
+
+	if (import->flags & GF_IMPORT_PROBE_ONLY) {
+		import->nb_tracks = 1;
+		return GF_OK;
+	}
+
+	cfg	= NULL;
+	if (import->esd) {
+		if (!import->esd->slConfig)	{
+			import->esd->slConfig =	(GF_SLConfig *)	gf_odf_desc_new(GF_ODF_SLC_TAG);
+			import->esd->slConfig->predefined =	2;
+			import->esd->slConfig->timestampResolution = 1000;
+		}
+		timescale =	import->esd->slConfig->timestampResolution;
+		if (!timescale)	timescale =	1000;
+
+		/*explicit text	config*/
+		if (import->esd->decoderConfig && import->esd->decoderConfig->decoderSpecificInfo->tag == GF_ODF_GEN_SUB_CFG_TAG) {
+			cfg	= (GF_GenericSubtitleConfig	*) import->esd->decoderConfig->decoderSpecificInfo;
+			import->esd->decoderConfig->decoderSpecificInfo	= NULL;
+		}
+		ID = import->esd->ESID;
+		OCR_ES_ID =	import->esd->OCRESID;
+	} else {
+		timescale =	1000;
+		OCR_ES_ID =	ID = 0;
+	}
+	
+	if (cfg	&& cfg->timescale) timescale = cfg->timescale;
+	track =	gf_isom_new_track(import->dest,	ID,	GF_ISOM_MEDIA_TEXT,	timescale);
+	if (!track)	{
+		return gf_import_message(import, gf_isom_last_error(import->dest), "Error creating text track");
+	}
+	gf_isom_set_track_enabled(import->dest,	track, 1);
+	if (import->esd	&& !import->esd->ESID) import->esd->ESID = gf_isom_get_track_id(import->dest, track);
+
+	if (OCR_ES_ID) gf_isom_set_track_reference(import->dest, track,	GF_ISOM_REF_OCR, OCR_ES_ID);
+
+	if (!stricmp(import->streamFormat, "SVG")) {
+		mime = "image/svg+xml";
+	} else {
+		mime = "application/octet-stream";
+	}
+	/*setup	track*/
+	if (cfg) {
+		u32	i;
+		u32	count;
+		/*set track	info*/
+		gf_isom_set_track_layout_info(import->dest,	track, cfg->text_width<<16,	cfg->text_height<<16, 0, 0,	cfg->layer);
+
+		/*and set sample descriptions*/
+		count =	gf_list_count(cfg->sample_descriptions);
+		for	(i=0; i<count; i++)	{
+			gf_isom_new_simpletext_description(import->dest, track, NULL, NULL, NULL, NULL, mime, &descIndex);
+		}
+		gf_import_message(import, GF_OK, "SWF import - text track %d	x %d", cfg->text_width,	cfg->text_height);
+		gf_odf_desc_del((GF_Descriptor *)cfg);
+	} else {
+		u32	w;
+		u32	h;
+
+		gf_text_get_video_size(import, &w, &h);
+		gf_isom_set_track_layout_info(import->dest,	track, w<<16, h<<16, 0,	0, 0);
+
+		gf_isom_new_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);
+	//duration = (u32) (((Double) import->duration)*timescale/1000.0);
+
+	read = gf_swf_reader_new(NULL, import->in_name);
+	gf_swf_read_header(read);
+	flusher.import = import;
+	flusher.track = track;
+	flusher.timescale = timescale;
+	flusher.descriptionIndex = descIndex;
+	gf_swf_reader_set_user_mode(read, &flusher, swf_svg_add_iso_sample, swf_svg_add_iso_header);
+	if (!import->streamFormat || (import->streamFormat && !stricmp(import->streamFormat, "SVG"))) {
+		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);
+	}
+	if (e) {
+		goto exit;
+	}
+	/*parse all tags*/
+	while (e == GF_OK) {
+		e = swf_parse_tag(read);
+	}
+	if (e==GF_EOS) e = GF_OK;
+exit:
+	gf_swf_reader_del(read);
+	return e;
+}
+/* end of SWF Importer */
+
+#else
+
+GF_EXPORT
+GF_Err gf_text_import_swf(GF_MediaImporter *import)
+{
+	GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("Warning: GPAC was compiled without SWF import support, can't import track."));
+	return GF_NOT_SUPPORTED;
+}
+
+#endif /*GPAC_DISABLE_SWF_IMPORT*/
+
 static GF_Err gf_text_import_sub(GF_MediaImporter *import)
 {
 	FILE *sub_in;
@@ -1267,7 +1547,7 @@
 			samp = gf_isom_new_text_sample();
 			ts = 0;
 			descIndex = 1;
-			last_sample_empty = GF_FALSE;
+			last_sample_empty = GF_TRUE;
 
 			j=0;
 			while ( (att=(GF_XMLAttribute*)gf_list_enum(node->attributes, &j))) {
@@ -1848,11 +2128,15 @@
 	u32 fmt;
 	e = gf_text_guess_format(import->in_name, &fmt);
 	if (e) return e;
+	if (import->streamFormat) {
+		if (!strcmp(import->streamFormat, "VTT")) fmt = GF_TEXT_IMPORT_WEBVTT;
+		else if (!strcmp(import->streamFormat, "TTML")) fmt = GF_TEXT_IMPORT_TTML;
+	}
+	if ((strstr(import->in_name, ".swf") || strstr(import->in_name, ".SWF")) && !stricmp(import->streamFormat, "SVG")) fmt = GF_TEXT_IMPORT_SWF_SVG;
 	if (!fmt) {
 		GF_LOG(GF_LOG_WARNING, GF_LOG_PARSER, ("[TTXT Import] Input %s does not look like a supported text format - ignoring\n", import->in_name));
 		return GF_NOT_SUPPORTED;
 	}
-	if (import->streamFormat && !strcmp(import->streamFormat, "VTT")) fmt = GF_TEXT_IMPORT_WEBVTT;
 	if (import->flags & GF_IMPORT_PROBE_ONLY) {
 		if (fmt==GF_TEXT_IMPORT_SUB) import->flags |= GF_IMPORT_OVERRIDE_FPS;
 		return GF_OK;
@@ -1863,6 +2147,8 @@
 	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.svn4668.tar.bz2/src/media_tools/webvtt.c -> gpac-0.5.0.svn5178.tar.bz2/src/media_tools/webvtt.c Changed

@@ -25,37 +25,11 @@
 
 #include <gpac/internal/isomedia_dev.h>
 #include <gpac/internal/media_dev.h>
+#include <gpac/webvtt.h>
 #include <gpac/constants.h>
 
 #ifndef GPAC_DISABLE_VTT
 
-/* WebVTT types */
-typedef enum {
-    WEBVTT_ID,
-    WEBVTT_SETTINGS,
-    WEBVTT_PAYLOAD,
-    WEBVTT_TIME
-} GF_WebVTTCuePropertyType;
-
-typedef struct _webvtt_timestamp {
-    u32 hour, min, sec, ms;
-} GF_WebVTTTimestamp;
-
-typedef struct _webvtt_cue
-{
-    GF_WebVTTTimestamp start;
-    GF_WebVTTTimestamp end;
-    char *id;
-    char *settings;
-    char *text;
-    char *time;
-
-    Bool split;
-    /* original times before split, if applicable */
-    GF_WebVTTTimestamp orig_start;
-    GF_WebVTTTimestamp orig_end;
-} GF_WebVTTCue;
-
 struct _webvtt_sample
 {
     u64 start;
@@ -63,43 +37,9 @@
     GF_List *cues;
 };
 
-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
-} 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 *);
-
-};
 
 #ifndef GPAC_DISABLE_ISOM
 
-
-typedef struct 
-{
-    GF_ISOM_BOX
-    char *string;
-} GF_StringBox;
-
 typedef struct
 {
     GF_ISOM_BOX
@@ -109,18 +49,12 @@
     GF_StringBox *payload;
 } GF_VTTCueBox;
 
-typedef struct
-{
-    GF_ISOM_SAMPLE_ENTRY_FIELDS
-    GF_StringBox *config;
-} GF_WebVTTSampleEntryBox;
-
 GF_Box *boxstring_New(u32 type) {
     ISOM_DECL_BOX_ALLOC(GF_StringBox, type);
     return (GF_Box *)tmp;
 }
 
-static GF_Box *boxstring_new_with_data(u32 type, const char *string) {
+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;
@@ -156,6 +90,7 @@
     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_free(s);
 }
 
 void vtte_del(GF_Box *s)
@@ -512,7 +447,8 @@
         return GF_BAD_PARAM;
     }
     if (wvtt) {
-        trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+		if (!movie->keep_utc)
+	        trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
         wvtt->config = (GF_StringBox *)boxstring_new_with_data(GF_ISOM_BOX_TYPE_VTTC, config);
     } else {
@@ -548,7 +484,8 @@
         e = Media_CreateDataRef(trak->Media->information->dataInformation->dref, URLname, URNname, &dataRefIndex);
         if (e) return e;
     }
-    trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
+	if (!movie->keep_utc)
+	    trak->Media->mediaHeader->modificationTime = gf_isom_get_mp4time();
 
     wvtt = (GF_WebVTTSampleEntryBox *) gf_isom_box_new(GF_ISOM_BOX_TYPE_WVTT);
     wvtt->dataReferenceIndex = dataRefIndex;
@@ -557,77 +494,36 @@
     return e;
 }
 
-//GF_Err gf_isom_get_webvtt_esd(GF_MediaBox *mdia, GF_ESD **out_esd)
-//{
-//    GF_BitStream *bs;
-//    u32 count, i;
-//    Bool has_v_info;
-//    GF_List *sampleDesc;
-//    GF_ESD *esd;
-//    GF_TrackBox *tk;
-//
-//    *out_esd = NULL;
-//    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;
-//
-//    bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
-//
-//    /*Base3GPPFormat*/
-//    gf_bs_write_u8(bs, 0x10);
-//    /*MPEGExtendedFormat*/
-//    gf_bs_write_u8(bs, 0x10);
-//    /*profileLevel*/
-//    gf_bs_write_u8(bs, 0x10);
-//    gf_bs_write_u24(bs, mdia->mediaHeader->timeScale);
-//    gf_bs_write_int(bs, 0, 1);  /*no alt formats*/
-//    gf_bs_write_int(bs, 2, 2);  /*only out-of-band-band sample desc*/
-//    gf_bs_write_int(bs, 1, 1);  /*we will write sample desc*/
-//
-//    /*write v info if any visual track in this movie*/
-//    has_v_info = GF_FALSE;
-//    i=0;
-//    while ((tk = (GF_TrackBox*)gf_list_enum(mdia->mediaTrack->moov->trackList, &i))) {
-//        if (tk->Media->handler && (tk->Media->handler->handlerType == GF_ISOM_MEDIA_VISUAL)) {
-//            has_v_info = GF_TRUE;
-//        }
-//    }
-//    gf_bs_write_int(bs, has_v_info, 1);
-//
-//    gf_bs_write_int(bs, 0, 3);  /*reserved, spec doesn't say the values*/
-//    gf_bs_write_u8(bs, mdia->mediaTrack->Header->layer);
-//    gf_bs_write_u16(bs, mdia->mediaTrack->Header->width>>16);
-//    gf_bs_write_u16(bs, mdia->mediaTrack->Header->height>>16);
-//
-//    /*write desc*/
-//    gf_bs_write_u8(bs, count);
-//    for (i=0; i<count; i++) {
-//        //GF_Tx3gSampleEntryBox *a;
-//        //a = (GF_Tx3gSampleEntryBox *) gf_list_get(sampleDesc, i);
-//        //if ((a->type != GF_ISOM_BOX_TYPE_TX3G) && (a->type != GF_ISOM_BOX_TYPE_TEXT) ) continue;
-//        //gf_isom_write_tx3g(a, bs, i+1, SAMPLE_INDEX_OFFSET);
-//    }
-//    if (has_v_info) {
-//        u32 trans;
-//        gf_bs_write_u16(bs, 0);
-//        gf_bs_write_u16(bs, 0);
-//        trans = mdia->mediaTrack->Header->matrix[6]; trans >>= 16;
-//        gf_bs_write_u16(bs, trans);
-//        trans = mdia->mediaTrack->Header->matrix[7]; trans >>= 16;
-//        gf_bs_write_u16(bs, trans);
-//    }
-//
-//    gf_bs_get_content(bs, &esd->decoderConfig->decoderSpecificInfo->data, &esd->decoderConfig->decoderSpecificInfo->dataLength);
-//    gf_bs_del(bs);
-//    *out_esd = esd;
-//    return GF_OK;
-//}
 #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
+} 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 *);
+};
+
 /* mark the overlapped cue in the previous sample as split */
 /* duplicate the cue, mark it as split and adjust its timing */
 /* adjust the end of the overlapped cue in the previous sample */
@@ -645,9 +541,9 @@
     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);
-    dup_cue->settings       = gf_strdup(cue->settings);
-    dup_cue->text           = gf_strdup(cue->text);
+    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;
@@ -655,7 +551,7 @@
 
 static GF_Err gf_webvtt_cue_add_property(GF_WebVTTCue *cue, GF_WebVTTCuePropertyType type, char *text_data, u32 text_len)
 {
-    char **prop;
+    char **prop = NULL;
     u32 len;
     if (!cue) return GF_BAD_PARAM;
     if (!text_len) return GF_OK;
@@ -692,7 +588,8 @@
     return cue;
 }
 
-static void gf_webvtt_cue_del(GF_WebVTTCue * cue)
+GF_EXPORT
+void gf_webvtt_cue_del(GF_WebVTTCue * cue)
 {
     if (cue) {
         if (cue->id)        gf_free(cue->id);
@@ -845,14 +742,6 @@
     fprintf(dump, "%02u:%02u.%03u", ts->min, ts->sec, ts->ms);
 }
 
-//void gf_webvtt_timestamp_add(GF_WebVTTTimestamp *ts, u64 value)
-//{
-//    u64 tmp;
-//    tmp = gf_webvtt_timestamp_get(ts);
-//    tmp+= value;
-//    gf_webvtt_timestamp_set(ts, tmp);
-//}
-
 static GF_Err gf_webvtt_add_cue_to_samples(GF_WebVTTParser *parser, GF_List *samples, GF_WebVTTCue *cue)
 {
     s32 i;
@@ -1296,6 +1185,26 @@
     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_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;
+	config = (GF_StringBox *)box;
+    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;
+}
+
 GF_Err gf_webvtt_dump_header(FILE *dump, GF_ISOFile *file, u32 track, u32 index)
 {
     GF_WebVTTSampleEntryBox *wvtt;
@@ -1338,14 +1247,21 @@
     return GF_OK;
 }
 
+GF_EXPORT
 GF_List *gf_webvtt_parse_iso_cues(GF_ISOSample *iso_sample, u64 start)
 {
+	return gf_webvtt_parse_cues_from_data(iso_sample->data, iso_sample->dataLength, start);
+}
+
+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(iso_sample->data, iso_sample->dataLength, GF_BITSTREAM_READ);
+    bs = gf_bs_new(data, dataLength, GF_BITSTREAM_READ);
     while(gf_bs_available(bs))
     {
         GF_Err  e;
@@ -1473,7 +1389,9 @@
 
     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;
@@ -1494,7 +1412,7 @@
     return GF_OK;
 }
 
-void gf_webvtt_dump_cue(void *user, GF_WebVTTCue *cue)
+static void gf_webvtt_dump_cue(void *user, GF_WebVTTCue *cue)
 {
     FILE *dump = (FILE *)user;
     if (!cue || !dump) return;
@@ -1516,7 +1434,7 @@
     fprintf(dump, "\n");
 }
 
-GF_Err gf_webvtt_dump_cues(FILE *dump, GF_List *cues)
+static GF_Err gf_webvtt_dump_cues(FILE *dump, GF_List *cues)
 {
     u32 i;
     for (i = 0; i < gf_list_count(cues); i++) {
@@ -1575,4 +1493,6 @@
     return e;
 }
 
+#endif //GPAC_DISABLE_ISOM_DUMP
+
 #endif /* GPAC_DISABLE_VTT */

gpac-0.5.0.svn4668.tar.bz2/src/odf/descriptors.c -> gpac-0.5.0.svn5178.tar.bz2/src/odf/descriptors.c Changed

@@ -819,8 +819,10 @@
 			if (n->data) gf_free(n->data);
 			gf_free(n);
 		}
+		gf_list_del(pa->nalus);
 		gf_free(pa);
 	}
+	gf_list_del(cfg->param_array);
 	gf_free(cfg);
 }
 
@@ -833,7 +835,7 @@
 	gf_bs_write_int(bs, cfg->profile_space, 2);
 	gf_bs_write_int(bs, cfg->tier_flag, 1);
 	gf_bs_write_int(bs, cfg->profile_idc, 5);
-	gf_bs_write_int(bs, cfg->profile_compatibility_indications, 32);
+	gf_bs_write_int(bs, cfg->general_profile_compatibility_flags, 32);
 
 	gf_bs_write_int(bs, cfg->progressive_source_flag, 1);
 	gf_bs_write_int(bs, cfg->interlaced_source_flag, 1);
@@ -860,6 +862,13 @@
 	gf_bs_write_int(bs, cfg->temporalIdNested, 1);
 	gf_bs_write_int(bs, cfg->nal_unit_size - 1, 2);
 
+	if (cfg->is_shvc) {
+		gf_bs_write_int(bs, cfg->complete_representation, 1);
+		gf_bs_write_int(bs, cfg->non_hevc_base_layer, 1);
+		gf_bs_write_int(bs, cfg->num_layers ? cfg->num_layers - 1 : 0, 6);
+		gf_bs_write_int(bs, cfg->scalability_mask, 16);
+	}
+
 	count = gf_list_count(cfg->param_array);
 	gf_bs_write_int(bs, count, 8);
 	for (i=0; i<count; i++) {
@@ -895,17 +904,16 @@
 }
 
 GF_EXPORT
-GF_HEVCConfig *gf_odf_hevc_cfg_read_bs(GF_BitStream *bs)
+GF_HEVCConfig *gf_odf_hevc_cfg_read_bs(GF_BitStream *bs, Bool is_shvc)
 {
 	u32 i, count;
 	GF_HEVCConfig *cfg = gf_odf_hevc_cfg_new();
 
-
 	cfg->configurationVersion = gf_bs_read_int(bs, 8);
 	cfg->profile_space = gf_bs_read_int(bs, 2);
 	cfg->tier_flag = gf_bs_read_int(bs, 1);
 	cfg->profile_idc = gf_bs_read_int(bs, 5);
-	cfg->profile_compatibility_indications = gf_bs_read_int(bs, 32);
+	cfg->general_profile_compatibility_flags = gf_bs_read_int(bs, 32);
 
 	cfg->progressive_source_flag = gf_bs_read_int(bs, 1);
 	cfg->interlaced_source_flag = gf_bs_read_int(bs, 1);
@@ -933,6 +941,13 @@
 
 	cfg->nal_unit_size = 1 + gf_bs_read_int(bs, 2);
 
+	if (is_shvc) {
+		cfg->is_shvc = 1;
+		cfg->complete_representation = gf_bs_read_int(bs, 1);
+		cfg->non_hevc_base_layer = gf_bs_read_int(bs, 1);
+		cfg->num_layers = 1 + gf_bs_read_int(bs, 6);
+		cfg->scalability_mask = gf_bs_read_int(bs, 16);
+	}
 	count = gf_bs_read_int(bs, 8);
 	for (i=0; i<count; i++) {
 		u32 nalucount, j;
@@ -960,10 +975,10 @@
 }
 
 GF_EXPORT
-GF_HEVCConfig *gf_odf_hevc_cfg_read(char *dsi, u32 dsi_size)
+GF_HEVCConfig *gf_odf_hevc_cfg_read(char *dsi, u32 dsi_size, Bool is_shvc)
 {
 	GF_BitStream *bs = gf_bs_new(dsi, dsi_size, GF_BITSTREAM_READ);
-	GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read_bs(bs);
+	GF_HEVCConfig *cfg = gf_odf_hevc_cfg_read_bs(bs, is_shvc);
 	gf_bs_del(bs);
 	return cfg;
 }
@@ -1076,6 +1091,10 @@
 			return "MPEG-4 SVC Video";
 		case GPAC_OTI_VIDEO_AVC_PS:
 			return "MPEG-4 AVC|H264 Parameter Set";
+		case GPAC_OTI_VIDEO_HEVC:
+			return "MPEG-H HEVC Video";
+		case GPAC_OTI_VIDEO_SHVC:
+			return "MPEG-H SHVC Video";
 		case GPAC_OTI_MEDIA_FFMPEG:
 			return "GPAC FFMPEG Private Video";
 		case GPAC_OTI_VIDEO_SMPTE_VC1:

gpac-0.5.0.svn4668.tar.bz2/src/odf/odf_code.c -> gpac-0.5.0.svn5178.tar.bz2/src/odf/odf_code.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/odf/odf_parse.c -> gpac-0.5.0.svn5178.tar.bz2/src/odf/odf_parse.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/loader_bt.c -> gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/loader_bt.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/loader_svg.c -> gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/loader_svg.c Changed

@@ -757,6 +757,11 @@
 	nb_attributes = 0;
 #endif
 
+	/*set the root of the SVG tree BEFORE processing events in order to have it setup for script init (e.g. load events, including in root svg)*/
+	if ((tag == TAG_SVG_svg) && !parser->has_root) {
+		svg_init_root_element(parser, elt);
+	}
+
 	/*parse all att*/
 	for (i=0; i<nb_attributes; i++) {
 		GF_XMLAttribute *att = (GF_XMLAttribute *)&attributes[i];
@@ -886,6 +891,7 @@
 			if (evtType != GF_EVENT_UNKNOWN) {
 				SVG_handlerElement *handler = gf_dom_listener_build((GF_Node *) elt, evtType, 0);
 				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);
@@ -933,11 +939,6 @@
 		svg_report(parser, GF_OK, "Skipping attribute %s on node %s", att->name, name);
 	}
 
-	/*set the root of the SVG tree BEFORE processing events in order to have it setup for script init (e.g. load events)*/
-	if ((tag == TAG_SVG_svg) && !parser->has_root) {
-		svg_init_root_element(parser, elt);
-	}
-
 	/* When a handler element specifies the event attribute, an implicit listener is defined */
 	if (ev_event) {
 		GF_Node *node = (GF_Node *)elt;

gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/loader_xmt.c -> gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/loader_xmt.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/scene_dump.c -> gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/scene_dump.c Changed

@@ -163,6 +163,12 @@
 }
 
 GF_EXPORT
+void gf_sm_dumper_set_extra_graph(GF_SceneDumper *sdump, GF_SceneGraph *extra)
+{
+	sdump->sg = extra;
+}
+
+GF_EXPORT
 void gf_sm_dumper_del(GF_SceneDumper *sdump)
 {
 	gf_list_del(sdump->dump_nodes);
@@ -397,7 +403,7 @@
 	if (!str) return;
 	len = (u32) strlen(str);
 	if (!len) return;
-	uniLine = (u16*)gf_malloc(sizeof(u16) * len);
+	uniLine = (u16*)gf_malloc(sizeof(u16) * len*4);
 	_len = gf_utf8_mbstowcs(uniLine, len, (const char **) &str);
 	if (_len != (size_t) (-1)) {
 		len = (u32) _len;
@@ -463,7 +469,7 @@
 
 	i=0;
 	while ((com = (GF_Command *)gf_list_enum(sdump->inserted_routes, &i))) {
-		if ((com->tag == GF_SG_ROUTE_INSERT)) {
+		if (com->tag == GF_SG_ROUTE_INSERT) {
 			if (com->RouteID==ID) {
 				(*outName) = com->def_name;
 				return 1;
@@ -554,7 +560,7 @@
 		u16 *uniLine;
 		str = (char*)((SFScript *)ptr)->script_text;
 		len = (u32)strlen(str);
-		uniLine = (u16*)gf_malloc(sizeof(short) * len);
+		uniLine = (u16*)gf_malloc(sizeof(short) * (len+1));
 		_len = gf_utf8_mbstowcs(uniLine, len, (const char **) &str);
 		if (_len != (size_t) -1) {
 			len = (u32) _len;
@@ -2278,8 +2284,18 @@
 	
 	node_name = gf_node_get_name_and_id(r->FromNode, &id);
 	if (node_name) {
+		const char *to_name;
 		strcpy(fromNode, node_name);
-		strcpy(toNode, gf_node_get_name(r->ToNode));
+		to_name = gf_node_get_name(r->ToNode);
+		if (to_name) {
+			strcpy(toNode, to_name);
+		} else {
+			char str[100];
+			u32 id;
+			id = gf_node_get_id(r->ToNode);
+			sprintf(str, "node_%d", id);
+			strcpy(toNode, str);
+		}
 	} else {
 		sprintf(fromNode, "N%d", id-1);
 		sprintf(toNode, "N%d", gf_node_get_id(r->ToNode) - 1);
@@ -2879,7 +2895,7 @@
 {
 	GF_ChildNodeItem *list;
 	char attName[100], *attValue, attID[100];
-	u32 i, count, nID;
+	u32 nID;
 	SVG_Element *svg = (SVG_Element *)n;
 	GF_FieldInfo info;
 	SVGAttribute *att;
@@ -2986,32 +3002,7 @@
 		att = att->next;
 	}
 
-	/*re-translate dynamically created listeners/handlers */
-	if (n->sgprivate->interact && n->sgprivate->interact->dom_evt) {
-		count = gf_list_count(n->sgprivate->interact->dom_evt->evt_list);
-		for (i=0; i<count; i++) {
-			SVG_handlerElement *hdl;
-			GF_Node *listener = (GF_Node *)gf_list_get(n->sgprivate->interact->dom_evt->evt_list, i);
-			/*this listener has been created for internal use*/
-			if (listener->sgprivate->parents) continue;
-			if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, 0, 0, &info)==GF_OK) {
-				GF_DOMText *txt;
-				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))
-				)
-					continue;
-
-				txt = hdl->children ? (GF_DOMText*)hdl->children->node : NULL;
-				if (!txt || (txt->sgprivate->tag!=TAG_DOMText) || !txt->textContent) continue;
-				if (gf_node_get_attribute_by_tag((GF_Node*)hdl, TAG_XMLEV_ATT_event, 0, 0, &info)==GF_OK) {
-					fprintf(sdump->trace, " on%s=\"%s\"", gf_dom_event_get_name( ((XMLEV_Event*)info.far_ptr)->type), txt->textContent);
-				}
-			}
-		}
-	}
+	gf_dom_event_dump_listeners(n, sdump->trace);
 	if (svg->children) {
 		fprintf(sdump->trace, ">");
 	} else {

gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/swf_parse.c -> gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/swf_parse.c Changed

@@ -28,7 +28,7 @@
 #include <gpac/internal/swf_dev.h>
 #include <gpac/avparse.h>
 
-#if !defined(GPAC_DISABLE_SWF_IMPORT) && !defined(GPAC_DISABLE_ZLIB)
+#ifndef GPAC_DISABLE_SWF_IMPORT
 
 
 #include <zlib.h>
@@ -105,7 +105,7 @@
 	memset(dst, 0, sizeof(char)*8);
 	gf_bs_read_data(read->bs, src, size);
 	dst_size -= 8;
-	uncompress(dst+8, (uLongf *)&dst_size, src, size);
+	uncompress((Bytef *) dst+8, (uLongf *)&dst_size, (Bytef *) src, size);
 	dst_size += 8;
 	gf_free(src);
 	read->mem = dst;
@@ -2040,8 +2040,8 @@
 	}
 
 	/*dump file*/
-	if (read->load->localPath) {
-		sprintf(szName, "%s/swf_jpeg_%d.jpg", read->load->localPath, ID);
+	if (read->localPath) {
+		sprintf(szName, "%s/swf_jpeg_%d.jpg", read->localPath, ID);
 	} else {
 		sprintf(szName, "swf_jpeg_%d.jpg", ID);
 	}
@@ -2105,7 +2105,7 @@
 
 		osize = w*h;
 		dst = gf_malloc(sizeof(char)*osize);
-		uncompress(dst, (uLongf *) &osize, buf, AlphaPlaneSize);
+		uncompress((Bytef *) dst, (uLongf *) &osize, buf, AlphaPlaneSize);
 		/*write alpha channel*/
 		for (j=0; j<osize; j++) {
 			raw[4*j + 3] = dst[j];
@@ -2113,8 +2113,8 @@
 		gf_free(dst);
 
 		/*write png*/
-		if (read->load->localPath) {
-			sprintf(szName, "%s/swf_png_%d.png", read->load->localPath, ID);
+		if (read->localPath) {
+			sprintf(szName, "%s/swf_png_%d.png", read->localPath, ID);
 		} else {
 			sprintf(szName, "swf_png_%d.png", ID);
 		}
@@ -2251,7 +2251,7 @@
 	}
 }
 
-static GF_Err swf_parse_tag(SWFReader *read)
+GF_Err swf_parse_tag(SWFReader *read)
 {
 	GF_Err e;
 	s32 diff;
@@ -2356,11 +2356,9 @@
 	return e;
 }
 
-void gf_sm_load_done_swf(GF_SceneLoader *load)
+void gf_swf_reader_del(SWFReader *read)
 {
-	SWFReader *read = (SWFReader *) load->loader_priv;
 	if (!read) return;
-
 	gf_bs_del(read->bs);
 	if (read->mem) gf_free(read->mem);
 
@@ -2398,26 +2396,25 @@
 	if (read->localPath) gf_free(read->localPath);
 	fclose(read->input);
 	gf_free(read);
+}
+
+void gf_sm_load_done_swf(GF_SceneLoader *load)
+{
+	SWFReader *read = (SWFReader *) load->loader_priv;
+	if (!read) return;
+	gf_swf_reader_del(read);
 	load->loader_priv = NULL;
 }
 
-GF_Err gf_sm_load_init_swf(GF_SceneLoader *load)
+SWFReader *gf_swf_reader_new(const char *localPath, const char *inputName)
 {
 	SWFReader *read;
-	SWFRec rc;
-	GF_Err e;
 	FILE *input;
-	u8 sig[3];
-
-	if (!load->ctx || !load->scene_graph || !load->fileName) return GF_BAD_PARAM;
-	input = gf_f64_open(load->fileName, "rb");
-	if (!input) return GF_URL_ERROR;
+	input = gf_f64_open(inputName, "rb");
+	if (!input) return NULL;
 
 	GF_SAFEALLOC(read, SWFReader);
-	read->load = load;
-	
-	e = GF_OK;
-
+	read->inputName = gf_strdup(inputName);
 	read->input = input;
 	read->bs = gf_bs_from_file(input, GF_BITSTREAM_READ);
 	gf_bs_set_eos_callback(read->bs, swf_io_error, &read);
@@ -2426,12 +2423,11 @@
 	read->apps = gf_list_new();
 	read->sounds = gf_list_new();
 
-	read->flags = load->swf_import_flags;
-	read->flat_limit = FLT2FIX(load->swf_flatten_limit);
-	if (load->localPath) read->localPath = gf_strdup(load->localPath);
-	else {
+	if (localPath) {
+		read->localPath = gf_strdup(localPath);
+	} else {
 		char *c;
-		read->localPath = gf_strdup(load->fileName);
+		read->localPath = gf_strdup(inputName);
 		c = strrchr(read->localPath, GF_PATH_SEPARATOR);
 		if (c) c[1] = 0;
 		else {
@@ -2440,7 +2436,24 @@
 		}
 	}
 
-	load->loader_priv = read;
+	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))
+{
+	if (!read) return GF_BAD_PARAM;
+	read->user = user;
+	read->add_header = add_header;
+	read->add_sample = add_sample;
+	return GF_OK;
+}
+
+GF_Err gf_swf_read_header(SWFReader *read)
+{
+	SWFRec rc;
+	u8 sig[3];
 
 	/*get signature*/
 	sig[0] = gf_bs_read_u8(read->bs);
@@ -2448,28 +2461,45 @@
 	sig[2] = gf_bs_read_u8(read->bs);
 	/*"FWS" or "CWS"*/
 	if ( ((sig[0] != 'F') && (sig[0] != 'C')) || (sig[1] != 'W') || (sig[2] != 'S') ) {
-		e = GF_URL_ERROR;
-		goto exit;
+		return GF_URL_ERROR;
 	}
 	/*version = */gf_bs_read_u8(read->bs);
 	read->length = swf_get_32(read);
 
 	/*if compressed decompress the whole file*/
-	if (sig[0] == 'C') 
+	if (sig[0] == 'C') {
 		swf_init_decompress(read);
-	
+	}
+
 	swf_get_rec(read, &rc);
 	read->width = rc.w;
 	read->height = rc.h;
-	load->ctx->scene_width = FIX2INT(read->width);
-	load->ctx->scene_height = FIX2INT(read->height);
-	load->ctx->is_pixel_metrics = 1;
 	
 	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 %dx%d - %d frames @ %d FPS", load->ctx->scene_width, load->ctx->scene_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", read->width, read->height, read->frame_count, read->frame_rate));
+	return GF_OK;
+}
+
+GF_Err gf_sm_load_init_swf(GF_SceneLoader *load)
+{
+	SWFReader *read;
+	GF_Err e;
+
+	if (!load->ctx || !load->scene_graph || !load->fileName) return GF_BAD_PARAM;
+	e = GF_OK;
+
+	read = gf_swf_reader_new(load->localPath, load->fileName);
+	read->load = load;
+	read->flags = load->swf_import_flags;
+	read->flat_limit = FLT2FIX(load->swf_flatten_limit);
+	load->loader_priv = read;
+
+	gf_swf_read_header(read);
+	load->ctx->scene_width = FIX2INT(read->width);
+	load->ctx->scene_height = FIX2INT(read->height);
+	load->ctx->is_pixel_metrics = 1;
 
 	if (!(load->swf_import_flags & GF_SM_SWF_SPLIT_TIMELINE) ) {
 		swf_report(read, GF_OK, "ActionScript disabled");
@@ -2479,7 +2509,7 @@
     if (!(load->swf_import_flags & GF_SM_SWF_USE_SVG)) {
         e = swf_to_bifs_init(read);
     } else {
-        e = swf_to_svg_init(read);
+        e = swf_to_svg_init(read, read->flags, load->swf_flatten_limit);
     }
 	if (e) goto exit;

gpac-0.5.0.svn4668.tar.bz2/src/scene_manager/swf_svg.c -> gpac-0.5.0.svn5178.tar.bz2/src/scene_manager/swf_svg.c Changed

@@ -1,1183 +1,535 @@
-/*
- *          GPAC - Multimedia Framework C SDK
- *
- *          Authors: Cyril Concolato
- *          Copyright (c) Telecom ParisTech 2000-2012
- *                  All rights reserved
- *
- *  This file is part of GPAC / Scene Management sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *   
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *   
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
- *
- */
-#include <gpac/utf.h>
-#include <gpac/xml.h>
-#include <gpac/internal/swf_dev.h>
-#include <gpac/internal/scenegraph_dev.h>
-
-#ifndef GPAC_DISABLE_VRML
-
-#ifndef GPAC_DISABLE_SWF_IMPORT
-
-#define SWF_TEXT_SCALE              (1/1024.0f)
-
-typedef struct
-{
-    u32 btn_id;
-    u32 sprite_up_id;
-} s2sBtnRec;
-
-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;
-    fprintf(read->svg_output, "rgb(%f%%,%f%%,%f%%)", 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;
-    fprintf(read->svg_output, "%f", FIX2FLT(alpha));
-}
-
-static void swg_svg_print_shape_record_to_fill_stroke(SWFReader *read, SWFShapeRec *srec, Bool is_fill)
-{
-	/*get regular appearance reuse*/
-	if (is_fill) {
-		switch (srec->type) {
-		/*solid/alpha fill*/
-		case 0x00:
-            fprintf(read->svg_output, "fill=\"");
-            swf_svg_print_color(read, srec->solid_col);
-            fprintf(read->svg_output, "\" ");
-            fprintf(read->svg_output, "fill-opacity=\"");
-            swf_svg_print_alpha(read, srec->solid_col);
-            fprintf(read->svg_output, "\" ");
-			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;
-		case 0x40:
-		case 0x41:
-		case 0x42:
-		case 0x43:
-			//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 {
-        fprintf(read->svg_output, "fill=\"none\" ");
-        fprintf(read->svg_output, "stroke=\"");
-        swf_svg_print_color(read, srec->solid_col);
-        fprintf(read->svg_output, "\" ");
-        fprintf(read->svg_output, "stroke-opacity=\"");
-        swf_svg_print_alpha(read, srec->solid_col);
-        fprintf(read->svg_output, "\" ");
-        fprintf(read->svg_output, "stroke-width=\"%f\" ", FIX2FLT(srec->width));
-	}
-}
-
-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:
-            fprintf(read->svg_output, "M%f,%f", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
-            pt_idx++;
-            break;
-        /*lineTo*/
-        case 1:
-            fprintf(read->svg_output, "L%f,%f", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
-            pt_idx++;
-            break;
-        /*curveTo*/
-        case 2:
-            fprintf(read->svg_output, "Q%f,%f", FIX2FLT(srec->path->pts[pt_idx].x), FIX2FLT(srec->path->pts[pt_idx].y));
-            pt_idx++;
-            fprintf(read->svg_output, ",%f,%f", 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)) 
-        {
-            fprintf(read->svg_output, "transform=\"");
-            if (translate.x != 0 || translate.y != 0)
-            {
-                fprintf(read->svg_output, "translate(%f, %f) ", FIX2FLT(translate.x), FIX2FLT(translate.y));
-            }
-            if (rotate != 0)
-            {
-                fprintf(read->svg_output, "rotate(%f) ", FIX2FLT(rotate));
-            }
-            if (scale.x != FIX_ONE || scale.y != FIX_ONE)
-            {
-                fprintf(read->svg_output, "scale(%f, %f) ", FIX2FLT(scale.x), FIX2FLT(scale.y));
-            }
-            fprintf(read->svg_output, "\" ");
-        } 
-        else 
-        {
-            fprintf(read->svg_output, "transform=\"matrix(%f,%f,%f,%f,%f,%f)\" ", 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->cur_shape) 
-    {
-        fprintf(read->svg_output, "<defs>\n");
-        if (!parent_font)
-        {
-            fprintf(read->svg_output, "<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));
-            fprintf(read->svg_output, "<g id=\"%s\" >\n", szGlyphId);
-            gf_list_add(parent_font->glyphs, szGlyphId);
-        }
-    }
-    read->cur_shape = (GF_Node *)"shape";
-
-    i=0;
-    while ((srec = (SWFShapeRec*)gf_list_enum(shape->fill_left, &i))) {
-        fprintf(read->svg_output, "<path d=\"");
-        swf_svg_print_shape_record_to_path_d(read, srec);
-        fprintf(read->svg_output, "\" ");
-        swg_svg_print_shape_record_to_fill_stroke(read, srec, 1);
-        fprintf(read->svg_output, "/>\n");
-    }
-    i=0;
-    while ((srec = (SWFShapeRec*)gf_list_enum(shape->lines, &i))) {
-        fprintf(read->svg_output, "<path d=\"");
-        swf_svg_print_shape_record_to_path_d(read, srec);
-        fprintf(read->svg_output, "\" ");
-        swg_svg_print_shape_record_to_fill_stroke(read, srec, 0);
-        fprintf(read->svg_output, "/>\n");
-    }
-
-    if (last_sub_shape) 
-    {
-        read->cur_shape = NULL;
-        fprintf(read->svg_output, "</g>\n");
-        fprintf(read->svg_output, "</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;
-
-    fprintf(read->svg_output, "<defs>\n");
-    fprintf(read->svg_output, "<g id=\"S%d\" ", text->ID);
-    swf_svg_print_matrix(read, &text->mat);
-    fprintf(read->svg_output, ">\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)*/
-            fprintf(read->svg_output, "<text ");
-            fprintf(read->svg_output, "x=\"%f \" ", FIX2FLT(gr->orig_x));
-            fprintf(read->svg_output, "y=\"%f \" ", FIX2FLT(gr->orig_y));
-            fprintf(read->svg_output, "font-size=\"%d\" ", (u32)(gr->fontSize * SWF_TWIP_SCALE));
-            if (ft->fontName)
-            {
-                fprintf(read->svg_output, "font-family=\"%s\" ", ft->fontName);
-            }
-            if (ft->is_italic) 
-            {
-                fprintf(read->svg_output, "font-style=\"italic\" ");
-            }
-            if (ft->is_bold) 
-            {
-                fprintf(read->svg_output, "font-weight=\"bold\" ");
-            }
-            fprintf(read->svg_output, ">");
-            /*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;
-                    fprintf(read->svg_output, "%s", str);
-                }
-            }
-            fprintf(read->svg_output, "</text>\n");
-        }
-        else
-        {
-            /*convert glyphs*/
-            Fixed       dx;
-            fprintf(read->svg_output, "<g tranform=\"scale(1,-1) ");
-            fprintf(read->svg_output, "translate(%f, %f)\" >\n", FIX2FLT(gr->orig_x), FIX2FLT(gr->orig_y));
-
-            dx = 0;
-            for (j=0; j<gr->nbGlyphs; j++) 
-            {
-                fprintf(read->svg_output, "<use xlink:href=\"#Font%d_Glyph%d\" transform=\"translate(%f)\" />\n", gr->fontID, gr->indexes[j], FIX2FLT(gf_divfix(dx, FLT2FIX(gr->fontSize * SWF_TEXT_SCALE))));
-                dx += gr->dx[j];
-            }
-            fprintf(read->svg_output, "</g>\n");
-        }
-    }
-    fprintf(read->svg_output, "</g>\n");
-    fprintf(read->svg_output, "</defs>\n");
-    return GF_OK;
-}
-
-static GF_Err swf_svg_define_edit_text(SWFReader *read, SWFEditText *text)
-{
-    //char styles[1024];
-    //char *ptr;
-    //Bool use_layout;
-    //M_Layout *layout = NULL;
-    //M_Shape *txt;
-    //M_Text *t;
-    //M_FontStyle *f;
-    //M_Transform2D *tr;
-
-    //tr = (M_Transform2D *) s2s_new_node(read, TAG_MPEG4_Transform2D);
-    //tr->scale.y = -FIX_ONE;
-
-    //use_layout = 0;
-    //if (text->align==3) use_layout = 1;
-    //else if (text->multiline) use_layout = 1;
-
-    //if (use_layout) {
-    //  layout = (M_Layout *) s2s_new_node(read, TAG_MPEG4_Layout);
-    //  tr->translation.x = read->width/2;
-    //  tr->translation.y = read->height/2;
-    //}
-
-    //t = (M_Text *) s2s_new_node(read, TAG_MPEG4_Text);
-    //f = (M_FontStyle *) s2s_new_node(read, TAG_MPEG4_FontStyle);
-    //t->fontStyle = (GF_Node *) f;
-    //gf_node_register(t->fontStyle, (GF_Node *) t);
-
-    ///*restore back the font height in pixels (it's currently in SWF glyph design units)*/
-    //f->size = text->font_height;
-    //f->spacing = text->font_height + text->leading;
-
-    //gf_sg_vrml_mf_reset(&f->justify, GF_SG_VRML_MFSTRING);
-    //gf_sg_vrml_mf_append(&f->justify, GF_SG_VRML_MFSTRING, (void**)&ptr);
-    //switch (text->align) {
-    //case 0:
-    //  ((SFString*)ptr)->buffer = gf_strdup("BEGIN"); 
-    //  break;
-    //case 1:
-    //  ((SFString*)ptr)->buffer = gf_strdup("END"); 
-    //  break;
-    //case 3:
-    //  ((SFString*)ptr)->buffer = gf_strdup("JUSTIFY"); 
-    //  break;
-    //default:
-    //  ((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);
-
-    //if (text->init_value) {
-    //  gf_sg_vrml_mf_reset(&t->string, GF_SG_VRML_MFSTRING);
-    //  gf_sg_vrml_mf_append(&t->string, GF_SG_VRML_MFSTRING, (void**)&ptr);
-
-    //  if (text->html) {
-    //      GF_SAXParser *xml;
-    //      SWFFlatText flat;
-    //      flat.final = 0;
-    //      flat.len = 0;
-    //      xml = gf_xml_sax_new(swf_nstart, swf_nend, swf_ntext, &flat);
-    //      gf_xml_sax_init(xml, NULL);
-    //      gf_xml_sax_parse(xml, text->init_value);
-    //      gf_xml_sax_del(xml);
-
-    //      if (flat.final) {
-    //          ((SFString*)ptr)->buffer = gf_strdup(flat.final);
-    //          gf_free(flat.final);
-    //      }
-    //  } else {
-    //      ((SFString*)ptr)->buffer = gf_strdup(text->init_value);
-    //  }
-    //}
-
-
-    //txt = (M_Shape *) s2s_new_node(read, TAG_MPEG4_Shape);
-    //txt->appearance = s2s_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) {     
-    //  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"); 
-    //      break;
-    //  case 1:
-    //      layout->justify.vals[0] = gf_strdup("END"); 
-    //      break;
-    //  case 3:
-    //      layout->justify.vals[0] = gf_strdup("JUSTIFY"); 
-    //      break;
-    //  default:
-    //      layout->justify.vals[0] = gf_strdup("MIDDLE"); 
-    //      break;
-    //  }
-    //  if (text->multiline || text->word_wrap) layout->wrap = 1;
-
-    //  gf_node_insert_child((GF_Node *) layout, (GF_Node *)txt, -1);
-    //  gf_node_register((GF_Node *) txt, (GF_Node *) layout);
-
-    //  gf_node_insert_child((GF_Node *) tr, (GF_Node *)layout, -1);
-    //  gf_node_register((GF_Node *) layout, (GF_Node *) tr);
-    //} 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;
-    //  sprintf(szDEF, "Text%d", text->ID);
-    //  read->load->ctx->max_node_id++;
-    //  ID = read->load->ctx->max_node_id;
-    //  gf_node_set_id((GF_Node*)tr, ID, szDEF);
-    //  s2s_insert_symbol(read, (GF_Node*)tr);
-    //}
-    return GF_OK;
-}
-
-#if 0
-/*called upon end of sprite or clip*/
-static void swf_svg_end_of_clip(SWFReader *read)
-{
-    //char szDEF[1024];
-    //u32 i;
-    //GF_AUContext *au;
-    //GF_Command *com;
-    //GF_CommandField *f;
-    //GF_Node *empty;
-    //
-    //return;
-
-    //empty = gf_sg_find_node_by_name(read->load->scene_graph, "Shape0");
-
-    //au = gf_list_get(read->bifs_es->AUs, 0);
-    //for (i=0; i<read->max_depth; i++) {
-    //  /*and write command*/
-    //  com = gf_sg_command_new(read->load->scene_graph, GF_SG_INDEXED_REPLACE);
-    //  sprintf(szDEF, "CLIP%d_DL", read->current_sprite_id);
-    //  com->node = gf_sg_find_node_by_name(read->load->scene_graph, szDEF);
-
-    //  gf_node_register(com->node, NULL);
-    //  f = gf_sg_command_field_new(com);
-    //  f->field_ptr = &f->new_node;
-    //  f->fieldType = GF_SG_VRML_SFNODE;
-    //  f->pos = i;
-    //  f->fieldIndex = 2;  /*children index*/
-    //  f->new_node = empty;
-    //  gf_node_register(f->new_node, com->node);
-
-    //  gf_list_insert(au->commands, com, i);
-    //}
-}
-#endif
-
-static Bool swf_svg_allocate_depth(SWFReader *read, u32 depth)
-{
-    //char szDEF[100];
-    //GF_Node *disp, *empty;
-    //if (read->max_depth > depth) return 1;
-
-    //sprintf(szDEF, "CLIP%d_DL", read->current_sprite_id);
-    //disp = gf_sg_find_node_by_name(read->load->scene_graph, szDEF);
-
-    //empty = gf_sg_find_node_by_name(read->load->scene_graph, "Shape0");
-    //while (read->max_depth<=depth) {
-    //  gf_node_insert_child(disp, empty, -1);
-    //  gf_node_register(empty, disp);
-    //  read->max_depth++;
-    //}
-    return 0;
-}
-
-static GF_Err swf_svg_define_sprite(SWFReader *read, u32 nb_frames)
-{
-    //GF_Err e;
-    //GF_ObjectDescriptor *od;
-    //GF_ESD *esd;
-    //u32 ID;
-    //GF_Node *n, *par;
-    //GF_FieldInfo info;
-    //char szDEF[100];
-    //GF_StreamContext *prev_sc;
-    //GF_AUContext *prev_au;
-
-    ///*init OD*/
-    //e = swf_init_od(read, 0);
-    //if (e) return e;
-
-    ///*create animationStream object*/
-    //od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-    //if (!od) return GF_OUT_OF_MEM;
-
-    //od->objectDescriptorID = swf_get_od_id(read);
-    //esd = (GF_ESD *) gf_odf_desc_esd_new(0);
-    //if (!esd) return GF_OUT_OF_MEM;
-    //esd->ESID = swf_get_es_id(read);
-    ///*sprite runs on its own timeline*/
-    //esd->OCRESID = esd->ESID;
-    ///*always depends on main scene*/
-    //esd->dependsOnESID = 1;
-    //esd->decoderConfig->streamType = GF_STREAM_SCENE;
-    //esd->decoderConfig->objectTypeIndication = 1;
-    //esd->slConfig->timestampResolution = read->bifs_es->timeScale;
-    //gf_odf_desc_del((GF_Descriptor *) esd->decoderConfig->decoderSpecificInfo);
-    //esd->decoderConfig->decoderSpecificInfo = NULL;
-    //gf_list_add(od->ESDescriptors, esd);
-
-    ///*by default insert OD at begining*/
-    //e = swf_insert_od(read, 0, od);
-    //if (e) {
-    //  gf_odf_desc_del((GF_Descriptor *) od);
-    //  return e;
-    //}
-
-    ///*create AS for sprite - all AS are created in initial scene replace*/
-    //n = s2s_new_node(read, TAG_MPEG4_AnimationStream);
-    //gf_node_insert_child(read->root, n, 0);
-    //gf_node_register(n, read->root);
-    ///*assign URL*/
-    //gf_node_get_field_by_name(n, "url", &info);
-    //gf_sg_vrml_mf_alloc(info.far_ptr, info.fieldType, 1);
-    //((MFURL*)info.far_ptr)->vals[0].OD_ID = od->objectDescriptorID;
-    //((M_AnimationStream *)n)->startTime = 0;
-
-    //n = s2s_new_node(read, TAG_MPEG4_MediaControl);
-    //sprintf(szDEF, "CLIP%d_CTRL", read->current_sprite_id);
-    //read->load->ctx->max_node_id++;
-    //ID = read->load->ctx->max_node_id;
-    //gf_node_set_id(n, ID, szDEF);
-
-    //gf_node_insert_child(read->root, n, 0);
-    //gf_node_register(n, read->root);
-    ///*assign URL*/
-    //gf_node_get_field_by_name(n, "url", &info);
-    //gf_sg_vrml_mf_alloc(info.far_ptr, info.fieldType, 1);
-    //((MFURL*)info.far_ptr)->vals[0].OD_ID = od->objectDescriptorID;
-    ///*inactive by default (until inserted)*/
-    //((M_MediaControl *)n)->mediaSpeed = 0;
-    //((M_MediaControl *)n)->loop = 1;
-
-    ///*create sprite grouping node*/
-    //n = s2s_new_node(read, TAG_MPEG4_Group);
-    //sprintf(szDEF, "CLIP%d_DL", read->current_sprite_id);
-
-    //read->load->ctx->max_node_id++;
-    //ID = read->load->ctx->max_node_id;
-    //gf_node_set_id(n, ID, szDEF);
-    //par = gf_sg_find_node_by_name(read->load->scene_graph, "DICTIONARY");
-    //assert(par);
-    //gf_node_list_add_child(&((M_Switch *)par)->choice, n);
-    //gf_node_register(n, par);
-    //par = gf_sg_find_node_by_name(read->load->scene_graph, "Shape0");
-    //gf_node_insert_child(n, par, -1);
-    //gf_node_register(par, n);
-
-    ///*store BIFS context*/
-    //prev_sc = read->bifs_es;
-    //prev_au = read->bifs_au;
-    ///*create new BIFS stream*/
-    //read->bifs_es = gf_sm_stream_new(read->load->ctx, esd->ESID, GF_STREAM_SCENE, 1);
-    //read->bifs_es->timeScale = prev_sc->timeScale;
-    //read->bifs_es->imp_exp_time = prev_sc->imp_exp_time + prev_au->timing;
-
-    ///*create first AU*/
-    //read->bifs_au = gf_sm_stream_au_new(read->bifs_es, 0, 0, 1);
-
-    //e = swf_parse_sprite(read);
-    //if (e) return e;
-
-    //swf_svg_end_of_clip(read);
-
-    ///*restore BIFS context*/
-    //read->bifs_es = prev_sc;
-    //read->bifs_au = prev_au;
-
-    return GF_OK;
-}
-
-static GF_Err swf_svg_setup_sound(SWFReader *read, SWFSound *snd, Bool soundstream_first_block)
-{
-//  GF_Err e;
-//  GF_ObjectDescriptor *od;
-//  GF_ESD *esd;
-//  GF_MuxInfo *mux;
-//  GF_Node *n, *par;
-//  GF_FieldInfo info;
-//  u32 ID;
-//  char szDEF[100];
-//
-//  /*soundstream header, only declare the associated MediaControl node for later actions*/
-//  if (!snd->ID && !soundstream_first_block) {
-//      n = s2s_new_node(read, TAG_MPEG4_MediaControl);
-//      sprintf(szDEF, "CLIP%d_SND", read->current_sprite_id);
-//      read->load->ctx->max_node_id++;
-//      ID = read->load->ctx->max_node_id;
-//      gf_node_set_id(n, ID, szDEF);
-//
-//      gf_node_insert_child(read->root, n, 0);
-//      gf_node_register(n, read->root);
-//      return GF_OK;
-//  }
-//
-//  e = swf_init_od(read, 0);
-//  if (e) return e;
-//
-//  /*create audio object*/
-//  od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-//  if (!od) return GF_OUT_OF_MEM;
-//  od->objectDescriptorID = swf_get_od_id(read);
-//  esd = (GF_ESD *) gf_odf_desc_new(GF_ODF_ESD_TAG);
-//  if (!esd) return GF_OUT_OF_MEM;
-//  esd->ESID = swf_get_es_id(read);
-//  if (snd->ID) {
-//      /*sound runs on its own timeline*/
-//      esd->OCRESID = esd->ESID;
-//  } else {
-//      /*soundstream runs on movie/sprite timeline*/
-//      esd->OCRESID = read->bifs_es->ESID;
-//      esd->OCRESID = esd->ESID;
-//  }
-//  gf_list_add(od->ESDescriptors, esd);
-//
-//  /*setup mux info*/
-//  mux = (GF_MuxInfo*)gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
-//  mux->file_name = gf_strdup(snd->szFileName);
-////    mux->startTime = snd->frame_delay_ms;
-//  mux->startTime = 0;
-//  /*MP3 in, destroy file once done*/
-//  if (snd->format==2) mux->delete_file = 1;
-//  gf_list_add(esd->extensionDescriptors, mux);
-//
-//
-//  /*by default insert OD at begining*/
-//  e = swf_insert_od(read, 0, od);
-//  if (e) {
-//      gf_odf_desc_del((GF_Descriptor *) od);
-//      return e;
-//  }
-//  /*create sound & audio clip*/
-//  n = s2s_new_node(read, TAG_MPEG4_Sound2D);
-//  gf_node_insert_child(read->root, n, 0);
-//  gf_node_register(n, read->root);
-//  par = n;
-//  n = s2s_new_node(read, TAG_MPEG4_AudioClip);
-//  ((M_Sound2D *)par)->source = n;
-//  gf_node_register(n, par);
-//  /*assign URL*/
-//  gf_node_get_field_by_name(n, "url", &info);
-//  gf_sg_vrml_mf_alloc(info.far_ptr, info.fieldType, 1);
-//  ((MFURL *)info.far_ptr)->vals[0].OD_ID = od->objectDescriptorID;
-//
-//  ((M_AudioClip*)n)->startTime = -1.0;
-//
-//  /*regular sound: set an ID to do play/stop*/
-//  if (snd->ID) {
-//      sprintf(szDEF, "Sound%d", snd->ID);
-//      read->load->ctx->max_node_id++;
-//      ID = read->load->ctx->max_node_id;
-//      gf_node_set_id(n, ID, szDEF);
-//  }
-//  /*soundStream - add a MediaControl*/
-//  else {
-//      /*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;
-//          ((M_AudioClip*)n)->startTime = 0;
-//      }
-//
-//      sprintf(szDEF, "CLIP%d_SND", read->current_sprite_id);
-//      n = gf_sg_find_node_by_name(read->load->scene_graph, szDEF);
-//
-//      /*assign URL*/
-//      gf_node_get_field_by_name(n, "url", &info);
-//      gf_sg_vrml_mf_alloc(info.far_ptr, info.fieldType, 1);
-//      ((MFURL*)info.far_ptr)->vals[0].OD_ID = od->objectDescriptorID;
-//      ((M_MediaControl *)n)->loop = 0;
-//
-//      /*inactive by default (until inserted)*/
-//      if (read->current_sprite_id) {
-//          ((M_MediaControl *)n)->mediaSpeed = 0;
-//      } else {
-//          ((M_MediaControl *)n)->mediaSpeed = FIX_ONE;
-//      }
-//  }
-    return GF_OK;
-}
-
-static GF_Err swf_svg_setup_image(SWFReader *read, u32 ID, char *fileName)
-{
-
-    //GF_Err e;
-    //GF_ObjectDescriptor *od;
-    //GF_ESD *esd;
-    //GF_MuxInfo *mux;
-    //GF_Node *n, *par;
-    //GF_FieldInfo info;
-    //char szDEF[100];
-    //
-    //e = swf_init_od(read, 0);
-    //if (e) return e;
-
-    ///*create visual object*/
-    //od = (GF_ObjectDescriptor *) gf_odf_desc_new(GF_ODF_OD_TAG);
-    //if (!od) return GF_OUT_OF_MEM;
-    //od->objectDescriptorID = swf_get_od_id(read);
-    //esd = (GF_ESD *) gf_odf_desc_new(GF_ODF_ESD_TAG);
-    //if (!esd) return GF_OUT_OF_MEM;
-    //esd->ESID = swf_get_es_id(read);
-    //esd->OCRESID = esd->ESID;
-    //gf_list_add(od->ESDescriptors, esd);
-
-    ///*setup mux info*/
-    //mux = (GF_MuxInfo*)gf_odf_desc_new(GF_ODF_MUXINFO_TAG);
-
-    //mux->file_name = gf_strdup(fileName);
-    ///*destroy file once done*/
-    ////mux->delete_file = 1;
-    //gf_list_add(esd->extensionDescriptors, mux);
-
-
-    ///*by default insert OD at begining*/
-    //e = swf_insert_od(read, 0, od);
-    //if (e) {
-    //  gf_odf_desc_del((GF_Descriptor *) od);
-    //  return e;
-    //}
-    ///*create appearance clip*/
-    //par = s2s_new_node(read, TAG_MPEG4_Shape);
-    //s2s_insert_symbol(read, par);
-    //n = s2s_new_node(read, TAG_MPEG4_Appearance);
-    //((M_Shape *)par)->appearance = n;
-    //gf_node_register(n, par);
-
-    //par = n;
-    //n = s2s_new_node(read, TAG_MPEG4_ImageTexture);
-    //((M_Appearance *)par)->texture = n;
-    //gf_node_register(n, par);
-
-    //sprintf(szDEF, "Bitmap%d", ID);
-    //read->load->ctx->max_node_id++;
-    //ID = read->load->ctx->max_node_id;
-    //gf_node_set_id(n, ID, szDEF);
-
-    ///*assign URL*/
-    //gf_node_get_field_by_name(n, "url", &info);
-    //gf_sg_vrml_mf_alloc(info.far_ptr, info.fieldType, 1);
-    //((MFURL *)info.far_ptr)->vals[0].OD_ID = od->objectDescriptorID;
-
-    return GF_OK;
-}
-
-static GF_Err swf_svg_set_backcol(SWFReader *read, u32 xrgb)
-{
-    //SFColor rgb;
-    //GF_Node *bck = gf_sg_find_node_by_name(read->load->scene_graph, "BACKGROUND");
-
-    //rgb.red = INT2FIX((xrgb>>16) & 0xFF) / 255;
-    //rgb.green = INT2FIX((xrgb>>8) & 0xFF) / 255;
-    //rgb.blue = INT2FIX((xrgb) & 0xFF) / 255;
-    //s2s_set_field(read, read->bifs_au->commands, bck, "backColor", -1, GF_SG_VRML_SFCOLOR, &rgb, 0);
-    return GF_OK;
-}
-
-static GF_Err swf_svg_start_sound(SWFReader *read, SWFSound *snd, Bool stop)
-{
-    //GF_Node *sound2D;
-    //SFTime t = 0;
-    //char szDEF[100];
-
-    //sprintf(szDEF, "Sound%d", snd->ID);
-    //sound2D = gf_sg_find_node_by_name(read->load->scene_graph, szDEF);
-    ///*check flags*/
-    //if (sound2D)
-    //  s2s_set_field(read, read->bifs_au->commands, sound2D, stop ? "stopTime" : "startTime", -1, GF_SG_VRML_SFTIME, &t, 0);
-
-    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)
-{
-    //fprintf(read->svg_output, "<use xlink:href=\"#S%d\" z-index=\"%d\" ", ID, depth);
-    //if (mat) {
-    //    swf_svg_print_matrix(read, mat);
-    //}
-    //fprintf(read->svg_output, "/>\n");
-
-    //GF_Command *com;
-    //GF_CommandField *f;
-    //GF_Node *obj, *par;
-    //char szDEF[100];
-    //Bool is_sprite;
-
-    //obj = s2s_get_node(read, ID);
-    //is_sprite = 0;
-    //if (!obj) {
-    //  sprintf(szDEF, "CLIP%d_DL", ID);
-    //  obj = gf_sg_find_node_by_name(read->load->scene_graph, szDEF);
-    //  if (obj) is_sprite = 1;
-    //}
-    //if (!obj) return GF_BAD_PARAM;
-
-    ///*then add cmat/mat and node*/
-    //par = s2s_wrap_node(read, obj, mat, cmat);
-
-    ///*and write command*/
-    //com = gf_sg_command_new(read->load->scene_graph, GF_SG_INDEXED_REPLACE);
-    //sprintf(szDEF, "CLIP%d_DL", read->current_sprite_id);
-    //com->node = gf_sg_find_node_by_name(read->load->scene_graph, szDEF);
-    //gf_node_register(com->node, NULL);
-    //f = gf_sg_command_field_new(com);
-    //f->field_ptr = &f->new_node;
-    //f->fieldType = GF_SG_VRML_SFNODE;
-    //f->pos = depth;
-    //f->fieldIndex = 2;    /*children index*/
-    //f->new_node = par;
-    //gf_node_register(f->new_node, com->node);
-    //gf_list_add(read->bifs_au->commands, com);
-
-    //if (ID==prev_id) return GF_OK;
-
-    //strcpy(szDEF, gf_node_get_name(obj));
-    ///*when inserting a button, trigger a pause*/
-    //if (!strnicmp(szDEF, "Button", 6)) {
-    //  u32 i, count;
-    //  s2s_control_sprite(read, read->bifs_au->commands, read->current_sprite_id, 1, 0, 0, 1);
-
-    //  count = gf_list_count(read->buttons);
-    //  for (i=0; i<count; i++) {
-    //      s2sBtnRec *btnrec = gf_list_get(read->buttons, i);
-    //      if (btnrec->btn_id==ID) {
-    //          s2s_control_sprite(read, read->bifs_au->commands, btnrec->sprite_up_id, 0, 0, 0, 1);
-    //      }
-    //  }
-    //}
-    ///*starts anim*/
-    //else if (is_sprite) {
-    //  s2s_control_sprite(read, read->bifs_au->commands, ID, 0, 1, 0, 0);
-    //  if (prev_id) {
-    //      s2s_control_sprite(read, read->bifs_au->commands, prev_id, 1, 0, 0, 0);
-    //  }
-    //}
-    return GF_OK;
-}
-
-static GF_Err swf_svg_remove_obj(SWFReader *read, u32 depth, u32 ID)
-{
-    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 */
-    while (gf_list_count(read->display_list))
-    {
-        Bool        inserted = 0;
-        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 = 1;
-                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);
-        fprintf(read->svg_output, "<use xlink:href=\"#S%d\" z-index=\"%d\" ", s->char_id, s->depth);
-        swf_svg_print_matrix(read, &s->mat);
-        fprintf(read->svg_output, "/>\n");
-    }
-    fprintf(read->svg_output, "</g>\n");
-
-    fprintf(read->svg_output, "<g id=\"frame%d\" display=\"none\">\n",read->current_frame+1);
-    fprintf(read->svg_output, "<animate attributeName=\"display\" to=\"inline\" begin=\"%f\" end=\"%f\" fill=\"%s\" restart=\"never\"/>\n", 
-        1.0*(read->current_frame+1)/read->frame_rate, 1.0*(read->current_frame+2)/read->frame_rate,
-        (((read->current_frame+1) <= (read->frame_count-1)) ? "remove" : "freeze"));
-    return GF_OK;
-}
-
-static void swf_svg_finalize(SWFReader *read)
-{
-    //u32 i, count;
-
-    //swf_svg_end_of_clip(read);    
-
-    //while (gf_list_count(read->buttons)) {
-    //  s2sBtnRec *btnrec = gf_list_get(read->buttons, 0);
-    //  gf_list_rem(read->buttons, 0);
-    //  gf_free(btnrec);
-    //}
-
-    //count = gf_list_count(read->fonts);
-    //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);
-    //      gf_list_rem(ft->glyphs, 0);
-    //      gf_node_unregister(gl, NULL);
-    //  }
-    //}
-    fprintf(read->svg_output, "</g>\n");
-    fprintf(read->svg_output, "</svg>\n");
-    fclose(read->svg_output);
-}
-
-static GF_Err swf_svg_define_button(SWFReader *read, SWF_Button *btn)
-{
-    //char szName[1024];
-    //M_Switch *button;
-    //SWF_ButtonRecord *br;
-    //GF_Node *btn_root, *n, *btn_ts;
-    //u32 i, ID, pos;
-
-    //if (!btn) {
-    //  read->btn = NULL;
-    //  read->btn_over = read->btn_not_over = read->btn_active = read->btn_not_active = NULL;
-    //  return GF_OK;
-    //}
-
-    //read->btn = btn;
-
-    //btn_root = s2s_new_node(read, TAG_MPEG4_Transform2D);
-    //sprintf(szName, "Button%d", btn->ID);
-    //read->load->ctx->max_node_id++;
-    //ID = read->load->ctx->max_node_id;
-    //gf_node_set_id((GF_Node *)btn_root, ID, szName);
-
-    //n = s2s_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; 
-
-    ///*locate hit buttons and add them to the color transform*/
-    //for (i=0; i<btn->count; i++) {
-    //  GF_Node *character;
-    //  br = &btn->buttons[i];
-    //  if (!br->hitTest) continue;
-    //  character = s2s_get_node(read, br->character_id);
-    //  if (!character) {
-    //      sprintf(szName, "CLIP%d_DL", br->character_id);
-    //      character = gf_sg_find_node_by_name(read->load->scene_graph, szName);
-    //  }
-    //  if (character) {
-    //      gf_node_list_add_child(&((GF_ParentNode*)n)->children, character);
-    //      gf_node_register(character, (GF_Node *)n);
-    //  }
-    //}
-    ///*add touch sensor to the color transform*/
-    //sprintf(szName, "BTN%d_TS", read->btn->ID);
-    //btn_ts = s2s_button_add_child(read, n, TAG_MPEG4_TouchSensor, szName, -1);
-
-    //s2s_insert_symbol(read, (GF_Node *)btn_root);
-
-    ///*isActive handler*/
-    //sprintf(szName, "BTN%d_CA", read->btn->ID);
-    //n = s2s_button_add_child(read, btn_root, TAG_MPEG4_Conditional, szName, -1);
-    //read->btn_active = ((M_Conditional*)n)->buffer.commandList;
-    //s2s_button_add_route(read, btn_ts, 4, n, 0);
-
-    ///*!isActive handler*/
-    //sprintf(szName, "BTN%d_CNA", read->btn->ID);
-    //n = s2s_button_add_child(read, btn_root, TAG_MPEG4_Conditional, szName, -1);
-    //read->btn_not_active = ((M_Conditional*)n)->buffer.commandList;
-    //s2s_button_add_route(read, btn_ts, 4, n, 1);
-
-    ///*isOver handler*/
-    //sprintf(szName, "BTN%d_CO", read->btn->ID);
-    //n = s2s_button_add_child(read, btn_root, TAG_MPEG4_Conditional, szName, -1);
-    //read->btn_over = ((M_Conditional*)n)->buffer.commandList;
-    //s2s_button_add_route(read, btn_ts, 5, n, 0);
-
-    ///*!isOver handler*/
-    //sprintf(szName, "BTN%d_CNO", read->btn->ID);
-    //n = s2s_button_add_child(read, btn_root, TAG_MPEG4_Conditional, szName, -1);
-    //read->btn_not_over = ((M_Conditional*)n)->buffer.commandList;
-    //s2s_button_add_route(read, btn_ts, 5, n, 1);
-
-    ///*by default show first character*/
-    //pos = 0;
-    //for (i=0; i<btn->count; i++) {
-    //  GF_Node *sprite_ctrl = NULL;
-    //  GF_Node *character;
-    //  br = &btn->buttons[i];
-    //  if (!br->up && !br->down && !br->over) continue;
-
-    //  character = s2s_get_node(read, br->character_id);
-
-    //  if (!character) {
-    //      sprintf(szName, "CLIP%d_DL", br->character_id);
-    //      character = gf_sg_find_node_by_name(read->load->scene_graph, szName);
-    //      if (character) {
-    //          sprintf(szName, "CLIP%d_CTRL", br->character_id);
-    //          sprite_ctrl = gf_sg_find_node_by_name(read->load->scene_graph, szName);
-    //      }
-    //  }
-    //  if (character) {
-    //      SFInt32 choice = 0;
-    //      GF_Node *n = s2s_wrap_node(read, character, &br->mx, &br->cmx);
-
-    //      sprintf(szName, "BTN%d_R%d", btn->ID, i+1);
-    //      button = (M_Switch *) s2s_button_add_child(read, btn_root, TAG_MPEG4_Switch, szName, pos);
-    //      pos++;
-
-    //      gf_node_list_add_child(&button->choice, n);
-    //      gf_node_register(n, (GF_Node *)button);
-    //      /*initial state*/
-    //      if (br->up) {
-    //          button->whichChoice = 0;
-    //          /*register this button for sprite start upon place_obj*/
-    //          if (sprite_ctrl) {
-    //              s2sBtnRec *btnrec;
-    //              if (!read->buttons) read->buttons = gf_list_new();
-    //              btnrec = gf_malloc(sizeof(s2sBtnRec));
-    //              btnrec->btn_id = btn->ID;
-    //              btnrec->sprite_up_id = br->character_id;
-    //              gf_list_add(read->buttons, btnrec);
-    //          }
-
-    //      } else {
-    //          button->whichChoice = -1;
-    //      }
-
-    //      choice = br->up ? 0 : -1;
-    //      s2s_set_field(read, read->btn_not_over, (GF_Node *)button, "whichChoice", -1, GF_SG_VRML_SFINT32, &choice, 0);
-    //      /*start or stop sprite if button is up or not*/
-    //      if (sprite_ctrl) {
-    //          s2s_control_sprite(read, read->btn_not_over, br->character_id, choice, 1, 0, 0);
-    //      }
-
-    //      choice = br->down ? 0 : -1;
-    //      s2s_set_field(read, read->btn_active, (GF_Node *)button, "whichChoice", -1, GF_SG_VRML_SFINT32, &choice, 0);
-    //      if (sprite_ctrl && !br->over) {
-    //          s2s_control_sprite(read, read->btn_active, br->character_id, choice, 1, 0, 0);
-    //      }
-
-    //      choice = br->over ? 0 : -1;
-    //      s2s_set_field(read, read->btn_not_active, (GF_Node *)button, "whichChoice", -1, GF_SG_VRML_SFINT32, &choice, 0);
-    //      s2s_set_field(read, read->btn_over, (GF_Node *)button, "whichChoice", -1, GF_SG_VRML_SFINT32, &choice, 0);
-    //      if (sprite_ctrl) {
-    //          s2s_control_sprite(read, read->btn_over, br->character_id, choice, 1, 0, 0);
-    //          if (!br->down)
-    //              s2s_control_sprite(read, read->btn_not_active, br->character_id, choice, 1, 0, 0);
-    //      }
-    //  }
-    //}
-
-    return GF_OK;
-}
-
-Bool swf_svg_action(SWFReader *read, SWFAction *act)
-{
-//  GF_List *dst;
-//  MFURL url;
-//  SFURL sfurl;
-//  Bool bval;
-//  GF_Node *n;
-//  Double time;
-//
-//  dst = read->bifs_au->commands;
-//  if (read->btn) {
-//      if (act->button_mask & GF_SWF_COND_OVERUP_TO_OVERDOWN) dst = read->btn_active;
-//      else if (act->button_mask & GF_SWF_COND_IDLE_TO_OVERUP) dst = read->btn_over;
-//      else if (act->button_mask & GF_SWF_COND_OVERUP_TO_IDLE) dst = read->btn_not_over;
-//      else dst = read->btn_not_active;
-//  }
-//
-//  switch (act->type) {
-//  case GF_SWF_AS3_WAIT_FOR_FRAME:
-//      /*while correct, this is not optimal, we set the wait-frame upon GOTO frame*/
-////        read->wait_frame = act->frame_number;
-//      break;
-//  case GF_SWF_AS3_GOTO_FRAME:
-//      if (act->frame_number>read->current_frame)
-//          read->wait_frame = act->frame_number;
-//
-//      time = act->frame_number ? act->frame_number +1: 0;
-//      time /= read->frame_rate;
-//      s2s_control_sprite(read, dst, read->current_sprite_id, 0, 1, time, 0);
-//      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;
-//      s2s_set_field(read, dst, n, "url", -1, GF_SG_VRML_MFURL, &url, 0);
-//      s2s_set_field(read, dst, n, "parameter", -1, GF_SG_VRML_MFSTRING, &url, 0);
-//      bval = 1;
-//      s2s_set_field(read, dst, n, "activate", -1, GF_SG_VRML_SFBOOL, &bval, 0);
-//      break;
-//  case GF_SWF_AS3_PLAY:
-//      s2s_control_sprite(read, dst, read->current_sprite_id, 0, 1, -1, 0);
-//      break;
-//  case GF_SWF_AS3_STOP:
-//      s2s_control_sprite(read, dst, read->current_sprite_id, 1, 0, 0, 0);
-//      break;
-//  default:
-//      return 0;
-//  }
-//
-    return 1;
-}
-
-GF_Err swf_to_svg_init(SWFReader *read)
-{
-    char szFileName[GF_MAX_PATH];
-    sprintf(szFileName, "%s.svg", read->load->fileName);
-    /*init callbacks*/
-    read->svg_output = gf_f64_open(szFileName, "wt");
-    fprintf(read->svg_output, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-    fprintf(read->svg_output, "<svg xmlns=\"http://www.w3.org/2000/svg\" ");
-    fprintf(read->svg_output, "xmlns:xlink=\"http://www.w3.org/1999/xlink\" ");
-    fprintf(read->svg_output, "width=\"100%%\" ");
-    fprintf(read->svg_output, "height=\"100%%\" ");
-    fprintf(read->svg_output, "viewBox=\"0 0 %d %d\" ", FIX2INT(read->width), FIX2INT(read->height));
-    fprintf(read->svg_output, "viewport-fill=\"rgb(255,255,255)\" ");
-    fprintf(read->svg_output, ">\n");
-    fprintf(read->svg_output, "<g id=\"frame%d\" display=\"none\">\n",read->current_frame);
-    fprintf(read->svg_output, "<animate attributeName=\"display\" to=\"inline\" begin=\"%f\" end=\"%f\" fill=\"remove\" restart=\"never\"/>\n",
-        1.0*(read->current_frame)/read->frame_rate, 1.0*(read->current_frame+1)/read->frame_rate);
-    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;
-    return GF_OK;
-}
-
-#endif /*GPAC_DISABLE_SWF_IMPORT*/
-
-#else
-GF_Err swf_to_svg_init(SWFReader *read)
-{
-    return GF_NOT_SUPPORTED;
-}
-
-#endif /*GPAC_DISABLE_VRML*/
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato
+ *          Copyright (c) Telecom ParisTech 2000-2012
+ *                  All rights reserved
+ *
+ *  This file is part of GPAC / Scene Management sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *   
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *   
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 
+ *
+ */
+#include <gpac/utf.h>
+#include <gpac/xml.h>
+#include <gpac/internal/swf_dev.h>
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/internal/isomedia_dev.h>
+#include <gpac/internal/media_dev.h>
+#include <gpac/constants.h>
+
+#ifndef GPAC_DISABLE_VRML
+
+#ifndef GPAC_DISABLE_SWF_IMPORT
+
+#define SWF_TEXT_SCALE              (1/1024.0f)
+
+typedef struct _swf_svg_sample
+{
+    u64 start;
+    u64 end;
+    char *data;
+} GF_SWF_SVG_Sample;
+
+static void swf_svg_print(SWFReader *read, const char *format, ...) {
+	char line[2000];
+	u32 line_length;
+	u32 new_size;
+	va_list args;
+
+	/* print the line */
+	va_start(args, format);
+	vsprintf(line, format, args);
+	va_end(args);
+	/* add the line to the buffer */
+	line_length = (u32)strlen(line);
+	new_size = read->svg_data_size+line_length;
+	read->svg_data = (char *)gf_realloc(read->svg_data, new_size+1);
+	if (read->print_frame_header) {
+		/* write at the beginning of the buffer */
+		memmove(read->svg_data+read->frame_header_offset+line_length, read->svg_data+read->frame_header_offset, (read->svg_data_size-read->frame_header_offset)+1);
+		memcpy(read->svg_data+read->frame_header_offset, line, line_length);
+		read->frame_header_offset += line_length;
+	} else {
+		strcpy(read->svg_data+read->svg_data_size, line);
+	}
+	read->svg_data_size = new_size;
+}
+
+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));
+}
+
+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));
+}
+
+static void swg_svg_print_shape_record_to_fill_stroke(SWFReader *read, SWFShapeRec *srec, Bool is_fill)
+{
+	/*get regular appearance reuse*/
+	if (is_fill) {
+		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, "\" ");
+			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;
+		case 0x40:
+		case 0x41:
+		case 0x42:
+		case 0x43:
+			//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));
+	}
+}
+
+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;
+        }
+    }
+}
+
+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]) );
+        }
+    }
+}
+
+/*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);
+        }
+    }
+	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;
+}
+
+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*/
+            {
+				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");
+        }
+    }
+	read->empty_frame = GF_FALSE;
+    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;
+}
+
+#if 0
+/*called upon end of sprite or clip*/
+static void swf_svg_end_of_clip(SWFReader *read)
+{
+}
+#endif
+
+static Bool swf_svg_allocate_depth(SWFReader *read, u32 depth)
+{
+    return GF_FALSE;
+}
+
+static GF_Err swf_svg_define_sprite(SWFReader *read, u32 nb_frames)
+{
+    return GF_OK;
+}
+
+static GF_Err swf_svg_setup_sound(SWFReader *read, SWFSound *snd, Bool soundstream_first_block)
+{
+    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;
+}
+
+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;
+}
+
+static GF_Err swf_svg_start_sound(SWFReader *read, SWFSound *snd, Bool stop)
+{
+    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;
+}
+
+static GF_Err swf_svg_remove_obj(SWFReader *read, u32 depth, u32 ID)
+{
+	read->empty_frame = GF_FALSE;
+    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");
+		read->empty_frame = GF_FALSE;
+    }
+	if (!read->empty_frame) {
+		read->print_frame_header = GF_TRUE;
+		read->frame_header_offset = 0;
+		swf_svg_print(read, "<g display=\"none\">\n");
+		swf_svg_print(read, "<animate id=\"frame%d_anim\" attributeName=\"display\" to=\"inline\" ", read->current_frame);
+		swf_svg_print(read, "begin=\"%g\" ", 1.0*(read->current_frame)/read->frame_rate);
+		if (read->current_frame+1 < read->frame_count) {
+			swf_svg_print(read, "end=\"frame%d_anim.begin\" fill=\"remove\" ", (read->current_frame+1));
+		} else {
+			swf_svg_print(read, "fill=\"freeze\" ");
+		}
+		swf_svg_print(read, "/>\n");
+		read->print_frame_header = GF_FALSE;
+
+		swf_svg_print(read, "</g>\n");
+	}
+	read->add_sample(read->user, read->svg_data, read->svg_data_size, read->current_frame*1000/read->frame_rate, (read->current_frame == 0));
+	gf_free(read->svg_data);
+	read->svg_data = NULL;
+	read->svg_data_size = 0;
+
+	read->empty_frame = GF_TRUE;
+    return GF_OK;
+}
+
+static void swf_svg_finalize(SWFReader *read)
+{
+}
+
+static GF_Err swf_svg_define_button(SWFReader *read, SWF_Button *btn)
+{
+    return GF_OK;
+}
+
+Bool swf_svg_action(SWFReader *read, SWFAction *act)
+{
+    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;
+
+	read->flags = swf_flags;
+	read->flat_limit = FLT2FIX(swf_flatten_angle);
+
+	read->print_stream_header = GF_TRUE;
+	swf_svg_print(read, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+	swf_svg_print(read, "<svg xmlns=\"http://www.w3.org/2000/svg\" ");
+	swf_svg_print(read, "xmlns:xlink=\"http://www.w3.org/1999/xlink\" ");
+	swf_svg_print(read, "width=\"100%%\" ");
+	swf_svg_print(read, "height=\"100%%\" ");
+	swf_svg_print(read, "viewBox=\"0 0 %d %d\" ", FIX2INT(read->width), FIX2INT(read->height));
+	swf_svg_print(read, "viewport-fill=\"rgb(255,255,255)\" ");
+	swf_svg_print(read, ">\n");
+	read->print_stream_header = GF_FALSE;
+
+	/* update sample description */
+	read->add_header(read->user, read->svg_data, read->svg_data_size);
+	gf_free(read->svg_data);
+	read->svg_data = NULL;
+	read->svg_data_size = 0;
+
+	return GF_OK;
+}
+
+#endif /*GPAC_DISABLE_SWF_IMPORT*/
+
+#else
+GF_Err swf_to_svg_init(SWFReader *read, u32 swf_flags, Float swf_flatten_angle)
+{
+    return GF_NOT_SUPPORTED;
+}
+
+#endif /*GPAC_DISABLE_VRML*/

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/base_scenegraph.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/base_scenegraph.c Changed

@@ -62,9 +62,7 @@
 
 #ifndef GPAC_DISABLE_SVG
 	tmp->dom_evt_mx = gf_mx_new("DOMEvent");
-	tmp->dom_evt.evt_list = gf_list_new();
-	tmp->dom_evt.ptr = tmp;
-	tmp->dom_evt.ptr_type = GF_DOM_EVENT_DOCUMENT;
+	tmp->dom_evt = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_DOCUMENT, tmp);
 	tmp->xlink_hrefs = gf_list_new();
 	tmp->smil_timed_elements = gf_list_new();
 	tmp->modified_smil_timed_elements = gf_list_new();
@@ -140,7 +138,8 @@
 	gf_sg_reset(sg);
 
 #ifndef GPAC_DISABLE_SVG
-	gf_list_del(sg->dom_evt.evt_list);
+
+	gf_dom_event_target_del(sg->dom_evt);
 	gf_list_del(sg->xlink_hrefs);
 	gf_list_del(sg->smil_timed_elements);
 	gf_list_del(sg->modified_smil_timed_elements);
@@ -149,7 +148,13 @@
 #endif
 #ifdef GPAC_HAS_SPIDERMONKEY
 	gf_list_del(sg->scripts);
+	sg->scripts = NULL;
 	gf_list_del(sg->objects);
+	sg->objects = NULL;
+	if (sg->svg_js) {
+		void gf_svg_script_context_del(GF_SVGJS *svg_js, GF_SceneGraph *scenegraph);
+		gf_svg_script_context_del(sg->svg_js, sg);
+	}
 #endif
 
 #ifndef GPAC_DISABLE_VRML
@@ -159,7 +164,6 @@
 	gf_list_del(sg->routes_to_activate);
 	gf_list_del(sg->routes_to_destroy);
 #endif
-
 	gf_list_del(sg->exported_nodes);
 	gf_free(sg);
 }
@@ -332,11 +336,7 @@
 
 	gf_mx_p(sg->dom_evt_mx);
 	/*remove listeners attached to the doc*/
-	while (gf_list_count(sg->dom_evt.evt_list)) {
-		GF_Node *n = gf_list_get(sg->dom_evt.evt_list, 0);
-		gf_dom_listener_del(n, &sg->dom_evt);
-	}
-
+	gf_dom_event_remove_all_listeners(sg->dom_evt);
 	/*flush any pending add_listener*/
 	gf_dom_listener_reset_defered(sg);
 	gf_mx_v(sg->dom_evt_mx);
@@ -1199,6 +1199,7 @@
 	GF_SAFEALLOC(p->sgprivate, NodePriv);
 	p->sgprivate->tag = tag;
 	p->sgprivate->flags = GF_SG_NODE_DIRTY;
+	//GF_SAFEALLOC(node->sgprivate->interact, struct _node_interactive_ext);
 }
 
 GF_Node *gf_sg_new_base_node()
@@ -1509,6 +1510,9 @@
 	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);
 
 	if (node->sgprivate->interact) {
 		if (node->sgprivate->interact->routes) {
@@ -1516,12 +1520,8 @@
 		}
 #ifndef GPAC_DISABLE_SVG
 		if (node->sgprivate->interact->dom_evt) {
-			while (gf_list_count(node->sgprivate->interact->dom_evt->evt_list)) {
-				GF_Node *n = gf_list_get(node->sgprivate->interact->dom_evt->evt_list, 0);
-				gf_dom_listener_del(n, node->sgprivate->interact->dom_evt);
-			}
-			gf_list_del(node->sgprivate->interact->dom_evt->evt_list);
-			gf_free(node->sgprivate->interact->dom_evt);
+			gf_dom_event_remove_all_listeners(node->sgprivate->interact->dom_evt);
+			gf_dom_event_target_del(node->sgprivate->interact->dom_evt);
 		}
 		if (node->sgprivate->interact->animations) {
 			gf_list_del(node->sgprivate->interact->animations);

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/dom_events.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/dom_events.c Changed

@@ -60,35 +60,35 @@
 	}
 }
 
-void gf_sg_unregister_event_type(GF_SceneGraph *sg, u32 type)
-{
-	if (sg->nb_evts_mouse && (type & GF_DOM_EVENT_MOUSE)) sg->nb_evts_mouse--;
-	if (sg->nb_evts_focus && (type & GF_DOM_EVENT_FOCUS)) sg->nb_evts_focus--;
-	if (sg->nb_evts_key && (type & GF_DOM_EVENT_KEY)) sg->nb_evts_key--;
-	if (sg->nb_evts_ui && (type & GF_DOM_EVENT_UI)) sg->nb_evts_ui--;
-	if (sg->nb_evts_mutation && (type & GF_DOM_EVENT_MUTATION)) sg->nb_evts_mutation--;
-	if (sg->nb_evts_text && (type & GF_DOM_EVENT_TEXT)) sg->nb_evts_text--;
-	if (sg->nb_evts_smil && (type & GF_DOM_EVENT_SMIL)) sg->nb_evts_smil--;
-	if (sg->nb_evts_laser && (type & GF_DOM_EVENT_LASER)) sg->nb_evts_laser--;
-	if (sg->nb_evts_text && (type & GF_DOM_EVENT_TEXT)) sg->nb_evts_text--;
-	if (sg->nb_evts_svg && (type & GF_DOM_EVENT_SVG)) sg->nb_evts_svg--;
-	if (sg->nb_evts_media && (type & GF_DOM_EVENT_MEDIA)) sg->nb_evts_media--;
+void gf_sg_unregister_event_type(GF_SceneGraph *sg, GF_DOMEventCategory category)
+{
+	if (sg->nb_evts_mouse && (category & GF_DOM_EVENT_MOUSE)) sg->nb_evts_mouse--;
+	if (sg->nb_evts_focus && (category & GF_DOM_EVENT_FOCUS)) sg->nb_evts_focus--;
+	if (sg->nb_evts_key && (category & GF_DOM_EVENT_KEY)) sg->nb_evts_key--;
+	if (sg->nb_evts_ui && (category & GF_DOM_EVENT_UI)) sg->nb_evts_ui--;
+	if (sg->nb_evts_mutation && (category & GF_DOM_EVENT_MUTATION)) sg->nb_evts_mutation--;
+	if (sg->nb_evts_text && (category & GF_DOM_EVENT_TEXT)) sg->nb_evts_text--;
+	if (sg->nb_evts_smil && (category & GF_DOM_EVENT_SMIL)) sg->nb_evts_smil--;
+	if (sg->nb_evts_laser && (category & GF_DOM_EVENT_LASER)) sg->nb_evts_laser--;
+	if (sg->nb_evts_text && (category & GF_DOM_EVENT_TEXT)) sg->nb_evts_text--;
+	if (sg->nb_evts_svg && (category & GF_DOM_EVENT_SVG)) sg->nb_evts_svg--;
+	if (sg->nb_evts_media && (category & GF_DOM_EVENT_MEDIA)) sg->nb_evts_media--;
 
 	gf_dom_refresh_event_filter(sg);
 }
 
-void gf_sg_register_event_type(GF_SceneGraph *sg, u32 type)
+void gf_sg_register_event_type(GF_SceneGraph *sg, GF_DOMEventCategory category)
 {
-	if (type & GF_DOM_EVENT_MOUSE) sg->nb_evts_mouse++;
-	if (type & GF_DOM_EVENT_FOCUS) sg->nb_evts_focus++;
-	if (type & GF_DOM_EVENT_KEY) sg->nb_evts_key++;
-	if (type & GF_DOM_EVENT_UI) sg->nb_evts_ui++;
-	if (type & GF_DOM_EVENT_MUTATION) sg->nb_evts_mutation++;
-	if (type & GF_DOM_EVENT_TEXT) sg->nb_evts_text++;
-	if (type & GF_DOM_EVENT_SMIL) sg->nb_evts_smil++;
-	if (type & GF_DOM_EVENT_LASER) sg->nb_evts_laser++;
-	if (type & GF_DOM_EVENT_SVG) sg->nb_evts_svg++;
-	if (type & GF_DOM_EVENT_MEDIA) sg->nb_evts_media++;
+	if (category & GF_DOM_EVENT_MOUSE) sg->nb_evts_mouse++;
+	if (category & GF_DOM_EVENT_FOCUS) sg->nb_evts_focus++;
+	if (category & GF_DOM_EVENT_KEY) sg->nb_evts_key++;
+	if (category & GF_DOM_EVENT_UI) sg->nb_evts_ui++;
+	if (category & GF_DOM_EVENT_MUTATION) sg->nb_evts_mutation++;
+	if (category & GF_DOM_EVENT_TEXT) sg->nb_evts_text++;
+	if (category & GF_DOM_EVENT_SMIL) sg->nb_evts_smil++;
+	if (category & GF_DOM_EVENT_LASER) sg->nb_evts_laser++;
+	if (category & GF_DOM_EVENT_SVG) sg->nb_evts_svg++;
+	if (category & GF_DOM_EVENT_MEDIA) sg->nb_evts_media++;
 
 	gf_dom_refresh_event_filter(sg);
 }
@@ -107,6 +107,10 @@
     }
 }
 
+/* Associate a listener node and a event target node 
+   - adds the listener node in the list of event listener nodes for the target node
+   - sets the target node as the user of the listener
+*/
 GF_Err gf_sg_listener_add(GF_Node *listener, GF_DOMEventTarget *evt_target)
 {
 	GF_FieldInfo info;
@@ -114,7 +118,6 @@
 	if (listener->sgprivate->tag!=TAG_SVG_listener)
 		return GF_BAD_PARAM;
 
-
 	/*only one observer per listener*/
 	if (listener->sgprivate->UserPrivate!=NULL) return GF_NOT_SUPPORTED;
 	listener->sgprivate->UserPrivate = evt_target;
@@ -123,13 +126,14 @@
 	gf_node_register((GF_Node *)listener, NULL);
 
 	if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info) == GF_OK) {
-		u32 type = ((XMLEV_Event *)info.far_ptr)->type;
+		GF_EventType type = ((XMLEV_Event *)info.far_ptr)->type;
 		gf_sg_register_event_type(listener->sgprivate->scenegraph, gf_dom_event_get_category(type));
 	}
 
-	return gf_list_add(evt_target->evt_list, listener);
+	return gf_list_add(evt_target->listeners, listener);
 }
 
+/* Create event-related structures in the node and associate the listener with this node */
 GF_EXPORT
 GF_Err gf_node_dom_listener_add(GF_Node *node, GF_Node *listener)
 {
@@ -141,10 +145,7 @@
 		GF_SAFEALLOC(node->sgprivate->interact, struct _node_interactive_ext);
 
 	if (!node->sgprivate->interact->dom_evt) {
-		GF_SAFEALLOC(node->sgprivate->interact->dom_evt, GF_DOMEventTarget);
-		node->sgprivate->interact->dom_evt->ptr = node;
-		node->sgprivate->interact->dom_evt->ptr_type = GF_DOM_EVENT_NODE;
-		node->sgprivate->interact->dom_evt->evt_list = gf_list_new();
+		node->sgprivate->interact->dom_evt = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_NODE, node);
 	}
 	return gf_sg_listener_add(listener, node->sgprivate->interact->dom_evt);
 }
@@ -154,10 +155,10 @@
 {
 	GF_FieldInfo info;
 	if (!listener || !target) return GF_BAD_PARAM;
-	if (gf_list_del_item(target->evt_list, listener)<0) return GF_BAD_PARAM;
+	if (gf_list_del_item(target->listeners, listener)<0) return GF_BAD_PARAM;
 
 	if (gf_node_get_attribute_by_tag((GF_Node *)listener, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info) == GF_OK) {
-		u32 type = ((XMLEV_Event *)info.far_ptr)->type;
+		GF_EventType type = ((XMLEV_Event *)info.far_ptr)->type;
 		gf_sg_unregister_event_type(listener->sgprivate->scenegraph, gf_dom_event_get_category(type));
 	}
 	listener->sgprivate->UserPrivate = NULL;
@@ -166,18 +167,47 @@
 	return GF_OK;
 }
 
+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) {
+		GF_Node *node = (GF_Node *)event_target->ptr;
+		node->sgprivate->UserPrivate = NULL;
+	}
+	gf_list_del_item(event_target->listeners, listener);
+
+#if 0
+	{
+		GF_FieldInfo info;
+		if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info) == GF_OK) {
+			GF_EventType type = ((XMLEV_Event *)info.far_ptr)->type;
+			gf_sg_unregister_event_type(listener->sgprivate->scenegraph, gf_dom_event_get_category(type));
+		}
+	}
+#endif
+	return GF_OK;
+}
+
+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);
+		gf_dom_listener_del(n, event_target);
+	}
+}
+
 GF_EXPORT
 u32 gf_dom_listener_count(GF_Node *node)
 {
 	if (!node || !node->sgprivate->interact || !node->sgprivate->interact->dom_evt) return 0;
-	return gf_list_count(node->sgprivate->interact->dom_evt->evt_list);
+	return gf_list_count(node->sgprivate->interact->dom_evt->listeners);
 }
 
 GF_EXPORT
 GF_Node *gf_dom_listener_get(GF_Node *node, u32 i)
 {
 	if (!node || !node->sgprivate->interact || !node->sgprivate->interact->dom_evt) return 0;
-	return (GF_Node *)gf_list_get(node->sgprivate->interact->dom_evt->evt_list, i);
+	return (GF_Node *)gf_list_get(node->sgprivate->interact->dom_evt->listeners, i);
 }
 
 typedef struct
@@ -225,11 +255,16 @@
 void gf_sg_handle_dom_event(GF_Node *hdl, GF_DOM_Event *event, GF_Node *observer)
 {
 #ifdef GPAC_HAS_SPIDERMONKEY
-	if (hdl->sgprivate->scenegraph->svg_js) 
-		if (hdl->sgprivate->scenegraph->svg_js->handler_execute(hdl, event, observer, NULL)) return;
+	if (hdl->sgprivate->scenegraph->svg_js) {
+		if (hdl->sgprivate->scenegraph->svg_js->handler_execute(hdl, event, observer, NULL)) {
+			return;
+		} else {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[DOM Events] Error executing JavaScript event handler\n"));
+			return;
+		}
+	}
 #endif
-	/*no clue what this is*/
-	GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[DOM Events    ] Unknown event handler\n"));
+	GF_LOG(GF_LOG_WARNING, GF_LOG_INTERACT, ("[DOM Events] JavaScript context not found \n"));
 }
 
 static GF_Node *dom_evt_get_handler(GF_Node *n)
@@ -322,19 +357,24 @@
 }
 
 GF_EXPORT
-Bool sg_fire_dom_event(GF_DOMEventTarget *et, GF_DOM_Event *event, GF_SceneGraph *sg, GF_Node *n)
+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_NODE || et->ptr_type == GF_DOM_EVENT_DOCUMENT) { 
+        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_NODE) {
+            if (et->ptr_type==GF_DOM_EVENT_TARGET_NODE) {
                 observer = (GF_Node *)et->ptr;
             }
-		    count = gf_list_count(et->evt_list);
+		    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->evt_list, i);
+			    GF_Node *listen = (GF_Node *)gf_list_get(et->listeners, i);
 
 			    switch (listen->sgprivate->tag) {
 			    case TAG_SVG_listener:
@@ -389,9 +429,9 @@
 			    }
 
 			    /*if listeners have been removed, update count*/
-			    post_count = gf_list_count(et->evt_list);
+			    post_count = gf_list_count(et->listeners);
 			    if (post_count < count) {
-				    s32 pos = gf_list_find(et->evt_list, listen);
+				    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--;
@@ -403,12 +443,14 @@
 			    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;
-    } 
-    return GF_FALSE;
+    } else {
+		/* if the node does not have a event target, probably a parent will have, so let's bubble */
+		return GF_TRUE;
+	}
 }
 
 static void gf_sg_dom_event_bubble(GF_Node *node, GF_DOM_Event *event, GF_List *use_stack, u32 cur_par_idx)
@@ -424,7 +466,7 @@
 	if (!parent) {
 	/*top of the graph, use Document*/
 		if (node->sgprivate->scenegraph->RootNode==node)
-			sg_fire_dom_event(&node->sgprivate->scenegraph->dom_evt, event, node->sgprivate->scenegraph, NULL);
+			gf_sg_fire_dom_event(node->sgprivate->scenegraph->dom_evt, event, node->sgprivate->scenegraph, NULL);
 		return;
 	}
 	if (cur_par_idx) {
@@ -436,7 +478,7 @@
 			else cur_par_idx = 0;
 			/*if no events attached,bubble by default*/
 			if (parent->sgprivate->interact) {
-				Bool can_bubble = sg_fire_dom_event(parent->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, parent);
+				Bool can_bubble = gf_sg_fire_dom_event(parent->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, parent);
 				if (!can_bubble)  {
 					return;
 				}
@@ -448,7 +490,7 @@
 	/*if no events attached,bubble by default*/
 	if (parent->sgprivate->interact) {
 		Bool can_bubble;
-		can_bubble = sg_fire_dom_event(parent->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, parent);
+		can_bubble = gf_sg_fire_dom_event(parent->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, parent);
 		if(!can_bubble) return;
 	}
 	gf_sg_dom_event_bubble(parent, event, use_stack, cur_par_idx);
@@ -479,13 +521,13 @@
 
 	event->consumed = 0;
 	event->target = node;
-	event->target_type = GF_DOM_EVENT_NODE;
+	event->target_type = GF_DOM_EVENT_TARGET_NODE;
 	if (node->sgprivate->interact && node->sgprivate->interact->dom_evt) {
 		event->currentTarget = node->sgprivate->interact->dom_evt;
 	} else {
-		cur_target.ptr_type = GF_DOM_EVENT_NODE;
+		cur_target.ptr_type = GF_DOM_EVENT_TARGET_NODE;
 		cur_target.ptr = node;
-		cur_target.evt_list = NULL;
+		cur_target.listeners = NULL;
 		event->currentTarget = &cur_target;
 	}
 
@@ -503,7 +545,7 @@
 		for (i=0; i<count; i++) {
 			GF_Node *n = (GF_Node *)gf_list_get(parents, i);
 			if (n->sgprivate->interact)
-				sg_fire_dom_event(n->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, n);
+				gf_sg_fire_dom_event(n->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, n);
 
 			/*event has been canceled*/
 			if (event->event_phase & (GF_DOM_EVENT_PHASE_CANCEL|GF_DOM_EVENT_PHASE_CANCEL_ALL) ) {
@@ -530,7 +572,7 @@
 	sg->abort_bubbling = GF_FALSE;
 
 	if (node->sgprivate->interact) {
-		can_bubble = sg_fire_dom_event(node->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, node);
+		can_bubble = gf_sg_fire_dom_event(node->sgprivate->interact->dom_evt, event, node->sgprivate->scenegraph, node);
 	}
 	if ( (!node->sgprivate->interact || can_bubble) && event->bubbles) {
 		/*bubbling phase*/
@@ -628,7 +670,7 @@
 		}
 		/*only handle event if coming from the watched element*/
 		if (proto->element) {
-			if ((evt->currentTarget->ptr_type!=GF_DOM_EVENT_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;
 		}
 
@@ -826,6 +868,77 @@
 	return update;
 }
 
+void gf_dom_event_dump_listeners(GF_Node *n, FILE *f) 
+{
+	u32		i;
+	u32		count;
+	GF_List *listeners = NULL;
+	GF_FieldInfo info;
+
+	/*re-translate dynamically created listeners/handlers */
+	if (n && n->sgprivate && n->sgprivate->interact && n->sgprivate->interact->dom_evt) {
+		listeners = n->sgprivate->interact->dom_evt->listeners;
+		count = gf_list_count(listeners);
+		for (i=0; i<count; i++) {
+			SVG_handlerElement *hdl;
+			GF_Node *listener = (GF_Node *)gf_list_get(listeners, i);
+			/*this listener has been created for internal use*/
+			if (listener->sgprivate->parents) continue;
+			if (gf_node_get_attribute_by_tag(listener, TAG_XMLEV_ATT_handler, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+				GF_DOMText *txt;
+				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))
+				)
+					continue;
+
+				txt = hdl->children ? (GF_DOMText*)hdl->children->node : NULL;
+				if (!txt || (txt->sgprivate->tag!=TAG_DOMText) || !txt->textContent) continue;
+				if (gf_node_get_attribute_by_tag((GF_Node*)hdl, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info)==GF_OK) {
+					fprintf(f, " on%s=\"%s\"", gf_dom_event_get_name( ((XMLEV_Event*)info.far_ptr)->type), txt->textContent);
+				}
+			}
+		}
+	}
+}
+
+GF_DOMEventTarget *gf_dom_event_target_new(GF_DOMEventTargetType type, void *obj) 
+{
+    GF_DOMEventTarget *target;
+    GF_SAFEALLOC(target, GF_DOMEventTarget);
+    target->ptr_type = type;
+	target->listeners = gf_list_new();
+    target->ptr = obj;
+    return target;
+}
+
+void gf_dom_event_target_del(GF_DOMEventTarget *target) 
+{
+    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 *target = NULL;
+	//GF_HTML_MediaElement *me = html_media_element_get_from_node(c, n);
+	//*target = me->evt_target;
+
+	if (!n->sgprivate->interact) {
+		GF_SAFEALLOC(n->sgprivate->interact, struct _node_interactive_ext);
+	}
+	if (!n->sgprivate->interact->dom_evt) {
+		n->sgprivate->interact->dom_evt = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_NODE, n);
+	}
+	target = n->sgprivate->interact->dom_evt;
+
+	return target;
+}
+
+
 
 #endif	//GPAC_DISABLE_SVG

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/dom_smjs.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/dom_smjs.c Changed

@@ -41,6 +41,8 @@
 
 #ifdef GPAC_HAS_SPIDERMONKEY
 
+#include <gpac/html5_mse.h>
+
 #ifdef GPAC_ANDROID
 #ifndef XP_UNIX
 #define XP_UNIX
@@ -50,6 +52,9 @@
 #include <gpac/html5_media.h>
 #include <gpac/internal/smjs_api.h>
 
+typedef struct __xhr_context XMLHTTPContext;
+GF_DOMEventTarget *xml_http_get_event_target(XMLHTTPContext *ctx);
+GF_SceneGraph *xml_http_get_scenegraph(XMLHTTPContext *ctx);
 
 static GFINLINE Bool ScriptAction(GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
 {
@@ -129,6 +134,112 @@
 
 static GF_DOMRuntime *dom_rt = NULL;
 
+typedef enum {
+	NODE_JSPROPERTY_NODENAME				= -1,
+	NODE_JSPROPERTY_NODEVALUE				= -2,
+	NODE_JSPROPERTY_NODETYPE				= -3,
+	NODE_JSPROPERTY_PARENTNODE				= -4,
+	NODE_JSPROPERTY_CHILDNODES				= -5,
+	NODE_JSPROPERTY_FIRSTCHILD				= -6,
+	NODE_JSPROPERTY_LASTCHILD				= -7,
+	NODE_JSPROPERTY_PREVIOUSSIBLING			= -8,
+	NODE_JSPROPERTY_NEXTSIBLING				= -9,
+	NODE_JSPROPERTY_ATTRIBUTES				= -10,
+	NODE_JSPROPERTY_OWNERDOCUMENT			= -11,
+	NODE_JSPROPERTY_NAMESPACEURI			= -12,
+	NODE_JSPROPERTY_PREFIX					= -13,
+	NODE_JSPROPERTY_LOCALNAME				= -14,
+	NODE_JSPROPERTY_BASEURI					= -15,
+	NODE_JSPROPERTY_TEXTCONTENT				= -16,
+	NODE_JSPROPERTY_FIRSTELEMENTCHILD		= -17,
+	NODE_JSPROPERTY_LASTELEMENTCHILD		= -18,
+	NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING	= -19,
+	NODE_JSPROPERTY_NEXTELEMENTSIBLING		= -20
+} GF_DOMNodeJSProperty;
+
+typedef enum {
+	DOCUMENT_JSPROPERTY_DOCTYPE				= -1,
+	DOCUMENT_JSPROPERTY_IMPLEMENTATION		= -2,
+	DOCUMENT_JSPROPERTY_DOCUMENTELEMENT		= -3,
+	DOCUMENT_JSPROPERTY_INPUTENCODING		= -4,
+	DOCUMENT_JSPROPERTY_XMLENCODING			= -5,
+	DOCUMENT_JSPROPERTY_XMLSTANDALONE		= -6,
+	DOCUMENT_JSPROPERTY_XMLVERSION			= -7,
+	DOCUMENT_JSPROPERTY_STRICTERRORCHECKING	= -8,
+	DOCUMENT_JSPROPERTY_DOCUMENTURI			= -9,
+	DOCUMENT_JSPROPERTY_LOCATION			= -10,
+	DOCUMENT_JSPROPERTY_DOMCONFIG			= -11,
+	DOCUMENT_JSPROPERTY_GLOBAL				= -12
+} GF_DOMDocumentJSProperty;
+
+typedef enum {
+	ELEMENT_JSPROPERTY_TAGNAME			= -1,
+	ELEMENT_JSPROPERTY_SCHEMATYPEINFO	= -2,
+} GF_DOMElementJSProperty;
+
+typedef enum {
+	DCCI_JSPROPERTY_VALUE						= -1,
+	DCCI_JSPROPERTY_VALUETYPE					= -2,
+	DCCI_JSPROPERTY_PROPERTYTYPE				= -3,
+	DCCI_JSPROPERTY_READONLY					= -4,
+	DCCI_JSPROPERTY_DCCIMETADATAINTERFACETYPE	= -5,
+	DCCI_JSPROPERTY_DCCIMETADATAINTERFACE		= -6,
+	DCCI_JSPROPERTY_VERSION						= -7,
+} GF_DCCIJSProperty;
+
+typedef enum {
+	NODELIST_JSPROPERTY_LENGTH = -1,
+} GF_DOMNodeListJSProperty;
+
+typedef enum {
+	EVENT_JSPROPERTY_TYPE						= -1,
+	EVENT_JSPROPERTY_TARGET						= -2,
+	EVENT_JSPROPERTY_CURRENTTARGET				= -3,
+	EVENT_JSPROPERTY_EVENTPHASE					= -4,
+	EVENT_JSPROPERTY_BUBBLES					= -5,
+	EVENT_JSPROPERTY_CANCELABLE					= -6,
+	EVENT_JSPROPERTY_TIMESTAMP					= -7,
+	EVENT_JSPROPERTY_NAMESPACEURI				= -8,
+	EVENT_JSPROPERTY_DEFAULTPREVENTED			= -9,
+	EVENT_JSPROPERTY_DETAIL						= -10,
+	EVENT_JSPROPERTY_DATA						= -11,
+	EVENT_JSPROPERTY_SCREENX					= -12,
+	EVENT_JSPROPERTY_SCREENY					= -13,
+	EVENT_JSPROPERTY_CLIENTX					= -14,
+	EVENT_JSPROPERTY_CLIENTY					= -15,
+	EVENT_JSPROPERTY_BUTTON						= -16,
+	EVENT_JSPROPERTY_RELATEDTARGET				= -17,
+	EVENT_JSPROPERTY_WHEELDELTA					= -18,
+	EVENT_JSPROPERTY_KEYIDENTIFIER				= -19,
+	EVENT_JSPROPERTY_KEYCHAR					= -20,
+	EVENT_JSPROPERTY_CHARCODE					= -21,
+	EVENT_JSPROPERTY_LENGTHCOMPUTABLE			= -22,
+	EVENT_JSPROPERTY_TYPEARG					= -23,
+	EVENT_JSPROPERTY_LOADED						= -24,
+	EVENT_JSPROPERTY_TOTAL						= -25,
+	EVENT_JSPROPERTY_BUFFERLEVELVALID			= -26,
+	EVENT_JSPROPERTY_BUFFERLEVEL				= -27,
+	EVENT_JSPROPERTY_BUFFERREMAININGTIME		= -28,
+	EVENT_JSPROPERTY_STATUS						= -29,
+	EVENT_JSPROPERTY_WIDTH						= -30,
+	EVENT_JSPROPERTY_HEIGHT						= -31,
+	EVENT_JSPROPERTY_OFFSETX					= -32,
+	EVENT_JSPROPERTY_OFFSETY					= -33,
+	EVENT_JSPROPERTY_VPWIDTH					= -34,
+	EVENT_JSPROPERTY_VPHEIGHT					= -35,
+	EVENT_JSPROPERTY_TRANSLATIONX				= -36,
+	EVENT_JSPROPERTY_TRANSLATIONY				= -37,
+	EVENT_JSPROPERTY_TYPE3D						= -38,
+	EVENT_JSPROPERTY_ERROR						= -39,
+	EVENT_JSPROPERTY_DYNAMIC_SCENE				= -40,
+} GF_DOMEventJSProperty;
+
+typedef enum {
+	TEXT_JSPROPERTY_DATA						= -1,
+	TEXT_JSPROPERTY_LENGTH						= -2,
+	TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE	= -3,
+	TEXT_JSPROPERTY_WHOLETEXT					= -4,
+} GF_DOMTextJSProperty;
 
 static JSBool SMJS_FUNCTION(xml_dom3_not_implemented)
 {
@@ -227,6 +338,32 @@
 	return NULL;
 }
 
+static void dom_js_define_document_ex(JSContext *c, JSObject *global, GF_SceneGraph *doc, const char *name)
+{
+	GF_JSClass *__class;
+	JSObject *obj;
+	if (!doc || !doc->RootNode) return;
+
+	if (doc->reference_count)
+		doc->reference_count++;
+	gf_node_register(doc->RootNode, NULL);
+
+	__class = NULL;
+	if (dom_rt->get_document_class)
+		__class = (GF_JSClass *)dom_rt->get_document_class(doc);
+	if (!__class) __class = &dom_rt->domDocumentClass;
+
+	obj = JS_DefineObject(c, global, name, & __class->_class, 0, 0 );
+	SMJS_SET_PRIVATE(c, obj, doc);
+	doc->document = obj;
+}
+
+void dom_js_define_document(JSContext *c, JSObject *global, GF_SceneGraph *doc)
+{
+	dom_js_define_document_ex(c, global, doc, "document");
+}
+
+/* Constructs a new document based on the given context and scene graph, used for documents in XHR */
 static jsval dom_document_construct(JSContext *c, GF_SceneGraph *sg)
 {
 	GF_JSClass *jsclass;
@@ -240,7 +377,6 @@
 	jsclass = NULL;
 	if (dom_rt->get_document_class)
 		jsclass = (GF_JSClass *) dom_rt->get_document_class(sg);
-
 	if (!jsclass) jsclass = &dom_rt->domDocumentClass;
 
 	new_obj = JS_NewObject(c, & jsclass->_class, 0, 0);
@@ -475,17 +611,31 @@
 static SMJS_FUNC_PROP_GET( dom_nodelist_getProperty)
 
 	DOMNodeList *nl;
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->domNodeListClass, NULL)
-	)
+	u32			count;
+	s32			idx;
+	if (!GF_JS_InstanceOf(c, obj, &dom_rt->domNodeListClass, NULL)) {
 		return JS_TRUE;
+	}
+	nl = (DOMNodeList *) SMJS_GET_PRIVATE(c, obj);
+	count = gf_node_list_get_count(nl->owner ? nl->owner->children : nl->child);
 
 	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 
 	switch (SMJS_ID_TO_INT(id)) {
-	case 0:
-		nl = (DOMNodeList *) SMJS_GET_PRIVATE(c, obj);
-		*vp = INT_TO_JSVAL( gf_node_list_get_count(nl->owner ? nl->owner->children : nl->child) );
+	case NODELIST_JSPROPERTY_LENGTH:
+		*vp = INT_TO_JSVAL( count );
 		return JS_TRUE;
+	default:
+		idx = SMJS_ID_TO_INT(id);
+		if ((idx<0) || ((u32) idx>=count)) {
+			*vp = JSVAL_VOID;
+			return JS_TRUE;
+		} else {
+			GF_Node *n;
+			n = gf_node_list_get_child(nl->owner ? nl->owner->children : nl->child, idx);
+			*vp = dom_node_construct(c, n);
+			return JS_TRUE;
+		}
 	}
 	return JS_TRUE;
 }
@@ -522,94 +672,155 @@
 	}
 }
 
-/*eventListeners routines used by document, element and connection interfaces*/
-JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *on_node)
+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)
 {
-	GF_DOMEventTarget *target;
-	GF_FieldInfo info;
-	GF_Node *listener;
-	SVG_handlerElement *handler;
-	char *type, *callback;
-	u32 of = 0;
-	u32 evtType;
-	char *inNS = NULL;
-	GF_SceneGraph *sg = NULL;
-	JSFunction*fun = NULL;
-	GF_Node *n = NULL;
-	jsval funval = JSVAL_NULL;
-	JSObject *evt_handler;
-	SMJS_OBJ
-	SMJS_ARGS
-
-	target = NULL;
-	/*document interface*/
-	sg = dom_get_doc(c, obj);
-	if (sg) {
+	Bool is_svg_document_class(JSContext *c, JSObject *obj);
+	Bool is_svg_element_class(JSContext *c, JSObject *obj);
+	Bool gf_mse_is_mse_object(JSContext *c, JSObject *obj);
+	*target = NULL;
+	*sg = NULL;
+	*n = NULL;
+
+	if (gf_dom_event_get_category(evtType) == GF_DOM_EVENT_MEDIA) {
+		void gf_html_media_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg);
+		gf_html_media_get_event_target(c, obj, target, sg);
+		if (*target && *sg) return JS_TRUE;
+	} 
+	
+	if (gf_dom_event_get_category(evtType) == GF_DOM_EVENT_MEDIASOURCE) {
+		void gf_mse_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg);
+		gf_mse_get_event_target(c, obj, target, sg);
+		if (*target && *sg) return JS_TRUE;
+	} 
+	
+	if (GF_JS_InstanceOf(c, obj, &dom_rt->domDocumentClass, NULL) || is_svg_document_class(c, obj)) {
+		/*document interface*/
+		*sg = dom_get_doc(c, obj);
+		if (*sg) {
 #ifndef GPAC_DISABLE_SVG
-		target = &sg->dom_evt;
+			*target = (*sg)->dom_evt;
 #else
-		return JS_TRUE;
+			return JS_TRUE;
 #endif
-	} else {
-		if (on_node) {
-			n = on_node;
 		} else {
-			n = dom_get_element(c, obj);
+			return JS_TRUE;
+		}
+	} else if (GF_JS_InstanceOf(c, obj, &dom_rt->domElementClass, NULL) || is_svg_element_class(c, obj) || vrml_node) {
+		/*Element interface*/
+		if (vrml_node) {
+			*n = vrml_node;
+		} else {
+			*n = dom_get_element(c, obj);
 		}
-		if (n) sg = n->sgprivate->scenegraph;
+		if (*n) {
+			*sg = (*n)->sgprivate->scenegraph;
+			if (!(*n)->sgprivate->interact->dom_evt) {
+				(*n)->sgprivate->interact->dom_evt = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_NODE, *n);
+			}
+			*target = (*n)->sgprivate->interact->dom_evt;
+		} else {
+			return JS_TRUE;
+		}
+	} else if (GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL)) {
+		/*XHR interface*/
+		XMLHTTPContext *ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
+		if (ctx) {
+			*sg = xml_get_scenegraph(c);
+			*target = xml_http_get_event_target(ctx);
+		} else {
+			return JS_TRUE;
+		}
+	} else {
+		return JS_TRUE;
 	}
+	return JS_TRUE;
+}
 
-	/*FIXME - SVG uDOM connection not supported yet*/
+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;
 
-	if (!sg) return JS_TRUE;
+	*evtType = GF_EVENT_UNKNOWN;
+	*callback = NULL;
+	*funval = JSVAL_NULL;
+	if (evt_handler) *evt_handler = obj;
 
 	/*NS version (4 args in DOM2, 5 in DOM3 for evt_group param)*/
 	if (argc>=4) {
-		if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
+		if (!JSVAL_CHECK_STRING(argv[0])) return GF_BAD_PARAM;
 		inNS = js_get_utf8(c, argv[0]);
-		of = 1;
+		offset = 1;
 	}
-	evt_handler = obj;
 
-	type = callback = NULL;
-	if (!JSVAL_CHECK_STRING(argv[of])) goto err_exit;
-	type = SMJS_CHARS(c, argv[of]);
-
-	if (JSVAL_CHECK_STRING(argv[of+1])) {
-		callback = SMJS_CHARS(c, argv[of+1]);
-		if (!callback) goto err_exit;
-	} else if (JSVAL_IS_OBJECT(argv[of+1])) {
-		if (JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(argv[of+1]))) {
-			//fun = JS_ValueToFunction(c, argv[of+1]);
-			funval = argv[of+1];
+	if (!JSVAL_CHECK_STRING(argv[offset])) goto err_exit;
+	type = SMJS_CHARS(c, argv[offset]);
+
+	if (JSVAL_CHECK_STRING(argv[offset+1])) {
+		*callback = SMJS_CHARS(c, argv[offset+1]);
+		if (!*callback) goto err_exit;
+	} else if (JSVAL_IS_OBJECT(argv[offset+1])) {
+		if (JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(argv[offset+1]))) {
+			*funval = argv[offset+1];
 		} else {
 			JSBool found;
 			jsval evt_fun;
-			evt_handler = JSVAL_TO_OBJECT(argv[of+1]);
-			found = JS_GetProperty(c, evt_handler, "handleEvent", &evt_fun);
+			if (evt_handler) {
+				*evt_handler = JSVAL_TO_OBJECT(argv[offset+1]);
+			} else {
+				goto err_exit;
+			}
+			found = JS_GetProperty(c, *evt_handler, "handleEvent", &evt_fun);
 			if (!found || !JSVAL_IS_OBJECT(evt_fun) ) goto err_exit;
 			if (!JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(evt_fun)) ) goto err_exit;
-			funval = evt_fun;
+			*funval = evt_fun;
 		}
 	}
 
-	evtType = gf_dom_event_type_by_name(type);
-	if (evtType==GF_EVENT_UNKNOWN) goto err_exit;
+	*evtType = gf_dom_event_type_by_name(type);
+	if (*evtType==GF_EVENT_UNKNOWN) goto err_exit;
+
+	SMJS_FREE(c, type);
+	if (inNS) gf_free(inNS);
+	return GF_OK;
+
+err_exit:
+	if (inNS) gf_free(inNS);
+	if (type) SMJS_FREE(c, type);
+	if (callback) SMJS_FREE(c, *callback);
+	*callback = NULL;
+	*evtType = GF_EVENT_UNKNOWN;
+	*funval = JSVAL_NULL;
+	if (evt_handler) *evt_handler = NULL;
+	return GF_BAD_PARAM;
+}
+
+static GF_Node *create_listener(GF_SceneGraph *sg, GF_EventType evtType, GF_Node *n, GF_Node *vrml_node,
+								JSContext *c, char *callback, jsval funval, JSObject *evt_handler)
+{
+	GF_FieldInfo info;
+	GF_Node *listener;
+	SVG_handlerElement *handler;
 
 	listener = gf_node_new(sg, TAG_SVG_listener);
 	/*we don't register the listener with the parent node , it will be registered
-	on gf_dom_listener__add*/
+	on gf_dom_listener_add*/
 
 	/*!!! create the handler in the scene owning the script context !!! */
 	{
+		/* removed in harmonisation with XHR, was it really needed ? 
 		GF_SceneGraph *sg = xml_get_scenegraph(c);
+		*/
 		handler = (SVG_handlerElement *) gf_node_new(sg, TAG_SVG_handler);
 		/*we register the handler with the listener node to avoid modifying the DOM*/
 		gf_node_register((GF_Node *)handler, listener);
 		gf_node_list_add_child(& ((GF_ParentNode *)listener)->children, (GF_Node*)handler);
 
 		if (!callback) {
-			handler->js_fun = fun;
+			handler->js_fun = NULL;
 			handler->js_fun_val = *(u64 *) &funval;
 			if (handler->js_fun_val) {
 				handler->js_context = c;
@@ -642,14 +853,44 @@
 		handler->handle_event = gf_sg_handle_dom_event;
 #endif
 
-	if (on_node) {
+	if (vrml_node) {
 		handler->js_context = c;
 #ifndef GPAC_DISABLE_VRML
-		if (on_node->sgprivate->tag <= GF_NODE_RANGE_LAST_VRML)
+		if (vrml_node->sgprivate->tag <= GF_NODE_RANGE_LAST_VRML)
 			handler->handle_event = gf_sg_handle_dom_event_for_vrml;
 #endif
 	}
 
+	return listener;
+}
+
+/*eventListeners routines used by document, element and XHR interfaces*/
+JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node)
+{
+	GF_DOMEventTarget *target = NULL;
+	GF_Node *listener = NULL;	
+	GF_EventType evtType = GF_EVENT_UNKNOWN;	
+	GF_SceneGraph *sg = NULL;
+	char *callback = NULL;
+	jsval funval = JSVAL_NULL;
+	GF_Node *n = NULL;
+	JSObject *evt_handler = NULL;
+	GF_Err e;
+
+	SMJS_OBJ
+	SMJS_ARGS
+
+	/* Determine the event type and handler params */
+	e = sg_js_parse_event_args(c, obj, argc, argv, &evtType, &callback, &funval, &evt_handler);
+	if (e != GF_OK) goto err_exit;
+
+	/* First retrieve the scenegraph and the GF_DOMEventTarget object */
+	sg_js_get_event_target(c, obj, evtType, vrml_node, &sg, &target, &n);	
+	if (!sg || !target) goto err_exit;
+
+	listener = create_listener(sg, evtType, n, vrml_node, c, callback, funval, evt_handler);
+	if (!listener) goto err_exit;
+
 	/*don't add listener directly, post it and wait for event processing*/
 	if (n) {
 		gf_sg_listener_post_add((GF_Node *) n, listener);
@@ -658,9 +899,7 @@
 	}
 
 err_exit:
-	if (inNS) gf_free(inNS);
-	SMJS_FREE(c, type);
-	SMJS_FREE(c, callback);
+   if (callback) SMJS_FREE(c, callback);
    return JS_TRUE;
 }
 
@@ -673,69 +912,34 @@
 JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node)
 {
 #ifndef GPAC_DISABLE_SVG
-	char *type, *callback;
-	u32 of = 0;
-	u32 evtType, i, count;
-	char *inNS = NULL;
+	char *callback = NULL;
+	GF_EventType evtType = GF_EVENT_UNKNOWN;
+	u32 i, count;
 	GF_Node *node = NULL;
 	jsval funval = JSVAL_NULL;
 	GF_SceneGraph *sg = NULL;
 	GF_DOMEventTarget *target = NULL;
+	GF_Err e;
 	SMJS_OBJ
 	SMJS_ARGS
 
-	/*get the scenegraph first*/
-	sg = dom_get_doc(c, obj);
-	if (!sg) {
-		if (vrml_node) {
-			node = vrml_node;
-		} else {
-			node = dom_get_element(c, obj);
-		}
-		if (node) sg = node->sgprivate->scenegraph;
-	}
+	/* Determine the event type and handler params */
+	e = sg_js_parse_event_args(c, obj, argc, argv, &evtType, &callback, &funval, NULL);
+	if (e != GF_OK) goto err_exit;
+
+	/* First retrieve the scenegraph and the GF_DOMEventTarget object */
+	sg_js_get_event_target(c, obj, evtType, vrml_node, &sg, &target, &node);	
+	if (!sg || !target) return JS_TRUE;
 
-	if (!sg) return JS_TRUE;
 	/*flush all pending add_listener*/
 	gf_dom_listener_process_add(sg);
-	if (node) {
-		if (node->sgprivate->interact) target = node->sgprivate->interact->dom_evt;
-	}
-	/*FIXME - SVG uDOM connection not supported yet*/
-	else {
-		target = &sg->dom_evt;
-	}
-	if (!target) return JS_TRUE;
-
 
-	if (argc==4) {
-		if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
-		inNS = js_get_utf8(c, argv[0]);
-		of = 1;
-	}
-
-	type = callback = NULL;
-	if (!JSVAL_CHECK_STRING(argv[of])) goto err_exit;
-	type = SMJS_CHARS(c, argv[of]);
-
-	if (JSVAL_CHECK_STRING(argv[of+1])) {
-		callback = SMJS_CHARS(c, argv[of+1]);
-	} else if (JSVAL_IS_OBJECT(argv[of+1])) {
-		if (JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(argv[of+1]) )) {
-			funval = argv[of+1];
-		}
-	}
-	if (!callback && JSVAL_IS_NULL(funval) ) goto err_exit;
-
-	evtType = gf_dom_event_type_by_name(type);
-	if (evtType==GF_EVENT_UNKNOWN) goto err_exit;
-
-	count = gf_list_count(target->evt_list);
+	count = gf_list_count(target->listeners);
 	for (i=0; i<count; i++) {
 		GF_FieldInfo info;
 		GF_DOMText *txt;
 		SVG_handlerElement *hdl;
-		GF_Node *el = (GF_Node *)gf_list_get(target->evt_list, i);
+		GF_Node *el = (GF_Node *)gf_list_get(target->listeners, i);
 
 		gf_node_get_attribute_by_tag(el, TAG_XMLEV_ATT_event, GF_FALSE, GF_FALSE, &info);
 		if (!info.far_ptr) continue;
@@ -746,7 +950,13 @@
 		hdl = (SVG_handlerElement *) ((XMLRI*)info.far_ptr)->target;
 		if (!hdl) continue;
 		if (! JSVAL_IS_NULL(funval) ) {
-			if (*(u64 *) &funval != hdl->js_fun_val) continue;
+#if (JS_VERSION>=185)
+            JSBool res = JS_FALSE;
+            if (! JS_StrictlyEqual(c, funval, *(jsval *)&hdl->js_fun_val, &res)) 
+                continue;
+#else
+			if (funval != *(jsval *)&hdl->js_fun_val) continue;
+#endif
 		} else if (hdl->children) {
 			txt = (GF_DOMText *) hdl->children->node;
 			if (txt->sgprivate->tag != TAG_DOMText) continue;
@@ -762,9 +972,7 @@
 #endif
 
 err_exit:
-	if (inNS) gf_free(inNS);
-	SMJS_FREE(c, type);
-	SMJS_FREE(c, callback);
+	if (callback) SMJS_FREE(c, callback);
 	return JS_TRUE;
 }
 
@@ -914,19 +1122,26 @@
 	GF_Node *n, *new_node;
 	SMJS_OBJ
 	SMJS_ARGS
-	if (!argc || !JSVAL_IS_OBJECT(argv[0])) return JS_TRUE;
+	if (!argc || !JSVAL_IS_OBJECT(argv[0])) {
+		return JS_TRUE;
+	}
 	n = dom_get_node(c, obj);
 	if (!n) {
 		return dom_throw_exception(c, GF_DOM_EXC_HIERARCHY_REQUEST_ERR);
 	}
 
 	new_node = dom_get_node(c, JSVAL_TO_OBJECT(argv[0]));
-	if (!new_node) return JS_TRUE;
+	if (!new_node) {
+		return JS_TRUE;
+	}
 	tag = gf_node_get_tag(n);
-	if (tag==TAG_DOMText) return JS_TRUE;
+	if (tag==TAG_DOMText) {
+		return JS_TRUE;
+	}
 
-	if (!check_dom_parents(c, n, new_node))
+	if (!check_dom_parents(c, n, new_node)) {
 		return JS_FALSE;
+	}
 
 	dom_node_inserted(c, new_node, n, -1);
 
@@ -1136,8 +1351,7 @@
 	par = (GF_ParentNode*)n;
 
 	switch (SMJS_ID_TO_INT(id)) {
-	/*"nodeName"*/
-	case 0:
+	case NODE_JSPROPERTY_NODENAME:
 		if (sg) {
 			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "#document") );
 		}
@@ -1150,16 +1364,14 @@
 			*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_node_get_class_name(n) ) );
 		}
 		return JS_TRUE;
-	/*"nodeValue"*/
-	case 1:
+	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;
-	/*"nodeType"*/
-	case 2:
+	case NODE_JSPROPERTY_NODETYPE:
 		if (sg) *vp = INT_TO_JSVAL(9);
 		else if (tag==TAG_DOMText) {
 			GF_DOMText *txt = (GF_DOMText *)n;
@@ -1168,8 +1380,7 @@
 		}
 		else *vp = INT_TO_JSVAL(1);
 		return JS_TRUE;
-	/*"parentNode"*/
-	case 3:
+	case NODE_JSPROPERTY_PARENTNODE:
 		if (sg) {
 			*vp = JSVAL_NULL;
 		}
@@ -1180,15 +1391,13 @@
 			*vp = dom_node_construct(c, gf_node_get_parent(n, 0) );
 		}
 		return JS_TRUE;
-	/*"childNodes"*/
-	case 4:
+	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;
-	/*"firstChild"*/
-	case 5:
+	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) {
@@ -1196,33 +1405,27 @@
 		}
 		else *vp = dom_node_construct(c, par->children->node);
 		return JS_TRUE;
-	/*"lastChild"*/
-	case 6:
+	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;
-	/*"previousSibling"*/
-	case 7:
+	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;
-	/*"nextSibling"*/
-	case 8:
+	case NODE_JSPROPERTY_NEXTSIBLING:
 		*vp = dom_node_get_sibling(c, n, GF_FALSE, GF_FALSE);
 		return JS_TRUE;
-	/*"attributes"*/
-	case 9:
+	case NODE_JSPROPERTY_ATTRIBUTES:
 		/*NOT SUPPORTED YET*/
 		*vp = JSVAL_VOID;
 		return JS_TRUE;
-	/*"ownerDocument"*/
-	case 10:
+	case NODE_JSPROPERTY_OWNERDOCUMENT:
 		if (sg) *vp = JSVAL_NULL;
 		else *vp = dom_document_construct(c, n->sgprivate->scenegraph);
 		return JS_TRUE;
-	/*"namespaceURI"*/
-	case 11:
+	case NODE_JSPROPERTY_NAMESPACEURI:
 		*vp = JSVAL_NULL;
 		if (!sg) {
 			tag = gf_xml_get_element_namespace(n);
@@ -1233,8 +1436,7 @@
 			}
 		}
 		return JS_TRUE;
-	/*"prefix"*/
-	case 12:
+	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;
@@ -1243,20 +1445,17 @@
 			if (xmlns) *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, xmlns) );
 		}
 		return JS_TRUE;
-	/*"localName"*/
-	case 13:
+	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;
-	/*"baseURI"*/
-	case 14:
+	case NODE_JSPROPERTY_BASEURI:
 		/*NOT SUPPORTED YET*/
 		*vp = JSVAL_NULL;
 		return JS_TRUE;
-	/*"textContent"*/
-	case 15:
+	case NODE_JSPROPERTY_TEXTCONTENT:
 		*vp = JSVAL_VOID;
 		if (!sg)  {
 			char *res = gf_dom_flatten_textContent(n);
@@ -1264,8 +1463,7 @@
 			gf_free(res);
 		}
 		return JS_TRUE;
-
-	case 16:/*firstElementChild*/
+	case NODE_JSPROPERTY_FIRSTELEMENTCHILD:
 		*vp = JSVAL_NULL;
 		if (n->sgprivate->tag!=TAG_DOMText) {
 			GF_ChildNodeItem *child = ((GF_ParentNode*)n)->children;
@@ -1278,7 +1476,7 @@
 			}
 		}
 		return JS_TRUE;
-	case 17:/*lastElementChild*/
+	case NODE_JSPROPERTY_LASTELEMENTCHILD:
 		*vp = JSVAL_NULL;
 		if (n->sgprivate->tag!=TAG_DOMText) {
 			GF_Node *last = NULL;
@@ -1292,10 +1490,10 @@
 			if (last) *vp = dom_element_construct(c, last);
 		}
 		return JS_TRUE;
-	case 18:/*previousElementSibling*/
+	case NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING:
 		*vp = dom_node_get_sibling(c, n, GF_TRUE, GF_TRUE);
 		return JS_TRUE;
-	case 19:/*nextElementSibling*/
+	case NODE_JSPROPERTY_NEXTELEMENTSIBLING:
 		*vp = dom_node_get_sibling(c, n, GF_FALSE, GF_TRUE);
 		return JS_TRUE;
 
@@ -1329,8 +1527,7 @@
 	tag = n ? gf_node_get_tag(n) : 0;
 
 	switch (SMJS_ID_TO_INT(id)) {
-	/*"nodeValue"*/
-	case 1:
+	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);
@@ -1339,12 +1536,10 @@
 		}
 		/*we only support element and sg in the Node interface, no set*/
 		return JS_TRUE;
-	/*"prefix"*/
-	case 12:
+	case NODE_JSPROPERTY_PREFIX:
 		/*NOT SUPPORTED YET*/
 		return JS_TRUE;
-	/*"textContent"*/
-	case 15:
+	case NODE_JSPROPERTY_TEXTCONTENT:
 	{
 		char *txt;
 		txt = js_get_utf8(c, *vp);
@@ -1392,30 +1587,29 @@
 	prop_id = SMJS_ID_TO_INT(id);
 
 	switch (prop_id) {
-	case 2:/*implementation*/
+	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 3: /*"documentElement"*/
+	case DOCUMENT_JSPROPERTY_DOCUMENTELEMENT:
 		*vp = dom_element_construct(c, sg->RootNode);
 		return JS_TRUE;
-
-	case 11:/*global*/
+	case DOCUMENT_JSPROPERTY_GLOBAL:
 		*vp = OBJECT_TO_JSVAL( JS_GetGlobalObject(c) );
 		return JS_TRUE;
 
-
 	/*NOT SUPPORTED YET*/
 
-	case 1: /*"doctype"*/
-	case 4: /*"inputEncoding"*/
-	case 5: /*"xmlEncoding"*/
-	case 6: /*"xmlStandalone"*/
-	case 7: /*"xmlVersion"*/
-	case 8: /*"strictErrorChecking"*/
-	case 9: /*"documentURI"*/
-	case 10: /*"domConfig"*/
+	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;
 	}
@@ -1432,15 +1626,15 @@
 	prop_id = SMJS_ID_TO_INT(id);
 
 	switch (prop_id) {
-	case 6:/*"xmlStandalone"*/
+	case DOCUMENT_JSPROPERTY_XMLSTANDALONE:
 		break;
-	case 7:/*"xmlVersion"*/
+	case DOCUMENT_JSPROPERTY_XMLVERSION:
 		break;
-	case 8:/*"strictErrorChecking"*/
+	case DOCUMENT_JSPROPERTY_STRICTERRORCHECKING:
 		break;
-	case 9:/*"documentURI"*/
+	case DOCUMENT_JSPROPERTY_DOCUMENTURI:
 		break;
-	case 10:/*"domConfig"*/
+	case DOCUMENT_JSPROPERTY_DOMCONFIG:
 		break;
 
 	/*the rest is read-only*/
@@ -1610,10 +1804,10 @@
 	if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
 	prop_id = SMJS_ID_TO_INT(id);
 	switch (prop_id) {
-	case 1: /*"tagName"*/
+	case ELEMENT_JSPROPERTY_TAGNAME:
 		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, gf_node_get_class_name(n) ) );
 		return JS_TRUE;
-	case 2: /*"schemaTypeInfo"*/
+	case ELEMENT_JSPROPERTY_SCHEMATYPEINFO:
 		/*NOT SUPPORTED YET*/
 		*vp = JSVAL_VOID;
 		return JS_TRUE;
@@ -1926,7 +2120,7 @@
 					gf_node_get_attribute_by_name((GF_Node *)anim_target, attname->name, attname->type, GF_FALSE, GF_FALSE, &attType);
 					attname->type = attType.fieldType;
 				} else {
-					GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOM] Cannot find attribute 'type' on <%s> element and cannot find target of the animation to parse attribute %s\n", gf_node_get_class_name(n), attname->name));
+					GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOM] Cannot find target of the animation to parse attribute %s\n", attname->name));
 				}
 			}
 
@@ -2125,17 +2319,17 @@
 	prop_id = SMJS_ID_TO_INT(id);
 
 	switch (prop_id) {
-	case 1: /*"data"*/
+	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 2:/*"length"*/
+	case TEXT_JSPROPERTY_LENGTH:
 		*vp = INT_TO_JSVAL(txt->textContent ? strlen(txt->textContent) : 0);
 		return JS_TRUE;
-	case 3:/*"isElementContentWhitespace"*/
+	case TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE:
 		*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
 		return JS_TRUE;
-	case 4:/*"wholeText"*/
+	case TEXT_JSPROPERTY_WHOLETEXT:
 		/*FIXME - this is wrong*/
 		*vp = INT_TO_JSVAL(txt->textContent ? strlen(txt->textContent) : 0);
 		return JS_TRUE;
@@ -2151,7 +2345,7 @@
 	prop_id = SMJS_ID_TO_INT(id);
 
 	switch (prop_id) {
-	case 1: /*"data"*/
+	case TEXT_JSPROPERTY_DATA:
 		if (txt->textContent) gf_free(txt->textContent);
 		txt->textContent = NULL;
 		if (JSVAL_CHECK_STRING(*vp)) {
@@ -2197,57 +2391,71 @@
 	if (evt==NULL) return JS_TRUE;
 	if (SMJS_ID_IS_INT(id)) {
 		switch (SMJS_ID_TO_INT(id)) {
-		case 0: /*type*/
+		case EVENT_JSPROPERTY_TYPE:
 			s = JS_NewStringCopyZ(c, gf_dom_event_get_name(evt->type) );
 			*vp = STRING_TO_JSVAL( s );
 			break;
-		case 1: /*target*/
+		case EVENT_JSPROPERTY_TARGET:
 			if (evt->is_vrml) return JS_TRUE;
 			switch (evt->target_type) {
-			case GF_DOM_EVENT_NODE:
+			case GF_DOM_EVENT_TARGET_NODE:
 				*vp = dom_element_construct(c, (GF_Node*) evt->target);
 				break;
-			case GF_DOM_EVENT_DOCUMENT:
+			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 2:	/*currentTarget*/
+		case EVENT_JSPROPERTY_CURRENTTARGET:
 			if (evt->is_vrml) return JS_TRUE;
 			switch (evt->currentTarget->ptr_type) {
-			case GF_DOM_EVENT_NODE:
+			case GF_DOM_EVENT_TARGET_NODE:
 				*vp = dom_element_construct(c, (GF_Node*) evt->currentTarget->ptr);
 				break;
-			case GF_DOM_EVENT_DOCUMENT:
+			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;
-		/*eventPhase */
-		case 3:
+		case EVENT_JSPROPERTY_EVENTPHASE:
 			*vp = INT_TO_JSVAL( (evt->event_phase & 0x3) ); return JS_TRUE;
-		case 4: /*bubbles*/
+		case EVENT_JSPROPERTY_BUBBLES:
 			*vp = BOOLEAN_TO_JSVAL(evt->bubbles ? JS_TRUE : JS_FALSE); return JS_TRUE;
-		case 5: /*cancelable*/
+		case EVENT_JSPROPERTY_CANCELABLE:
 			*vp = BOOLEAN_TO_JSVAL(evt->cancelable ? JS_TRUE : JS_FALSE); return JS_TRUE;
-		case 6: /*namespaceURI*/
+		case EVENT_JSPROPERTY_NAMESPACEURI:
 			*vp = JSVAL_NULL;
 			return JS_TRUE;
-		/*timeStamp */
-		case 7:
+		case EVENT_JSPROPERTY_TIMESTAMP:
 			*vp = JSVAL_VOID;
 			return JS_TRUE;
-		/*defaultPrevented */
-		case 8:
+		case EVENT_JSPROPERTY_DEFAULTPREVENTED:
 			*vp = BOOLEAN_TO_JSVAL((evt->event_phase & GF_DOM_EVENT_PHASE_PREVENT) ? JS_TRUE : JS_FALSE); return JS_TRUE;
-
-
-		case 20:/*detail*/
+		case EVENT_JSPROPERTY_DETAIL:
 			*vp = INT_TO_JSVAL(evt->detail); return JS_TRUE;
-
-		case 25: /*data*/
+		case EVENT_JSPROPERTY_DATA:
 		{
 			u32 len;
 			s16 txt[2];
@@ -2263,88 +2471,87 @@
 		}
 			return JS_TRUE;
 
-		case 30:/*screenX*/
+		case EVENT_JSPROPERTY_SCREENX:
 			*vp = INT_TO_JSVAL(evt->screenX); return JS_TRUE;
-		case 31: /*screenY*/
+		case EVENT_JSPROPERTY_SCREENY:
 			*vp = INT_TO_JSVAL(evt->screenY); return JS_TRUE;
-		case 32: /*clientX*/
+		case EVENT_JSPROPERTY_CLIENTX:
 			*vp = INT_TO_JSVAL(evt->clientX); return JS_TRUE;
-		case 33: /*clientY*/
+		case EVENT_JSPROPERTY_CLIENTY:
 			*vp = INT_TO_JSVAL(evt->clientY); return JS_TRUE;
-		case 34:/*button*/
+		case EVENT_JSPROPERTY_BUTTON:
 			*vp = INT_TO_JSVAL(evt->button); return JS_TRUE;
-		case 35:/*relatedTarget*/
+		case EVENT_JSPROPERTY_RELATEDTARGET:
 			if (evt->is_vrml) return JS_TRUE;
 			*vp = dom_element_construct(c, evt->relatedTarget);
 			return JS_TRUE;
-		case 36:/*wheelDelta*/
+		case EVENT_JSPROPERTY_WHEELDELTA:
 			*vp = INT_TO_JSVAL(FIX2INT(evt->new_scale) ); return JS_TRUE;
 
-
-		/*DOM3 event keyIndentifier*/
-		case 40:
+		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 41:
-		case 42:
+		case EVENT_JSPROPERTY_KEYCHAR:
+		case EVENT_JSPROPERTY_CHARCODE:
 			*vp = INT_TO_JSVAL(evt->detail); return JS_TRUE;
-
-		case 52:/*loaded*/
+		case EVENT_JSPROPERTY_LOADED:
 			if (!evt->media_event) return JS_TRUE;
 			*vp = INT_TO_JSVAL( evt->media_event->loaded_size);
 			return JS_TRUE;
-		case 53:/*total*/
+		case EVENT_JSPROPERTY_TOTAL:
 			if (!evt->media_event) return JS_TRUE;
 			*vp = INT_TO_JSVAL( evt->media_event->total_size);
 			return JS_TRUE;
-		case 54:/*bufferLevelValid*/
+		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 55:/*bufferLevel*/
+		case EVENT_JSPROPERTY_BUFFERLEVEL:
 			if (!evt->media_event) return JS_TRUE;
 			*vp = INT_TO_JSVAL( evt->media_event->level);
 			return JS_TRUE;
-		case 56:/*bufferRemainingTime*/
+		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 57:/*status*/
+		case EVENT_JSPROPERTY_STATUS:
 			if (!evt->media_event) return JS_TRUE;
 			*vp = INT_TO_JSVAL( evt->media_event->status);
 			return JS_TRUE;
 
 		/*VRML ones*/
-		case 60:/*width*/
+		case EVENT_JSPROPERTY_WIDTH:
 			*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->screen_rect.width) );
 			return JS_TRUE;
-		case 61:/*height*/
+		case EVENT_JSPROPERTY_HEIGHT:
 			*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->screen_rect.height) );
 			return JS_TRUE;
-		case 62:/*offset_x*/
+		case EVENT_JSPROPERTY_OFFSETX:
 			*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->screen_rect.x) );
 			return JS_TRUE;
-		case 63:/*offset_x*/
+		case EVENT_JSPROPERTY_OFFSETY:
 			*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->screen_rect.y) );
 			return JS_TRUE;
-		case 64:/*vp_width*/
+		case EVENT_JSPROPERTY_VPWIDTH:
 			*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->prev_translate.x) );
 			return JS_TRUE;
-		case 65:/*vp_height*/
+		case EVENT_JSPROPERTY_VPHEIGHT:
 			*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->prev_translate.y) );
 			return JS_TRUE;
-		case 66:/*translation_x*/
+		case EVENT_JSPROPERTY_TRANSLATIONX:
 			*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->new_translate.x) );
 			return JS_TRUE;
-		case 67:/*translation_y*/
+		case EVENT_JSPROPERTY_TRANSLATIONY:
 			*vp = JS_MAKE_DOUBLE(c, FIX2FLT(evt->new_translate.y) );
 			return JS_TRUE;
-		case 68:/*type3d*/
+		case EVENT_JSPROPERTY_TYPE3D:
 			*vp = INT_TO_JSVAL(evt->detail); return JS_TRUE;
-		case 69:/*error*/
+		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;
 
 		default: return JS_TRUE;
 		}
@@ -2357,15 +2564,78 @@
  *	xmlHttpRequest implementation
  *
  *************************************************************/
+typedef enum {
+	XHR_ONABORT					= -1,
+	XHR_ONERROR					= -2,
+	XHR_ONLOAD					= -3,
+	XHR_ONLOADEND				= -4,
+	XHR_ONLOADSTART				= -5,
+	XHR_ONPROGRESS				= -6,
+	XHR_ONREADYSTATECHANGE		= -7,
+	XHR_ONTIMEOUT				= -8,
+	XHR_READYSTATE				= -9,
+	XHR_RESPONSE				= -10,
+	XHR_RESPONSETYPE			= -11,
+	XHR_RESPONSETEXT			= -12,
+	XHR_RESPONSEXML				= -13,
+	XHR_STATUS					= -14,
+	XHR_STATUSTEXT				= -15,
+	XHR_TIMEOUT					= -16,
+	XHR_UPLOAD					= -17,
+	XHR_WITHCREDENTIALS			= -18,
+	XHR_STATIC_UNSENT			= -19,
+	XHR_STATIC_OPENED			= -20,
+	XHR_STATIC_HEADERS_RECEIVED = -21,
+	XHR_STATIC_LOADING			= -22,
+	XHR_STATIC_DONE				= -23,
+	XHR_CACHE					= -24
+} XHR_JSProperty;
+
+typedef enum {
+	XHR_READYSTATE_UNSENT			= 0,
+	XHR_READYSTATE_OPENED			= 1,
+	XHR_READYSTATE_HEADERS_RECEIVED = 2,
+	XHR_READYSTATE_LOADING			= 3,
+	XHR_READYSTATE_DONE				= 4
+} XHR_ReadyState;
+
+typedef enum {
+	XHR_RESPONSETYPE_NONE,
+	XHR_RESPONSETYPE_ARRAYBUFFER,
+	XHR_RESPONSETYPE_BLOB,
+	XHR_RESPONSETYPE_DOCUMENT,
+	XHR_RESPONSETYPE_JSON,
+	XHR_RESPONSETYPE_TEXT,
+	XHR_RESPONSETYPE_STREAM
+} XHR_ResponseType;
+
+typedef enum {
+	XHR_CACHETYPE_NORMAL,
+	XHR_CACHETYPE_NONE,
+	XHR_CACHETYPE_MEMORY,
+} XHR_CacheType;
 
-typedef struct
+struct __xhr_context
 {
 	JSContext *c;
 	JSObject *_this;
-	JSFunction *onreadystatechange;
 
-	u32 readyState;
+	/* callback functions */
+	jsval onabort;
+	jsval onerror;
+	jsval onreadystatechange;
+	jsval onload;
+	jsval onloadstart;
+	jsval onloadend;
+	jsval onprogress;
+	jsval ontimeout;
+
+	XHR_ReadyState readyState;
 	Bool async;
+
+	/* GPAC extension to control the caching of XHR-downloaded resources */
+	XHR_CacheType  cache;
+
 	/*header/header-val, terminated by NULL*/
 	char **headers;
 	u32 cur_header;
@@ -2379,23 +2649,65 @@
 	GF_Err ret_code;
 	u32 html_status;
 	char *statusText;
+	char *mime;
 	u32 timeout;
-	u32 responseType;
+	XHR_ResponseType responseType;
 	Bool withCredentials;
+	Bool isFile;
 
 	GF_SAXParser *sax;
 	GF_List *node_stack;
-	/*dom graph*/
+
+	GF_DOMEventTarget *event_target;
+
+	/* dom graph in which the XHR is created */
+	GF_SceneGraph *owning_graph;
+	/* dom graph used to parse XML into */
 	GF_SceneGraph *document;
-} XMLHTTPContext;
+};
 
-static void xml_http_append_send_header(XMLHTTPContext *ctx, char *hdr, char *val)
+GF_SceneGraph *xml_http_get_scenegraph(XMLHTTPContext *ctx)
+{
+	return ctx->owning_graph;
+}
+
+GF_DOMEventTarget *xml_http_get_event_target(XMLHTTPContext *ctx)
+{
+	return ctx->event_target;
+}
+
+static void xml_http_reset_recv_hdr(XMLHTTPContext *ctx)
+{
+	u32 nb_hdr = 0;
+	if (ctx->recv_headers) {
+		while (ctx->recv_headers[nb_hdr]) {
+			gf_free(ctx->recv_headers[nb_hdr]);
+			gf_free(ctx->recv_headers[nb_hdr+1]);
+			nb_hdr+=2;
+		}
+		gf_free(ctx->recv_headers);
+		ctx->recv_headers = NULL;
+	}
+}
+
+static void xml_http_append_recv_header(XMLHTTPContext *ctx, const char *hdr, const char *val)
 {
 	u32 nb_hdr = 0;
+	if (ctx->recv_headers) {
+		while (ctx->recv_headers[nb_hdr]) nb_hdr+=2;
+	}
+	ctx->recv_headers = (char **)gf_realloc(ctx->recv_headers, sizeof(char*)*(nb_hdr+3));
+	ctx->recv_headers[nb_hdr] = gf_strdup(hdr);
+	ctx->recv_headers[nb_hdr+1] = gf_strdup(val ? val : "");
+	ctx->recv_headers[nb_hdr+2] = NULL;
+}
+
+static void xml_http_append_send_header(XMLHTTPContext *ctx, char *hdr, char *val)
+{
 	if (!hdr) return;
 
 	if (ctx->headers) {
-		nb_hdr = 0;
+		u32 nb_hdr = 0;
 		while (ctx->headers && ctx->headers[nb_hdr]) {
 			if (stricmp(ctx->headers[nb_hdr], hdr)) {
 				nb_hdr+=2;
@@ -2455,73 +2767,66 @@
 			nb_hdr+=2;
 		}
 	}
-	nb_hdr = 0;
-	if (ctx->headers) {
-		while (ctx->headers[nb_hdr]) nb_hdr+=2;
+	xml_http_append_recv_header(ctx, hdr, val);
+}
+
+void xhr_del_array_buffer(void *udta)
+{
+	if (udta) {
+		((XMLHTTPContext *)udta)->arraybuffer = NULL;
+		((XMLHTTPContext *)udta)->data = NULL;
 	}
-	ctx->headers = (char **)gf_realloc(ctx->headers, sizeof(char*)*(nb_hdr+3));
-	ctx->headers[nb_hdr] = gf_strdup(hdr);
-	ctx->headers[nb_hdr+1] = gf_strdup(val ? val : "");
-	ctx->headers[nb_hdr+2] = NULL;
 }
 
-static void xml_http_reset_recv_hdr(XMLHTTPContext *ctx)
+static void xml_http_del_data(XMLHTTPContext *ctx)
 {
-	u32 nb_hdr = 0;
-	if (ctx->recv_headers) {
-		while (ctx->recv_headers[nb_hdr]) {
-			gf_free(ctx->recv_headers[nb_hdr]);
-			gf_free(ctx->recv_headers[nb_hdr+1]);
-			nb_hdr+=2;
+	if (ctx->data) {
+		if (ctx->arraybuffer) {
+			/* if there is an arraybuffer holding a point to that data, we need to release it */
+			if (ctx->arraybuffer) {
+//				GF_HTML_ArrayBuffer *html_array = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(ctx->c, ctx->arraybuffer);
+				//detach the ArrayBuffer from this object
+				JS_SetParent(ctx->c, ctx->arraybuffer, NULL);
+				ctx->arraybuffer = NULL;
+			}
+		} else {
+			gf_free(ctx->data);
 		}
-		gf_free(ctx->recv_headers);
-		ctx->recv_headers = NULL;
+		ctx->data = NULL;
+		ctx->size = 0;
 	}
 }
-static void xml_http_append_recv_header(XMLHTTPContext *ctx, const char *hdr, const char *val)
+
+static void xml_http_reset_partial(XMLHTTPContext *ctx)
 {
-	u32 nb_hdr = 0;
-	if (ctx->recv_headers) {
-		while (ctx->recv_headers[nb_hdr]) nb_hdr+=2;
+	xml_http_reset_recv_hdr(ctx);
+	xml_http_del_data(ctx);
+	if (ctx->mime) {
+		gf_free(ctx->mime);
+		ctx->mime = NULL;
 	}
-	ctx->recv_headers = (char **)gf_realloc(ctx->recv_headers, sizeof(char*)*(nb_hdr+3));
-	ctx->recv_headers[nb_hdr] = gf_strdup(hdr);
-	ctx->recv_headers[nb_hdr+1] = gf_strdup(val ? val : "");
-	ctx->recv_headers[nb_hdr+2] = NULL;
+	if (ctx->statusText) {
+		gf_free(ctx->statusText);
+		ctx->statusText = NULL;
+	}
+	ctx->cur_header = 0;
+	ctx->html_status = 0;
 }
 
-
 static void xml_http_reset(XMLHTTPContext *ctx)
 {
-	u32 nb_hdr = 0;
 	if (ctx->method) { gf_free(ctx->method); ctx->method = NULL; }
 	if (ctx->url) { gf_free(ctx->url); ctx->url = NULL; }
 
-	xml_http_reset_recv_hdr(ctx);
-	if (ctx->headers) {
-		while (ctx->headers[nb_hdr]) {
-			gf_free(ctx->headers[nb_hdr]);
-			gf_free(ctx->headers[nb_hdr+1]);
-			nb_hdr+=2;
-		}
-		gf_free(ctx->headers);
-		ctx->headers = NULL;
-	}
+	xml_http_reset_partial(ctx);
+
 	if (ctx->sess) {
 		GF_DownloadSession *tmp = ctx->sess;
 		ctx->sess = NULL;
 		gf_dm_sess_abort(tmp);
 		gf_dm_sess_del(tmp);
 	}
-	if (ctx->data) {
-		if (!ctx->arraybuffer) gf_free(ctx->data);
-		ctx->data = NULL;
-		ctx->arraybuffer = NULL;
-	}
-	if (ctx->statusText) {
-		gf_free(ctx->statusText);
-		ctx->statusText = NULL;
-	}
+
 	if (ctx->url) {
 		gf_free(ctx->url);
 		ctx->url = NULL;
@@ -2546,20 +2851,27 @@
 	ctx->document = NULL;
 	ctx->size = 0;
 	ctx->async = GF_FALSE;
-	ctx->readyState = 0;
-	ctx->cur_header = 0;
+	ctx->readyState = XHR_READYSTATE_UNSENT;
 	ctx->ret_code = GF_OK;
-	ctx->html_status = 0;
 }
 
-static DECL_FINALIZE( xml_http_finalize)
+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 (ctx->onreadystatechange) gf_js_remove_root(c, &(ctx->onreadystatechange), GF_JSGC_VAL);
+		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);
 	}
 }
@@ -2572,11 +2884,23 @@
 	GF_SAFEALLOC(p, XMLHTTPContext);
 	p->c = c;
 	p->_this = obj;
+	p->owning_graph = xml_get_scenegraph(c);
+	p->event_target = gf_dom_event_target_new(GF_DOM_EVENT_TARGET_XHR, p);
 	SMJS_SET_PRIVATE(c, obj, p);
 	SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
 	return JS_TRUE;
 }
 
+static void xml_http_fire_event(XMLHTTPContext *ctx, GF_EventType evtType)
+{
+	GF_DOM_Event xhr_evt;
+	memset(&xhr_evt, 0, sizeof(GF_DOM_Event));
+	xhr_evt.type = evtType;
+	xhr_evt.target = ctx->event_target->ptr;
+	xhr_evt.target_type = ctx->event_target->ptr_type;
+	gf_sg_fire_dom_event(ctx->event_target, &xhr_evt, ctx->owning_graph, NULL);
+}
+
 static void xml_http_state_change(XMLHTTPContext *ctx)
 {
 	GF_SceneGraph *scene;
@@ -2584,11 +2908,8 @@
 	jsval rval;
 	
 	gf_sg_lock_javascript(ctx->c, GF_TRUE);
-	if (ctx->onreadystatechange)
-		JS_CallFunction(ctx->c, ctx->_this, ctx->onreadystatechange, 0, NULL, &rval);
-
-	/*todo - fire XHR events*/
-
+	if (! JSVAL_IS_NULL(ctx->onreadystatechange))
+		JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onreadystatechange, 0, NULL, &rval);
 
 	gf_sg_lock_javascript(ctx->c, GF_FALSE);
 
@@ -2647,7 +2968,7 @@
 	val = SMJS_CHARS(c, argv[1]);
 	par.uri.url = val;
 	ScriptAction(scene, GF_JSAPI_OP_RESOLVE_URI, scene->RootNode, &par);
-	ctx->url = (char *)par.uri.url;
+	ctx->url = par.uri.url;
 	SMJS_FREE(c, val);
 
 	/*async defaults to true*/
@@ -2669,8 +2990,13 @@
 		SMJS_FREE(c, val);
 	}
 	/*OPEN success*/
-	ctx->readyState = 1;
+	ctx->readyState = XHR_READYSTATE_OPENED;
 	xml_http_state_change(ctx);
+	xml_http_fire_event(ctx, GF_EVENT_MEDIA_LOAD_START);
+	if (! JSVAL_IS_NULL(ctx->onloadstart) ) {
+		jsval rval;
+		return JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onloadstart, 0, NULL, &rval);
+	}
 	return JS_TRUE;
 }
 
@@ -2685,7 +3011,7 @@
 	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
 	if (!ctx) return JS_TRUE;
 
-	if (ctx->readyState!=1) return JS_TRUE;
+	if (ctx->readyState!=XHR_READYSTATE_OPENED) return JS_TRUE;
 	if (argc!=2) return JS_TRUE;
 	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
 	if (!JSVAL_CHECK_STRING(argv[1])) return JS_TRUE;
@@ -2725,7 +3051,7 @@
 			prev = att;
 		}
 	}
-	par = gf_list_last(ctx->node_stack);
+	par = (GF_DOMFullNode *)gf_list_last(ctx->node_stack);
 	gf_node_register((GF_Node*)node, (GF_Node*)par);
 	if (par) {
 		gf_node_list_add_child(&par->children, (GF_Node*)node);
@@ -2767,6 +3093,35 @@
 
 #define USE_PROGRESSIVE_SAX	0
 
+static void xml_http_terminate(XMLHTTPContext *ctx, GF_Err error) 
+{
+	/*if we get here, destroy downloader - FIXME we'll need a mutex here for sync case...*/
+	if (ctx->sess) {
+		gf_dm_sess_del(ctx->sess);
+		ctx->sess = NULL;
+	}
+
+	/*error, complete reset*/
+	if (error) {
+		xml_http_reset(ctx);
+	} else {
+		ctx->html_status = 200;
+	}
+	/*but stay in loaded mode*/
+	ctx->readyState = XHR_READYSTATE_DONE;
+	xml_http_state_change(ctx);
+	xml_http_fire_event(ctx, GF_EVENT_LOAD);
+	xml_http_fire_event(ctx, GF_EVENT_MEDIA_LOAD_DONE);
+	if (! JSVAL_IS_NULL(ctx->onload)) {
+		jsval rval;
+		JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onload, 0, NULL, &rval);
+	}
+	if (! JSVAL_IS_NULL(ctx->onloadend)) {
+		jsval rval;
+		JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onloadend, 0, NULL, &rval);
+	}
+}
+
 static void xml_http_on_data(void *usr_cbk, GF_NETIO_Parameter *parameter)
 {
 	Bool locked = GF_FALSE;
@@ -2781,15 +3136,16 @@
 		gf_sleep(1);
 	}
 	/*if session not set, we've had an abort*/
-	if (!ctx->sess){
+	if (!ctx->sess && !ctx->isFile){
 		if (locked)
 			gf_sg_lock_javascript(ctx->c, GF_FALSE);
 		return;
 	}
 
-	assert( locked );
-	gf_sg_lock_javascript(ctx->c, GF_FALSE);
-
+	if (!ctx->isFile) {
+		assert( locked );
+		gf_sg_lock_javascript(ctx->c, GF_FALSE);
+	}
 	switch (parameter->msg_type) {
 	case GF_NETIO_SETUP:
 		/*nothing to do*/
@@ -2799,19 +3155,14 @@
 		return;
 	case GF_NETIO_WAIT_FOR_REPLY:
 		/*reset send() state (data, current header) and prepare recv headers*/
-		if (ctx->data && !ctx->arraybuffer) gf_free(ctx->data);
-		ctx->data = NULL;
-		ctx->size = 0;
-		ctx->arraybuffer = NULL;
-		ctx->cur_header = 0;
-		ctx->html_status = 0;
-		if (ctx->statusText) {
-			gf_free(ctx->statusText);
-			ctx->statusText = NULL;
-		}
-		xml_http_reset_recv_hdr(ctx);
-		ctx->readyState = 2;
+		xml_http_reset_partial(ctx);
+		ctx->readyState = XHR_READYSTATE_HEADERS_RECEIVED;
 		xml_http_state_change(ctx);
+		xml_http_fire_event(ctx, GF_EVENT_MEDIA_PROGRESS);
+		if (! JSVAL_IS_NULL(ctx->onprogress) ) {
+			jsval rval;
+			JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onprogress, 0, NULL, &rval);
+		}
 		return;
 	/*this is signaled sent AFTER headers*/
 	case GF_NETIO_PARSE_REPLY:
@@ -2819,8 +3170,15 @@
 		if (parameter->value) {
 			ctx->statusText = gf_strdup(parameter->value);
 		}
-		ctx->readyState = 3;
+		ctx->readyState = XHR_READYSTATE_LOADING;
+		xml_http_state_change(ctx);
+		ctx->readyState = XHR_READYSTATE_HEADERS_RECEIVED;
 		xml_http_state_change(ctx);
+		xml_http_fire_event(ctx, GF_EVENT_MEDIA_PROGRESS);
+		if (! JSVAL_IS_NULL(ctx->onprogress) ) {
+			jsval rval;
+			JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onprogress, 0, NULL, &rval);
+		}
 		return;
 
 	case GF_NETIO_GET_METHOD:
@@ -2855,9 +3213,7 @@
 			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;
-		} else {
-			GF_LOG(GF_LOG_INFO, GF_LOG_SCRIPT, ("[XmlHttpRequest] content type %s - ResponseXML not supported\n", parameter->value));
-		}
+		} 
 		return;
 	case GF_NETIO_DATA_EXCHANGE:
 		if (parameter->data && parameter->size) {
@@ -2894,26 +3250,83 @@
 		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] Download error: %s\n", gf_error_to_string(parameter->error)));
 		break;
 	}
+	if (ctx->async) {
+		xml_http_terminate(ctx, parameter->error);
+	}
+}
 
-	/*if we get here, destroy downloader - FIXME we'll need a mutex here for sync case...*/
-	if (ctx->sess) {
-		gf_dm_sess_del(ctx->sess);
-		ctx->sess = NULL;
+static GF_Err xml_http_process_local(XMLHTTPContext *ctx)
+{
+	/* For XML Http Requests to files, we fake the processing by calling the HTTP callbacks */
+	GF_NETIO_Parameter par;
+	u64 fsize;
+	FILE *responseFile;
+		
+	/*opera-style local host*/
+	if (!strnicmp(ctx->url, "file://localhost", 16)) responseFile = gf_f64_open(ctx->url+16, "rb");
+	/*regular-style local host*/
+	else if (!strnicmp(ctx->url, "file://", 7)) responseFile = gf_f64_open(ctx->url+7, "rb");
+	/* other types: e.g. "C:\" */
+	else responseFile = gf_f64_open(ctx->url, "rb");
+
+	if (!responseFile) {
+		ctx->html_status = 404;
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] cannot open local file %s\n", ctx->url));
+		xml_http_fire_event(ctx, GF_EVENT_ERROR);
+		if (! JSVAL_IS_NULL(ctx->onerror) ) {
+			jsval rval;
+			JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onerror, 0, NULL, &rval);
+		}
+		return GF_BAD_PARAM;
 	}
+	ctx->isFile = GF_TRUE;
 
-	/*error, complete reset*/
-	if (parameter->error) {
-		xml_http_reset(ctx);
+	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";
+	if (ctx->responseType == XHR_RESPONSETYPE_DOCUMENT) {
+		par.value = "application/xml";
 	} else {
-		ctx->html_status = 200;
+		par.value = "application/octet-stream";
 	}
-	/*but stay in loaded mode*/
-	ctx->readyState = 4;
-	xml_http_state_change(ctx);
+	xml_http_on_data(ctx, &par);
+
+	{
+		char contentLengthHeader[256];
+		memset(&par, 0, sizeof(GF_NETIO_Parameter));
+		par.msg_type = GF_NETIO_PARSE_HEADER;
+		par.name = "Content-Length";
+		sprintf(contentLengthHeader, "%d", ctx->size);
+		par.value = contentLengthHeader;
+		xml_http_on_data(ctx, &par);
+	}
+
+	memset(&par, 0, sizeof(GF_NETIO_Parameter));
+	par.msg_type = GF_NETIO_DATA_TRANSFERED;
+	xml_http_on_data(ctx, &par);			
+
+	if (!ctx->async) {
+		xml_http_terminate(ctx, GF_OK);
+	}
+	return GF_OK;
 }
 
 static JSBool SMJS_FUNCTION(xml_http_send)
 {
+	GF_Err e;
 	GF_JSAPIParam par;
 	GF_SceneGraph *scene;
 	char *data = NULL;
@@ -2925,7 +3338,7 @@
 	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
 	if (!ctx) return JS_TRUE;
 
-	if (ctx->readyState!=1) return JS_TRUE;
+	if (ctx->readyState!=XHR_READYSTATE_OPENED) return JS_TRUE;
 	if (ctx->sess) return JS_TRUE;
 
 	scene = xml_get_scenegraph(c);
@@ -2947,19 +3360,23 @@
 	}
 
 	/*reset previous text*/
-	if (ctx->data && !ctx->arraybuffer) {
-		gf_free(ctx->data);
-		ctx->data = NULL;
-		ctx->size = 0;
-		ctx->arraybuffer = NULL;
-	}
+	xml_http_del_data(ctx);
 	ctx->data = data ? gf_strdup(data) : NULL;
 	SMJS_FREE(c, data);
 
 	if (!strncmp(ctx->url, "http://", 7)) {
-		GF_Err e;
-
-		ctx->sess = gf_dm_sess_new(par.dnld_man, ctx->url, ctx->async ? 0 : GF_NETIO_SESSION_NOT_THREADED, xml_http_on_data, ctx, &e);			
+		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);			
 		if (!ctx->sess) return JS_TRUE;
 
 		/*start our download (whether the session is threaded or not)*/
@@ -2967,58 +3384,14 @@
 		if (e!=GF_OK) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] Error processing %s: %s\n", ctx->url, gf_error_to_string(e) ));
 		}
-		/**/
-		if (!ctx->async && ctx->sess) gf_dm_sess_del(ctx->sess);
+		if (!ctx->async) {
+			xml_http_terminate(ctx, e);
+		}
 	} else {
-		u64 fsize;
-		FILE * xmlf;
-		
-		if (ctx->data && !ctx->arraybuffer) gf_free(ctx->data);
-		ctx->data = NULL;
-		ctx->size = 0;
-		ctx->arraybuffer = NULL;
-		ctx->cur_header = 0;
-		ctx->html_status = 0;
-		if (ctx->statusText) {
-			gf_free(ctx->statusText);
-			ctx->statusText = NULL;
-		}
-		/*opera-style local host*/
-		if (!strnicmp(ctx->url, "file://localhost", 16)) xmlf = gf_f64_open(ctx->url+16, "rt");
-		/*regular-style local host*/
-		else if (!strnicmp(ctx->url, "file://", 7)) xmlf = gf_f64_open(ctx->url+7, "rt");
-		else xmlf = gf_f64_open(ctx->url, "rt");
-
-		if (!xmlf) {
-			ctx->html_status = 404;
-			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] cannot open %s\n", ctx->url));
-			return JS_TRUE;
+		e = xml_http_process_local(ctx);
+		if (e!=GF_OK) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[XmlHttpRequest] Error processing %s: %s\n", ctx->url, gf_error_to_string(e) ));
 		}
-		ctx->readyState = 2;
-		xml_http_state_change(ctx);
-		
-		gf_f64_seek(xmlf, 0, SEEK_END);
-		fsize = gf_f64_tell(xmlf);
-		gf_f64_seek(xmlf, 0, SEEK_SET);
-		
-		ctx->data = (char *)gf_malloc(sizeof(char)*(size_t)(fsize+1));
-		fsize = fread(ctx->data, sizeof(char), (size_t)fsize, xmlf);
-		fclose(xmlf);
-		ctx->data[fsize] = 0;
-
-		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;
-
-		gf_xml_sax_parse_file(ctx->sax, ctx->url, NULL);
-
-		ctx->readyState = 3;
-		xml_http_state_change(ctx);
-		ctx->readyState = 4;
-		ctx->html_status = 200;
-		xml_http_state_change(ctx);
 	}
 
 	return JS_TRUE;
@@ -3038,10 +3411,29 @@
 	ctx->sess = NULL;
 	if (sess) gf_dm_sess_del(sess);
 
+	xml_http_fire_event(ctx, GF_EVENT_ABORT);
+	if (! JSVAL_IS_NULL(ctx->onabort)) {
+		jsval rval;
+		return JS_CallFunctionValue(ctx->c, ctx->_this, ctx->onabort, 0, NULL, &rval);
+	}
+
 	xml_http_reset(ctx);
 	return JS_TRUE;
 }
 
+static JSBool SMJS_FUNCTION(xml_http_wait)
+{
+	XMLHTTPContext *ctx;
+	SMJS_OBJ
+
+	if (!GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
+	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
+	if (!ctx) return JS_TRUE;
+
+	gf_sleep(2000);
+	return JS_TRUE;
+}
+
 static JSBool SMJS_FUNCTION(xml_http_get_all_headers)
 {
 	u32 nb_hdr;
@@ -3054,7 +3446,7 @@
 	if (!ctx) return JS_TRUE;
 
 	/*must be received or loaded*/
-	if (ctx->readyState<3) return JS_TRUE;
+	if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_TRUE;
 	szVal[0] = 0;
 	nb_hdr = 0;
 	if (ctx->recv_headers) {
@@ -3089,7 +3481,7 @@
 
 	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
 	/*must be received or loaded*/
-	if (ctx->readyState<3) return JS_TRUE;
+	if (ctx->readyState<XHR_READYSTATE_LOADING) return JS_TRUE;
 	hdr = SMJS_CHARS(c, argv[0]);
 
 	szVal[0] = 0;
@@ -3112,7 +3504,24 @@
 	return JS_TRUE;
 }
 
-static SMJS_FUNC_PROP_GET( xml_http_getProperty)
+static JSBool SMJS_FUNCTION(xml_http_overrideMimeType)
+{
+	char *mime;
+	XMLHTTPContext *ctx;
+	SMJS_OBJ
+	SMJS_ARGS
+	if (!argc || !GF_JS_InstanceOf(c, obj, &dom_rt->xmlHTTPRequestClass, NULL) ) return JS_TRUE;
+	ctx = (XMLHTTPContext *)SMJS_GET_PRIVATE(c, obj);
+	if (!ctx) return JS_TRUE;
+
+	if (!JSVAL_CHECK_STRING(argv[0])) return JS_TRUE;
+	mime = SMJS_CHARS(c, argv[0]);
+	ctx->mime = gf_strdup(mime);
+	SMJS_FREE(c, mime);
+	return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(xml_http_getProperty)
 
 	JSString *s;
 	XMLHTTPContext *ctx;
@@ -3122,22 +3531,53 @@
 
 	s = NULL;
 	if (SMJS_ID_IS_INT(id)) {
+		*vp = JSVAL_VOID;
 		switch (SMJS_ID_TO_INT(id)) {
-		/*onreadystatechange*/
-		case 0:
-			if (ctx->onreadystatechange) {
-				*vp = OBJECT_TO_JSVAL((JSObject*)ctx->onreadystatechange);
-			} else {
-				*vp = JSVAL_VOID;
+		case XHR_ONABORT:
+			if (! JSVAL_IS_NULL(ctx->onabort)) {
+				*vp = ctx->onabort;
 			}
 			return JS_TRUE;
-		/*readyState*/
-		case 1:
+		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;
-		/*responseText*/
-		case 2:
-			if (ctx->readyState<3) 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 );
@@ -3145,29 +3585,40 @@
 				*vp = JSVAL_VOID;
 			}
 			return JS_TRUE;
-		/*responseXML*/
-		case 3:
-			if (ctx->readyState<3) 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;
-		/*response*/
-		case 10:
-			if (ctx->readyState<3) return JS_TRUE;
+		case XHR_RESPONSE:
+			if (ctx->readyState<XHR_READYSTATE_LOADING) {
+				return JS_TRUE;
+			}
 			if (ctx->data) {
 				switch(ctx->responseType)
 				{
-				case 0:
+				case XHR_RESPONSETYPE_NONE:
+				case XHR_RESPONSETYPE_TEXT:
 					s =	JS_NewStringCopyZ(c, ctx->data);
 					*vp	= STRING_TO_JSVAL( s );
 					break;
-				case 1:
-					if (!ctx->arraybuffer) ctx->arraybuffer = gf_arraybuffer_js_new(c, ctx->data, ctx->size, obj);
+				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;
@@ -3176,12 +3627,10 @@
 				*vp = JSVAL_VOID;
 			}
 			return JS_TRUE;
-		/*status*/
-		case 4:
+		case XHR_STATUS:
 			*vp = INT_TO_JSVAL(ctx->html_status); 
 			return JS_TRUE;
-		/*statusText*/
-		case 5:
+		case XHR_STATUSTEXT:
 			if (ctx->statusText) {
 				s = JS_NewStringCopyZ(c, ctx->statusText);
 				*vp = STRING_TO_JSVAL( s );
@@ -3189,60 +3638,70 @@
 				*vp = JSVAL_VOID;
 			}
 			return JS_TRUE;
-        /*timeout*/
-		case 6:
+		case XHR_TIMEOUT:
 			*vp = INT_TO_JSVAL(ctx->timeout); 
 			return JS_TRUE;
-		/* withCredentials */
-        case 7:
+        case XHR_WITHCREDENTIALS:
 			*vp = BOOLEAN_TO_JSVAL(ctx->withCredentials ? JS_TRUE : JS_FALSE); 
 			return JS_TRUE;
-        /* upload */
-		case 8:
+		case XHR_UPLOAD:
 			/* TODO */
 			return JS_TRUE;
-        /* responseType */
-		case 9:
+		case XHR_RESPONSETYPE:
 			switch (ctx->responseType)
             {
-            case 0:
+            case XHR_RESPONSETYPE_NONE:
 				s = JS_NewStringCopyZ(c, "");
                 break;
-            case 1:
+            case XHR_RESPONSETYPE_ARRAYBUFFER:
 				s = JS_NewStringCopyZ(c, "arraybuffer");
                 break;
-            case 2:
+            case XHR_RESPONSETYPE_BLOB:
 				s = JS_NewStringCopyZ(c, "blob");
                 break;
-            case 3:
+            case XHR_RESPONSETYPE_DOCUMENT:
 				s = JS_NewStringCopyZ(c, "document");
                 break;
-            case 4:
+            case XHR_RESPONSETYPE_JSON:
 				s = JS_NewStringCopyZ(c, "json");
                 break;
-            case 5:
+            case XHR_RESPONSETYPE_TEXT:
 				s = JS_NewStringCopyZ(c, "text");
                 break;
-            case 6:
+            case XHR_RESPONSETYPE_STREAM:
 				s = JS_NewStringCopyZ(c, "stream");
                 break;
             }
 			*vp = STRING_TO_JSVAL( s );
 			return JS_TRUE;
-		case 100:
-			*vp = INT_TO_JSVAL(0);
+		case XHR_STATIC_UNSENT:
+			*vp = INT_TO_JSVAL(XHR_READYSTATE_UNSENT);
 			return JS_TRUE;
-		case 101:
-			*vp = INT_TO_JSVAL(1);
+		case XHR_STATIC_OPENED:
+			*vp = INT_TO_JSVAL(XHR_READYSTATE_OPENED);
 			return JS_TRUE;
-		case 102:
-			*vp = INT_TO_JSVAL(2);
+		case XHR_STATIC_HEADERS_RECEIVED:
+			*vp = INT_TO_JSVAL(XHR_READYSTATE_HEADERS_RECEIVED);
 			return JS_TRUE;
-		case 103:
-			*vp = INT_TO_JSVAL(3);
+		case XHR_STATIC_LOADING:
+			*vp = INT_TO_JSVAL(XHR_READYSTATE_LOADING);
 			return JS_TRUE;
-		case 104:
-			*vp = INT_TO_JSVAL(4);
+		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;
@@ -3251,6 +3710,28 @@
 	return SMJS_CALL_PROP_STUB();
 }
 
+JSBool gf_set_js_eventhandler(JSContext *c, jsval vp, jsval *callbackfuncval) {
+	if (!callbackfuncval) return JS_FALSE;
+	if (! JSVAL_IS_NULL( *callbackfuncval )) {
+		gf_js_remove_root(c, callbackfuncval, GF_JSGC_VAL);
+	}
+	if (JSVAL_IS_VOID(vp)) {
+		return JS_TRUE;
+	} else if (JSVAL_CHECK_STRING(vp)) {
+		jsval fval;
+		char *callbackstr = SMJS_CHARS(c, vp);
+		if (! JS_LookupProperty(c, JS_GetGlobalObject(c), callbackstr, &fval)) return JS_TRUE;
+		*callbackfuncval = fval;
+		SMJS_FREE(c, callbackstr);
+	} else if (JSVAL_IS_OBJECT(vp)) {
+		*callbackfuncval = vp;
+	}
+	if (! JSVAL_IS_NULL( *callbackfuncval )) {
+		gf_js_add_root(c, callbackfuncval, GF_JSGC_VAL);
+	}
+	return JS_TRUE;
+}
+
 static SMJS_FUNC_PROP_SET( xml_http_setProperty)
 
 	XMLHTTPContext *ctx;
@@ -3260,57 +3741,72 @@
 
 	if (SMJS_ID_IS_INT(id)) {
 		switch (SMJS_ID_TO_INT(id)) {
-		/*onreadystatechange*/
-		case 0:
-		    if (ctx->onreadystatechange) gf_js_remove_root(c, &(ctx->onreadystatechange), GF_JSGC_VAL);
-		    ctx->onreadystatechange = NULL;
-
-		    if (JSVAL_IS_VOID(*vp)) {
-			    return JS_TRUE;
-		    }
-		    else if (JSVAL_CHECK_STRING(*vp)) {
-			    jsval fval;
-			    char *callback = SMJS_CHARS(c, *vp);
-			    if (! JS_LookupProperty(c, JS_GetGlobalObject(c), callback, &fval)) return JS_TRUE;
-			    ctx->onreadystatechange = JS_ValueToFunction(c, fval);
-			    SMJS_FREE(c, callback);
-		    } else if (JSVAL_IS_OBJECT(*vp)) {
-			    ctx->onreadystatechange = JS_ValueToFunction(c, *vp);
-		    }
-		    if (ctx->onreadystatechange) gf_js_add_root(c, &(ctx->onreadystatechange), GF_JSGC_VAL);
-		    return JS_TRUE;
+		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;
-        /*timeout*/
-		case 6:
+		case XHR_ONTIMEOUT: 
+			gf_set_js_eventhandler(c, *vp, &ctx->ontimeout);
+			break;
+		case XHR_TIMEOUT:
 			ctx->timeout = JSVAL_TO_INT(*vp);
 			return JS_TRUE;
-		/* withCredentials */
-        case 7:
+        case XHR_WITHCREDENTIALS:
 			ctx->withCredentials = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
 			return JS_TRUE;
-        /* responseType */
-		case 9:
+		case XHR_RESPONSETYPE:
             { 
                 char *str = SMJS_CHARS(c, *vp);
 	            if (!str) return JS_TRUE;
                 if (!strcmp(str, "")) {
-                    ctx->responseType = 0;
+                    ctx->responseType = XHR_RESPONSETYPE_NONE;
                 } else if (!strcmp(str, "arraybuffer")) {
-                    ctx->responseType = 1;
+                    ctx->responseType = XHR_RESPONSETYPE_ARRAYBUFFER;
                 } else if (!strcmp(str, "blob")) {
-                    ctx->responseType = 2;
+                    ctx->responseType = XHR_RESPONSETYPE_BLOB;
                 } else if (!strcmp(str, "document")) {
-                    ctx->responseType = 3;
+                    ctx->responseType = XHR_RESPONSETYPE_DOCUMENT;
                 } else if (!strcmp(str, "json")) {
-                    ctx->responseType = 4;
+                    ctx->responseType = XHR_RESPONSETYPE_JSON;
                 } else if (!strcmp(str, "text")) {
-                    ctx->responseType = 5;
+                    ctx->responseType = XHR_RESPONSETYPE_TEXT;
                 } else if (!strcmp(str, "stream")) {
-                    ctx->responseType = 6;
+                    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;
@@ -3333,8 +3829,7 @@
 
 	if (SMJS_ID_IS_INT(id)) {
 		switch (SMJS_ID_TO_INT(id)) {
-		/*value*/
-		case 0:
+		case DCCI_JSPROPERTY_VALUE:
 			child = n->children;
 			while (child) {
 				if (child->node && (child->node->sgprivate->tag==TAG_DOMText)) {
@@ -3349,8 +3844,7 @@
 			}
 			*vp = JSVAL_NULL;
 			return JS_TRUE;
-		/*valueType*/
-		case 1:
+		case DCCI_JSPROPERTY_VALUETYPE:
 			value = "DOMString";
 			att = (GF_DOMFullAttribute*) n->attributes;
 			while (att) {
@@ -3363,8 +3857,7 @@
 			s = JS_NewStringCopyZ(c, value);
 			*vp = STRING_TO_JSVAL( s );
 			return JS_TRUE;
-		/*propertyType*/
-		case 2:
+		case DCCI_JSPROPERTY_PROPERTYTYPE:
 			value = "DOMString";
 			att = (GF_DOMFullAttribute*) n->attributes;
 			while (att) {
@@ -3377,11 +3870,10 @@
 			s = JS_NewStringCopyZ(c, value);
 			*vp = STRING_TO_JSVAL( s );
 			return JS_TRUE;
-		/*readOnly*/
-		case 3:
+		case DCCI_JSPROPERTY_READONLY:
 			att = (GF_DOMFullAttribute*) n->attributes;
 			while (att) {
-				if (att->name && !strcmp(att->name, "readOnly") && att->data && !strcmp(att->data, "true")) {
+				if (att->name && !strcmp(att->name, "readOnly") && att->data && !strcmp((const char *)att->data, "true")) {
 					*vp = BOOLEAN_TO_JSVAL(JS_TRUE);
 					return JS_TRUE;
 				}
@@ -3389,16 +3881,13 @@
 			}
 			*vp = BOOLEAN_TO_JSVAL(JS_FALSE);
 			return JS_TRUE;
-		/*DCCIMetadataInterfaceType*/
-		case 4:
+		case DCCI_JSPROPERTY_DCCIMETADATAINTERFACETYPE:
 			*vp = JSVAL_NULL;
 			return JS_TRUE;
-		/*DCCIMetadataInterface*/
-		case 5:
+		case DCCI_JSPROPERTY_DCCIMETADATAINTERFACE:
 			*vp = JSVAL_NULL;
 			return JS_TRUE;
-		/*version*/
-		case 6:
+		case DCCI_JSPROPERTY_VERSION:
 			s = JS_NewStringCopyZ(c, "1.0");
 			*vp = STRING_TO_JSVAL( s );
 			return JS_TRUE;
@@ -3426,8 +3915,7 @@
 
 	if (SMJS_ID_IS_INT(id)) {
 		switch (SMJS_ID_TO_INT(id)) {
-		/*value*/
-		case 0:
+		case DCCI_JSPROPERTY_VALUE:
 			readonly = GF_FALSE;
 			att = (GF_DOMFullAttribute*) n->attributes;
 			while (att) {
@@ -3461,8 +3949,7 @@
 			gf_dom_event_fire((GF_Node*)n, &evt);
 			n->sgprivate->scenegraph->modified = GF_TRUE;
 			break;
-		/*propertyType*/
-		case 2:
+		case DCCI_JSPROPERTY_PROPERTYTYPE:
 			break;
 
 		/*all other properties are read-only*/
@@ -3589,8 +4076,10 @@
 static SMJS_FUNC_PROP_GET( storage_getProperty)
 
 	/*avoids gcc warning*/
-	if (!id) id=0;
-	if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
+#ifndef GPAC_CONFIG_DARWIN
+    if (!id) id=0;
+#endif
+    if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
 	*vp = JSVAL_VOID;
 	return JS_TRUE;
 }
@@ -3598,7 +4087,9 @@
 static SMJS_FUNC_PROP_SET_NOVP( storage_setProperty)
 
 	/*avoids gcc warning*/
-	if (!id) id=0;
+#ifndef GPAC_CONFIG_DARWIN
+    if (!id) id=0;
+#endif
 	if (!GF_JS_InstanceOf(c, obj, &dom_rt->storageClass, NULL) ) return JS_TRUE;
 	return JS_TRUE;
 }
@@ -3636,7 +4127,6 @@
 		/*Event class*/
 		JS_SETUP_CLASS(dom_rt->domEventClass , "Event", JSCLASS_HAS_PRIVATE, event_getProperty, JS_PropertyStub_forSetter, JS_FinalizeStub);
 
-
 		JS_SETUP_CLASS(dom_rt->domNodeListClass, "NodeList", JSCLASS_HAS_PRIVATE, dom_nodelist_getProperty, dom_nodelist_setProperty, dom_nodelist_finalize);
 		JS_SETUP_CLASS(dom_rt->xmlHTTPRequestClass, "XMLHttpRequest", JSCLASS_HAS_PRIVATE, xml_http_getProperty, xml_http_setProperty, xml_http_finalize);
 		JS_SETUP_CLASS(dom_rt->storageClass, "Storage", JSCLASS_HAS_PRIVATE, storage_getProperty, storage_setProperty, storage_finalize);
@@ -3653,51 +4143,51 @@
 		JSFunctionSpec nodeFuncs[] = {
 			SMJS_FUNCTION_SPEC("insertBefore",			xml_node_insert_before, 2),
 			SMJS_FUNCTION_SPEC("replaceChild",			xml_node_replace_child, 2),
-			SMJS_FUNCTION_SPEC("removeChild",				xml_node_remove_child, 1),
-			SMJS_FUNCTION_SPEC("appendChild",				xml_node_append_child, 1),
+			SMJS_FUNCTION_SPEC("removeChild",			xml_node_remove_child, 1),
+			SMJS_FUNCTION_SPEC("appendChild",			xml_node_append_child, 1),
 			SMJS_FUNCTION_SPEC("hasChildNodes",			xml_node_has_children, 0),
 			SMJS_FUNCTION_SPEC("cloneNode",				xml_clone_node, 1),
 			SMJS_FUNCTION_SPEC("normalize",				xml_dom3_not_implemented, 0),
-			SMJS_FUNCTION_SPEC("isSupported",				xml_dom3_not_implemented, 2),
+			SMJS_FUNCTION_SPEC("isSupported",			xml_dom3_not_implemented, 2),
 			SMJS_FUNCTION_SPEC("hasAttributes",			xml_node_has_attributes, 0),
 			SMJS_FUNCTION_SPEC("compareDocumentPosition", xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("isSameNode",				xml_node_is_same_node, 1),
+			SMJS_FUNCTION_SPEC("isSameNode",			xml_node_is_same_node, 1),
 			SMJS_FUNCTION_SPEC("lookupPrefix",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("isDefaultNamespace",		xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("lookupNamespaceURI",		xml_dom3_not_implemented, 1),
+			SMJS_FUNCTION_SPEC("isDefaultNamespace",	xml_dom3_not_implemented, 1),
+			SMJS_FUNCTION_SPEC("lookupNamespaceURI",	xml_dom3_not_implemented, 1),
 			/*we don't support full node compare*/
-			SMJS_FUNCTION_SPEC("isEqualNode",				xml_node_is_same_node, 1),
-			SMJS_FUNCTION_SPEC("getFeature",				xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("setUserData",				xml_dom3_not_implemented, 3),
-			SMJS_FUNCTION_SPEC("getUserData",				xml_dom3_not_implemented, 1),
+			SMJS_FUNCTION_SPEC("isEqualNode",			xml_node_is_same_node, 1),
+			SMJS_FUNCTION_SPEC("getFeature",			xml_dom3_not_implemented, 2),
+			SMJS_FUNCTION_SPEC("setUserData",			xml_dom3_not_implemented, 3),
+			SMJS_FUNCTION_SPEC("getUserData",			xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec nodeProps[] = {
-			SMJS_PROPERTY_SPEC("nodeName",		0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("nodeValue",		1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("nodeType",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("parentNode",		3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("childNodes",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("firstChild",		5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("lastChild",		6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("previousSibling",	7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("nextSibling",		8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("attributes",		9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("ownerDocument",	10,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("namespaceURI",	11,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("prefix",			12,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("localName",		13,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("baseURI",			14,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("textContent",		15,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("nodeName",		NODE_JSPROPERTY_NODENAME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("nodeValue",		NODE_JSPROPERTY_NODEVALUE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("nodeType",		NODE_JSPROPERTY_NODETYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("parentNode",	NODE_JSPROPERTY_PARENTNODE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("childNodes",	NODE_JSPROPERTY_CHILDNODES,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("firstChild",	NODE_JSPROPERTY_FIRSTCHILD,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("lastChild",		NODE_JSPROPERTY_LASTCHILD,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("previousSibling",NODE_JSPROPERTY_PREVIOUSSIBLING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("nextSibling",	NODE_JSPROPERTY_NEXTSIBLING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("attributes",	NODE_JSPROPERTY_ATTRIBUTES,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("ownerDocument",	NODE_JSPROPERTY_OWNERDOCUMENT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("namespaceURI",	NODE_JSPROPERTY_NAMESPACEURI,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("prefix",		NODE_JSPROPERTY_PREFIX,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("localName",		NODE_JSPROPERTY_LOCALNAME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("baseURI",		NODE_JSPROPERTY_BASEURI,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("textContent",	NODE_JSPROPERTY_TEXTCONTENT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
 			/*elementTraversal interface*/
-			SMJS_PROPERTY_SPEC("firstElementChild",		16,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("lastElementChild",		17,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("previousElementSibling",	18,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("nextElementSibling",		19,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("firstElementChild",		NODE_JSPROPERTY_FIRSTELEMENTCHILD,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("lastElementChild",		NODE_JSPROPERTY_LASTELEMENTCHILD,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("previousElementSibling",NODE_JSPROPERTY_PREVIOUSELEMENTSIBLING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("nextElementSibling",	NODE_JSPROPERTY_NEXTELEMENTSIBLING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
-		GF_JS_InitClass(c, global, 0, &dom_rt->domNodeClass, 0, 0, nodeProps, nodeFuncs, 0, 0);
+		GF_JS_InitClass(c, global, JS_NewObject(c, NULL, NULL, NULL), &dom_rt->domNodeClass, 0, 0, nodeProps, nodeFuncs, 0, 0);
 		if (!dom_rt->domNodeClass._proto) {
 			GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[DOMCore] Not enough memory to initialize JS node class\n"));
 			return;
@@ -3713,40 +4203,42 @@
 	{
 		JSFunctionSpec documentFuncs[] = {
 			SMJS_FUNCTION_SPEC("createElement",				xml_document_create_element, 1),
-			SMJS_FUNCTION_SPEC("createDocumentFragment",		xml_dom3_not_implemented, 0),
-			SMJS_FUNCTION_SPEC("createTextNode",				xml_document_create_text, 1),
+			SMJS_FUNCTION_SPEC("createDocumentFragment",	xml_dom3_not_implemented, 0),
+			SMJS_FUNCTION_SPEC("createTextNode",			xml_document_create_text, 1),
 			SMJS_FUNCTION_SPEC("createComment",				xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("createCDATASection",			xml_dom3_not_implemented, 1),
+			SMJS_FUNCTION_SPEC("createCDATASection",		xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC("createProcessingInstruction",	xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("createAttribute",				xml_dom3_not_implemented, 1),
+			SMJS_FUNCTION_SPEC("createAttribute",			xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC("createEntityReference",		xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC("getElementsByTagName",		xml_document_elements_by_tag, 1),
-			SMJS_FUNCTION_SPEC("importNode",					xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("createElementNS",				xml_document_create_element, 2),
+			SMJS_FUNCTION_SPEC("importNode",				xml_dom3_not_implemented, 2),
+			SMJS_FUNCTION_SPEC("createElementNS",			xml_document_create_element, 2),
 			SMJS_FUNCTION_SPEC("createAttributeNS",			xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("getElementsByTagNameNS",		xml_document_elements_by_tag, 2),
-			SMJS_FUNCTION_SPEC("getElementById",				xml_document_element_by_id, 1),
+			SMJS_FUNCTION_SPEC("getElementsByTagNameNS",	xml_document_elements_by_tag, 2),
+			SMJS_FUNCTION_SPEC("getElementById",			xml_document_element_by_id, 1),
 			SMJS_FUNCTION_SPEC("adoptNode",					xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC("normalizeDocument",			xml_dom3_not_implemented, 0),
-			SMJS_FUNCTION_SPEC("renameNode",					xml_dom3_not_implemented, 3),
+			SMJS_FUNCTION_SPEC("renameNode",				xml_dom3_not_implemented, 3),
 			/*eventTarget interface*/
 			JS_DOM3_EVENT_TARGET_INTERFACE
 			/*DocumentEvent interface*/
-			SMJS_FUNCTION_SPEC("createEvent",					xml_dom3_not_implemented, 1),
+			SMJS_FUNCTION_SPEC("createEvent",				xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 
 		JSPropertySpec documentProps[] = {
-			SMJS_PROPERTY_SPEC("doctype",				1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("implementation",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("documentElement",		3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("inputEncoding",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("xmlEncoding",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("xmlStandalone",		6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("xmlVersion",			7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("strictErrorChecking",	8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("documentURI",			9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("domConfig",			10,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("doctype",			 DOCUMENT_JSPROPERTY_DOCTYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("implementation",	 DOCUMENT_JSPROPERTY_IMPLEMENTATION,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("documentElement",	 DOCUMENT_JSPROPERTY_DOCUMENTELEMENT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("inputEncoding",		 DOCUMENT_JSPROPERTY_INPUTENCODING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("xmlEncoding",		 DOCUMENT_JSPROPERTY_XMLENCODING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("xmlStandalone",		 DOCUMENT_JSPROPERTY_XMLSTANDALONE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("xmlVersion",		 DOCUMENT_JSPROPERTY_XMLVERSION,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("strictErrorChecking",DOCUMENT_JSPROPERTY_STRICTERRORCHECKING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("documentURI",		 DOCUMENT_JSPROPERTY_DOCUMENTURI,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("location",			 DOCUMENT_JSPROPERTY_LOCATION,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("domConfig",			 DOCUMENT_JSPROPERTY_DOMCONFIG,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("global",			 DOCUMENT_JSPROPERTY_GLOBAL,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
 		};
 
@@ -3758,30 +4250,30 @@
 		JSFunctionSpec elementFuncs[] = {
 			SMJS_FUNCTION_SPEC("getAttribute",				xml_element_get_attribute, 1),
 			SMJS_FUNCTION_SPEC("setAttribute",				xml_element_set_attribute, 2),
-			SMJS_FUNCTION_SPEC("removeAttribute",				xml_element_remove_attribute, 1),
-			SMJS_FUNCTION_SPEC("getAttributeNS",				xml_element_get_attribute, 2),
-			SMJS_FUNCTION_SPEC("setAttributeNS",				xml_element_set_attribute, 3),
+			SMJS_FUNCTION_SPEC("removeAttribute",			xml_element_remove_attribute, 1),
+			SMJS_FUNCTION_SPEC("getAttributeNS",			xml_element_get_attribute, 2),
+			SMJS_FUNCTION_SPEC("setAttributeNS",			xml_element_set_attribute, 3),
 			SMJS_FUNCTION_SPEC("removeAttributeNS",			xml_element_remove_attribute, 2),
 			SMJS_FUNCTION_SPEC("hasAttribute",				xml_element_has_attribute, 1),
-			SMJS_FUNCTION_SPEC("hasAttributeNS",				xml_element_has_attribute, 2),
+			SMJS_FUNCTION_SPEC("hasAttributeNS",			xml_element_has_attribute, 2),
 			SMJS_FUNCTION_SPEC("getElementsByTagName",		xml_element_elements_by_tag, 1),
-			SMJS_FUNCTION_SPEC("getElementsByTagNameNS",		xml_element_elements_by_tag, 2),
-			SMJS_FUNCTION_SPEC("setIdAttribute",				xml_element_set_id, 2),
+			SMJS_FUNCTION_SPEC("getElementsByTagNameNS",	xml_element_elements_by_tag, 2),
+			SMJS_FUNCTION_SPEC("setIdAttribute",			xml_element_set_id, 2),
 			SMJS_FUNCTION_SPEC("setIdAttributeNS",			xml_element_set_id, 3),
 			SMJS_FUNCTION_SPEC("getAttributeNode",			xml_dom3_not_implemented, 1),
 			SMJS_FUNCTION_SPEC("setAttributeNode",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("removeAttributeNode",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("getAttributeNodeNS",			xml_dom3_not_implemented, 2),
-			SMJS_FUNCTION_SPEC("setAttributeNodeNS",			xml_dom3_not_implemented, 1),
-			SMJS_FUNCTION_SPEC("setIdAttributeNode",			xml_dom3_not_implemented, 2),
+			SMJS_FUNCTION_SPEC("removeAttributeNode",		xml_dom3_not_implemented, 1),
+			SMJS_FUNCTION_SPEC("getAttributeNodeNS",		xml_dom3_not_implemented, 2),
+			SMJS_FUNCTION_SPEC("setAttributeNodeNS",		xml_dom3_not_implemented, 1),
+			SMJS_FUNCTION_SPEC("setIdAttributeNode",		xml_dom3_not_implemented, 2),
 			/*eventTarget interface*/
 			JS_DOM3_EVENT_TARGET_INTERFACE
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 
 		JSPropertySpec elementProps[] = {
-			SMJS_PROPERTY_SPEC("tagName",				1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("schemaTypeInfo",		2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("tagName",		ELEMENT_JSPROPERTY_TAGNAME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("schemaTypeInfo",ELEMENT_JSPROPERTY_SCHEMATYPEINFO,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
 		};
 		GF_JS_InitClass(c, global, dom_rt->domNodeClass._proto, &dom_rt->domElementClass, 0, 0, elementProps, elementFuncs, 0, 0);
@@ -3803,11 +4295,11 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec textProps[] = {
-			SMJS_PROPERTY_SPEC("data",						1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("length",						2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("data",						TEXT_JSPROPERTY_DATA,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("length",					TEXT_JSPROPERTY_LENGTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*text*/
-			SMJS_PROPERTY_SPEC("isElementContentWhitespace",	3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("wholeText",					4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("isElementContentWhitespace",TEXT_JSPROPERTY_ISELEMENTCONTENTWHITESPACE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("wholeText",					TEXT_JSPROPERTY_WHOLETEXT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
 		};
 		GF_JS_InitClass(c, global, dom_rt->domNodeClass._proto, &dom_rt->domTextClass, 0, 0, textProps, textFuncs, 0, 0);
@@ -3827,56 +4319,57 @@
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec eventProps[] = {
-			SMJS_PROPERTY_SPEC("type",			 0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("target",			 1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("currentTarget",	 2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("eventPhase",		 3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("bubbles",			 4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("cancelable",		 5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("timeStamp",		 6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("namespaceURI",	 7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("defaultPrevented", 8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("type",			EVENT_JSPROPERTY_TYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("target",		EVENT_JSPROPERTY_TARGET,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("currentTarget",	EVENT_JSPROPERTY_CURRENTTARGET,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("eventPhase",	EVENT_JSPROPERTY_EVENTPHASE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("bubbles",		EVENT_JSPROPERTY_BUBBLES,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("cancelable",	EVENT_JSPROPERTY_CANCELABLE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("timeStamp",		EVENT_JSPROPERTY_TIMESTAMP,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("namespaceURI",	EVENT_JSPROPERTY_NAMESPACEURI,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("defaultPrevented",EVENT_JSPROPERTY_DEFAULTPREVENTED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			/*UIEvent*/
-			SMJS_PROPERTY_SPEC("detail",			20,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("detail",			EVENT_JSPROPERTY_DETAIL,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*text, connectionEvent*/
-			SMJS_PROPERTY_SPEC("data",			25,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("data",				EVENT_JSPROPERTY_DATA,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*MouseEvent*/
-			SMJS_PROPERTY_SPEC("screenX",			30,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("screenY",			31,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("clientX",			32,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("clientY",			33,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("button",			34,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("relatedTarget",	35,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("screenX",			EVENT_JSPROPERTY_SCREENX,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("screenY",			EVENT_JSPROPERTY_SCREENY,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("clientX",			EVENT_JSPROPERTY_CLIENTX,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("clientY",			EVENT_JSPROPERTY_CLIENTY,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("button",			EVENT_JSPROPERTY_BUTTON,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("relatedTarget",		EVENT_JSPROPERTY_RELATEDTARGET, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			/*wheelEvent*/
-			SMJS_PROPERTY_SPEC("wheelDelta",		36,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("wheelDelta",		EVENT_JSPROPERTY_WHEELDELTA,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			/*keyboard*/
-			SMJS_PROPERTY_SPEC("keyIdentifier",	40,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("keyChar",			41,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("charCode",		42,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("keyIdentifier",	EVENT_JSPROPERTY_KEYIDENTIFIER,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("keyChar",		EVENT_JSPROPERTY_KEYCHAR,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("charCode",		EVENT_JSPROPERTY_CHARCODE,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			/*progress*/
-			SMJS_PROPERTY_SPEC("lengthComputable",50,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("typeArg",			51,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("loaded",			52,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("total",			53,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("bufferLevelValid",	54,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("bufferLevel",			55,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("bufferRemainingTime",	56,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("status",				57,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("lengthComputable",	EVENT_JSPROPERTY_LENGTHCOMPUTABLE,	JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("typeArg",			EVENT_JSPROPERTY_TYPEARG,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("loaded",			EVENT_JSPROPERTY_LOADED,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("total",				EVENT_JSPROPERTY_TOTAL,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("bufferLevelValid",	EVENT_JSPROPERTY_BUFFERLEVELVALID,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("bufferLevel",		EVENT_JSPROPERTY_BUFFERLEVEL,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("bufferRemainingTime",EVENT_JSPROPERTY_BUFFERREMAININGTIME, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("status",			EVENT_JSPROPERTY_STATUS,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			/*used by vrml*/
-			SMJS_PROPERTY_SPEC("width",			60,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("height",			61,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("offset_x",		62,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("offset_y",		63,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("vp_width",		64,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("vp_height",		65,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("translation_x",	66,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("translation_y",	67,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("type3d",			68,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("error",			69,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("width",			EVENT_JSPROPERTY_WIDTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("height",		EVENT_JSPROPERTY_HEIGHT,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("offset_x",		EVENT_JSPROPERTY_OFFSETX,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("offset_y",		EVENT_JSPROPERTY_OFFSETY,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("vp_width",		EVENT_JSPROPERTY_VPWIDTH,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("vp_height",		EVENT_JSPROPERTY_VPHEIGHT,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("translation_x",	EVENT_JSPROPERTY_TRANSLATIONX,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("translation_y",	EVENT_JSPROPERTY_TRANSLATIONY,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("type3d",		EVENT_JSPROPERTY_TYPE3D,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("error",			EVENT_JSPROPERTY_ERROR,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("dynamic_scene",	EVENT_JSPROPERTY_DYNAMIC_SCENE,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0),
 		};
@@ -3893,14 +4386,13 @@
 		JS_DefineProperty(c, dom_rt->domEventClass._proto, "DOM_KEY_LOCATION_NUMPAD", INT_TO_JSVAL(3), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
 	}
 
-
 	{
 		JSFunctionSpec nodeListFuncs[] = {
 			SMJS_FUNCTION_SPEC("item", dom_nodelist_item, 1),
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
 		JSPropertySpec nodeListProps[] = {
-			SMJS_PROPERTY_SPEC("length",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("length",	NODELIST_JSPROPERTY_LENGTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		GF_JS_InitClass(c, global, 0, &dom_rt->domNodeListClass, 0, 0, nodeListProps, nodeListFuncs, 0, 0);
@@ -3909,38 +4401,50 @@
 
 	{
 		JSPropertySpec xmlHTTPRequestClassProps[] = {
-			SMJS_PROPERTY_SPEC("onreadystatechange",	0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-			SMJS_PROPERTY_SPEC("readyState",			1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("responseText",			2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("responseXML",			3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("status",				4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("statusText",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("timeout",				6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-			SMJS_PROPERTY_SPEC("withCredentials",		7,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-			SMJS_PROPERTY_SPEC("upload",				8,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("responseType",			9,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
-			SMJS_PROPERTY_SPEC("response",				10,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("UNSENT",			100,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("OPENED",			101,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("HEADERS_RECEIVED",	102,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("LOADING",			103,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-			SMJS_PROPERTY_SPEC("DONE",				104,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("onabort",				XHR_ONABORT,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("onerror",				XHR_ONERROR,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("onload",				XHR_ONLOAD,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("onloadend",				XHR_ONLOADEND,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("onloadstart",			XHR_ONLOADSTART,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("onprogress",			XHR_ONPROGRESS,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("onreadystatechange",	XHR_ONREADYSTATECHANGE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("ontimeout",				XHR_ONTIMEOUT,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+			SMJS_PROPERTY_SPEC("readyState",			XHR_READYSTATE,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("response",				XHR_RESPONSE,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("responseType",			XHR_RESPONSETYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
+			SMJS_PROPERTY_SPEC("responseText",			XHR_RESPONSETEXT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("responseXML",			XHR_RESPONSEXML,		JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("status",				XHR_STATUS,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("statusText",			XHR_STATUSTEXT,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("timeout",				XHR_TIMEOUT,			JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
+			SMJS_PROPERTY_SPEC("upload",				XHR_UPLOAD,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+			SMJS_PROPERTY_SPEC("withCredentials",		XHR_WITHCREDENTIALS,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
+			SMJS_PROPERTY_SPEC("cache",					XHR_CACHE,				JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0),
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSPropertySpec xmlHTTPRequestStaticClassProps[] = {
+			SMJS_PROPERTY_SPEC("UNSENT",			XHR_STATIC_UNSENT,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
+			SMJS_PROPERTY_SPEC("OPENED",			XHR_STATIC_OPENED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
+			SMJS_PROPERTY_SPEC("HEADERS_RECEIVED",	XHR_STATIC_HEADERS_RECEIVED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
+			SMJS_PROPERTY_SPEC("LOADING",			XHR_STATIC_LOADING,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
+			SMJS_PROPERTY_SPEC("DONE",				XHR_STATIC_DONE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, xml_http_getProperty, 0),
 			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 		};
 		JSFunctionSpec xmlHTTPRequestClassFuncs[] = {
-			SMJS_FUNCTION_SPEC("open",					xml_http_open, 2),
-			SMJS_FUNCTION_SPEC("setRequestHeader",		xml_http_set_header, 2),
-			SMJS_FUNCTION_SPEC("send",					xml_http_send, 0),
 			SMJS_FUNCTION_SPEC("abort",					xml_http_abort, 0),
 			SMJS_FUNCTION_SPEC("getAllResponseHeaders",	xml_http_get_all_headers, 0),
 			SMJS_FUNCTION_SPEC("getResponseHeader",		xml_http_get_header, 1),
+			SMJS_FUNCTION_SPEC("open",					xml_http_open, 2),
+			SMJS_FUNCTION_SPEC("overrideMimeType",		xml_http_overrideMimeType, 1),
+			SMJS_FUNCTION_SPEC("send",					xml_http_send, 0),
+			SMJS_FUNCTION_SPEC("setRequestHeader",		xml_http_set_header, 2),
+			SMJS_FUNCTION_SPEC("wait",					xml_http_wait, 0),
+			/*eventTarget interface*/
+			JS_DOM3_EVENT_TARGET_INTERFACE
 			/*todo - addEventListener and removeEventListener*/
 			SMJS_FUNCTION_SPEC(0, 0, 0)
 		};
-		GF_JS_InitClass(c, global, 0, &dom_rt->xmlHTTPRequestClass, xml_http_constructor, 0, xmlHTTPRequestClassProps, xmlHTTPRequestClassFuncs, xmlHTTPRequestStaticClassProps, 0);
+		GF_JS_InitClass(c, global, NULL, &dom_rt->xmlHTTPRequestClass, xml_http_constructor, 0, xmlHTTPRequestClassProps, xmlHTTPRequestClassFuncs, xmlHTTPRequestStaticClassProps, 0);
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[DOMCore] XMLHttpRequest class initialized\n"));
 	}
 
@@ -3969,13 +4473,13 @@
 		if (dcci && dcci->RootNode) {
 
 			JSPropertySpec DCCIClassProps[] = {
-				SMJS_PROPERTY_SPEC("value",							0,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-				SMJS_PROPERTY_SPEC("valueType",						1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC("propertyType",					2,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
-				SMJS_PROPERTY_SPEC("readOnly",						3,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC("DCCIMetadataInterfaceType",		4,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC("DCCIMetadataInterface",			5,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
-				SMJS_PROPERTY_SPEC("version",							6,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("value",						DCCI_JSPROPERTY_VALUE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+				SMJS_PROPERTY_SPEC("valueType",					DCCI_JSPROPERTY_VALUETYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("propertyType",				DCCI_JSPROPERTY_PROPERTYTYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0),
+				SMJS_PROPERTY_SPEC("readOnly",					DCCI_JSPROPERTY_READONLY,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("DCCIMetadataInterfaceType",	DCCI_JSPROPERTY_DCCIMETADATAINTERFACETYPE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("DCCIMetadataInterface",		DCCI_JSPROPERTY_DCCIMETADATAINTERFACE,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
+				SMJS_PROPERTY_SPEC("version",					DCCI_JSPROPERTY_VERSION,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0),
 				SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
 			};
 			JSFunctionSpec DCCIClassFuncs[] = {
@@ -4000,9 +4504,8 @@
 {
 	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;
@@ -4022,6 +4525,9 @@
 		JSObject *obj = (JSObject *)gf_list_get(sg->objects, 0);
 		n = dom_get_node(c, obj);
 		if (n) {
+			if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
+				html_media_element_js_finalize(c, n);
+			}
 			SMJS_SET_PRIVATE(c, obj, NULL);
 			n->sgprivate->interact->js_binding->node=NULL;
 			gf_node_unregister(n, NULL);
@@ -4064,31 +4570,6 @@
 	}
 }
 
-static void dom_js_define_document_ex(JSContext *c, JSObject *global, GF_SceneGraph *doc, const char *name)
-{
-	GF_JSClass *__class;
-	JSObject *obj;
-	if (!doc || !doc->RootNode) return;
-
-	if (doc->reference_count)
-		doc->reference_count++;
-
-	__class = NULL;
-	if (dom_rt->get_document_class)
-		__class = dom_rt->get_document_class(doc);
-	if (!__class) __class = &dom_rt->domDocumentClass;
-
-	obj = JS_DefineObject(c, global, name, & __class->_class, 0, 0 );
-	gf_node_register(doc->RootNode, NULL);
-	SMJS_SET_PRIVATE(c, obj, doc);
-	doc->document = obj;
-}
-
-void dom_js_define_document(JSContext *c, JSObject *global, GF_SceneGraph *doc)
-{
-	dom_js_define_document_ex(c, global, doc, "document");
-}
-
 JSObject *dom_js_define_event(JSContext *c, JSObject *global)
 {
 	JSObject *obj = JS_DefineObject(c, global, "evt", &dom_rt->domEventClass._class, 0, 0 );

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/html5_media_smjs.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/html5_media_smjs.c Changed

@@ -1,1515 +1,1717 @@
-/*
- *          GPAC - Multimedia Framework C SDK
- *
- *          Authors: Cyril Concolato
- *          Copyright (c) Telecom ParisTech 2007-2012
- *          All rights reserved
- *
- *  This file is part of GPAC / Scene Graph sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-
-#include <gpac/internal/scenegraph_dev.h>
-
-/*base SVG type*/
-#include <gpac/nodes_svg.h>
-/*dom events*/
-#include <gpac/events.h>
-/*dom text event*/
-#include <gpac/utf.h>
-
-#include <gpac/download.h>
-#include <gpac/network.h>
-#include <gpac/xml.h>
-
-#ifndef GPAC_DISABLE_SVG
-
-
-#ifdef GPAC_ANDROID
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif /* XP_UNIX */
-#endif
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#include <gpac/internal/smjs_api.h>
-#include <gpac/html5_media.h>
-
-/***********************************************************
- *
- * DOM generic functions being used 
- *
- ***********************************************************/
-#ifdef USE_FFDEV_15
-void dom_element_finalize(JSFreeOp *fop, JSObject *obj);
-void dom_document_finalize(JSFreeOp *fop, JSObject *obj);
-#else
-void dom_element_finalize(JSContext *c, JSObject *obj);
-void dom_document_finalize(JSContext *c, JSObject *obj);
-#endif
-char *js_get_utf8(jsval val);
-
-
-void gf_svg_set_attributeNS(GF_Node *n, u32 ns_code, char *name, char *val);
-
-#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
-
-/* including terminal dev for MediaObject */
-
-#include <gpac/internal/terminal_dev.h>
-
-/* including Compositor dev for TextureHandler and AudioInput */
-#include <gpac/internal/compositor_dev.h>
-
-static GF_HTML_MediaRuntime *html_media_rt = NULL;
-
-typedef enum
-{
-    MEDIA_ERROR_PROP_ABORTED            = 0,
-    MEDIA_ERROR_PROP_NETWORK            = 1,
-    MEDIA_ERROR_PROP_DECODE             = 2,
-    MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED  = 3,
-    MEDIA_ERROR_PROP_CODE               = 4
-} GF_HTML_MediaErrorPropEnum;
-
-typedef enum 
-{
-    HTML_MEDIA_PROP_ERROR                       = 0,
-    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,
-} GF_HTML_MediaEltPropEnum;
-
-/* HTMLVideoElement properties */
-typedef enum {
-    HTML_VIDEO_PROP_WIDTH                       = 0,
-    HTML_VIDEO_PROP_HEIGHT                      = 1,
-    HTML_VIDEO_PROP_VIDEOWIDTH                  = 2,
-    HTML_VIDEO_PROP_VIDEOHEIGHT                 = 3,
-    HTML_VIDEO_PROP_POSTER                      = 4,
-} GF_HTML_VideoEltPropEnum;
-
-/* HTMLTrack properties */
-typedef enum {
-    HTML_TRACK_PROP_ID                          = 0,
-    HTML_TRACK_PROP_KIND                        = 1,
-    HTML_TRACK_PROP_LABEL                       = 2,
-    HTML_TRACK_PROP_LANGUAGE                    = 3,
-    HTML_TRACK_PROP_SELECTED                    = 4,
-    HTML_TRACK_PROP_ENABLED                     = 5,
-    HTML_TRACK_PROP_INBANDTYPE                  = 6,
-} GF_HTML_TrackPropEnum;
-
-#define HTML_MEDIA_JS_CHECK     GF_HTML_MediaElement *me; \
-                                GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj); \
-                                if (!n || (n->sgprivate->tag != TAG_SVG_video && n->sgprivate->tag != TAG_SVG_audio)) \
-                                { \
-                                    return JS_TRUE; \
-                                } \
-                                me = (GF_HTML_MediaElement *)html_media_element_get_from_node(c, n); \
-                                if (!me) { \
-                                    return JS_TRUE; \
-                                }
-
-#define HTML_MEDIA_JS_START     HTML_MEDIA_JS_CHECK
-
-
-typedef struct
-{
-	GF_TextureHandler txh;
-	struct _drawable *graph;
-	MFURL txurl;	
-	Bool first_frame_fetched;
-	GF_Node *audio;
-	Bool audio_dirty;
-	Bool stop_requested;
-} SVG_video_stack;
-
-typedef struct
-{
-	GF_AudioInput input;
-	Bool is_active, is_error;
-	MFURL aurl;
-} SVG_audio_stack;
-
-static GF_MediaObject *gf_html_media_object(GF_Node *n)
-{
-    GF_MediaObject *mo = NULL;
-    if (n->sgprivate->tag == TAG_SVG_video)
-    {
-        SVG_video_stack *video_stack;
-        video_stack = (SVG_video_stack *)n->sgprivate->UserPrivate;
-        mo = video_stack->txh.stream;
-    }
-    else if (n->sgprivate->tag == TAG_SVG_audio)
-    {
-        SVG_audio_stack *audio_stack;
-        audio_stack = (SVG_audio_stack *)n->sgprivate->UserPrivate;
-        mo = audio_stack->input.stream;
-    }
-    return mo;
-}
-
-static 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;
-
-    node_obj = (JSObject *)n->sgprivate->interact->js_binding->node;
-    if (node_obj)
-    {
-        JS_GetProperty(c, node_obj, "gpac_me_impl", &vp);
-        me_obj = JSVAL_TO_OBJECT(vp);
-        me = (GF_HTML_MediaElement *)SMJS_GET_PRIVATE(c, me_obj);
-    }
-    return me;
-}
-
-static 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);
-}
-
-void gf_html_media_controller_init_js(GF_HTML_MediaController *mc, JSContext *c)
-{
-    mc->c            = c;
-    mc->_this        = JS_NewObject(c, &html_media_rt->mediaControllerClass._class, NULL, NULL);
-    SMJS_SET_PRIVATE(c, mc->_this, mc);
-    mc->buffered.c              = c;
-    mc->buffered._this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
-    SMJS_SET_PRIVATE(c, mc->buffered._this, &mc->buffered);
-    mc->played.c                = c;
-    mc->played._this            = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
-    SMJS_SET_PRIVATE(c, mc->played._this, &mc->played);
-    mc->seekable.c              = c;
-    mc->seekable._this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
-    SMJS_SET_PRIVATE(c, mc->seekable._this, &mc->seekable);
-}
-
-void gf_html_media_element_init_js(GF_HTML_MediaElement *me, JSContext *c, JSObject *node_obj)
-{
-    me->c                       = c;
-    me->_this                   = JS_NewObject(c, &html_media_rt->htmlMediaElementClass._class, NULL, node_obj);
-    SMJS_SET_PRIVATE(c, me->_this, me);
-
-    me->error.c                 = c;
-    me->error._this             = JS_NewObject(c, &html_media_rt->mediaErrorClass._class, NULL, me->_this);
-    SMJS_SET_PRIVATE(c, me->error._this, &me->error);
-
-    me->audioTracks.c           = c;
-    me->audioTracks._this       = JS_NewObject(c, &html_media_rt->audioTrackListClass._class, NULL, me->_this);
-    SMJS_SET_PRIVATE(c, me->audioTracks._this, &me->audioTracks);
-
-    me->videoTracks.c           = c;
-    me->videoTracks._this       = JS_NewObject(c, &html_media_rt->videoTrackListClass._class, NULL, me->_this);
-    SMJS_SET_PRIVATE(c, me->videoTracks._this, &me->videoTracks);
-
-    me->textTracks.c            = c;
-    me->textTracks._this        = JS_NewObject(c, &html_media_rt->textTrackListClass._class, NULL, me->_this);
-    SMJS_SET_PRIVATE(c, me->textTracks._this, &me->textTracks);
-
-    me->buffered.c              = c;
-    me->buffered._this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
-    SMJS_SET_PRIVATE(c, me->buffered._this, &me->buffered);
-
-    me->played.c                = c;
-    me->played._this            = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
-    SMJS_SET_PRIVATE(c, me->played._this, &me->played);
-
-    me->seekable.c              = c;
-    me->seekable._this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
-    SMJS_SET_PRIVATE(c, me->seekable._this, &me->seekable);
-}
-/*
- * TODO : Unused, create warnings on debian
-static void html_media_script_error(JSContext *c, const char *msg, JSErrorReport *jserr)
-{
-    GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d (%s)", msg, jserr->lineno, jserr->linebuf));
-}*/
-
-static void html_media_element_populate_tracks(JSContext *c, GF_HTML_MediaElement *me)
-{
-    GF_HTML_Track *track;
-    GF_Node *n = me->node;
-    if (n->sgprivate->tag == TAG_SVG_video) {
-        SVG_video_stack *video_stack = (SVG_video_stack *)n->sgprivate->UserPrivate;
-        if (video_stack->txh.is_open)
-        {
-            GF_MediaObject *mo = video_stack->txh.stream;
-            GF_ClientService *service = mo->odm->net_service;
-            GF_Scene *scene = mo->odm->parentscene;
-            u32 i, count;
-            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) 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;
-                    }
-                }
-            }
-        }
-    }
-}
-
-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))
-    {
-        /* mo->odm->net_service */
-    }
-    return JS_TRUE;
-}
-
-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;
-}
-
-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;
-}
-
-static JSBool SMJS_FUNCTION(html_media_addTextTrack)
-{
-    return JS_TRUE;
-}
-
-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;
-    }
-}
-
-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);
-    }
-}
-
-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);
-}
-
-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;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_error)
-    HTML_MEDIA_JS_START
-    *vp = OBJECT_TO_JSVAL(me->error._this);
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_src)
-    GF_FieldInfo info; 
-    HTML_MEDIA_JS_START
-    if (gf_node_get_attribute_by_name(n, "href", GF_XMLNS_XLINK, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-        char *szAtt = gf_svg_dump_attribute(n, &info);
-        *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
-        if (szAtt) gf_free(szAtt);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_src)
-    HTML_MEDIA_JS_START
-    if (JSVAL_CHECK_STRING(*vp)) {
-        char *str = SMJS_CHARS(c, *vp);
-        gf_svg_set_attributeNS(n, GF_XMLNS_XLINK, "href", str);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_cors)
-    GF_FieldInfo info; 
-    HTML_MEDIA_JS_START
-    if (gf_node_get_attribute_by_name(n, "crossorigin", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-        char *szAtt = gf_svg_dump_attribute(n, &info);
-        *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
-        if (szAtt) gf_free(szAtt);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_cors)
-    HTML_MEDIA_JS_START
-    if (JSVAL_CHECK_STRING(*vp)) {
-        char *str = SMJS_CHARS(c, *vp);
-        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "crossorigin", str);
-    }
-    return JS_TRUE;
-}
-
-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;
-
-    memset(&media_event, 0, sizeof(GF_DOMMediaEvent));
-    media_event_collect_info(mo->odm->net_service, mo->odm, &media_event, &min_time, &min_buffer);
-    GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] min_time: %d, min_buffer: %d loaded: "LLD"/"LLD"\n", 
-                                                        min_time, min_buffer, media_event.loaded_size, media_event.total_size));
-    if (min_buffer == 0)
-    {
-        *readyState = HAVE_NOTHING;
-        *networkState = NETWORK_EMPTY;
-    }
-    else
-    {
-        if (media_event.loaded_size != 0)
-        {
-            *readyState = HAVE_METADATA;
-        }
-        else if (media_event.loaded_size == media_event.total_size)
-        {
-            *readyState = HAVE_ENOUGH_DATA;
-        }
-    }
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_ready_state)
-    GF_HTML_MediaReadyState readyState = HAVE_NOTHING;
-    GF_HTML_NetworkState networkState = NETWORK_EMPTY;
-    GF_MediaObject *mo = NULL;
-    HTML_MEDIA_JS_START
-    html_media_element_populate_tracks(c, me);
-    mo = gf_html_media_object(n);
-    html_media_get_states(mo, &readyState, &networkState);
-    *vp = INT_TO_JSVAL( readyState );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_network_state)
-    GF_HTML_MediaReadyState readyState = HAVE_NOTHING;
-    GF_HTML_NetworkState networkState = NETWORK_EMPTY;
-    GF_MediaObject *mo = NULL;
-    HTML_MEDIA_JS_START
-    mo = gf_html_media_object(n);
-    html_media_get_states(mo, &readyState, &networkState);
-    *vp = INT_TO_JSVAL( networkState );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_const)
-    u32 v = 0;
-    if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL) ||
-        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
-        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL))
-    {
-        if (!SMJS_ID_IS_INT(id)) {
-            return JS_TRUE;
-        }
-        switch (SMJS_ID_TO_INT(id)) {
-        case HTML_MEDIA_PROP_NETWORK_EMPTY:
-            v = NETWORK_EMPTY;
-            break;
-        case HTML_MEDIA_PROP_NETWORK_IDLE:
-            v = NETWORK_IDLE;
-            break;
-        case HTML_MEDIA_PROP_NETWORK_LOADING:
-            v = NETWORK_LOADING;
-            break;
-        case HTML_MEDIA_PROP_NETWORK_NO_SOURCE:
-            v = NETWORK_NO_SOURCE;
-            break;
-        case HTML_MEDIA_PROP_HAVE_NOTHING:
-            v = HAVE_NOTHING;
-            break;
-        case HTML_MEDIA_PROP_HAVE_METADATA:
-            v = HAVE_METADATA;
-            break;
-        case HTML_MEDIA_PROP_HAVE_CURRENT_DATA:
-            v = HAVE_CURRENT_DATA;
-            break;
-        case HTML_MEDIA_PROP_HAVE_FUTURE_DATA:
-            v = HAVE_FUTURE_DATA;
-            break;
-        case HTML_MEDIA_PROP_HAVE_ENOUGH_DATA:
-            v = HAVE_ENOUGH_DATA;
-            break;
-        default:
-            return JS_TRUE;
-        }
-    }
-    *vp = INT_TO_JSVAL( v );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_preload)
-    GF_FieldInfo info;
-    HTML_MEDIA_JS_START
-    if (gf_node_get_attribute_by_name(n, "preload", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-        char *szAtt = gf_svg_dump_attribute(n, &info);
-        *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
-        if (szAtt) gf_free(szAtt);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_preload)
-    HTML_MEDIA_JS_START
-    if (JSVAL_CHECK_STRING(*vp)) {
-        char *str = SMJS_CHARS(c, *vp);
-        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "preload", str);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_buffered)
-    HTML_MEDIA_JS_START
-    *vp = OBJECT_TO_JSVAL( me->buffered._this );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_seeking)
-    HTML_MEDIA_JS_START
-    /* TODO: implement if for real */
-    *vp = BOOLEAN_TO_JSVAL( (me->seeking ? JS_TRUE : JS_FALSE) );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_current_time)
-    u32 time_ms = 0;
-    Double time_s;
-    GF_MediaObject *mo = NULL;
-    HTML_MEDIA_JS_START
-    mo = gf_html_media_object(n);
-    gf_mo_get_object_time(mo, &time_ms);
-    time_s = time_ms / 1000.0;
-    *vp = JS_MAKE_DOUBLE(c, time_s );
-    return JS_TRUE;
-}
-
-static GFINLINE Bool ScriptAction(GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
-{
-    if (scene->script_action) 
-    {
-        return scene->script_action(scene->script_action_cbck, type, node, param);
-    }
-    return GF_FALSE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_current_time)
-    double d;
-    GF_JSAPIParam par;
-    HTML_MEDIA_JS_START
-    if (!JSVAL_IS_NUMBER(*vp)) 
-    {
-        return 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;
-}
-
-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)
-    {
-        dur = video_stack->txh.last_frame_time;
-        dur /= 1000;
-    }*/
-    *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
-    /* TODO */
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_paused)
-    HTML_MEDIA_JS_START
-    *vp =( BOOLEAN_TO_JSVAL( (me->paused ? JS_TRUE : JS_FALSE) ) );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_default_playback_rate)
-    HTML_MEDIA_JS_START
-    *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, me->defaultPlaybackRate));
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_default_playback_rate)
-    jsdouble d;
-    HTML_MEDIA_JS_START
-    JS_ValueToNumber(c, *vp, &d);
-    me->defaultPlaybackRate = d;
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_playback_rate)
-    Double speed;
-    GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-    GF_MediaObject *mo = gf_html_media_object(n);
-    speed = gf_mo_get_current_speed(mo);
-    *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, speed));
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_playback_rate)
-    jsdouble d;
-    Fixed speed;
-    GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-    GF_MediaObject *mo = gf_html_media_object(n);
-    JS_ValueToNumber(c, *vp, &d);
-    speed = FLT2FIX(d);
-    gf_mo_set_speed(mo, speed);
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_played)
-    HTML_MEDIA_JS_START
-    *vp =( OBJECT_TO_JSVAL( me->played._this ) );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_seekable)
-    HTML_MEDIA_JS_START
-    *vp =( OBJECT_TO_JSVAL( me->seekable._this ) );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_ended)
-    GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
-    GF_MediaObject *mo = gf_html_media_object(n);
-    *vp = BOOLEAN_TO_JSVAL( gf_mo_is_done(mo) ? JS_TRUE : JS_FALSE);
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_autoplay)
-    GF_FieldInfo info;
-    HTML_MEDIA_JS_START
-    if (gf_node_get_attribute_by_name(n, "autoplay", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-        char *szAtt = gf_svg_dump_attribute(n, &info);
-        if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) 
-        {
-            *vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
-        } 
-        else
-        {
-            *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-        }
-        if (szAtt) gf_free(szAtt);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_autoplay)
-    HTML_MEDIA_JS_START
-    if (JSVAL_CHECK_STRING(*vp)) {
-        char *str = SMJS_CHARS(c, *vp);
-        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "autoplay", str);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_loop)
-    GF_FieldInfo info;
-    HTML_MEDIA_JS_START
-    /* TODO: gf_mo_get_loop */
-    if (gf_node_get_attribute_by_name(n, "loop", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-        char *szAtt = gf_svg_dump_attribute(n, &info);
-        if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) 
-        {
-            *vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
-        } 
-        else
-        {
-            *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-        }
-        if (szAtt) gf_free(szAtt);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_loop)
-    HTML_MEDIA_JS_START
-    if (JSVAL_CHECK_STRING(*vp)) {
-        char *str = SMJS_CHARS(c, *vp);
-        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "loop", str);
-        //TODO: use gf_mo_get_loop
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_mediagroup)
-    GF_FieldInfo info;
-    HTML_MEDIA_JS_START
-    if (gf_node_get_attribute_by_name(n, "mediagroup", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-        char *szAtt = gf_svg_dump_attribute(n, &info);
-        *vp =( STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) ) );
-        if (szAtt) gf_free(szAtt);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_mediagroup)
-    HTML_MEDIA_JS_START
-    if (JSVAL_CHECK_STRING(*vp)) {
-        char *str = SMJS_CHARS(c, *vp);
-        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "mediagroup", str);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_controller)
-    HTML_MEDIA_JS_START
-    if (me->controller) {
-        *vp = OBJECT_TO_JSVAL( me->controller->_this );
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_controller)
-    HTML_MEDIA_JS_START
-    me->controller = (GF_HTML_MediaController *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_controls)
-    GF_FieldInfo info;
-    HTML_MEDIA_JS_START
-    if (gf_node_get_attribute_by_name(n, "controls", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-        char *szAtt = gf_svg_dump_attribute(n, &info);
-        if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) 
-        {
-            *vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
-        } 
-        else
-        {
-            *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
-        }
-        if (szAtt) gf_free(szAtt);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_controls)
-    HTML_MEDIA_JS_START
-    if (JSVAL_CHECK_STRING(*vp)) {
-        char *str = SMJS_CHARS(c, *vp);
-        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "controls", str);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_volume)
-    Fixed volume = FIX_ONE;
-    SVG_video_stack *video_stack = NULL;
-    SVG_audio_stack *audio_stack = NULL;
-    HTML_MEDIA_JS_CHECK
-    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;
-    }
-    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_video_stack *video_stack = NULL;
-    SVG_audio_stack *audio_stack = NULL;
-    HTML_MEDIA_JS_CHECK
-    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;
-    }
-    if (audio_stack) {
-        JS_ValueToNumber(c, *vp, &volume);
-        audio_stack->input.intensity = FLT2FIX(volume);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_muted)
-    SVG_video_stack *video_stack = NULL;
-    SVG_audio_stack *audio_stack = NULL;
-    HTML_MEDIA_JS_CHECK
-    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;
-    }
-    if (audio_stack) {
-        *vp = BOOLEAN_TO_JSVAL(audio_stack->input.is_muted ? JS_TRUE : JS_FALSE);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_media_set_muted)
-    SVG_video_stack *video_stack = NULL;
-    SVG_audio_stack *audio_stack = NULL;
-    HTML_MEDIA_JS_CHECK
-    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;
-    }
-    if (audio_stack) {
-        audio_stack->input.is_muted = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE);
-    }
-    return JS_TRUE;
-}
-
-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);
-    }
-    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;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_audio_tracks)
-    HTML_MEDIA_JS_START
-    *vp =( OBJECT_TO_JSVAL( me->audioTracks._this ) );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_video_tracks)
-    HTML_MEDIA_JS_START
-    *vp =( OBJECT_TO_JSVAL( me->videoTracks._this ) );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_media_get_text_tracks)
-    HTML_MEDIA_JS_START
-    *vp =( OBJECT_TO_JSVAL( me->videoTracks._this ) );
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_time_ranges_get_length)
-    GF_HTML_MediaTimeRanges *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 JS_TRUE;
-    }
-    timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
-    if (!timeranges) 
-    {
-        return JS_TRUE;
-    }
-    if (JSVAL_IS_INT(argv[0])) {
-        u32 i = JSVAL_TO_INT(argv[0]);
-        double *start_value = (double *)gf_list_get(timeranges->times, 2*i);
-        if (!start_value) {
-            dom_throw_exception(c, GF_DOM_EXC_WRONG_DOCUMENT_ERR);
-            return JS_FALSE;
-        } else {
-            SMJS_SET_RVAL(DOUBLE_TO_JSVAL(JS_NewDouble(c, *start_value)));
-        }
-    }
-    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 JS_TRUE;
-    }
-    timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
-    if (!timeranges) 
-    {
-        return JS_TRUE;
-    }
-    if (JSVAL_IS_INT(argv[0])) {
-        u32 i = JSVAL_TO_INT(argv[0]);
-        double *start_value = (double *)gf_list_get(timeranges->times, 2*i+1);
-        if (!start_value) {
-            dom_throw_exception(c, GF_DOM_EXC_WRONG_DOCUMENT_ERR);
-            return JS_FALSE;
-        } else {
-            SMJS_SET_RVAL(DOUBLE_TO_JSVAL(JS_NewDouble(c, *start_value)));
-        }
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_length)
-    GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-    *vp = INT_TO_JSVAL( gf_list_count(tracklist->tracks) );
-    return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(html_track_list_get_track_by_id)
-{
-    SMJS_OBJ
-    SMJS_ARGS
-    char *str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, argv[0]) );
-    GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-    GF_HTML_Track *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;
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_property)
-    GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-    s32 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;
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_selected_index)
-    if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL)) {
-        GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
-        *vp = INT_TO_JSVAL(tracklist->selected_index);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_onchange)
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_track_list_set_onchange)
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_onaddtrack)
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_track_list_set_onaddtrack)
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_track_list_get_onremovetrack)
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_track_list_set_onremovetrack)
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(html_track_get_property)
-    if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL) ||
-        GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL) ||
-        GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackClass, NULL))
-    {
-        GF_HTML_Track *track = (GF_HTML_Track *)SMJS_GET_PRIVATE(c, obj);
-        if (!SMJS_ID_IS_INT(id)) {
-            return JS_TRUE;
-        }
-        switch (SMJS_ID_TO_INT(id)) {
-        case HTML_TRACK_PROP_ID:
-            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->id ? track->id : "") );
-            return JS_TRUE;
-        case HTML_TRACK_PROP_KIND:
-            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->kind ? track->kind : "") );
-            return JS_TRUE;
-        case HTML_TRACK_PROP_LABEL:
-            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->label ? track->label : "") );
-            return JS_TRUE;
-        case HTML_TRACK_PROP_LANGUAGE:
-            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->language ? track->language  : "") );
-            return JS_TRUE;
-        case HTML_TRACK_PROP_INBANDTYPE:
-            if (GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackClass, NULL)) 
-            {
-                *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->mime ? track->mime  : "") );
-                return JS_TRUE;
-            }
-        case HTML_TRACK_PROP_SELECTED:
-            if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL)) 
-            {
-                *vp = BOOLEAN_TO_JSVAL(track->enabled_or_selected ? JS_TRUE : JS_FALSE);
-            }
-            return JS_TRUE;
-        case HTML_TRACK_PROP_ENABLED:
-            if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL)) 
-            {
-                *vp = BOOLEAN_TO_JSVAL(track->enabled_or_selected ? JS_TRUE : JS_FALSE);
-            }
-            return JS_TRUE;
-        }
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(html_track_set_property)
-    if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL) ||
-        GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL) ||
-        GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackClass, NULL))
-    {
-        GF_HTML_Track *track = (GF_HTML_Track *)SMJS_GET_PRIVATE(c, obj);
-        if (!SMJS_ID_IS_INT(id)) {
-            return JS_TRUE;
-        }
-        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);
-            }
-            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);
-            }
-            return JS_TRUE;
-        }
-    }
-    return JS_TRUE;
-}
-
-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);
-        video = (SVG_video_stack *)n->sgprivate->UserPrivate;
-        if (!SMJS_ID_IS_INT(id)) {
-            return JS_TRUE;
-        }
-        switch (SMJS_ID_TO_INT(id)) {
-        case HTML_VIDEO_PROP_WIDTH:
-            if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-                SVG_Length *length;
-                length = (SVG_Length *)info.far_ptr;
-                *vp = INT_TO_JSVAL( FIX2FLT(length->value) );
-            }
-            return JS_TRUE;
-        case HTML_VIDEO_PROP_HEIGHT:
-            if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-                SVG_Length *length;
-                length = (SVG_Length *)info.far_ptr;
-                *vp = INT_TO_JSVAL( FIX2FLT(length->value) );
-            }
-            return JS_TRUE;
-        case HTML_VIDEO_PROP_VIDEOWIDTH:
-             *vp = INT_TO_JSVAL( video->txh.width );
-            return JS_TRUE;
-        case HTML_VIDEO_PROP_VIDEOHEIGHT:
-             *vp = INT_TO_JSVAL( video->txh.height );
-            return JS_TRUE;
-        case HTML_VIDEO_PROP_POSTER:
-            if (gf_node_get_attribute_by_name(n, "poster", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
-                char *szAtt = gf_svg_dump_attribute(n, &info);
-                *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
-                if (szAtt) gf_free(szAtt);
-            }
-            return JS_TRUE;
-        }
-    }
-    return JS_TRUE;
-}
-
-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 JS_TRUE;
-        }
-        switch (SMJS_ID_TO_INT(id)) {
-        case HTML_VIDEO_PROP_WIDTH:
-            /* TODO: change value and dirty node */
-            return JS_TRUE;
-        case HTML_VIDEO_PROP_HEIGHT:
-            /* TODO: change value and dirty node */
-            return JS_TRUE;
-        case HTML_VIDEO_PROP_POSTER:
-            {
-                char *str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, *vp) );
-                gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "poster", str);
-                SMJS_FREE(c, str);
-                return JS_TRUE;
-            }
-        }
-    }
-    return JS_TRUE;
-}
-
-void html_media_source_init_js_api(JSContext *js_ctx, JSObject *global, GF_HTML_MediaRuntime *html_media_rt);
-
-void html_media_init_js_api(GF_SceneGraph *scene)
-{
-    /* HTML Media Element */
-    if (!html_media_rt) {
-        GF_SAFEALLOC(html_media_rt, GF_HTML_MediaRuntime);
-
-        /* Setting up MediaError class (no constructor, no finalizer) */
-        JS_SETUP_CLASS(html_media_rt->mediaErrorClass, "MediaError", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-        {
-            JSPropertySpec mediaErrorClassProps[] = {
-                {"MEDIA_ERR_ABORTED",           MEDIA_ERROR_PROP_ABORTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-                {"MEDIA_ERR_NETWORK",           MEDIA_ERROR_PROP_NETWORK,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-                {"MEDIA_ERR_DECODE",            MEDIA_ERROR_PROP_DECODE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-                {"MEDIA_ERR_SRC_NOT_SUPPORTED", MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-                {"code",                        MEDIA_ERROR_PROP_CODE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec mediaErrorClassFuncs[] = {
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->mediaErrorClass, 0, 0, mediaErrorClassProps, mediaErrorClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] MediaError class initialized\n"));
-        }
-
-        /* Setting up TimeRanges class (no constructor, no finalizer) */
-        JS_SETUP_CLASS(html_media_rt->timeRangesClass, "TimeRanges", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-        {
-            JSPropertySpec timeRangesClassProps[] = {
-                {"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_time_ranges_get_length, 0},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec timeRangesClassFuncs[] = {
-                SMJS_FUNCTION_SPEC("start",                 html_time_ranges_start, 1),
-                SMJS_FUNCTION_SPEC("end",                   html_time_ranges_end, 1),
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->timeRangesClass, 0, 0, timeRangesClassProps, timeRangesClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TimeRanges class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->audioTrackClass, "AudioTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
-        {
-            JSPropertySpec audioTrackClassProps[] = {
-                {"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"kind",             HTML_TRACK_PROP_KIND,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"label",            HTML_TRACK_PROP_LABEL,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"language",         HTML_TRACK_PROP_LANGUAGE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"enabled",          HTML_TRACK_PROP_SELECTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec audioTrackClassFuncs[] = {
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->audioTrackClass, 0, 0, audioTrackClassProps, audioTrackClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] AudioTrack class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->videoTrackClass, "VideoTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
-        {
-            JSPropertySpec videoTrackClassProps[] = {
-                {"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"kind",             HTML_TRACK_PROP_KIND,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"label",            HTML_TRACK_PROP_LABEL,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"language",         HTML_TRACK_PROP_LANGUAGE,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"selected",         HTML_TRACK_PROP_SELECTED,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec videoTrackClassFuncs[] = {
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->videoTrackClass, 0, 0, videoTrackClassProps, videoTrackClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] VideoTrack class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->textTrackClass, "TextTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
-        {
-            JSPropertySpec textTrackClassProps[] = {
-                {"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"kind",             HTML_TRACK_PROP_KIND,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"label",            HTML_TRACK_PROP_LABEL,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"language",         HTML_TRACK_PROP_LANGUAGE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"inBandMetadataTrackDispatchType",         HTML_TRACK_PROP_INBANDTYPE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec textTrackClassFuncs[] = {
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->textTrackClass, 0, 0, textTrackClassProps, textTrackClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TextTrack class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->audioTrackListClass, "AudioTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
-        {
-            JSPropertySpec audioTrackListClassProps[] = {
-                {"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
-                {"onchange",             0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onchange, html_track_list_set_onchange},
-                {"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
-                {"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec audioTrackListClassFuncs[] = {
-                SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->audioTrackListClass, 0, 0, audioTrackListClassProps, audioTrackListClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] AudioTrackList class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->videoTrackListClass, "VideoTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
-        {
-            JSPropertySpec videoTrackListClassProps[] = {
-                {"selectedIndex",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_selected_index, 0},
-                {"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
-                {"onchange",             0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onchange, html_track_list_set_onchange},
-                {"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
-                {"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec videoTrackListClassFuncs[] = {
-                SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->videoTrackListClass, 0, 0, videoTrackListClassProps, videoTrackListClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] VideoTrackList class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->textTrackListClass, "TextTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
-        {
-            JSPropertySpec textTrackListClassProps[] = {
-                {"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
-                {"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
-                {"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec textTrackListClassFuncs[] = {
-                SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->textTrackListClass, 0, 0, textTrackListClassProps, textTrackListClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TextTrackList class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->mediaControllerClass, "MediaController", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-        {
-            JSPropertySpec mediaControllerClassProps[] = {
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec mediaControllerClassFuncs[] = {
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->mediaControllerClass, 0, 0, mediaControllerClassProps, mediaControllerClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] MediaController class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->htmlMediaElementClass, "HTMLMediaElement", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
-        {
-            JSPropertySpec htmlMediaElementClassProps[] = {
-                {"error",               HTML_MEDIA_PROP_ERROR,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_error, 0},
-                {"src",                 HTML_MEDIA_PROP_SRC,          JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , html_media_get_src, html_media_set_src},
-                {"currentSrc",          HTML_MEDIA_PROP_CURRENTSRC,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_src, 0},
-                {"crossOrigin",         HTML_MEDIA_PROP_CROSSORIGIN,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_cors, html_media_set_cors},
-                {"NETWORK_EMPTY",       HTML_MEDIA_PROP_NETWORK_EMPTY,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"NETWORK_IDLE",        HTML_MEDIA_PROP_NETWORK_IDLE,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"NETWORK_LOADING",     HTML_MEDIA_PROP_NETWORK_LOADING,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"NETWORK_NO_SOURCE",   HTML_MEDIA_PROP_NETWORK_NO_SOURCE,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"networkState",        HTML_MEDIA_PROP_NETWORKSTATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_network_state, 0},
-                {"preload",             HTML_MEDIA_PROP_PRELOAD,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_preload, html_media_set_preload},
-                {"buffered",            HTML_MEDIA_PROP_BUFFERED,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_buffered, 0},
-                {"HAVE_NOTHING",        HTML_MEDIA_PROP_HAVE_NOTHING,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"HAVE_METADATA",       HTML_MEDIA_PROP_HAVE_METADATA,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"HAVE_CURRENT_DATA",   HTML_MEDIA_PROP_HAVE_CURRENT_DATA, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"HAVE_FUTURE_DATA",    HTML_MEDIA_PROP_HAVE_FUTURE_DATA,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"HAVE_ENOUGH_DATA",    HTML_MEDIA_PROP_HAVE_ENOUGH_DATA,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
-                {"readyState",          HTML_MEDIA_PROP_READYSTATE,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_ready_state, 0},
-                {"seeking",             HTML_MEDIA_PROP_SEEKING,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_seeking, 0},
-                {"currentTime",         HTML_MEDIA_PROP_CURRENTTIME,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_current_time, html_media_set_current_time},
-                {"duration",            HTML_MEDIA_PROP_DURATION,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_duration, 0},
-                {"startDate",           HTML_MEDIA_PROP_STARTDATE,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_start_date, 0},
-                {"paused",              HTML_MEDIA_PROP_PAUSED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_paused, 0},
-                {"defaultPlaybackRate", HTML_MEDIA_PROP_DEFAULTPLAYBACKRATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_default_playback_rate, html_media_set_default_playback_rate},
-                {"playbackRate",        HTML_MEDIA_PROP_PLAYBACKRATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_playback_rate, html_media_set_playback_rate},
-                {"played",              HTML_MEDIA_PROP_PLAYED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_played, 0},
-                {"seekable",            HTML_MEDIA_PROP_SEEKABLE,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_seekable, 0},
-                {"ended",               HTML_MEDIA_PROP_ENDED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_ended, 0},
-                {"autoplay",            HTML_MEDIA_PROP_AUTOPLAY,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_autoplay, html_media_set_autoplay},
-                {"loop",                HTML_MEDIA_PROP_LOOP,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_loop, html_media_set_loop},
-                {"mediaGroup",          HTML_MEDIA_PROP_MEDIAGROUP,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_mediagroup, html_media_set_mediagroup},
-                {"controller",          HTML_MEDIA_PROP_CONTROLLER,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_controller, html_media_set_controller},
-                {"controls",            HTML_MEDIA_PROP_CONTROLS,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_controls, html_media_set_controls},
-                {"volume",              HTML_MEDIA_PROP_VOLUME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_volume, html_media_set_volume},
-                {"muted",               HTML_MEDIA_PROP_MUTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_muted, html_media_set_muted},
-                {"defaultMuted",        HTML_MEDIA_PROP_DEFAULTMUTED, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_default_muted, html_media_set_default_muted},
-                {"audioTracks",         HTML_MEDIA_PROP_AUDIOTRACKS,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_audio_tracks, 0},
-                {"videoTracks",         HTML_MEDIA_PROP_VIDEOTRACKS,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_video_tracks, 0},
-                {"textTracks",          HTML_MEDIA_PROP_TEXTTRACKS,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_text_tracks, 0},
-                {0, 0, 0, 0, 0}
-            };
-            JSBool SMJS_FUNCTION(svg_udom_smil_pause);
-            JSBool SMJS_FUNCTION(svg_udom_smil_begin);
-            JSBool SMJS_FUNCTION(svg_udom_smil_end);
-            JSFunctionSpec htmlMediaElementClassFuncs[] = {
-                SMJS_FUNCTION_SPEC("load",                  html_media_load, 0),
-                SMJS_FUNCTION_SPEC("canPlayType",           html_media_canPlayType, 1),
-                SMJS_FUNCTION_SPEC("fastSeek",              html_media_fastSeek, 1),
-                SMJS_FUNCTION_SPEC("play",                  svg_udom_smil_begin, 0),
-                SMJS_FUNCTION_SPEC("pause",                 svg_udom_smil_pause, 0),
-                SMJS_FUNCTION_SPEC("addTextTrack",          html_media_addTextTrack, 1),
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            JSObject *elt_proto = dom_js_get_element_proto(scene->svg_js->js_ctx);
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, elt_proto, &html_media_rt->htmlMediaElementClass, 0, 0, htmlMediaElementClassProps, htmlMediaElementClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLMediaElement class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->htmlVideoElementClass, "HTMLVideoElement", JSCLASS_HAS_PRIVATE, html_video_get_property, html_video_set_property, dom_element_finalize);
-        {
-            JSPropertySpec htmlVideoElementClassProps[] = {
-                {"width",       HTML_VIDEO_PROP_WIDTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
-                {"height",      HTML_VIDEO_PROP_HEIGHT,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
-                {"videoWidth",  HTML_VIDEO_PROP_VIDEOWIDTH,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"videoHeight", HTML_VIDEO_PROP_VIDEOHEIGHT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
-                {"poster",      HTML_VIDEO_PROP_POSTER,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec htmlVideoElementClassFuncs[] = {
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt->htmlMediaElementClass._proto, &html_media_rt->htmlVideoElementClass, 0, 0, htmlVideoElementClassProps, htmlVideoElementClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLVideoElement class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->htmlAudioElementClass, "HTMLAudioElement", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, dom_element_finalize);
-        {
-            JSPropertySpec htmlAudioElementClassProps[] = {
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec htmlAudioElementClassFuncs[] = {
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt->htmlMediaElementClass._proto, &html_media_rt->htmlAudioElementClass, 0, 0, htmlAudioElementClassProps, htmlAudioElementClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLAudioElement class initialized\n"));
-        }
-        html_media_source_init_js_api(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt);
-    }
-}
-#endif  /*GPAC_HAS_SPIDERMONKEY*/
-
-#endif  /*GPAC_DISABLE_SVG*/
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato
+ *          Copyright (c) Telecom ParisTech 2007-2012
+ *          All rights reserved
+ *
+ *  This file is part of GPAC / Scene Graph sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <gpac/internal/scenegraph_dev.h>
+
+/*base SVG type*/
+#include <gpac/nodes_svg.h>
+/*dom events*/
+#include <gpac/events.h>
+/*dom text event*/
+#include <gpac/utf.h>
+
+#include <gpac/download.h>
+#include <gpac/network.h>
+#include <gpac/xml.h>
+
+#ifndef GPAC_DISABLE_SVG
+
+
+#ifdef GPAC_ANDROID
+#ifndef XP_UNIX
+#define XP_UNIX
+#endif /* XP_UNIX */
+#endif
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+#include <gpac/internal/smjs_api.h>
+#include <gpac/html5_media.h>
+
+/***********************************************************
+ *
+ * DOM generic functions being used 
+ *
+ ***********************************************************/
+#ifdef USE_FFDEV_15
+void dom_element_finalize(JSFreeOp *fop, JSObject *obj);
+void dom_document_finalize(JSFreeOp *fop, JSObject *obj);
+#else
+void dom_element_finalize(JSContext *c, JSObject *obj);
+void dom_document_finalize(JSContext *c, JSObject *obj);
+#endif
+char *js_get_utf8(jsval val);
+
+
+void gf_svg_set_attributeNS(GF_Node *n, u32 ns_code, char *name, char *val);
+
+#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
+
+/* including terminal dev for MediaObject */
+
+#include <gpac/internal/terminal_dev.h>
+
+/* including Compositor dev for TextureHandler and AudioInput */
+#include <gpac/internal/compositor_dev.h>
+
+static GF_HTML_MediaRuntime *html_media_rt = NULL;
+
+/* Enumeration of the property codes for use in JS Bindings for the the HTML5 MediaError interface */
+typedef enum
+{
+    MEDIA_ERROR_PROP_ABORTED            = -1,
+    MEDIA_ERROR_PROP_NETWORK            = -2,
+    MEDIA_ERROR_PROP_DECODE             = -3,
+    MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED  = -4,
+    MEDIA_ERROR_PROP_CODE               = -5
+} GF_HTML_MediaErrorPropEnum;
+
+/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLMediaElement interface */
+typedef enum 
+{
+    HTML_MEDIA_PROP_SRC                         = -1,
+    HTML_MEDIA_PROP_CURRENTSRC                  = -2,
+    HTML_MEDIA_PROP_CROSSORIGIN                 = -3,
+    HTML_MEDIA_PROP_NETWORKSTATE                = -4,
+    HTML_MEDIA_PROP_PRELOAD                     = -5,
+    HTML_MEDIA_PROP_BUFFERED                    = -6,
+    HTML_MEDIA_PROP_READYSTATE                  = -7,
+    HTML_MEDIA_PROP_SEEKING                     = -8,
+    HTML_MEDIA_PROP_CURRENTTIME                 = -9,
+    HTML_MEDIA_PROP_DURATION                    = -10,
+    HTML_MEDIA_PROP_STARTDATE                   = -11,
+    HTML_MEDIA_PROP_PAUSED                      = -12,
+    HTML_MEDIA_PROP_DEFAULTPLAYBACKRATE         = -13,
+    HTML_MEDIA_PROP_PLAYBACKRATE                = -14,
+    HTML_MEDIA_PROP_PLAYED                      = -15,
+    HTML_MEDIA_PROP_SEEKABLE                    = -16,
+    HTML_MEDIA_PROP_ENDED                       = -17,
+    HTML_MEDIA_PROP_AUTOPLAY                    = -18,
+    HTML_MEDIA_PROP_LOOP                        = -19,
+    HTML_MEDIA_PROP_MEDIAGROUP                  = -20,
+    HTML_MEDIA_PROP_CONTROLLER                  = -21,
+    HTML_MEDIA_PROP_CONTROLS                    = -22,
+    HTML_MEDIA_PROP_VOLUME                      = -23,
+    HTML_MEDIA_PROP_MUTED                       = -24,
+    HTML_MEDIA_PROP_DEFAULTMUTED                = -25,
+    HTML_MEDIA_PROP_AUDIOTRACKS                 = -26,
+    HTML_MEDIA_PROP_VIDEOTRACKS                 = -27,
+    HTML_MEDIA_PROP_TEXTTRACKS                  = -28,
+    HTML_MEDIA_PROP_NETWORK_EMPTY               = -29,
+    HTML_MEDIA_PROP_NETWORK_IDLE                = -30,
+    HTML_MEDIA_PROP_NETWORK_LOADING             = -31,
+    HTML_MEDIA_PROP_NETWORK_NO_SOURCE           = -32,
+    HTML_MEDIA_PROP_HAVE_NOTHING                = -33,
+    HTML_MEDIA_PROP_HAVE_METADATA               = -34,
+    HTML_MEDIA_PROP_HAVE_CURRENT_DATA           = -35,
+    HTML_MEDIA_PROP_HAVE_FUTURE_DATA            = -36,
+    HTML_MEDIA_PROP_HAVE_ENOUGH_DATA            = -37,
+    HTML_MEDIA_PROP_ERROR                       = -38
+} GF_HTML_MediaEltPropEnum;
+
+/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLVideoElement interface */
+typedef enum {
+    HTML_VIDEO_PROP_WIDTH                       = -1,
+    HTML_VIDEO_PROP_HEIGHT                      = -2,
+    HTML_VIDEO_PROP_VIDEOWIDTH                  = -3,
+    HTML_VIDEO_PROP_VIDEOHEIGHT                 = -4,
+    HTML_VIDEO_PROP_POSTER                      = -5
+} GF_HTML_VideoEltPropEnum;
+
+/* Enumeration of the property codes for use in JS Bindings for the the HTML5 HTMLTrackElement interface */
+typedef enum {
+    HTML_TRACK_PROP_ID                          = -1,
+    HTML_TRACK_PROP_KIND                        = -2,
+    HTML_TRACK_PROP_LABEL                       = -3,
+    HTML_TRACK_PROP_LANGUAGE                    = -4,
+    HTML_TRACK_PROP_SELECTED                    = -5,
+    HTML_TRACK_PROP_ENABLED                     = -6,
+    HTML_TRACK_PROP_INBANDTYPE                  = -7
+} GF_HTML_TrackPropEnum;
+
+#define HTML_MEDIA_JS_CHECK     GF_HTML_MediaElement *me; \
+                                GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj); \
+                                if (!n || (n->sgprivate->tag != TAG_SVG_video && n->sgprivate->tag != TAG_SVG_audio)) \
+                                { \
+									return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
+                                } \
+                                me = (GF_HTML_MediaElement *)html_media_element_get_from_node(c, n); \
+                                if (!me) { \
+									return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
+                                }
+
+#define HTML_MEDIA_JS_START     HTML_MEDIA_JS_CHECK
+
+/* Structure copied over from svg_media.c
+   TODO : fix this - remove the copy */
+typedef struct
+{
+	GF_TextureHandler txh;
+	struct _drawable *graph;
+	MFURL txurl;	
+	Bool first_frame_fetched;
+	GF_Node *audio;
+	Bool audio_dirty;
+	Bool stop_requested;
+} SVG_video_stack;
+
+/* Structure copied over from svg_media.c
+   TODO : fix this - remove the copy */
+typedef struct
+{
+	GF_AudioInput input;
+	Bool is_active, is_error;
+	MFURL aurl;
+} SVG_audio_stack;
+
+/* Gets the GF_MediaObject associated with this node
+ *
+ *  \param n the node either an SVG/HTML5 video or audio element
+ *  \return the GF_MediaObject attached to this node or null if none
+ */
+static GF_MediaObject *gf_html_media_object(GF_Node *n)
+{
+    GF_MediaObject *mo = NULL;
+    if (n->sgprivate->tag == TAG_SVG_video)
+    {
+        SVG_video_stack *video_stack;
+        video_stack = (SVG_video_stack *)n->sgprivate->UserPrivate;
+        mo = video_stack->txh.stream;
+    }
+    else if (n->sgprivate->tag == TAG_SVG_audio)
+    {
+        SVG_audio_stack *audio_stack;
+        audio_stack = (SVG_audio_stack *)n->sgprivate->UserPrivate;
+        mo = audio_stack->input.stream;
+    }
+    return mo;
+}
+
+static void gf_html_track_init_js(GF_HTML_Track *track, JSContext *c, GF_HTML_TrackList *tracklist)
+{
+    JSObject *track_obj;
+    track->c     = c;
+    if (track->type == HTML_MEDIA_TRACK_TYPE_AUDIO) 
+    {
+        track_obj = JS_NewObject(c, &html_media_rt->audioTrackClass._class, NULL, tracklist->_this);
+    } 
+    else if (track->type == HTML_MEDIA_TRACK_TYPE_VIDEO) 
+    {
+        track_obj = JS_NewObject(c, &html_media_rt->videoTrackClass._class, NULL, tracklist->_this);
+    } 
+    else if (track->type == HTML_MEDIA_TRACK_TYPE_TEXT) 
+    {
+        track_obj = JS_NewObject(c, &html_media_rt->textTrackClass._class, NULL, tracklist->_this);
+    }
+    else 
+    {
+        return;
+    }
+    track->_this = track_obj;
+    SMJS_SET_PRIVATE(c, track->_this, track);
+}
+
+/* Not yet used, removed for GCC warning
+static void gf_html_media_controller_init_js(GF_HTML_MediaController *mc, JSContext *c)
+{
+    mc->c            = c;
+    mc->_this        = JS_NewObject(c, &html_media_rt->mediaControllerClass._class, NULL, NULL);
+    SMJS_SET_PRIVATE(c, mc->_this, mc);
+    mc->buffered->c              = c;
+    mc->buffered->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
+    SMJS_SET_PRIVATE(c, mc->buffered->_this, mc->buffered);
+    mc->played->c                = c;
+    mc->played->_this            = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
+    SMJS_SET_PRIVATE(c, mc->played->_this, mc->played);
+    mc->seekable->c              = c;
+    mc->seekable->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, mc->_this);
+    SMJS_SET_PRIVATE(c, mc->seekable->_this, mc->seekable);
+}
+*/
+
+static void gf_html_media_element_init_js(GF_HTML_MediaElement *me, JSContext *c, JSObject *node_obj)
+{
+    me->c                       = c;
+    me->_this                   = JS_NewObject(c, &html_media_rt->htmlMediaElementClass._class, NULL, node_obj);
+    SMJS_SET_PRIVATE(c, me->_this, me);
+
+    me->error.c                 = c;
+    me->error._this             = JS_NewObject(c, &html_media_rt->mediaErrorClass._class, NULL, me->_this);
+    SMJS_SET_PRIVATE(c, me->error._this, &me->error);
+
+    me->audioTracks.c           = c;
+    me->audioTracks._this       = JS_NewObject(c, &html_media_rt->audioTrackListClass._class, NULL, me->_this);
+    SMJS_SET_PRIVATE(c, me->audioTracks._this, &me->audioTracks);
+
+    me->videoTracks.c           = c;
+    me->videoTracks._this       = JS_NewObject(c, &html_media_rt->videoTrackListClass._class, NULL, me->_this);
+    SMJS_SET_PRIVATE(c, me->videoTracks._this, &me->videoTracks);
+
+    me->textTracks.c            = c;
+    me->textTracks._this        = JS_NewObject(c, &html_media_rt->textTrackListClass._class, NULL, me->_this);
+    SMJS_SET_PRIVATE(c, me->textTracks._this, &me->textTracks);
+
+    me->buffered->c              = c;
+    me->buffered->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
+    SMJS_SET_PRIVATE(c, me->buffered->_this, me->buffered);
+
+    me->played->c                = c;
+    me->played->_this            = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
+    SMJS_SET_PRIVATE(c, me->played->_this, me->played);
+
+    me->seekable->c              = c;
+    me->seekable->_this          = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, me->_this);
+    SMJS_SET_PRIVATE(c, me->seekable->_this, me->seekable);
+}
+
+/* Function to browse the tracks in the MediaObject associated with the Media Element and to create appropriate HTML Track objects 
+ * 
+ * \param c The JavaScript Context to create the new JS object
+ * \param me the HTMLMediaElement to update 
+ */
+static void html_media_element_populate_tracks(JSContext *c, GF_HTML_MediaElement *me)
+{
+    GF_HTML_Track *track;
+	GF_MediaObject *mo;
+    GF_ClientService *service;
+    GF_Scene *scene;
+    u32 i, count;
+
+	if (!me || !me->node) {
+		return;
+	}
+	mo = gf_html_media_object(me->node);
+	if (!mo || !mo->odm || !mo->odm->net_service || !mo->odm->parentscene) {
+		return;
+	}
+	service = mo->odm->net_service;
+	scene = mo->odm->parentscene;
+
+	count = gf_list_count(scene->resources);
+    for (i=0; i<count; i++) {
+        u32 j;
+        GF_ObjectManager *odm = (GF_ObjectManager *)gf_list_get(scene->resources, i);
+        if (odm->net_service != service) continue;
+        if (!odm->mo || !odm->OD) continue;
+        for (j = 0; j < gf_list_count(odm->OD->ESDescriptors); j++)
+        {
+            char id[256];
+            char *lang = "";
+            GF_ESD *esd = (GF_ESD *)gf_list_get(odm->OD->ESDescriptors, j);
+            sprintf(id, "track%d", esd->ESID);
+            if (esd->langDesc) 
+            {
+                lang  = "";
+            }
+            switch(odm->mo->type)
+            {
+            case GF_MEDIA_OBJECT_VIDEO:
+                if (!html_media_tracklist_has_track(&me->videoTracks, id))
+                {
+                    track = html_media_add_new_track_to_list(&me->videoTracks, HTML_MEDIA_TRACK_TYPE_VIDEO, 
+                                                                "video/mp4", GF_TRUE, id, "myKind", "myLabel", lang);
+                    gf_html_track_init_js(track, c, &me->videoTracks);
+                }
+                break;
+            case GF_MEDIA_OBJECT_AUDIO:
+                if (!html_media_tracklist_has_track(&me->audioTracks, id))
+                {
+                    track = html_media_add_new_track_to_list(&me->audioTracks, HTML_MEDIA_TRACK_TYPE_AUDIO, 
+                                                            "audio/mp4", GF_TRUE, id, "myKind", "myLabel", lang);
+                    gf_html_track_init_js(track, c, &me->audioTracks);
+                }
+                break;
+            case GF_MEDIA_OBJECT_TEXT:
+                if (!html_media_tracklist_has_track(&me->textTracks, id))
+                {
+                    track = html_media_add_new_track_to_list(&me->textTracks, HTML_MEDIA_TRACK_TYPE_TEXT, 
+                                                                "text/plain", GF_TRUE, id, "myKind", "myLabel", lang);
+                    gf_html_track_init_js(track, c, &me->textTracks);
+                }
+                break;
+            }
+        }
+    }
+}
+
+/* Used to retrieve the structure implementing the GF_HTML_MediaElement interface associated with this node
+ * Usually this is done with the private stack of the node (see gf_node_get_private), but in this case,
+ * the stack already contains the rendering stack SVG_video_stack.
+ * So, we store the structure implementing the GF_HTML_MediaElement interface in the JavaScript context of this node,
+ * as a non enumeratable property named 'gpac_me_impl'
+ *
+ *  \param c the global JavaScript context 
+ *  \param n the audio or video node
+ *  \return the GF_HTML_MediaElement associated with this node in the given context
+ */
+static GF_HTML_MediaElement *html_media_element_get_from_node(JSContext *c, GF_Node *n)
+{
+    jsval vp;
+    JSObject *me_obj;
+    JSObject *node_obj;
+    GF_HTML_MediaElement *me = NULL;
+
+    if ((n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) && n->sgprivate->interact && n->sgprivate->interact->js_binding) {
+		node_obj = (JSObject *)n->sgprivate->interact->js_binding->node;
+		if (node_obj) {
+			JS_GetProperty(c, node_obj, "gpac_me_impl", &vp);
+			me_obj = JSVAL_TO_OBJECT(vp);
+			me = (GF_HTML_MediaElement *)SMJS_GET_PRIVATE(c, me_obj);
+		}
+	}
+    return me;
+}
+
+static JSBool SMJS_FUNCTION(html_media_load)
+{
+    SMJS_OBJ
+    if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
+    {
+		MFURL mfurl;
+		GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+		GF_HTML_MediaElement *me = html_media_element_get_from_node(c, n);
+		mfurl.count = 1;
+		mfurl.vals = (SFURL *)gf_malloc(sizeof(SFURL));
+		mfurl.vals[0].url = me->currentSrc;
+		mfurl.vals[0].OD_ID = GF_MEDIA_EXTERNAL_ID;
+		gf_mo_register(n, &mfurl, GF_FALSE, GF_FALSE);
+		gf_free(mfurl.vals);
+	    return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static JSBool SMJS_FUNCTION(html_media_canPlayType)
+{
+    SMJS_OBJ
+    if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
+    {
+	    return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static JSBool SMJS_FUNCTION(html_media_fastSeek)
+{
+    SMJS_OBJ
+    if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
+    {
+	    return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static JSBool SMJS_FUNCTION(html_media_addTextTrack)
+{
+    SMJS_OBJ
+    if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL))
+    {
+	    return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+void *html_get_element_class(GF_Node *n)
+{
+    if (!n || !html_media_rt)  
+    {
+        return NULL;
+    } else if (n->sgprivate->tag == TAG_SVG_video) {
+        return &html_media_rt->htmlVideoElementClass;
+    } else if (n->sgprivate->tag == TAG_SVG_audio) {
+        return &html_media_rt->htmlAudioElementClass;
+    } else {
+        return NULL;
+    }
+}
+
+/* Creates the GF_HTML_MediaElement structure for this node
+ * Store it in the JavaScript context of this node, as a non enumeratable property named 'gpac_me_impl'
+ * see \ref html_media_element_get_from_node for retrieving it
+ *
+ *  \param c the global JavaScript context 
+ *  \param n the audio or video node
+ *  \param node_obj the JavaScript object representing the audio or video node
+ */
+void html_media_element_js_init(JSContext *c, JSObject *node_obj, GF_Node *n)
+{
+    if (n->sgprivate->tag == TAG_SVG_video || n->sgprivate->tag == TAG_SVG_audio) {
+        GF_HTML_MediaElement *me;
+        me = gf_html_media_element_new(n, NULL);
+        gf_html_media_element_init_js(me, c, node_obj);
+        /* To be able to retrieve the Media Element interface from the Node element */
+        JS_DefineProperty(c, node_obj, "gpac_me_impl", OBJECT_TO_JSVAL(me->_this), 0, 0, JSPROP_READONLY | JSPROP_PERMANENT);
+    }
+}
+
+/* Deletes the GF_HTML_MediaElement structure for this node
+ *
+ *  \param c the global JavaScript context 
+ *  \param n the audio or video node
+ */
+void html_media_element_js_finalize(JSContext *c, GF_Node *n)
+{
+    GF_HTML_MediaElement *me = html_media_element_get_from_node(c, n);
+    /* TODO: finalize child objects */
+    gf_html_media_element_del(me);
+}
+
+/* Gets The EventTarget and SceneGraph from the GF_HTML_MediaElement structure for a audio/video JS node
+ *
+ *  \param c the global JavaScript context 
+ *  \param obj the JS object representing the HTMLAudioElement or HTMLVideoElement
+ *  \param target the GF_DOMEventTarget object
+ *  \param sg the scene graph
+ */
+void gf_html_media_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg) {
+	if (!sg || !target) return;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+		GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL) ) {
+		GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+		*target = gf_dom_event_get_target_from_node(n);
+		*sg = n->sgprivate->scenegraph;
+	} else {
+		*target = NULL;
+		*sg = NULL;
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_error_get_code)
+    if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaErrorClass, NULL))
+    {
+        GF_HTML_MediaError *error = (GF_HTML_MediaError*)SMJS_GET_PRIVATE(c, obj);
+        if (!SMJS_ID_IS_INT(id)) {
+            return JS_TRUE;
+        }
+        switch (SMJS_ID_TO_INT(id))
+        {
+        case MEDIA_ERROR_PROP_ABORTED:
+            *vp = INT_TO_JSVAL(MEDIA_ERR_ABORTED);
+            return JS_TRUE;
+        case MEDIA_ERROR_PROP_NETWORK:
+            *vp = INT_TO_JSVAL(MEDIA_ERR_NETWORK);
+            return JS_TRUE;
+        case MEDIA_ERROR_PROP_DECODE:
+            *vp = INT_TO_JSVAL(MEDIA_ERR_DECODE);
+            return JS_TRUE;
+        case MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED:
+            *vp = INT_TO_JSVAL(MEDIA_ERR_SRC_NOT_SUPPORTED);
+            return JS_TRUE;
+        case MEDIA_ERROR_PROP_CODE:
+            *vp = INT_TO_JSVAL(error->code);
+            return JS_TRUE;
+        }
+	    return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_error)
+    HTML_MEDIA_JS_START
+    *vp = OBJECT_TO_JSVAL(me->error._this);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_src)
+    GF_FieldInfo info; 
+    HTML_MEDIA_JS_START
+    if (gf_node_get_attribute_by_name(n, "href", GF_XMLNS_XLINK, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+        char *szAtt = gf_svg_dump_attribute(n, &info);
+        *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
+        if (szAtt) gf_free(szAtt);
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_src)
+    HTML_MEDIA_JS_START
+    if (JSVAL_CHECK_STRING(*vp)) {
+        char *str = SMJS_CHARS(c, *vp);
+        gf_svg_set_attributeNS(n, GF_XMLNS_XLINK, "href", str);
+	    return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_cors)
+    GF_FieldInfo info; 
+    HTML_MEDIA_JS_START
+    if (gf_node_get_attribute_by_name(n, "crossorigin", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+        char *szAtt = gf_svg_dump_attribute(n, &info);
+        *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
+        if (szAtt) gf_free(szAtt);
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_cors)
+    HTML_MEDIA_JS_START
+    if (JSVAL_CHECK_STRING(*vp)) {
+        char *str = SMJS_CHARS(c, *vp);
+        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "crossorigin", str);
+	    return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+void media_event_collect_info(GF_ClientService *net, GF_ObjectManager *odm, GF_DOMMediaEvent *media_event, u32 *min_time, u32 *min_buffer);
+
+static void html_media_get_states(GF_MediaObject *mo, GF_HTML_MediaReadyState *readyState, GF_HTML_NetworkState *networkState)
+{
+    GF_DOMMediaEvent media_event;
+    u32 min_time;
+    u32 min_buffer;
+    if (!mo) return;
+
+	if (!mo->odm) {
+        *readyState = HAVE_NOTHING;
+        *networkState = NETWORK_EMPTY;
+		return;
+    }
+
+    memset(&media_event, 0, sizeof(GF_DOMMediaEvent));
+    media_event_collect_info(mo->odm->net_service, mo->odm, &media_event, &min_time, &min_buffer);
+    //GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] min_time: %d, min_buffer: %d loaded: "LLD"/"LLD"\n", 
+    //                                                    min_time, min_buffer, media_event.loaded_size, media_event.total_size));
+    if (min_buffer == 0)
+    {
+        *readyState = HAVE_NOTHING;
+        *networkState = NETWORK_EMPTY;
+    }
+    else
+    {
+        if (media_event.loaded_size != 0)
+        {
+            *readyState = HAVE_METADATA;
+        }
+        else if (media_event.loaded_size == media_event.total_size)
+        {
+            *readyState = HAVE_ENOUGH_DATA;
+        }
+    }
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_ready_state)
+    GF_HTML_MediaReadyState readyState = HAVE_NOTHING;
+    GF_HTML_NetworkState networkState = NETWORK_EMPTY;
+    GF_MediaObject *mo = NULL;
+    HTML_MEDIA_JS_START
+    html_media_element_populate_tracks(c, me);
+    mo = gf_html_media_object(n);
+    html_media_get_states(mo, &readyState, &networkState);
+    *vp = INT_TO_JSVAL( readyState );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_network_state)
+    GF_HTML_MediaReadyState readyState = HAVE_NOTHING;
+    GF_HTML_NetworkState networkState = NETWORK_EMPTY;
+    GF_MediaObject *mo = NULL;
+    HTML_MEDIA_JS_START
+    mo = gf_html_media_object(n);
+    html_media_get_states(mo, &readyState, &networkState);
+    *vp = INT_TO_JSVAL( networkState );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_const)
+    u32 v = 0;
+    if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlMediaElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL) ||
+        GF_JS_InstanceOf(c, obj, &html_media_rt->htmlAudioElementClass, NULL))
+    {
+        if (!SMJS_ID_IS_INT(id)) {
+            return JS_TRUE;
+        }
+        switch (SMJS_ID_TO_INT(id)) {
+        case HTML_MEDIA_PROP_NETWORK_EMPTY:
+            v = NETWORK_EMPTY;
+            break;
+        case HTML_MEDIA_PROP_NETWORK_IDLE:
+            v = NETWORK_IDLE;
+            break;
+        case HTML_MEDIA_PROP_NETWORK_LOADING:
+            v = NETWORK_LOADING;
+            break;
+        case HTML_MEDIA_PROP_NETWORK_NO_SOURCE:
+            v = NETWORK_NO_SOURCE;
+            break;
+        case HTML_MEDIA_PROP_HAVE_NOTHING:
+            v = HAVE_NOTHING;
+            break;
+        case HTML_MEDIA_PROP_HAVE_METADATA:
+            v = HAVE_METADATA;
+            break;
+        case HTML_MEDIA_PROP_HAVE_CURRENT_DATA:
+            v = HAVE_CURRENT_DATA;
+            break;
+        case HTML_MEDIA_PROP_HAVE_FUTURE_DATA:
+            v = HAVE_FUTURE_DATA;
+            break;
+        case HTML_MEDIA_PROP_HAVE_ENOUGH_DATA:
+            v = HAVE_ENOUGH_DATA;
+            break;
+        default:
+            return JS_TRUE;
+        }
+		*vp = INT_TO_JSVAL( v );
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_preload)
+    GF_FieldInfo info;
+    HTML_MEDIA_JS_START
+    if (gf_node_get_attribute_by_name(n, "preload", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+        char *szAtt = gf_svg_dump_attribute(n, &info);
+        *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
+        if (szAtt) gf_free(szAtt);
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_preload)
+    HTML_MEDIA_JS_START
+    if (JSVAL_CHECK_STRING(*vp)) {
+        char *str = SMJS_CHARS(c, *vp);
+        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "preload", str);
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_buffered)
+    HTML_MEDIA_JS_START
+    *vp = OBJECT_TO_JSVAL( me->buffered->_this );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_seeking)
+    HTML_MEDIA_JS_START
+    /* TODO: implement it for real */
+    *vp = BOOLEAN_TO_JSVAL( (me->seeking ? JS_TRUE : JS_FALSE) );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_current_time)
+    u32 time_ms = 0;
+    Double time_s;
+    GF_MediaObject *mo = NULL;
+    HTML_MEDIA_JS_START
+    mo = gf_html_media_object(n);
+    gf_mo_get_object_time(mo, &time_ms);
+    time_s = time_ms / 1000.0;
+    *vp = JS_MAKE_DOUBLE(c, time_s );
+    return JS_TRUE;
+}
+
+static GFINLINE Bool ScriptAction(GF_SceneGraph *scene, u32 type, GF_Node *node, GF_JSAPIParam *param)
+{
+    if (scene->script_action) 
+    {
+        return scene->script_action(scene->script_action_cbck, type, node, param);
+    }
+    return GF_FALSE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_current_time)
+    double d;
+    GF_JSAPIParam par;
+    HTML_MEDIA_JS_START
+    if (!JSVAL_IS_NUMBER(*vp)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    JS_ValueToNumber(c, *vp, &d);
+    par.time = d;
+    ScriptAction(n->sgprivate->scenegraph, GF_JSAPI_OP_SET_TIME, (GF_Node *)n, &par);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_duration)
+    Double dur;
+    GF_MediaObject *mo = NULL;
+    HTML_MEDIA_JS_START
+    mo = gf_html_media_object(n);
+    dur = gf_mo_get_duration(mo);
+    if (dur <= 0) {
+		*vp = JS_GetNaNValue(c);
+    } else {
+		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, dur));
+	}
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_start_date)
+    HTML_MEDIA_JS_START
+	// SpiderMonkey 1.8.5 JSObject * JS_NewDateObject(JSContext *cx, int year, int mon, int mday, int hour, int min, int sec);
+	*vp = JSVAL_NULL;
+    /* TODO */
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_paused)
+    HTML_MEDIA_JS_START
+    *vp =( BOOLEAN_TO_JSVAL( (me->paused ? JS_TRUE : JS_FALSE) ) );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_default_playback_rate)
+    HTML_MEDIA_JS_START
+    *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, me->defaultPlaybackRate));
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_default_playback_rate)
+    jsdouble d;
+    HTML_MEDIA_JS_START
+    if (!JSVAL_IS_NUMBER(*vp)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    JS_ValueToNumber(c, *vp, &d);
+    me->defaultPlaybackRate = d;
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_playback_rate)
+    Double speed;
+    GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+    GF_MediaObject *mo = gf_html_media_object(n);
+    speed = gf_mo_get_current_speed(mo);
+    *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, speed));
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_playback_rate)
+    jsdouble d;
+    Fixed speed;
+    GF_MediaObject *mo;
+	HTML_MEDIA_JS_START
+    mo = gf_html_media_object(n);
+    if (!JSVAL_IS_NUMBER(*vp)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    JS_ValueToNumber(c, *vp, &d);
+    speed = FLT2FIX(d);
+    gf_mo_set_speed(mo, speed);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_played)
+    HTML_MEDIA_JS_START
+    *vp =( OBJECT_TO_JSVAL( me->played->_this ) );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_seekable)
+    HTML_MEDIA_JS_START
+    *vp =( OBJECT_TO_JSVAL( me->seekable->_this ) );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_ended)
+    GF_MediaObject *mo;
+	HTML_MEDIA_JS_START
+    mo = gf_html_media_object(n);
+    *vp = BOOLEAN_TO_JSVAL( gf_mo_is_done(mo) ? JS_TRUE : JS_FALSE);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_autoplay)
+    GF_FieldInfo info;
+    HTML_MEDIA_JS_START
+    if (gf_node_get_attribute_by_name(n, "autoplay", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+        char *szAtt = gf_svg_dump_attribute(n, &info);
+        if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
+            *vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
+        } else {
+            *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+        }
+        if (szAtt) gf_free(szAtt);
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_autoplay)
+    HTML_MEDIA_JS_START
+    if (JSVAL_CHECK_STRING(*vp)) {
+        char *str = SMJS_CHARS(c, *vp);
+        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "autoplay", str);
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_loop)
+    GF_FieldInfo info;
+    HTML_MEDIA_JS_START
+    /* TODO: gf_mo_get_loop */
+    if (gf_node_get_attribute_by_name(n, "loop", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+        char *szAtt = gf_svg_dump_attribute(n, &info);
+        if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
+            *vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
+        } else {
+            *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+        }
+        if (szAtt) gf_free(szAtt);
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_loop)
+    HTML_MEDIA_JS_START
+    if (JSVAL_CHECK_STRING(*vp)) {
+        char *str = SMJS_CHARS(c, *vp);
+        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "loop", str);
+        //TODO: use gf_mo_get_loop
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_mediagroup)
+    GF_FieldInfo info;
+    HTML_MEDIA_JS_START
+    if (gf_node_get_attribute_by_name(n, "mediagroup", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+        char *szAtt = gf_svg_dump_attribute(n, &info);
+        *vp =( STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) ) );
+        if (szAtt) gf_free(szAtt);
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_mediagroup)
+    HTML_MEDIA_JS_START
+    if (JSVAL_CHECK_STRING(*vp)) {
+        char *str = SMJS_CHARS(c, *vp);
+        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "mediagroup", str);
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_controller)
+    HTML_MEDIA_JS_START
+    if (me->controller) {
+        *vp = OBJECT_TO_JSVAL( me->controller->_this );
+    } else {
+		*vp = JSVAL_NULL;
+	}
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_controller)
+    HTML_MEDIA_JS_START
+    if (JSVAL_IS_OBJECT(*vp)) {
+		me->controller = (GF_HTML_MediaController *)SMJS_GET_PRIVATE(c, JSVAL_TO_OBJECT(*vp));
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_controls)
+    GF_FieldInfo info;
+    HTML_MEDIA_JS_START
+    if (gf_node_get_attribute_by_name(n, "controls", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+        char *szAtt = gf_svg_dump_attribute(n, &info);
+        if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
+            *vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
+        } else {
+            *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+        }
+        if (szAtt) gf_free(szAtt);
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_controls)
+    HTML_MEDIA_JS_START
+    if (JSVAL_CHECK_STRING(*vp)) {
+        char *str = SMJS_CHARS(c, *vp);
+        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "controls", str);
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SVG_audio_stack *html_media_get_audio_stack(GF_Node *n) {
+    SVG_video_stack *video_stack = NULL;
+    SVG_audio_stack *audio_stack = NULL;
+    if (n->sgprivate->tag == TAG_SVG_video) {
+        video_stack = (SVG_video_stack *)n->sgprivate->UserPrivate;
+        if (video_stack->audio) {
+            audio_stack = (SVG_audio_stack *)video_stack->audio->sgprivate->UserPrivate;
+        }
+    } else if (n->sgprivate->tag == TAG_SVG_audio) {
+        audio_stack = (SVG_audio_stack *)n->sgprivate->UserPrivate;
+    }
+	return audio_stack;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_volume)
+    Fixed volume = FIX_ONE;
+    SVG_audio_stack *audio_stack = NULL;
+    HTML_MEDIA_JS_CHECK
+	audio_stack = html_media_get_audio_stack(n);
+    if (audio_stack) {
+        audio_stack->input.input_ifce.GetChannelVolume(&audio_stack->input.input_ifce.callback, &volume);
+    }
+    *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, FIX2FLT(volume)));
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_volume)
+    jsdouble volume;
+    SVG_audio_stack *audio_stack = NULL;
+    HTML_MEDIA_JS_CHECK
+	audio_stack = html_media_get_audio_stack(n);
+    if (audio_stack) {
+        JS_ValueToNumber(c, *vp, &volume);
+        audio_stack->input.intensity = FLT2FIX(volume);
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_muted)
+    SVG_audio_stack *audio_stack = NULL;
+    HTML_MEDIA_JS_CHECK
+	audio_stack = html_media_get_audio_stack(n);
+    if (audio_stack) {
+        *vp = BOOLEAN_TO_JSVAL(audio_stack->input.is_muted ? JS_TRUE : JS_FALSE);
+    } else {
+        *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+	}
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_muted)
+    SVG_audio_stack *audio_stack = NULL;
+    HTML_MEDIA_JS_CHECK
+	audio_stack = html_media_get_audio_stack(n);
+    if (audio_stack) {
+        audio_stack->input.is_muted = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_default_muted)
+    GF_FieldInfo info;
+    HTML_MEDIA_JS_START
+    if (gf_node_get_attribute_by_name(n, "muted", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+        char *szAtt = gf_svg_dump_attribute(n, &info);
+        if (!strcmp(szAtt, "true") || !strcmp(szAtt, "TRUE")) {
+            *vp =( BOOLEAN_TO_JSVAL( JS_TRUE ) );
+        } else {
+            *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+        }
+        if (szAtt) gf_free(szAtt);
+    } else {
+        *vp =( BOOLEAN_TO_JSVAL( JS_FALSE ) );
+	}
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(html_media_set_default_muted)
+    HTML_MEDIA_JS_START
+    if (JSVAL_CHECK_STRING(*vp)) {
+        char *str = SMJS_CHARS(c, *vp);
+        gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "muted", str);
+		return JS_TRUE;
+    } else {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_audio_tracks)
+    HTML_MEDIA_JS_START
+    *vp =( OBJECT_TO_JSVAL( me->audioTracks._this ) );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_video_tracks)
+    HTML_MEDIA_JS_START
+    *vp =( OBJECT_TO_JSVAL( me->videoTracks._this ) );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_media_get_text_tracks)
+    HTML_MEDIA_JS_START
+    *vp =( OBJECT_TO_JSVAL( me->textTracks._this ) );
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(html_time_ranges_get_length)
+    GF_HTML_MediaTimeRanges *timeranges;
+	if (!GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
+    *vp = INT_TO_JSVAL( gf_list_count(timeranges->times)/2);
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(html_time_ranges_start)
+{
+    GF_HTML_MediaTimeRanges *timeranges;
+    SMJS_OBJ
+    SMJS_ARGS
+    if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
+    if (!timeranges) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    if (JSVAL_IS_INT(argv[0])) {
+        u32 i = JSVAL_TO_INT(argv[0]);
+        u64 *start_value = (u64 *)gf_list_get(timeranges->times, 2*i);
+        if (!start_value) {
+            return dom_throw_exception(c, GF_DOM_EXC_INDEX_SIZE_ERR);
+        } else {
+            SMJS_SET_RVAL(DOUBLE_TO_JSVAL(JS_NewDouble(c, (*start_value)*1.0/timeranges->timescale)));
+        }
+    } else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(html_time_ranges_end)
+{
+    GF_HTML_MediaTimeRanges *timeranges;
+    SMJS_OBJ
+    SMJS_ARGS
+    if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &html_media_rt->timeRangesClass, NULL)) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    timeranges = (GF_HTML_MediaTimeRanges *)SMJS_GET_PRIVATE(c, obj);
+    if (!timeranges) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    if (JSVAL_IS_INT(argv[0])) {
+        u32 i = JSVAL_TO_INT(argv[0]);
+        u64 *end_value = (u64 *)gf_list_get(timeranges->times, 2*i+1);
+        if (!end_value) {
+            return dom_throw_exception(c, GF_DOM_EXC_INDEX_SIZE_ERR);
+        } else {
+            SMJS_SET_RVAL(DOUBLE_TO_JSVAL(JS_NewDouble(c, (*end_value)*1.0/timeranges->timescale)));
+        }
+    } else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+    return JS_TRUE;
+}
+
+static Bool html_is_track_list(JSContext *c, JSObject *obj) {
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackListClass, NULL)) return GF_TRUE;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackListClass, NULL)) return GF_TRUE;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackListClass, NULL)) return GF_TRUE;
+	return GF_FALSE;
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_length)
+    GF_HTML_TrackList *tracklist;
+	if (html_is_track_list(c, obj)) {
+		tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		if (tracklist) {
+			*vp = INT_TO_JSVAL( gf_list_count(tracklist->tracks) );
+			return JS_TRUE;
+		} else {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		}
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static JSBool SMJS_FUNCTION(html_track_list_get_track_by_id)
+{
+    SMJS_OBJ
+    SMJS_ARGS
+	if (html_is_track_list(c, obj)) {
+		GF_HTML_TrackList *tracklist;
+		GF_HTML_Track *track;
+	    char *str;	
+		tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, argv[0]) );
+		track = html_media_tracklist_get_track(tracklist, str);
+		SMJS_FREE(c, str);
+		if (track) {
+			SMJS_SET_RVAL(OBJECT_TO_JSVAL(track->_this));
+		    return JS_TRUE;
+		} else {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		}
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_property)
+	if (html_is_track_list(c, obj)) {
+		GF_HTML_TrackList *tracklist;
+		s32 index;
+
+		tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		index = SMJS_ID_TO_INT(id);
+		if (index >= 0 && (u32)index < gf_list_count(tracklist->tracks)) {
+			GF_HTML_Track *track = (GF_HTML_Track *)gf_list_get(tracklist->tracks, (u32)index);
+			*vp = OBJECT_TO_JSVAL(track->_this);
+		}
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_selected_index)
+	if (html_is_track_list(c, obj)) {
+        GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+        *vp = INT_TO_JSVAL(tracklist->selected_index);
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_onchange)
+	if (html_is_track_list(c, obj)) {
+        GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		if (! JSVAL_IS_NULL(tracklist->onchange)) {
+			*vp = tracklist->onchange;
+		} else {
+			*vp = JSVAL_NULL;
+		}
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+JSBool gf_set_js_eventhandler(JSContext *c, jsval vp, jsval *callbackfuncval);
+
+static SMJS_FUNC_PROP_SET(html_track_list_set_onchange)
+	if (html_is_track_list(c, obj)) {
+        GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		gf_set_js_eventhandler(c, *vp, &tracklist->onchange);
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_onaddtrack)
+	if (html_is_track_list(c, obj)) {
+        GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		if (! JSVAL_IS_NULL(tracklist->onaddtrack)) {
+			*vp = tracklist->onaddtrack;
+		} else {
+			*vp = JSVAL_NULL;
+		}
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_SET(html_track_list_set_onaddtrack)
+	if (html_is_track_list(c, obj)) {
+        GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		gf_set_js_eventhandler(c, *vp, &tracklist->onaddtrack);
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_list_get_onremovetrack)
+	if (html_is_track_list(c, obj)) {
+        GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		if (! JSVAL_IS_NULL(tracklist->onremovetrack) ) {
+			*vp = tracklist->onremovetrack;
+		} else {
+			*vp = JSVAL_NULL;
+		}
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_SET(html_track_list_set_onremovetrack)
+	if (html_is_track_list(c, obj)) {
+        GF_HTML_TrackList *tracklist = (GF_HTML_TrackList *)SMJS_GET_PRIVATE(c, obj);
+		gf_set_js_eventhandler(c, *vp, &tracklist->onremovetrack);
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_track_get_property)
+    if (html_is_track_list(c, obj)) {
+        GF_HTML_Track *track = (GF_HTML_Track *)SMJS_GET_PRIVATE(c, obj);
+        if (!SMJS_ID_IS_INT(id)) {
+	        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+        }
+        switch (SMJS_ID_TO_INT(id)) {
+        case HTML_TRACK_PROP_ID:
+            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->id ? track->id : "") );
+            return JS_TRUE;
+        case HTML_TRACK_PROP_KIND:
+            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->kind ? track->kind : "") );
+            return JS_TRUE;
+        case HTML_TRACK_PROP_LABEL:
+            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->label ? track->label : "") );
+            return JS_TRUE;
+        case HTML_TRACK_PROP_LANGUAGE:
+            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->language ? track->language  : "") );
+            return JS_TRUE;
+        case HTML_TRACK_PROP_INBANDTYPE:
+            if (GF_JS_InstanceOf(c, obj, &html_media_rt->textTrackClass, NULL)) {
+                *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, track->mime ? track->mime  : "") );
+                return JS_TRUE;
+            }
+        case HTML_TRACK_PROP_SELECTED:
+            if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL)) {
+                *vp = BOOLEAN_TO_JSVAL(track->enabled_or_selected ? JS_TRUE : JS_FALSE);
+            }
+            return JS_TRUE;
+        case HTML_TRACK_PROP_ENABLED:
+            if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL)) {
+                *vp = BOOLEAN_TO_JSVAL(track->enabled_or_selected ? JS_TRUE : JS_FALSE);
+            }
+            return JS_TRUE;
+        }
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_SET(html_track_set_property)
+    if (html_is_track_list(c, obj)) {
+        GF_HTML_Track *track = (GF_HTML_Track *)SMJS_GET_PRIVATE(c, obj);
+        if (!SMJS_ID_IS_INT(id)) {
+	        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+        }
+        switch (SMJS_ID_TO_INT(id)) {
+        case HTML_TRACK_PROP_SELECTED:
+            if (GF_JS_InstanceOf(c, obj, &html_media_rt->videoTrackClass, NULL)) 
+            {
+                track->enabled_or_selected = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
+            }
+            return JS_TRUE;
+        case HTML_TRACK_PROP_ENABLED:
+            if (GF_JS_InstanceOf(c, obj, &html_media_rt->audioTrackClass, NULL)) 
+            {
+                track->enabled_or_selected = (JSVAL_TO_BOOLEAN(*vp) == JS_TRUE ? GF_TRUE : GF_FALSE);
+            }
+            return JS_TRUE;
+        }
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_GET(html_video_get_property)
+    if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL)) 
+    {
+        GF_FieldInfo    info;
+        SVG_video_stack *video;
+        GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+		if (!n) return JS_TRUE;
+
+        video = (SVG_video_stack *)n->sgprivate->UserPrivate;
+        if (!SMJS_ID_IS_INT(id)) {
+	        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+        }
+        switch (SMJS_ID_TO_INT(id)) {
+        case HTML_VIDEO_PROP_WIDTH:
+            if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_width, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+                SVG_Length *length;
+                length = (SVG_Length *)info.far_ptr;
+                *vp = INT_TO_JSVAL( FIX2FLT(length->value) );
+            }
+            return JS_TRUE;
+        case HTML_VIDEO_PROP_HEIGHT:
+            if (gf_node_get_attribute_by_tag(n, TAG_SVG_ATT_height, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+                SVG_Length *length;
+                length = (SVG_Length *)info.far_ptr;
+                *vp = INT_TO_JSVAL( FIX2FLT(length->value) );
+            }
+            return JS_TRUE;
+        case HTML_VIDEO_PROP_VIDEOWIDTH:
+             *vp = INT_TO_JSVAL( video->txh.width );
+            return JS_TRUE;
+        case HTML_VIDEO_PROP_VIDEOHEIGHT:
+             *vp = INT_TO_JSVAL( video->txh.height );
+            return JS_TRUE;
+        case HTML_VIDEO_PROP_POSTER:
+            if (gf_node_get_attribute_by_name(n, "poster", GF_XMLNS_SVG, GF_TRUE, GF_TRUE, &info)==GF_OK) {
+                char *szAtt = gf_svg_dump_attribute(n, &info);
+                *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, szAtt) );
+                if (szAtt) gf_free(szAtt);
+            }
+            return JS_TRUE;
+        }
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static SMJS_FUNC_PROP_SET(html_video_set_property)
+    if (GF_JS_InstanceOf(c, obj, &html_media_rt->htmlVideoElementClass, NULL)) 
+    {
+        GF_Node *n = (GF_Node *)SMJS_GET_PRIVATE(c, obj);
+        if (!SMJS_ID_IS_INT(id)) {
+	        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+        }
+        switch (SMJS_ID_TO_INT(id)) {
+        case HTML_VIDEO_PROP_WIDTH:
+            /* TODO: change value and dirty node */
+            return JS_TRUE;
+        case HTML_VIDEO_PROP_HEIGHT:
+            /* TODO: change value and dirty node */
+            return JS_TRUE;
+        case HTML_VIDEO_PROP_POSTER:
+            {
+                char *str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, *vp) );
+                gf_svg_set_attributeNS(n, GF_XMLNS_SVG, "poster", str);
+                SMJS_FREE(c, str);
+                return JS_TRUE;
+            }
+        }
+		return JS_TRUE;
+	} else {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+}
+
+static JSBool SMJS_FUNCTION(html_media_event_add_listener)
+{
+	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node);
+	return gf_sg_js_event_add_listener(SMJS_CALL_ARGS, NULL);
+}
+
+static JSBool SMJS_FUNCTION(html_media_event_remove_listener)
+{
+	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node);
+	return gf_sg_js_event_remove_listener(SMJS_CALL_ARGS, NULL);
+}
+
+static JSBool SMJS_FUNCTION(html_media_event_dispatch)
+{
+	return JS_TRUE;
+}
+
+void html_media_source_init_js_api(JSContext *js_ctx, JSObject *global, GF_HTML_MediaRuntime *html_media_rt);
+
+void html_media_js_api_del() {
+    if (html_media_rt) {
+		gf_free(html_media_rt);
+		html_media_rt = NULL;
+	}
+}
+
+void html_media_init_js_api(GF_SceneGraph *scene) {
+    /* HTML Media Element */
+    if (!html_media_rt) {
+        GF_SAFEALLOC(html_media_rt, GF_HTML_MediaRuntime);
+
+        /* Setting up MediaError class (no constructor, no finalizer) */
+        JS_SETUP_CLASS(html_media_rt->mediaErrorClass, "MediaError", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+        {
+            JSPropertySpec mediaErrorClassProps[] = {
+                {"MEDIA_ERR_ABORTED",           MEDIA_ERROR_PROP_ABORTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+                {"MEDIA_ERR_NETWORK",           MEDIA_ERROR_PROP_NETWORK,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+                {"MEDIA_ERR_DECODE",            MEDIA_ERROR_PROP_DECODE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+                {"MEDIA_ERR_SRC_NOT_SUPPORTED", MEDIA_ERROR_PROP_SRC_NOT_SUPPORTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+                {"code",                        MEDIA_ERROR_PROP_CODE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_error_get_code, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec mediaErrorClassFuncs[] = {
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->mediaErrorClass, 0, 0, mediaErrorClassProps, mediaErrorClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] MediaError class initialized\n"));
+        }
+
+        /* Setting up TimeRanges class (no constructor, no finalizer) */
+        JS_SETUP_CLASS(html_media_rt->timeRangesClass, "TimeRanges", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+        {
+            JSPropertySpec timeRangesClassProps[] = {
+                {"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_time_ranges_get_length, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec timeRangesClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("start",                 html_time_ranges_start, 1),
+                SMJS_FUNCTION_SPEC("end",                   html_time_ranges_end, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->timeRangesClass, 0, 0, timeRangesClassProps, timeRangesClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TimeRanges class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->audioTrackClass, "AudioTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
+        {
+            JSPropertySpec audioTrackClassProps[] = {
+                {"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"kind",             HTML_TRACK_PROP_KIND,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"label",            HTML_TRACK_PROP_LABEL,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"language",         HTML_TRACK_PROP_LANGUAGE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"enabled",          HTML_TRACK_PROP_SELECTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec audioTrackClassFuncs[] = {
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->audioTrackClass, 0, 0, audioTrackClassProps, audioTrackClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] AudioTrack class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->videoTrackClass, "VideoTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
+        {
+            JSPropertySpec videoTrackClassProps[] = {
+                {"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"kind",             HTML_TRACK_PROP_KIND,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"label",            HTML_TRACK_PROP_LABEL,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"language",         HTML_TRACK_PROP_LANGUAGE,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"selected",         HTML_TRACK_PROP_SELECTED,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, 0, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec videoTrackClassFuncs[] = {
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->videoTrackClass, 0, 0, videoTrackClassProps, videoTrackClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] VideoTrack class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->textTrackClass, "TextTrack", JSCLASS_HAS_PRIVATE, html_track_get_property, html_track_set_property, JS_FinalizeStub);
+        {
+            JSPropertySpec textTrackClassProps[] = {
+                {"id",               HTML_TRACK_PROP_ID,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"kind",             HTML_TRACK_PROP_KIND,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"label",            HTML_TRACK_PROP_LABEL,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"language",         HTML_TRACK_PROP_LANGUAGE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"inBandMetadataTrackDispatchType",         HTML_TRACK_PROP_INBANDTYPE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec textTrackClassFuncs[] = {
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->textTrackClass, 0, 0, textTrackClassProps, textTrackClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TextTrack class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->audioTrackListClass, "AudioTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
+        {
+            JSPropertySpec audioTrackListClassProps[] = {
+                {"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
+                {"onchange",             0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onchange, html_track_list_set_onchange},
+                {"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
+                {"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec audioTrackListClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->audioTrackListClass, 0, 0, audioTrackListClassProps, audioTrackListClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] AudioTrackList class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->videoTrackListClass, "VideoTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
+        {
+            JSPropertySpec videoTrackListClassProps[] = {
+                {"selectedIndex",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_selected_index, 0},
+                {"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
+                {"onchange",             0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onchange, html_track_list_set_onchange},
+                {"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
+                {"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec videoTrackListClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->videoTrackListClass, 0, 0, videoTrackListClassProps, videoTrackListClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] VideoTrackList class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->textTrackListClass, "TextTrackList", JSCLASS_HAS_PRIVATE, html_track_list_get_property, JS_PropertyStub_forSetter, JS_FinalizeStub);
+        {
+            JSPropertySpec textTrackListClassProps[] = {
+                {"length",               0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_track_list_get_length, 0},
+                {"onaddtrack",           0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onaddtrack, html_track_list_set_onaddtrack},
+                {"onremovetrack",        0,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_track_list_get_onremovetrack, html_track_list_set_onremovetrack},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec textTrackListClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("getTrackById",          html_track_list_get_track_by_id, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->textTrackListClass, 0, 0, textTrackListClassProps, textTrackListClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] TextTrackList class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->mediaControllerClass, "MediaController", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+        {
+            JSPropertySpec mediaControllerClassProps[] = {
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec mediaControllerClassFuncs[] = {
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &html_media_rt->mediaControllerClass, 0, 0, mediaControllerClassProps, mediaControllerClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] MediaController class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->htmlMediaElementClass, "HTMLMediaElement", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_FinalizeStub);
+        {
+            JSPropertySpec htmlMediaElementClassProps[] = {
+                {"error",               HTML_MEDIA_PROP_ERROR,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_error, 0},
+                {"src",                 HTML_MEDIA_PROP_SRC,          JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , html_media_get_src, html_media_set_src},
+                {"currentSrc",          HTML_MEDIA_PROP_CURRENTSRC,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_src, 0},
+                {"crossOrigin",         HTML_MEDIA_PROP_CROSSORIGIN,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_cors, html_media_set_cors},
+                {"NETWORK_EMPTY",       HTML_MEDIA_PROP_NETWORK_EMPTY,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"NETWORK_IDLE",        HTML_MEDIA_PROP_NETWORK_IDLE,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"NETWORK_LOADING",     HTML_MEDIA_PROP_NETWORK_LOADING,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"NETWORK_NO_SOURCE",   HTML_MEDIA_PROP_NETWORK_NO_SOURCE,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"networkState",        HTML_MEDIA_PROP_NETWORKSTATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_network_state, 0},
+                {"preload",             HTML_MEDIA_PROP_PRELOAD,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_preload, html_media_set_preload},
+                {"buffered",            HTML_MEDIA_PROP_BUFFERED,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_buffered, 0},
+                {"HAVE_NOTHING",        HTML_MEDIA_PROP_HAVE_NOTHING,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"HAVE_METADATA",       HTML_MEDIA_PROP_HAVE_METADATA,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"HAVE_CURRENT_DATA",   HTML_MEDIA_PROP_HAVE_CURRENT_DATA, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"HAVE_FUTURE_DATA",    HTML_MEDIA_PROP_HAVE_FUTURE_DATA,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"HAVE_ENOUGH_DATA",    HTML_MEDIA_PROP_HAVE_ENOUGH_DATA,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_const, 0},
+                {"readyState",          HTML_MEDIA_PROP_READYSTATE,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_ready_state, 0},
+                {"seeking",             HTML_MEDIA_PROP_SEEKING,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_seeking, 0},
+                {"currentTime",         HTML_MEDIA_PROP_CURRENTTIME,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_current_time, html_media_set_current_time},
+                {"duration",            HTML_MEDIA_PROP_DURATION,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_duration, 0},
+                {"startDate",           HTML_MEDIA_PROP_STARTDATE,    JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_start_date, 0},
+                {"paused",              HTML_MEDIA_PROP_PAUSED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_paused, 0},
+                {"defaultPlaybackRate", HTML_MEDIA_PROP_DEFAULTPLAYBACKRATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_default_playback_rate, html_media_set_default_playback_rate},
+                {"playbackRate",        HTML_MEDIA_PROP_PLAYBACKRATE, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_playback_rate, html_media_set_playback_rate},
+                {"played",              HTML_MEDIA_PROP_PLAYED,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_played, 0},
+                {"seekable",            HTML_MEDIA_PROP_SEEKABLE,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_seekable, 0},
+                {"ended",               HTML_MEDIA_PROP_ENDED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_ended, 0},
+                {"autoplay",            HTML_MEDIA_PROP_AUTOPLAY,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_autoplay, html_media_set_autoplay},
+                {"loop",                HTML_MEDIA_PROP_LOOP,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_loop, html_media_set_loop},
+                {"mediaGroup",          HTML_MEDIA_PROP_MEDIAGROUP,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_mediagroup, html_media_set_mediagroup},
+                {"controller",          HTML_MEDIA_PROP_CONTROLLER,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_controller, html_media_set_controller},
+                {"controls",            HTML_MEDIA_PROP_CONTROLS,     JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_controls, html_media_set_controls},
+                {"volume",              HTML_MEDIA_PROP_VOLUME,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_volume, html_media_set_volume},
+                {"muted",               HTML_MEDIA_PROP_MUTED,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_muted, html_media_set_muted},
+                {"defaultMuted",        HTML_MEDIA_PROP_DEFAULTMUTED, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, html_media_get_default_muted, html_media_set_default_muted},
+                {"audioTracks",         HTML_MEDIA_PROP_AUDIOTRACKS,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_audio_tracks, 0},
+                {"videoTracks",         HTML_MEDIA_PROP_VIDEOTRACKS,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_video_tracks, 0},
+                {"textTracks",          HTML_MEDIA_PROP_TEXTTRACKS,   JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, html_media_get_text_tracks, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSBool SMJS_FUNCTION(svg_udom_smil_pause);
+            JSBool SMJS_FUNCTION(svg_udom_smil_begin);
+            JSBool SMJS_FUNCTION(svg_udom_smil_end);
+            JSFunctionSpec htmlMediaElementClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("load",                  html_media_load, 0),
+                SMJS_FUNCTION_SPEC("canPlayType",           html_media_canPlayType, 1),
+                SMJS_FUNCTION_SPEC("fastSeek",              html_media_fastSeek, 1),
+                SMJS_FUNCTION_SPEC("play",                  svg_udom_smil_begin, 0),
+                SMJS_FUNCTION_SPEC("pause",                 svg_udom_smil_pause, 0),
+                SMJS_FUNCTION_SPEC("addTextTrack",          html_media_addTextTrack, 1),
+				SMJS_FUNCTION_SPEC("addEventListener",		html_media_event_add_listener, 3),
+				SMJS_FUNCTION_SPEC("removeEventListener",	html_media_event_remove_listener, 3),
+				SMJS_FUNCTION_SPEC("dispatchEvent",			html_media_event_dispatch, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            JSObject *elt_proto = dom_js_get_element_proto(scene->svg_js->js_ctx);
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, elt_proto, &html_media_rt->htmlMediaElementClass, 0, 0, htmlMediaElementClassProps, htmlMediaElementClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLMediaElement class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->htmlVideoElementClass, "HTMLVideoElement", JSCLASS_HAS_PRIVATE, html_video_get_property, html_video_set_property, dom_element_finalize);
+        {
+            JSPropertySpec htmlVideoElementClassProps[] = {
+                {"width",       HTML_VIDEO_PROP_WIDTH,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
+                {"height",      HTML_VIDEO_PROP_HEIGHT,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
+                {"videoWidth",  HTML_VIDEO_PROP_VIDEOWIDTH,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"videoHeight", HTML_VIDEO_PROP_VIDEOHEIGHT, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {"poster",      HTML_VIDEO_PROP_POSTER,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED , 0, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec htmlVideoElementClassFuncs[] = {
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt->htmlMediaElementClass._proto, &html_media_rt->htmlVideoElementClass, 0, 0, htmlVideoElementClassProps, htmlVideoElementClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLVideoElement class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->htmlAudioElementClass, "HTMLAudioElement", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, dom_element_finalize);
+        {
+            JSPropertySpec htmlAudioElementClassProps[] = {
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec htmlAudioElementClassFuncs[] = {
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt->htmlMediaElementClass._proto, &html_media_rt->htmlAudioElementClass, 0, 0, htmlAudioElementClassProps, htmlAudioElementClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTMLMediaAPI] HTMLAudioElement class initialized\n"));
+        }
+        html_media_source_init_js_api(scene->svg_js->js_ctx, scene->svg_js->global, html_media_rt);
+    }
+}
+#endif  /*GPAC_HAS_SPIDERMONKEY*/
+
+#endif  /*GPAC_DISABLE_SVG*/

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/html5_mse_smjs.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/html5_mse_smjs.c Changed

@@ -1,784 +1,949 @@
-/*
- *          GPAC - Multimedia Framework C SDK
- *
- *          Authors: Cyril Concolato
- *          Copyright (c) Telecom ParisTech 2012-
- *          All rights reserved
- *
- *  This file is part of GPAC / Scene Graph sub-project
- *
- *  GPAC is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Lesser General Public License as published by
- *  the Free Software Foundation; either version 2, or (at your option)
- *  any later version.
- *
- *  GPAC is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#include <gpac/setup.h>
-
-#ifndef GPAC_DISABLE_SVG
-
-#ifdef GPAC_HAS_SPIDERMONKEY
-
-#ifdef GPAC_ANDROID
-#ifndef XP_UNIX
-#define XP_UNIX
-#endif /* XP_UNIX */
-#endif
-
-#include <gpac/html5_mse.h>
-
-#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
-
-typedef enum 
-{
-    /* MediaSource properties */
-    HTML_MEDIASOURCE_PROP_SOURCEBUFFERS         = 34,
-    HTML_MEDIASOURCE_PROP_ACTIVESOURCEBUFFERS   = 35,
-    HTML_MEDIASOURCE_PROP_DURATION              = 36,
-    HTML_MEDIASOURCE_PROP_READYSTATE            = 37,
-    /* SourceBuffer properties */
-    HTML_SOURCEBUFFER_PROP_UPDATING             = 38,
-    HTML_SOURCEBUFFER_PROP_BUFFERED             = 39,
-    HTML_SOURCEBUFFER_PROP_TIMESTAMPOFFSET      = 40,
-    HTML_SOURCEBUFFER_PROP_TIMESCALE            = 41,
-    HTML_SOURCEBUFFER_PROP_AUDIOTRACKS          = 42,
-    HTML_SOURCEBUFFER_PROP_VIDEOTRACKS          = 43,
-    HTML_SOURCEBUFFER_PROP_TEXTTRACKS           = 44,
-    HTML_SOURCEBUFFER_PROP_APPENDWINDOWSTART    = 45,
-    HTML_SOURCEBUFFER_PROP_APPENDWINDOWEND      = 46,
-    /* SourceBufferList properties */
-    HTML_SOURCEBUFFERLIST_PROP_LENGTH           = 47,
-} GF_HTML_MediaSourcePropEnum;
-
-static GF_HTML_MediaRuntime *html_media_rt = NULL;
-
-static void mediasource_sourceBuffer_initjs(JSContext *c, GF_HTML_SourceBuffer *sb)
-{
-    sb->_this = JS_NewObject(c, &html_media_rt->sourceBufferClass._class, 0, 0);
-    gf_js_add_root(c, &sb->_this, GF_JSGC_OBJECT);
-    SMJS_SET_PRIVATE(c, sb->_this, sb);
-    sb->buffered._this = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, sb->_this);
-    SMJS_SET_PRIVATE(c, sb->buffered._this, &sb->buffered);
-}
-
-static 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;
-}
-
-#include <gpac/internal/terminal_dev.h>
-Bool gf_term_is_type_supported(GF_Terminal *term, const char* mime);
-
-static JSBool SMJS_FUNCTION(mediasource_is_type_supported)
-{
-    SMJS_ARGS
-    GF_SceneGraph *sg;
-    GF_JSAPIParam par;
-    Bool isSupported;
-    char *mime;
-    if (!argc || !JSVAL_CHECK_STRING(argv[0]) ) 
-    {
-        return JS_TRUE;
-    }
-    mime = SMJS_CHARS(c, argv[0]);
-    sg = mediasource_get_scenegraph(c);
-    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));
-    return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(mediasource_addSourceBuffer)
-{
-    SMJS_OBJ
-    SMJS_ARGS
-    GF_HTML_SourceBuffer    *sb;
-    GF_HTML_MediaSource     *p;
-    const char              *mime;
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-        return JS_TRUE;
-    }
-    if (!argc || !JSVAL_CHECK_STRING(argv[0])) 
-    {
-        return JS_TRUE;
-    }
-    mime = SMJS_CHARS(c, argv[0]);
-    if (!strlen(mime))
-    {
-        return JS_TRUE;
-    }
-    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-    if (p->readyState != MEDIA_SOURCE_OPEN) 
-    {
-        return JS_TRUE;
-    }
-    assert(p->service);
-    sb = gf_mse_source_buffer_new(p);
-    gf_mse_source_buffer_load_parser(sb, mime);
-    mediasource_sourceBuffer_initjs(c, sb);
-    SMJS_SET_RVAL( OBJECT_TO_JSVAL(sb->_this) );
-    return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(mediasource_removeSourceBuffer)
-{
-    return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(mediasource_endOfStream)
-{
-    return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(media_source_constructor)
-{
-    GF_HTML_MediaSource *p;
-    SMJS_OBJ_CONSTRUCTOR(&html_media_rt->mediaSourceClass)
-
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return JS_TRUE;
-
-    p = gf_mse_media_source_new();
-    p->c = c;
-    p->_this = obj;
-    SMJS_SET_PRIVATE(c, obj, p);
-
-    p->sourceBuffers._this = JS_NewObject(c, &html_media_rt->sourceBufferListClass._class, 0, 0);
-    SMJS_SET_PRIVATE(c, p->sourceBuffers._this, &p->sourceBuffers);
-
-    p->activeSourceBuffers._this = JS_NewObject(c, &html_media_rt->sourceBufferListClass._class, 0, 0);
-    SMJS_SET_PRIVATE(c, p->activeSourceBuffers._this, &p->activeSourceBuffers);
-
-    SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
-    return JS_TRUE;
-}
-
-static DECL_FINALIZE(media_source_finalize)
-
-    GF_HTML_MediaSource *p;
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return;
-    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-    if (p) {
-        u32 i;
-        /* TODO remove functions */
-        for (i = 0; i < gf_list_count(p->sourceBuffers.list); i++) 
-        {
-            GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(p->sourceBuffers.list, i);
-            if (sb) {
-                gf_free(sb);
-            }
-        }
-        gf_list_del(p->sourceBuffers.list);
-        gf_list_del(p->activeSourceBuffers.list); /* all source buffer should have been deleted in the deletion of sourecBuffers */
-        gf_free(p);
-    }
-}
-
-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 JS_TRUE;
-    }
-    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-    if (p) {
-        *vp = OBJECT_TO_JSVAL(p->sourceBuffers._this);
-        return JS_TRUE;
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(media_source_get_active_source_buffers)
-    GF_HTML_MediaSource *p;
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-        return JS_TRUE;
-    }
-    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-    if (p) {
-        *vp = OBJECT_TO_JSVAL(p->activeSourceBuffers._this);
-        return JS_TRUE;
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(media_source_get_ready_state)
-    GF_HTML_MediaSource *p;
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
-        return JS_TRUE;
-    }
-    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
-    if (p) {
-        switch (p->readyState)
-        {
-        case MEDIA_SOURCE_CLOSED:
-            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "closed"));
-            break;
-        case MEDIA_SOURCE_OPEN:
-            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "open"));
-            break;
-        case MEDIA_SOURCE_ENDED:
-            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "ended"));
-            break;
-        }
-        return JS_TRUE;
-    }
-    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->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)
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourcebufferlist_get_length)
-    GF_HTML_SourceBufferList *p;
-    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) {
-        u32 length = gf_list_count(p->list);
-        *vp = INT_TO_JSVAL(length);
-    }
-    return JS_TRUE;
-}
-
-#define SB_BASIC_CHECK \
-    GF_HTML_SourceBuffer *sb; \
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) )  \
-    { \
-        return JS_TRUE;\
-    }\
-    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);\
-    /* check if this source buffer is still in the list of source buffers */\
-    if (!sb || gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0)\
-    {\
-        return JS_TRUE;\
-    }
-
-#define SB_UPDATING_CHECK \
-    SB_BASIC_CHECK \
-    if (sb->updating)\
-    {\
-        return JS_TRUE;\
-    }\
-
-/* FIXME : Function not used, generates warning on debian
-static DECL_FINALIZE(sourcebuffer_finalize)
-
-    GF_HTML_SourceBuffer *sb;
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) return;
-    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);
-    if (sb) {
-         TODO delete lists, remove functions
-        gf_free(sb);
-    }
-}
-*/
-
-static void gf_mse_sourcebuffer_reopen(GF_HTML_SourceBuffer *sb)
-{
-    if (sb->mediasource->readyState == MEDIA_SOURCE_ENDED) {
-        sb->mediasource->readyState = MEDIA_SOURCE_OPEN;
-    }
-}
-
-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_CLOSED) {
-        return JS_TRUE;
-    } 
-    gf_mse_sourcebuffer_reopen(sb);
-
-    if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) 
-    {
-        return JS_TRUE;
-    }
-    js_ab = JSVAL_TO_OBJECT(argv[0]);
-    if (!GF_JS_InstanceOf(c, js_ab, &html_media_rt->arrayBufferClass, NULL) ) 
-    {
-        return JS_TRUE;
-    }
-    ab = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, js_ab);
-    if (!ab->length)
-    {
-        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;
-}
-
-static JSBool SMJS_FUNCTION(sourcebuffer_abort)
-{
-    SMJS_OBJ
-    SMJS_ARGS
-    GF_HTML_MediaSource_AbortMode mode;
-    char *smode;
-    SB_BASIC_CHECK
-    if (sb->mediasource->readyState != MEDIA_SOURCE_OPEN) {
-        return JS_TRUE;
-    } 
-
-    if (!argc || !JSVAL_CHECK_STRING(argv[0])) 
-    {
-        mode = MEDIA_SOURCE_ABORT_MODE_NONE;
-    }
-    smode = SMJS_CHARS(c, argv[0]);
-    if (!strlen(smode))
-    {
-        mode = MEDIA_SOURCE_ABORT_MODE_NONE;
-    } else if (!stricmp(smode, "continuation")) {
-        mode = MEDIA_SOURCE_ABORT_MODE_CONTINUATION;
-    } else if (!stricmp(smode, "timestampOffset")) {
-        mode = MEDIA_SOURCE_ABORT_MODE_OFFSET;
-    } else {
-        return JS_TRUE;
-    }
-
-    if (gf_mse_source_buffer_abort(sb, mode) != 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 JS_TRUE;
-    }
-    JS_ValueToNumber(c, argv[0], &start);
-    JS_ValueToNumber(c, argv[1], &end);
-    if (start < 0 /* || start > sb->duration */ || start >= end) 
-    {
-        return JS_TRUE;
-    }
-    if (sb->mediasource->readyState != MEDIA_SOURCE_OPEN) 
-    {
-        return JS_TRUE;
-    }
-    sb->updating = GF_TRUE;
-    if (!sb->remove_thread) {
-        sb->remove_thread = gf_th_new(NULL);
-    }
-    gf_th_run(sb->remove_thread, gf_mse_source_buffer_remove, sb);
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_updating)
-    SB_BASIC_CHECK
-    *vp = BOOLEAN_TO_JSVAL(sb->updating ? JS_TRUE : JS_FALSE);
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_timestampOffset)
-    SB_BASIC_CHECK
-    *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->timestampOffset));
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(sourceBuffer_set_timestampOffset)
-    jsdouble d;
-    SB_BASIC_CHECK
-    JS_ValueToNumber(c, *vp, &d);
-    sb->timestampOffset = d;
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_timescale)
-    SB_BASIC_CHECK
-    *vp = INT_TO_JSVAL(sb->timescale);
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_SET(sourceBuffer_set_timescale)
-    SB_BASIC_CHECK
-    sb->timescale = JSVAL_TO_INT(*vp);
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_appendWindowStart)
-    SB_UPDATING_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
-    JS_ValueToNumber(c, *vp, &d);
-    if (d < 0 || d >= sb->appendWindowEnd) {
-        return JS_TRUE;
-    }
-    sb->appendWindowStart = d;
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_appendWindowEnd)
-    SB_UPDATING_CHECK
-    *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
-    JS_ValueToNumber(c, *vp, &d);
-    if (d <= sb->appendWindowStart) {
-        return JS_TRUE;
-    }
-    sb->appendWindowEnd = d;
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_buffered)
-    SB_BASIC_CHECK
-    gf_mse_source_buffer_update_buffered(sb);
-    *vp = OBJECT_TO_JSVAL(sb->buffered._this);
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(sourceBuffer_get_tracks)
-    SB_BASIC_CHECK
-    return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(html_url_createObjectURL)
-{
-    SMJS_ARGS
-    JSObject    *js_ms;
-    GF_HTML_MediaSource *ms;
-    char        blobURI[256];
-
-    SMJS_SET_RVAL(JSVAL_NULL);
-    if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) 
-    {
-        return JS_TRUE;
-    }
-    js_ms = JSVAL_TO_OBJECT(argv[0]);
-    if (!GF_JS_InstanceOf(c, js_ms, &html_media_rt->mediaSourceClass, NULL) ) 
-    {
-        return JS_TRUE;
-    }
-    ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, js_ms);
-    sprintf(blobURI, "blob:%p", ms);
-    ms->blobURI = gf_strdup(blobURI);
-    SMJS_SET_RVAL(STRING_TO_JSVAL( JS_NewStringCopyZ(c, blobURI)));
-    return JS_TRUE;
-}
-
-GF_HTML_ArrayBuffer *gf_arraybuffer_new(char *data, u32 length)
-{
-    GF_HTML_ArrayBuffer *ab = NULL;
-    GF_SAFEALLOC(ab, GF_HTML_ArrayBuffer);
-    if (length > 0) {
-        ab->data = data;
-        ab->length = length;
-    }
-    ab->reference_count = 1;
-    return ab;
-}
-
-JSObject *gf_arraybuffer_js_new(JSContext *c, char *data, u32 length, JSObject *parent)
-{
-    JSObject *obj;
-    GF_HTML_ArrayBuffer *p;
-    if (!data) return NULL;
-    p = gf_arraybuffer_new(data, length);
-    obj = JS_NewObject(c, &html_media_rt->arrayBufferClass._class, NULL, parent);
-    if (!parent) {
-        p->reference_count = 0;
-    }
-    SMJS_SET_PRIVATE(c, obj, p);
-    p->c = c;
-    p->_this = obj;
-    return obj;
-}
-
-void gf_arraybuffer_del(GF_HTML_ArrayBuffer *buffer, Bool del_js) 
-{
-    if (buffer) {
-        if (del_js) {
-            /* finalize the object from the JS perspective */
-            buffer->c = NULL;
-            buffer->_this = NULL;
-        }
-        /* but only delete if the data is not used elsewhere */
-        if(buffer->reference_count) {
-            buffer->reference_count--;
-        }
-        if (!buffer->reference_count) {
-            gf_free(buffer->data);
-            gf_free(buffer);
-        }
-    }
-}
-
-static JSBool SMJS_FUNCTION(arraybuffer_constructor)
-{
-    SMJS_ARGS
-    u32 length = 0;
-    SMJS_OBJ_CONSTRUCTOR(&html_media_rt->arrayBufferClass)
-
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL)) 
-    {
-        return JS_TRUE;
-    }
-    if (argc && !JSVAL_IS_NULL(argv[0]) && JSVAL_IS_INT(argv[0]))
-    {
-        length = JSVAL_TO_INT(argv[0]);
-    }
-    if (length > 0)
-    {
-        gf_arraybuffer_js_new(c, (char *)gf_malloc(length), length, NULL);
-    }
-    return JS_TRUE;
-}
-
-static SMJS_FUNC_PROP_GET(arraybuffer_get_byteLength)
-    GF_HTML_ArrayBuffer *p;
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL) ) 
-    {
-        return JS_TRUE;
-    }
-    p = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, obj);
-    if (p) {
-        *vp = INT_TO_JSVAL(p->length);
-    }
-    return JS_TRUE;
-}
-
-static DECL_FINALIZE(arraybuffer_finalize)
-
-    GF_HTML_ArrayBuffer *p;
-    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL) ) return;
-    p = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, obj);
-    gf_arraybuffer_del(p, GF_TRUE);
-}
-
-static JSBool SMJS_FUNCTION(js_event_add_listener)
-{
-    SMJS_OBJ
-    SMJS_ARGS
-    char                *type = NULL;
-    char                *callback = NULL;
-    jsval               funval = JSVAL_NULL;
-    JSObject            *evt_handler = NULL;
-    u32                 evtType;
-    GF_DOMEventTarget   *target = NULL;
-    GF_DOMListener      *listener = NULL;
-
-    target = (GF_DOMEventTarget *)SMJS_GET_PRIVATE(c, obj);
-
-    if (!JSVAL_CHECK_STRING(argv[0])) {
-        goto err_exit;
-    }
-    type = SMJS_CHARS(c, argv[0]);
-
-    if (JSVAL_CHECK_STRING(argv[1])) {
-        callback = SMJS_CHARS(c, argv[1]);
-        if (!callback) {
-            goto err_exit;
-        }
-    } else if (JSVAL_IS_OBJECT(argv[1])) {
-        if (JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(argv[1]))) {
-            funval = argv[1];
-        } else {
-            JSBool found;
-            jsval evt_fun;
-            evt_handler = JSVAL_TO_OBJECT(argv[1]);
-            found = JS_GetProperty(c, evt_handler, "handleEvent", &evt_fun);
-            if (!found || !JSVAL_IS_OBJECT(evt_fun) || !JS_ObjectIsFunction(c, JSVAL_TO_OBJECT(evt_fun))) {
-                goto err_exit;
-            }
-            funval = evt_fun;
-        }
-    }
-
-    evtType = gf_dom_event_type_by_name(type);
-    if (evtType==GF_EVENT_UNKNOWN) {
-        goto err_exit;
-    }
-
-    GF_SAFEALLOC(listener, GF_DOMListener);
-    if (!callback) {
-        listener->js_fun_val = *(u64 *) &funval;
-        if (listener->js_fun_val) {
-            listener->js_context = c;
-            /*protect the function - we don't know how it was passed to us, so prevent it from being GCed*/
-            gf_js_add_root((JSContext *)listener->js_context, &listener->js_fun_val, GF_JSGC_VAL);
-        }
-        listener->evt_listen_obj = evt_handler;
-    } else {
-        listener->callback = gf_strdup(callback);
-    }
-    gf_list_add(target->listeners, listener);
-
-err_exit:
-    SMJS_FREE(c, type);
-    SMJS_FREE(c, callback);
-    return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(js_event_remove_listener)
-{
-    return JS_TRUE;
-}
-
-static JSBool SMJS_FUNCTION(js_event_dispatch)
-{
-    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", js_event_add_listener, 3),
-                SMJS_FUNCTION_SPEC("removeEventListener", js_event_remove_listener, 3),
-                SMJS_FUNCTION_SPEC("dispatchEvent", js_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[] = {
-                {"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(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, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
-        {
-            JSPropertySpec SourceBufferListClassProps[] = {
-                {"length",        HTML_SOURCEBUFFERLIST_PROP_LENGTH,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourcebufferlist_get_length, 0},
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec SourceBufferListClassFuncs[] = {
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->sourceBufferListClass, 0, 0, SourceBufferListClassProps, SourceBufferListClassFuncs, 0, 0);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] SourceBufferList class initialized\n"));
-        }
-
-        JS_SETUP_CLASS(html_media_rt->URLClass, "URL", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
-        {
-            JSPropertySpec URLClassProps[] = {
-                {0, 0, 0, 0, 0}
-            };
-            JSFunctionSpec URLClassFuncs[] = {
-                SMJS_FUNCTION_SPEC("createObjectURL", html_url_createObjectURL, 1),
-                SMJS_FUNCTION_SPEC(0, 0, 0)
-            };
-            GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->URLClass, 0, 0, URLClassProps, 0, 0, URLClassFuncs);
-            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] URL class initialized\n"));
-        }
-    }
-}
-
-
-#endif  /*GPAC_HAS_SPIDERMONKEY*/
-
-#endif  /*GPAC_DISABLE_SVG*/
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato
+ *          Copyright (c) Telecom ParisTech 2012-
+ *          All rights reserved
+ *
+ *  This file is part of GPAC / Scene Graph sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include <gpac/setup.h>
+
+#ifndef GPAC_DISABLE_SVG
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+#ifdef GPAC_ANDROID
+#ifndef XP_UNIX
+#define XP_UNIX
+#endif /* XP_UNIX */
+#endif
+
+#include <gpac/html5_mse.h>
+
+#define JSVAL_CHECK_STRING(_v) (JSVAL_IS_STRING(_v) || JSVAL_IS_NULL(_v))
+
+typedef enum 
+{
+    /* MediaSource properties */
+    HTML_MEDIASOURCE_PROP_SOURCEBUFFERS         = -1,
+    HTML_MEDIASOURCE_PROP_ACTIVESOURCEBUFFERS   = -2,
+    HTML_MEDIASOURCE_PROP_DURATION              = -3,
+    HTML_MEDIASOURCE_PROP_READYSTATE            = -4,
+    /* SourceBuffer properties */
+    HTML_SOURCEBUFFER_PROP_MODE					= -5,
+    HTML_SOURCEBUFFER_PROP_UPDATING             = -6,
+    HTML_SOURCEBUFFER_PROP_BUFFERED             = -7,
+    HTML_SOURCEBUFFER_PROP_TIMESTAMPOFFSET      = -8,
+    HTML_SOURCEBUFFER_PROP_TIMESCALE            = -9,
+    HTML_SOURCEBUFFER_PROP_AUDIOTRACKS          = -10,
+    HTML_SOURCEBUFFER_PROP_VIDEOTRACKS          = -11,
+    HTML_SOURCEBUFFER_PROP_TEXTTRACKS           = -12,
+    HTML_SOURCEBUFFER_PROP_APPENDWINDOWSTART    = -13,
+    HTML_SOURCEBUFFER_PROP_APPENDWINDOWEND      = -14,
+    /* SourceBufferList properties */
+    HTML_SOURCEBUFFERLIST_PROP_LENGTH           = -15,
+} GF_HTML_MediaSourcePropEnum;
+
+static GF_HTML_MediaRuntime *html_media_rt = NULL;
+
+Bool gf_mse_is_mse_object(JSContext *c, JSObject *obj) {
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return GF_TRUE;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) return GF_TRUE;
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) ) return GF_TRUE;
+	return GF_FALSE;
+}
+
+static GFINLINE GF_SceneGraph *mediasource_get_scenegraph(JSContext *c)
+{
+    GF_SceneGraph *scene;
+    JSObject *global = JS_GetGlobalObject(c);
+    assert(global);
+    scene = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, global);
+    assert(scene);
+    return scene;
+}
+
+void gf_mse_get_event_target(JSContext *c, JSObject *obj, GF_DOMEventTarget **target, GF_SceneGraph **sg) {
+	if (!sg || !target) return;
+	*sg = mediasource_get_scenegraph(c);
+	if (GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+		GF_HTML_MediaSource *ms = NULL;
+		ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+		*target = ms->evt_target;
+	} else if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) {
+		GF_HTML_SourceBuffer *sb = NULL;
+		sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);
+		*target = sb->evt_target;
+	} else if (GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) ) {
+		GF_HTML_SourceBufferList *sbl = NULL;
+		sbl = (GF_HTML_SourceBufferList *)SMJS_GET_PRIVATE(c, obj);
+		*target = sbl->evt_target;
+	} else {
+		*target = NULL;
+		*sg = NULL;
+	}
+}
+
+static void mediasource_sourceBuffer_initjs(JSContext *c, JSObject *ms_obj, GF_HTML_SourceBuffer *sb)
+{
+    sb->_this = JS_NewObject(c, &html_media_rt->sourceBufferClass._class, 0, 0);
+    //gf_js_add_root(c, &sb->_this, GF_JSGC_OBJECT);
+    SMJS_SET_PRIVATE(c, sb->_this, sb);
+    sb->buffered->_this = JS_NewObject(c, &html_media_rt->timeRangesClass._class, NULL, sb->_this);
+    SMJS_SET_PRIVATE(c, sb->buffered->_this, sb->buffered);
+}
+
+#include <gpac/internal/terminal_dev.h>
+Bool gf_term_is_type_supported(GF_Terminal *term, const char* mime);
+
+static JSBool SMJS_FUNCTION(mediasource_is_type_supported)
+{
+    SMJS_ARGS
+    GF_SceneGraph *sg;
+    GF_JSAPIParam par;
+    Bool isSupported = GF_TRUE;
+    char *mime;
+    if (!argc || !JSVAL_CHECK_STRING(argv[0])) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    mime = SMJS_CHARS(c, argv[0]);
+    sg = mediasource_get_scenegraph(c);
+	assert(sg);
+	if (!strlen(mime)) { 
+		isSupported = GF_FALSE;
+	} else {
+		sg->script_action(sg->script_action_cbck, GF_JSAPI_OP_GET_TERM, NULL, &par);
+		isSupported = gf_term_is_type_supported((GF_Terminal *)par.term, mime);
+	}
+    SMJS_SET_RVAL(BOOLEAN_TO_JSVAL(isSupported ? JS_TRUE : JS_FALSE));
+	SMJS_FREE(c, mime);
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(mediasource_addSourceBuffer)
+{
+    SMJS_OBJ
+    SMJS_ARGS
+    GF_HTML_SourceBuffer    *sb;
+    GF_HTML_MediaSource     *ms;
+    const char              *mime;
+	GF_Err					e;
+	u32						exception = 0;
+
+	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])) 
+    {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    mime = SMJS_CHARS(c, argv[0]);
+    if (!strlen(mime))     {
+		exception = GF_DOM_EXC_INVALID_ACCESS_ERR;
+		goto exit;
+    }
+    ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+	if (!ms) {
+		exception = GF_DOM_EXC_INVALID_ACCESS_ERR;
+		goto exit;
+	} else if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		exception = GF_DOM_EXC_INVALID_STATE_ERR;
+		goto exit;
+    }
+    assert(ms->service);
+    /* 
+	if (gf_list_count(ms->sourceBuffers.list) > 0) {
+		dom_throw_exception(c, GF_DOM_EXC_QUOTA_EXCEEDED_ERR);
+		e = GF_BAD_PARAM;
+		goto exit;
+	}
+	*/
+    sb = gf_mse_source_buffer_new(ms);
+	assert(sb);
+    e = gf_mse_source_buffer_load_parser(sb, mime);
+	if (e == GF_OK) {
+	    gf_mse_mediasource_add_source_buffer(ms, sb);
+		mediasource_sourceBuffer_initjs(c, obj, sb);
+		SMJS_SET_RVAL( OBJECT_TO_JSVAL(sb->_this) );
+	} else {
+		gf_mse_source_buffer_del(sb);
+		exception = GF_DOM_EXC_NOT_SUPPORTED_ERR;
+	}
+exit:
+	if (mime) { 
+		SMJS_FREE(c, (void *)mime);
+	}
+	if (exception) {
+		return dom_throw_exception(c, exception);
+	} else {
+		return JS_TRUE;
+	}
+}
+
+static JSBool SMJS_FUNCTION(mediasource_removeSourceBuffer)
+{
+    SMJS_OBJ
+    SMJS_ARGS
+    GF_HTML_MediaSource *ms;
+	GF_HTML_SourceBuffer *sb;
+	JSObject *sb_obj;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+	if (!ms) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+    if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    sb_obj = JSVAL_TO_OBJECT(argv[0]);
+    if (!GF_JS_InstanceOf(c, sb_obj, &html_media_rt->sourceBufferClass, NULL) ) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, sb_obj);
+	if (!sb) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	} else {
+		GF_Err e = gf_mse_remove_source_buffer(ms, sb);
+		if (e == GF_NOT_FOUND) {
+			return dom_throw_exception(c, GF_DOM_EXC_NOT_FOUND_ERR);
+		}
+	}
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(mediasource_endOfStream)
+{
+    SMJS_OBJ
+    SMJS_ARGS
+    GF_HTML_MediaSource *ms;
+	u32 i;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+	if (!ms) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+	}
+	for (i = 0; i < gf_list_count(ms->sourceBuffers.list); i++) {
+		GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
+		if (sb->updating) {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+		}
+	}
+    if (argc > 0)  {
+		char *error = NULL;
+		if (!JSVAL_CHECK_STRING(argv[0])) {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		}
+	    error = SMJS_CHARS(c, argv[0]);
+		if (strcmp(error, "decode") && strcmp(error, "network")) {
+			SMJS_FREE(c, error);
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		}
+		SMJS_FREE(c, error);
+    }
+	gf_mse_mediasource_end(ms);
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(media_source_constructor)
+{
+    GF_HTML_MediaSource *p;
+    SMJS_OBJ_CONSTRUCTOR(&html_media_rt->mediaSourceClass)
+
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return JS_TRUE;
+
+    p = gf_mse_media_source_new();
+    p->c = c;
+    p->_this = obj;
+    SMJS_SET_PRIVATE(c, obj, p);
+
+    p->sourceBuffers._this = JS_NewObject(c, &html_media_rt->sourceBufferListClass._class, 0, 0);
+    SMJS_SET_PRIVATE(c, p->sourceBuffers._this, &p->sourceBuffers);
+
+    p->activeSourceBuffers._this = JS_NewObject(c, &html_media_rt->sourceBufferListClass._class, 0, 0);
+    SMJS_SET_PRIVATE(c, p->activeSourceBuffers._this, &p->activeSourceBuffers);
+
+    SMJS_SET_RVAL( OBJECT_TO_JSVAL(obj) );
+    return JS_TRUE;
+}
+
+static DECL_FINALIZE(media_source_finalize)
+
+    GF_HTML_MediaSource *p;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) return;
+    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+	gf_mse_mediasource_del(p, GF_TRUE);
+}
+
+static SMJS_FUNC_PROP_GET(media_source_get_source_buffers)
+    GF_HTML_MediaSource *p;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+    if (!p) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	} else {
+        *vp = OBJECT_TO_JSVAL(p->sourceBuffers._this);
+        return JS_TRUE;
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(media_source_get_active_source_buffers)
+    GF_HTML_MediaSource *p;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+        return JS_TRUE;
+    }
+    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+    if (p) {
+        *vp = OBJECT_TO_JSVAL(p->activeSourceBuffers._this);
+        return JS_TRUE;
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(media_source_get_ready_state)
+    GF_HTML_MediaSource *p;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+    if (!p) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    } else {
+        switch (p->readyState)
+        {
+        case MEDIA_SOURCE_READYSTATE_CLOSED:
+            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "closed"));
+            break;
+        case MEDIA_SOURCE_READYSTATE_OPEN:
+            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "open"));
+            break;
+        case MEDIA_SOURCE_READYSTATE_ENDED:
+            *vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "ended"));
+            break;
+        }
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(media_source_get_duration)
+    GF_HTML_MediaSource *p;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL) ) {
+        return JS_TRUE;
+    }
+    p = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+    if (p) {
+        if (p->readyState == MEDIA_SOURCE_READYSTATE_CLOSED || p->durationType == DURATION_NAN) {
+            *vp = JS_GetNaNValue(c);
+        } else if (p->durationType == DURATION_INFINITY) {
+            *vp = JS_GetPositiveInfinityValue(c);
+        } else {
+            *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, p->duration));
+        }
+        return JS_TRUE;
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(media_source_set_duration)
+    GF_HTML_MediaSource *ms;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->mediaSourceClass, NULL)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, obj);
+    if (!ms) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    } else {
+        if (ms->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+		} else if (!JSVAL_IS_NUMBER(*vp)) {
+			return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+		} else {
+			u32 i, count;
+			count = gf_list_count(ms->sourceBuffers.list);
+			for (i = 0; i < count; i++) {
+				GF_HTML_SourceBuffer *sb = (GF_HTML_SourceBuffer *)gf_list_get(ms->sourceBuffers.list, i);
+				if (sb->updating) { 
+					return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+				}
+			}
+			{
+				jsdouble durationValue;
+				JS_ValueToNumber(c, *vp, &durationValue);
+				if (durationValue < 0) {
+					return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+				} else {
+					ms->duration = durationValue;
+					ms->durationType = DURATION_VALUE;
+					/* TODO: call the run duration algorithm */
+				}
+			}
+		}
+	}
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET( sourcebufferlist_getProperty)
+    GF_HTML_SourceBufferList *p;
+	u32 count;
+	s32 idx;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferListClass, NULL) ) 
+    {
+        return JS_TRUE;
+    }
+    p = (GF_HTML_SourceBufferList *)SMJS_GET_PRIVATE(c, obj);
+    if (p) {
+		count = gf_list_count(p->list);
+		if (!SMJS_ID_IS_INT(id)) return JS_TRUE;
+
+		switch (SMJS_ID_TO_INT(id)) {
+		case HTML_SOURCEBUFFERLIST_PROP_LENGTH:
+			*vp = INT_TO_JSVAL(count);
+			break;
+		default:
+			idx = SMJS_ID_TO_INT(id);
+			if ((idx<0) || ((u32) idx>=count)) {
+				*vp = JSVAL_VOID;
+				return JS_TRUE;
+			} else {
+				GF_HTML_SourceBuffer *sb;
+				sb = (GF_HTML_SourceBuffer *)gf_list_get(p->list, idx);
+				*vp = OBJECT_TO_JSVAL(sb->_this);
+				return JS_TRUE;
+			}
+
+		}
+    }
+    return JS_TRUE;
+
+}
+
+
+#define SB_BASIC_CHECK \
+    GF_HTML_SourceBuffer *sb; \
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) )  \
+    { \
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
+    }\
+    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);\
+    if (!sb)\
+    {\
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR); \
+    }
+
+#define SB_UPDATING_CHECK \
+    SB_BASIC_CHECK \
+    /* check if this source buffer is still in the list of source buffers */\
+    if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0)\
+    {\
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR); \
+    } \
+    if (sb->updating)\
+    {\
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR); \
+    }
+
+/* FIXME : Function not used, generates warning on debian
+static DECL_FINALIZE(sourcebuffer_finalize)
+
+    GF_HTML_SourceBuffer *sb;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->sourceBufferClass, NULL) ) return;
+    sb = (GF_HTML_SourceBuffer *)SMJS_GET_PRIVATE(c, obj);
+    if (sb) {
+         TODO delete lists, remove functions
+        gf_free(sb);
+    }
+}
+*/
+
+static JSBool SMJS_FUNCTION(sourcebuffer_appendBuffer)
+{
+    SMJS_OBJ
+    SMJS_ARGS
+    GF_HTML_ArrayBuffer  *ab;
+    JSObject             *js_ab;
+
+    SB_UPDATING_CHECK
+    if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_CLOSED) {
+        return JS_TRUE;
+    } else if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
+		gf_mse_mediasource_open(sb->mediasource, NULL);
+    }
+
+    if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    js_ab = JSVAL_TO_OBJECT(argv[0]);
+    if (!GF_JS_InstanceOf(c, js_ab, &html_media_rt->arrayBufferClass, NULL) ) 
+    {
+		return dom_throw_exception(c, GF_DOM_EXC_TYPE_MISMATCH_ERR);
+    }
+    ab = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, js_ab);
+    if (!ab->length)
+    {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    /* TODO: handle buffer full flag case */
+	/* TODO: run the coded frame eviction algo */
+    gf_mse_source_buffer_append_arraybuffer(sb, ab);
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(sourcebuffer_appendStream)
+{
+    SMJS_OBJ
+    SB_UPDATING_CHECK
+    /* TODO */
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(sourcebuffer_abort)
+{
+    SMJS_OBJ
+    SB_BASIC_CHECK
+    if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+    }
+    if (sb->mediasource->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+    }
+    if (gf_mse_source_buffer_abort(sb) != GF_OK) {
+        return JS_TRUE;
+    }
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(sourcebuffer_remove)
+{
+    SMJS_OBJ
+    SMJS_ARGS
+    jsdouble start, end;
+    SB_UPDATING_CHECK
+    if (argc < 2 || !JSVAL_IS_NUMBER(argv[0]) || !JSVAL_IS_NUMBER(argv[1])) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    JS_ValueToNumber(c, argv[0], &start);
+    JS_ValueToNumber(c, argv[1], &end);
+    if (start < 0 /* || start > sb->duration */ || start >= end) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    if (sb->mediasource->readyState != MEDIA_SOURCE_READYSTATE_OPEN) {
+		gf_mse_mediasource_open(sb->mediasource, NULL);
+    }
+	gf_mse_remove(sb, start, end);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_mode)
+    SB_BASIC_CHECK
+	if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEGMENTS) {
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "segments"));
+	} else if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE) {
+		*vp = STRING_TO_JSVAL( JS_NewStringCopyZ(c, "sequence"));
+	}
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_mode)
+	char *smode = NULL;
+	GF_HTML_MediaSource_AppendMode mode;
+    SB_BASIC_CHECK
+    if (!JSVAL_CHECK_STRING(*vp)) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    smode = SMJS_CHARS(c, *vp);
+	if (stricmp(smode, "segments") && stricmp(smode, "sequence")) {
+		SMJS_FREE(c, smode);
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+	if (!stricmp(smode, "segments")) {
+        mode = MEDIA_SOURCE_APPEND_MODE_SEGMENTS;
+    } else if (!stricmp(smode, "sequence")) {
+        mode = MEDIA_SOURCE_APPEND_MODE_SEQUENCE;
+    }
+	SMJS_FREE(c, smode);
+    if (gf_list_find(sb->mediasource->sourceBuffers.list, sb) < 0) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+    }
+    if (sb->updating) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+    }
+	if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
+		gf_mse_mediasource_open(sb->mediasource, NULL);
+	}
+	if (sb->append_state == MEDIA_SOURCE_APPEND_STATE_PARSING_MEDIA_SEGMENT) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+	}
+    sb->append_mode = mode;
+	if (sb->append_mode == MEDIA_SOURCE_APPEND_MODE_SEQUENCE) {
+		sb->group_start_timestamp_flag = GF_TRUE;
+		sb->group_start_timestamp = sb->group_end_timestamp;
+	}
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_updating)
+    SB_BASIC_CHECK
+    *vp = BOOLEAN_TO_JSVAL(sb->updating ? JS_TRUE : JS_FALSE);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_timestampOffset)
+    SB_BASIC_CHECK
+    *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->timestampOffset*1.0/sb->timescale));
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_timestampOffset)
+    jsdouble d;
+    SB_UPDATING_CHECK
+	if (sb->mediasource->readyState == MEDIA_SOURCE_READYSTATE_ENDED) {
+		gf_mse_mediasource_open(sb->mediasource, NULL);
+	}
+	if (sb->append_state == MEDIA_SOURCE_APPEND_STATE_PARSING_MEDIA_SEGMENT) {
+        return dom_throw_exception(c, GF_DOM_EXC_INVALID_STATE_ERR);
+	}
+    JS_ValueToNumber(c, *vp, &d);
+	gf_mse_source_buffer_set_timestampOffset(sb, d);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_timescale)
+    SB_BASIC_CHECK
+    *vp = INT_TO_JSVAL(sb->timescale);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_timescale)
+    SB_BASIC_CHECK
+    gf_mse_source_buffer_set_timescale(sb, JSVAL_TO_INT(*vp));
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_appendWindowStart)
+    SB_BASIC_CHECK
+    *vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->appendWindowStart));
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_appendWindowStart)
+    jsdouble d;
+    SB_UPDATING_CHECK
+	if (!JSVAL_IS_NUMBER(*vp)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+    JS_ValueToNumber(c, *vp, &d);
+    if (d < 0 || d >= sb->appendWindowEnd) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    sb->appendWindowStart = d;
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_appendWindowEnd)
+    SB_BASIC_CHECK
+	if (sb->appendWindowEnd == GF_MAX_DOUBLE) {
+		*vp = JS_GetPositiveInfinityValue(c);
+	} else {
+		*vp = DOUBLE_TO_JSVAL(JS_NewDouble(c, sb->appendWindowEnd));
+	}
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_SET(sourceBuffer_set_appendWindowEnd)
+    jsdouble d;
+    SB_UPDATING_CHECK
+	if (!JSVAL_IS_NUMBER(*vp)) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+	}
+    JS_ValueToNumber(c, *vp, &d);
+    if (d <= sb->appendWindowStart) {
+		return dom_throw_exception(c, GF_DOM_EXC_INVALID_ACCESS_ERR);
+    }
+    sb->appendWindowEnd = d;
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_buffered)
+    SB_BASIC_CHECK
+    gf_mse_source_buffer_update_buffered(sb);
+    *vp = OBJECT_TO_JSVAL(sb->buffered->_this);
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(sourceBuffer_get_tracks)
+    SB_BASIC_CHECK
+	/* TODO */
+    return JS_TRUE;
+}
+
+static JSBool SMJS_FUNCTION(html_url_createObjectURL)
+{
+    SMJS_ARGS
+    JSObject    *js_ms;
+    GF_HTML_MediaSource *ms;
+    char        blobURI[256];
+
+    SMJS_SET_RVAL(JSVAL_NULL);
+    if (!argc || JSVAL_IS_NULL(argv[0]) || !JSVAL_IS_OBJECT(argv[0])) {
+        return JS_TRUE;
+    }
+    js_ms = JSVAL_TO_OBJECT(argv[0]);
+    if (!GF_JS_InstanceOf(c, js_ms, &html_media_rt->mediaSourceClass, NULL) ) 
+    {
+        return JS_TRUE;
+    }
+    ms = (GF_HTML_MediaSource *)SMJS_GET_PRIVATE(c, js_ms);
+    sprintf(blobURI, "blob:%p", ms);
+    ms->blobURI = gf_strdup(blobURI);
+    SMJS_SET_RVAL(STRING_TO_JSVAL( JS_NewStringCopyZ(c, blobURI)));
+    return JS_TRUE;
+}
+
+GF_HTML_ArrayBuffer *gf_arraybuffer_new(char *data, u32 length)
+{
+    GF_HTML_ArrayBuffer *ab = NULL;
+    GF_SAFEALLOC(ab, GF_HTML_ArrayBuffer);
+    if (length > 0) {
+        ab->data = data;
+        ab->length = length;
+    }
+    ab->reference_count = 0;
+    return ab;
+}
+
+JSObject *gf_arraybuffer_js_new(JSContext *c, char *data, u32 length, JSObject *parent)
+{
+    JSObject *obj;
+    GF_HTML_ArrayBuffer *p;
+    if (!data) return NULL;
+    p = gf_arraybuffer_new(data, length);
+    obj = JS_NewObject(c, &html_media_rt->arrayBufferClass._class, NULL, parent);
+    if (!parent) {
+        p->reference_count = 0;
+    }
+    SMJS_SET_PRIVATE(c, obj, p);
+    p->c = c;
+    p->_this = obj;
+    return obj;
+}
+
+void xhr_del_array_buffer(void *udta);
+
+void gf_arraybuffer_del(GF_HTML_ArrayBuffer *buffer, Bool del_js) 
+{
+    if (buffer) {
+        if (del_js && buffer->_this) {
+			/*if we have a JS object, make sure the parent XHR doesn't point to us ...*/
+			JSObject *xhro = JS_GetParent(buffer->c, buffer->_this); 
+			if (xhro) {
+				void *xhr_ctx = SMJS_GET_PRIVATE(buffer->c, xhro);
+				xhr_del_array_buffer(xhr_ctx);
+			}
+
+            /* finalize the object from the JS perspective */
+            buffer->c = NULL;
+            buffer->_this = NULL;
+        }
+        /* but only delete if the data is not used elsewhere */
+        if(!del_js && buffer->reference_count) {
+            buffer->reference_count--;
+        }
+        if (!buffer->reference_count && !buffer->_this) {
+            gf_free(buffer->data);
+			if (buffer->url) gf_free(buffer->url);
+            gf_free(buffer);
+        }
+    }
+}
+
+static JSBool SMJS_FUNCTION(arraybuffer_constructor)
+{
+    SMJS_ARGS
+    u32 length = 0;
+    SMJS_OBJ_CONSTRUCTOR(&html_media_rt->arrayBufferClass)
+
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL)) 
+    {
+        return JS_TRUE;
+    }
+    if (argc && !JSVAL_IS_NULL(argv[0]) && JSVAL_IS_INT(argv[0])) {
+        length = JSVAL_TO_INT(argv[0]);
+    }
+    if (length > 0) {
+        gf_arraybuffer_js_new(c, (char *)gf_malloc(length), length, NULL);
+    }
+    return JS_TRUE;
+}
+
+static SMJS_FUNC_PROP_GET(arraybuffer_get_byteLength)
+    GF_HTML_ArrayBuffer *p;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL) ) {
+        return JS_TRUE;
+    }
+    p = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, obj);
+    if (p) {
+        *vp = INT_TO_JSVAL(p->length);
+    }
+    return JS_TRUE;
+}
+
+static DECL_FINALIZE(arraybuffer_finalize)
+
+    GF_HTML_ArrayBuffer *p;
+    if (!GF_JS_InstanceOf(c, obj, &html_media_rt->arrayBufferClass, NULL) ) return;
+    p = (GF_HTML_ArrayBuffer *)SMJS_GET_PRIVATE(c, obj);
+    if (!p) return;
+	gf_arraybuffer_del(p, GF_TRUE);
+}
+
+static JSBool SMJS_FUNCTION(mse_event_add_listener)
+{
+	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_add_listener, GF_Node *vrml_node);
+	return gf_sg_js_event_add_listener(SMJS_CALL_ARGS, NULL);
+}
+
+static JSBool SMJS_FUNCTION(mse_event_remove_listener)
+{
+	JSBool SMJS_FUNCTION_EXT(gf_sg_js_event_remove_listener, GF_Node *vrml_node);
+	return gf_sg_js_event_remove_listener(SMJS_CALL_ARGS, NULL);
+}
+
+static JSBool SMJS_FUNCTION(mse_event_dispatch)
+{
+	/* TODO */
+    return JS_TRUE;
+}
+
+void html_media_source_init_js_api(JSContext *js_ctx, JSObject *global, GF_HTML_MediaRuntime *_html_media_rt)
+{
+    /* HTML Media Element */
+    if (_html_media_rt) {
+        html_media_rt = _html_media_rt;
+
+        JS_SETUP_CLASS(html_media_rt->arrayBufferClass, "ArrayBuffer", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, arraybuffer_finalize);
+        {
+            JSPropertySpec arrayBufferClassProps[] = {
+                {"byteLength",       -1,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, arraybuffer_get_byteLength, 0},
+                {0, 0, 0, 0, 0}
+            };
+            GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->arrayBufferClass, arraybuffer_constructor, 0, arrayBufferClassProps, 0, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] ArrayBuffer class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->mediaSourceClass, "MediaSource", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, media_source_finalize);
+        {
+            JSPropertySpec htmlMediaSourceClassProps[] = {
+                {"sourceBuffers",       HTML_MEDIASOURCE_PROP_SOURCEBUFFERS,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_source_buffers, 0},
+                {"activeSourceBuffers", HTML_MEDIASOURCE_PROP_ACTIVESOURCEBUFFERS, JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_active_source_buffers, 0},
+                {"readyState",          HTML_MEDIASOURCE_PROP_READYSTATE,          JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, media_source_get_ready_state, 0},
+                {"duration",            HTML_MEDIASOURCE_PROP_DURATION,            JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, media_source_get_duration, media_source_set_duration},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec htmlMediaSourceClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("addSourceBuffer", mediasource_addSourceBuffer, 1),
+                SMJS_FUNCTION_SPEC("removeSourceBuffer", mediasource_removeSourceBuffer, 1),
+                SMJS_FUNCTION_SPEC("endOfStream", mediasource_endOfStream, 1),
+                SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
+                SMJS_FUNCTION_SPEC("removeEventListener", mse_event_remove_listener, 3),
+                SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_dispatch, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            JSFunctionSpec htmlMediaSourceClassStaticFuncs[] = {
+                SMJS_FUNCTION_SPEC("isTypeSupported", mediasource_is_type_supported, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->mediaSourceClass, media_source_constructor, 0, htmlMediaSourceClassProps, htmlMediaSourceClassFuncs, 0, htmlMediaSourceClassStaticFuncs);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] MediaSource class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->sourceBufferClass, "SourceBuffer", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
+        {
+            JSPropertySpec SourceBufferClassProps[] = {
+                {"mode",			  HTML_SOURCEBUFFER_PROP_MODE,             JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_mode, sourceBuffer_set_mode},
+                {"updating",          HTML_SOURCEBUFFER_PROP_UPDATING,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_updating, 0},
+                {"buffered",          HTML_SOURCEBUFFER_PROP_BUFFERED,         JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_buffered, 0},
+                {"timestampOffset",   HTML_SOURCEBUFFER_PROP_TIMESTAMPOFFSET,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_timestampOffset, sourceBuffer_set_timestampOffset},
+                {"timescale",         HTML_SOURCEBUFFER_PROP_TIMESCALE,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_timescale, sourceBuffer_set_timescale},
+                {"appendWindowStart", HTML_SOURCEBUFFER_PROP_APPENDWINDOWSTART,JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_appendWindowStart, sourceBuffer_set_appendWindowStart},
+                {"appendWindowEnd",   HTML_SOURCEBUFFER_PROP_APPENDWINDOWEND,  JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED, sourceBuffer_get_appendWindowEnd, sourceBuffer_set_appendWindowEnd},
+                {"audioTracks",       HTML_SOURCEBUFFER_PROP_AUDIOTRACKS,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
+                {"videoTracks",       HTML_SOURCEBUFFER_PROP_VIDEOTRACKS,      JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
+                {"textTracks",        HTML_SOURCEBUFFER_PROP_TEXTTRACKS,       JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, sourceBuffer_get_tracks, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec SourceBufferClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("appendBuffer", sourcebuffer_appendBuffer, 1),
+                SMJS_FUNCTION_SPEC("appendStream", sourcebuffer_appendStream, 1),
+                SMJS_FUNCTION_SPEC("abort",  sourcebuffer_abort, 0),
+                SMJS_FUNCTION_SPEC("remove", sourcebuffer_remove, 2),
+                SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
+                SMJS_FUNCTION_SPEC("removeEventListener", mse_event_add_listener, 3),
+                SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_add_listener, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->sourceBufferClass, 0, 0, SourceBufferClassProps, SourceBufferClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] SourceBuffer class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->sourceBufferListClass, "SourceBufferList", JSCLASS_HAS_PRIVATE, sourcebufferlist_getProperty, JS_PropertyStub_forSetter, JS_PropertyStub);
+        {
+            JSPropertySpec SourceBufferListClassProps[] = {
+                {"length",        HTML_SOURCEBUFFERLIST_PROP_LENGTH,        JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_SHARED | JSPROP_READONLY, 0, 0},
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec SourceBufferListClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("addEventListener", mse_event_add_listener, 3),
+                SMJS_FUNCTION_SPEC("removeEventListener", mse_event_add_listener, 3),
+                SMJS_FUNCTION_SPEC("dispatchEvent", mse_event_add_listener, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->sourceBufferListClass, 0, 0, SourceBufferListClassProps, SourceBufferListClassFuncs, 0, 0);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] SourceBufferList class initialized\n"));
+        }
+
+        JS_SETUP_CLASS(html_media_rt->URLClass, "URL", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
+        {
+            JSPropertySpec URLClassProps[] = {
+                {0, 0, 0, 0, 0}
+            };
+            JSFunctionSpec URLClassFuncs[] = {
+                SMJS_FUNCTION_SPEC("createObjectURL", html_url_createObjectURL, 1),
+                SMJS_FUNCTION_SPEC(0, 0, 0)
+            };
+            GF_JS_InitClass(js_ctx, global, 0, &html_media_rt->URLClass, 0, 0, URLClassProps, 0, 0, URLClassFuncs);
+            GF_LOG(GF_LOG_DEBUG, GF_LOG_SCRIPT, ("[HTML Media Source API] URL class initialized\n"));
+        }
+    }
+}
+
+
+#endif  /*GPAC_HAS_SPIDERMONKEY*/
+
+#endif  /*GPAC_DISABLE_SVG*/

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/mpeg4_nodes.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/mpeg4_nodes.c Changed

@@ -6440,72 +6440,72 @@
 	gf_node_setup((GF_Node *)p, TAG_MPEG4_FAP);
 
 	/*default field values*/
-	p->open_jaw = 2 << 31;
-	p->lower_t_midlip = 2 << 31;
-	p->raise_b_midlip = 2 << 31;
-	p->stretch_l_corner = 2 << 31;
-	p->stretch_r_corner = 2 << 31;
-	p->lower_t_lip_lm = 2 << 31;
-	p->lower_t_lip_rm = 2 << 31;
-	p->lower_b_lip_lm = 2 << 31;
-	p->lower_b_lip_rm = 2 << 31;
-	p->raise_l_cornerlip = 2 << 31;
-	p->raise_r_cornerlip = 2 << 31;
-	p->thrust_jaw = 2 << 31;
-	p->shift_jaw = 2 << 31;
-	p->push_b_lip = 2 << 31;
-	p->push_t_lip = 2 << 31;
-	p->depress_chin = 2 << 31;
-	p->close_t_l_eyelid = 2 << 31;
-	p->close_t_r_eyelid = 2 << 31;
-	p->close_b_l_eyelid = 2 << 31;
-	p->close_b_r_eyelid = 2 << 31;
-	p->yaw_l_eyeball = 2 << 31;
-	p->yaw_r_eyeball = 2 << 31;
-	p->pitch_l_eyeball = 2 << 31;
-	p->pitch_r_eyeball = 2 << 31;
-	p->thrust_l_eyeball = 2 << 31;
-	p->thrust_r_eyeball = 2 << 31;
-	p->dilate_l_pupil = 2 << 31;
-	p->dilate_r_pupil = 2 << 31;
-	p->raise_l_i_eyebrow = 2 << 31;
-	p->raise_r_i_eyebrow = 2 << 31;
-	p->raise_l_m_eyebrow = 2 << 31;
-	p->raise_r_m_eyebrow = 2 << 31;
-	p->raise_l_o_eyebrow = 2 << 31;
-	p->raise_r_o_eyebrow = 2 << 31;
-	p->squeeze_l_eyebrow = 2 << 31;
-	p->squeeze_r_eyebrow = 2 << 31;
-	p->puff_l_cheek = 2 << 31;
-	p->puff_r_cheek = 2 << 31;
-	p->lift_l_cheek = 2 << 31;
-	p->lift_r_cheek = 2 << 31;
-	p->shift_tongue_tip = 2 << 31;
-	p->raise_tongue_tip = 2 << 31;
-	p->thrust_tongue_tip = 2 << 31;
-	p->raise_tongue = 2 << 31;
-	p->tongue_roll = 2 << 31;
-	p->head_pitch = 2 << 31;
-	p->head_yaw = 2 << 31;
-	p->head_roll = 2 << 31;
-	p->lower_t_midlip_o = 2 << 31;
-	p->raise_b_midlip_o = 2 << 31;
-	p->stretch_l_cornerlip = 2 << 31;
-	p->stretch_r_cornerlip = 2 << 31;
-	p->lower_t_lip_lm_o = 2 << 31;
-	p->lower_t_lip_rm_o = 2 << 31;
-	p->raise_b_lip_lm_o = 2 << 31;
-	p->raise_b_lip_rm_o = 2 << 31;
-	p->raise_l_cornerlip_o = 2 << 31;
-	p->raise_r_cornerlip_o = 2 << 31;
-	p->stretch_l_nose = 2 << 31;
-	p->stretch_r_nose = 2 << 31;
-	p->raise_nose = 2 << 31;
-	p->bend_nose = 2 << 31;
-	p->raise_l_ear = 2 << 31;
-	p->raise_r_ear = 2 << 31;
-	p->pull_l_ear = 2 << 31;
-	p->pull_r_ear = 2 << 31;
+	p->open_jaw = 1 << 31;
+	p->lower_t_midlip = 1 << 31;
+	p->raise_b_midlip = 1 << 31;
+	p->stretch_l_corner = 1 << 31;
+	p->stretch_r_corner = 1 << 31;
+	p->lower_t_lip_lm = 1 << 31;
+	p->lower_t_lip_rm = 1 << 31;
+	p->lower_b_lip_lm = 1 << 31;
+	p->lower_b_lip_rm = 1 << 31;
+	p->raise_l_cornerlip = 1 << 31;
+	p->raise_r_cornerlip = 1 << 31;
+	p->thrust_jaw = 1 << 31;
+	p->shift_jaw = 1 << 31;
+	p->push_b_lip = 1 << 31;
+	p->push_t_lip = 1 << 31;
+	p->depress_chin = 1 << 31;
+	p->close_t_l_eyelid = 1 << 31;
+	p->close_t_r_eyelid = 1 << 31;
+	p->close_b_l_eyelid = 1 << 31;
+	p->close_b_r_eyelid = 1 << 31;
+	p->yaw_l_eyeball = 1 << 31;
+	p->yaw_r_eyeball = 1 << 31;
+	p->pitch_l_eyeball = 1 << 31;
+	p->pitch_r_eyeball = 1 << 31;
+	p->thrust_l_eyeball = 1 << 31;
+	p->thrust_r_eyeball = 1 << 31;
+	p->dilate_l_pupil = 1 << 31;
+	p->dilate_r_pupil = 1 << 31;
+	p->raise_l_i_eyebrow = 1 << 31;
+	p->raise_r_i_eyebrow = 1 << 31;
+	p->raise_l_m_eyebrow = 1 << 31;
+	p->raise_r_m_eyebrow = 1 << 31;
+	p->raise_l_o_eyebrow = 1 << 31;
+	p->raise_r_o_eyebrow = 1 << 31;
+	p->squeeze_l_eyebrow = 1 << 31;
+	p->squeeze_r_eyebrow = 1 << 31;
+	p->puff_l_cheek = 1 << 31;
+	p->puff_r_cheek = 1 << 31;
+	p->lift_l_cheek = 1 << 31;
+	p->lift_r_cheek = 1 << 31;
+	p->shift_tongue_tip = 1 << 31;
+	p->raise_tongue_tip = 1 << 31;
+	p->thrust_tongue_tip = 1 << 31;
+	p->raise_tongue = 1 << 31;
+	p->tongue_roll = 1 << 31;
+	p->head_pitch = 1 << 31;
+	p->head_yaw = 1 << 31;
+	p->head_roll = 1 << 31;
+	p->lower_t_midlip_o = 1 << 31;
+	p->raise_b_midlip_o = 1 << 31;
+	p->stretch_l_cornerlip = 1 << 31;
+	p->stretch_r_cornerlip = 1 << 31;
+	p->lower_t_lip_lm_o = 1 << 31;
+	p->lower_t_lip_rm_o = 1 << 31;
+	p->raise_b_lip_lm_o = 1 << 31;
+	p->raise_b_lip_rm_o = 1 << 31;
+	p->raise_l_cornerlip_o = 1 << 31;
+	p->raise_r_cornerlip_o = 1 << 31;
+	p->stretch_l_nose = 1 << 31;
+	p->stretch_r_nose = 1 << 31;
+	p->raise_nose = 1 << 31;
+	p->bend_nose = 1 << 31;
+	p->raise_l_ear = 1 << 31;
+	p->raise_r_ear = 1 << 31;
+	p->pull_l_ear = 1 << 31;
+	p->pull_r_ear = 1 << 31;
 	return (GF_Node *)p;
 }
 
@@ -20099,302 +20099,302 @@
 	gf_node_setup((GF_Node *)p, TAG_MPEG4_BAP);
 
 	/*default field values*/
-	p->sacroiliac_tilt = 2 << 31;
-	p->sacroiliac_torsion = 2 << 31;
-	p->sacroiliac_roll = 2 << 31;
-	p->l_hip_flexion = 2 << 31;
-	p->r_hip_flexion = 2 << 31;
-	p->l_hip_abduct = 2 << 31;
-	p->r_hip_abduct = 2 << 31;
-	p->l_hip_twisting = 2 << 31;
-	p->r_hip_twisting = 2 << 31;
-	p->l_knee_flexion = 2 << 31;
-	p->r_knee_flexion = 2 << 31;
-	p->l_knee_twisting = 2 << 31;
-	p->r_knee_twisting = 2 << 31;
-	p->l_ankle_flexion = 2 << 31;
-	p->r_ankle_flexion = 2 << 31;
-	p->l_ankle_twisting = 2 << 31;
-	p->r_ankle_twisting = 2 << 31;
-	p->l_subtalar_flexion = 2 << 31;
-	p->r_subtalar_flexion = 2 << 31;
-	p->l_midtarsal_flexion = 2 << 31;
-	p->r_midtarsal_flexion = 2 << 31;
-	p->l_metatarsal_flexion = 2 << 31;
-	p->r_metatarsal_flexion = 2 << 31;
-	p->l_sternoclavicular_abduct = 2 << 31;
-	p->r_sternoclavicular_abduct = 2 << 31;
-	p->l_sternoclavicular_rotate = 2 << 31;
-	p->r_sternoclavicular_rotate = 2 << 31;
-	p->l_acromioclavicular_abduct = 2 << 31;
-	p->r_acromioclavicular_abduct = 2 << 31;
-	p->l_acromioclavicular_rotate = 2 << 31;
-	p->r_acromioclavicular_rotate = 2 << 31;
-	p->l_shoulder_flexion = 2 << 31;
-	p->r_shoulder_flexion = 2 << 31;
-	p->l_shoulder_abduct = 2 << 31;
-	p->r_shoulder_abduct = 2 << 31;
-	p->l_shoulder_twisting = 2 << 31;
-	p->r_shoulder_twisting = 2 << 31;
-	p->l_elbow_flexion = 2 << 31;
-	p->r_elbow_flexion = 2 << 31;
-	p->l_elbow_twisting = 2 << 31;
-	p->r_elbow_twisting = 2 << 31;
-	p->l_wrist_flexion = 2 << 31;
-	p->r_wrist_flexion = 2 << 31;
-	p->l_wrist_pivot = 2 << 31;
-	p->r_wrist_pivot = 2 << 31;
-	p->l_wrist_twisting = 2 << 31;
-	p->r_wrist_twisting = 2 << 31;
-	p->skullbase_roll = 2 << 31;
-	p->skullbase_torsion = 2 << 31;
-	p->skullbase_tilt = 2 << 31;
-	p->vc1roll = 2 << 31;
-	p->vc1torsion = 2 << 31;
-	p->vc1tilt = 2 << 31;
-	p->vc2roll = 2 << 31;
-	p->vc2torsion = 2 << 31;
-	p->vc2tilt = 2 << 31;
-	p->vc3roll = 2 << 31;
-	p->vc3torsion = 2 << 31;
-	p->vc3tilt = 2 << 31;
-	p->vc4roll = 2 << 31;
-	p->vc4torsion = 2 << 31;
-	p->vc4tilt = 2 << 31;
-	p->vc5roll = 2 << 31;
-	p->vc5torsion = 2 << 31;
-	p->vc5tilt = 2 << 31;
-	p->vc6roll = 2 << 31;
-	p->vc6torsion = 2 << 31;
-	p->vc6tilt = 2 << 31;
-	p->vc7roll = 2 << 31;
-	p->vc7torsion = 2 << 31;
-	p->vc7tilt = 2 << 31;
-	p->vt1roll = 2 << 31;
-	p->vt1torsion = 2 << 31;
-	p->vt1tilt = 2 << 31;
-	p->vt2roll = 2 << 31;
-	p->vt2torsion = 2 << 31;
-	p->vt2tilt = 2 << 31;
-	p->vt3roll = 2 << 31;
-	p->vt3torsion = 2 << 31;
-	p->vt3tilt = 2 << 31;
-	p->vt4roll = 2 << 31;
-	p->vt4torsion = 2 << 31;
-	p->vt4tilt = 2 << 31;
-	p->vt5roll = 2 << 31;
-	p->vt5torsion = 2 << 31;
-	p->vt5tilt = 2 << 31;
-	p->vt6roll = 2 << 31;
-	p->vt6torsion = 2 << 31;
-	p->vt6tilt = 2 << 31;
-	p->vt7roll = 2 << 31;
-	p->vt7torsion = 2 << 31;
-	p->vt7tilt = 2 << 31;
-	p->vt8roll = 2 << 31;
-	p->vt8torsion = 2 << 31;
-	p->vt8tilt = 2 << 31;
-	p->vt9roll = 2 << 31;
-	p->vt9torsion = 2 << 31;
-	p->vt9tilt = 2 << 31;
-	p->vt10roll = 2 << 31;
-	p->vt10torsion = 2 << 31;
-	p->vt10tilt = 2 << 31;
-	p->vt11roll = 2 << 31;
-	p->vt11torsion = 2 << 31;
-	p->vt11tilt = 2 << 31;
-	p->vt12roll = 2 << 31;
-	p->vt12torsion = 2 << 31;
-	p->vt12tilt = 2 << 31;
-	p->vl1roll = 2 << 31;
-	p->vl1torsion = 2 << 31;
-	p->vl1tilt = 2 << 31;
-	p->vl2roll = 2 << 31;
-	p->vl2torsion = 2 << 31;
-	p->vl2tilt = 2 << 31;
-	p->vl3roll = 2 << 31;
-	p->vl3torsion = 2 << 31;
-	p->vl3tilt = 2 << 31;
-	p->vl4roll = 2 << 31;
-	p->vl4torsion = 2 << 31;
-	p->vl4tilt = 2 << 31;
-	p->vl5roll = 2 << 31;
-	p->vl5torsion = 2 << 31;
-	p->vl5tilt = 2 << 31;
-	p->l_pinky0_flexion = 2 << 31;
-	p->r_pinky0_flexion = 2 << 31;
-	p->l_pinky1_flexion = 2 << 31;
-	p->r_pinky1_flexion = 2 << 31;
-	p->l_pinky1_pivot = 2 << 31;
-	p->r_pinky1_pivot = 2 << 31;
-	p->l_pinky1_twisting = 2 << 31;
-	p->r_pinky1_twisting = 2 << 31;
-	p->l_pinky2_flexion = 2 << 31;
-	p->r_pinky2_flexion = 2 << 31;
-	p->l_pinky3_flexion = 2 << 31;
-	p->r_pinky3_flexion = 2 << 31;
-	p->l_ring0_flexion = 2 << 31;
-	p->r_ring0_flexion = 2 << 31;
-	p->l_ring1_flexion = 2 << 31;
-	p->r_ring1_flexion = 2 << 31;
-	p->l_ring1_pivot = 2 << 31;
-	p->r_ring1_pivot = 2 << 31;
-	p->l_ring1_twisting = 2 << 31;
-	p->r_ring1_twisting = 2 << 31;
-	p->l_ring2_flexion = 2 << 31;
-	p->r_ring2_flexion = 2 << 31;
-	p->l_ring3_flexion = 2 << 31;
-	p->r_ring3_flexion = 2 << 31;
-	p->l_middle0_flexion = 2 << 31;
-	p->r_middle0_flexion = 2 << 31;
-	p->l_middle1_flexion = 2 << 31;
-	p->r_middle1_flexion = 2 << 31;
-	p->l_middle1_pivot = 2 << 31;
-	p->r_middle1_pivot = 2 << 31;
-	p->l_middle1_twisting = 2 << 31;
-	p->r_middle1_twisting = 2 << 31;
-	p->l_middle2_flexion = 2 << 31;
-	p->r_middle2_flexion = 2 << 31;
-	p->l_middle3_flexion = 2 << 31;
-	p->r_middle3_flexion = 2 << 31;
-	p->l_index0_flexion = 2 << 31;
-	p->r_index0_flexion = 2 << 31;
-	p->l_index1_flexion = 2 << 31;
-	p->r_index1_flexion = 2 << 31;
-	p->l_index1_pivot = 2 << 31;
-	p->r_index1_pivot = 2 << 31;
-	p->l_index1_twisting = 2 << 31;
-	p->r_index1_twisting = 2 << 31;
-	p->l_index2_flexion = 2 << 31;
-	p->r_index2_flexion = 2 << 31;
-	p->l_index3_flexion = 2 << 31;
-	p->r_index3_flexion = 2 << 31;
-	p->l_thumb1_flexion = 2 << 31;
-	p->r_thumb1_flexion = 2 << 31;
-	p->l_thumb1_pivot = 2 << 31;
-	p->r_thumb1_pivot = 2 << 31;
-	p->l_thumb1_twisting = 2 << 31;
-	p->r_thumb1_twisting = 2 << 31;
-	p->l_thumb2_flexion = 2 << 31;
-	p->r_thumb2_flexion = 2 << 31;
-	p->l_thumb3_flexion = 2 << 31;
-	p->r_thumb3_flexion = 2 << 31;
-	p->HumanoidRoot_tr_vertical = 2 << 31;
-	p->HumanoidRoot_tr_lateral = 2 << 31;
-	p->HumanoidRoot_tr_frontal = 2 << 31;
-	p->HumanoidRoot_rt_body_turn = 2 << 31;
-	p->HumanoidRoot_rt_body_roll = 2 << 31;
-	p->HumanoidRoot_rt_body_tilt = 2 << 31;
-	p->extensionBap187 = 2 << 31;
-	p->extensionBap188 = 2 << 31;
-	p->extensionBap189 = 2 << 31;
-	p->extensionBap190 = 2 << 31;
-	p->extensionBap191 = 2 << 31;
-	p->extensionBap192 = 2 << 31;
-	p->extensionBap193 = 2 << 31;
-	p->extensionBap194 = 2 << 31;
-	p->extensionBap195 = 2 << 31;
-	p->extensionBap196 = 2 << 31;
-	p->extensionBap197 = 2 << 31;
-	p->extensionBap198 = 2 << 31;
-	p->extensionBap199 = 2 << 31;
-	p->extensionBap200 = 2 << 31;
-	p->extensionBap201 = 2 << 31;
-	p->extensionBap202 = 2 << 31;
-	p->extensionBap203 = 2 << 31;
-	p->extensionBap204 = 2 << 31;
-	p->extensionBap205 = 2 << 31;
-	p->extensionBap206 = 2 << 31;
-	p->extensionBap207 = 2 << 31;
-	p->extensionBap208 = 2 << 31;
-	p->extensionBap209 = 2 << 31;
-	p->extensionBap210 = 2 << 31;
-	p->extensionBap211 = 2 << 31;
-	p->extensionBap212 = 2 << 31;
-	p->extensionBap213 = 2 << 31;
-	p->extensionBap214 = 2 << 31;
-	p->extensionBap215 = 2 << 31;
-	p->extensionBap216 = 2 << 31;
-	p->extensionBap217 = 2 << 31;
-	p->extensionBap218 = 2 << 31;
-	p->extensionBap219 = 2 << 31;
-	p->extensionBap220 = 2 << 31;
-	p->extensionBap221 = 2 << 31;
-	p->extensionBap222 = 2 << 31;
-	p->extensionBap223 = 2 << 31;
-	p->extensionBap224 = 2 << 31;
-	p->extensionBap225 = 2 << 31;
-	p->extensionBap226 = 2 << 31;
-	p->extensionBap227 = 2 << 31;
-	p->extensionBap228 = 2 << 31;
-	p->extensionBap229 = 2 << 31;
-	p->extensionBap230 = 2 << 31;
-	p->extensionBap231 = 2 << 31;
-	p->extensionBap232 = 2 << 31;
-	p->extensionBap233 = 2 << 31;
-	p->extensionBap234 = 2 << 31;
-	p->extensionBap235 = 2 << 31;
-	p->extensionBap236 = 2 << 31;
-	p->extensionBap237 = 2 << 31;
-	p->extensionBap238 = 2 << 31;
-	p->extensionBap239 = 2 << 31;
-	p->extensionBap240 = 2 << 31;
-	p->extensionBap241 = 2 << 31;
-	p->extensionBap242 = 2 << 31;
-	p->extensionBap243 = 2 << 31;
-	p->extensionBap244 = 2 << 31;
-	p->extensionBap245 = 2 << 31;
-	p->extensionBap246 = 2 << 31;
-	p->extensionBap247 = 2 << 31;
-	p->extensionBap248 = 2 << 31;
-	p->extensionBap249 = 2 << 31;
-	p->extensionBap250 = 2 << 31;
-	p->extensionBap251 = 2 << 31;
-	p->extensionBap252 = 2 << 31;
-	p->extensionBap253 = 2 << 31;
-	p->extensionBap254 = 2 << 31;
-	p->extensionBap255 = 2 << 31;
-	p->extensionBap256 = 2 << 31;
-	p->extensionBap257 = 2 << 31;
-	p->extensionBap258 = 2 << 31;
-	p->extensionBap259 = 2 << 31;
-	p->extensionBap260 = 2 << 31;
-	p->extensionBap261 = 2 << 31;
-	p->extensionBap262 = 2 << 31;
-	p->extensionBap263 = 2 << 31;
-	p->extensionBap264 = 2 << 31;
-	p->extensionBap265 = 2 << 31;
-	p->extensionBap266 = 2 << 31;
-	p->extensionBap267 = 2 << 31;
-	p->extensionBap268 = 2 << 31;
-	p->extensionBap269 = 2 << 31;
-	p->extensionBap270 = 2 << 31;
-	p->extensionBap271 = 2 << 31;
-	p->extensionBap272 = 2 << 31;
-	p->extensionBap273 = 2 << 31;
-	p->extensionBap274 = 2 << 31;
-	p->extensionBap275 = 2 << 31;
-	p->extensionBap276 = 2 << 31;
-	p->extensionBap277 = 2 << 31;
-	p->extensionBap278 = 2 << 31;
-	p->extensionBap279 = 2 << 31;
-	p->extensionBap280 = 2 << 31;
-	p->extensionBap281 = 2 << 31;
-	p->extensionBap282 = 2 << 31;
-	p->extensionBap283 = 2 << 31;
-	p->extensionBap284 = 2 << 31;
-	p->extensionBap285 = 2 << 31;
-	p->extensionBap286 = 2 << 31;
-	p->extensionBap287 = 2 << 31;
-	p->extensionBap288 = 2 << 31;
-	p->extensionBap289 = 2 << 31;
-	p->extensionBap290 = 2 << 31;
-	p->extensionBap291 = 2 << 31;
-	p->extensionBap292 = 2 << 31;
-	p->extensionBap293 = 2 << 31;
-	p->extensionBap294 = 2 << 31;
-	p->extensionBap295 = 2 << 31;
-	p->extensionBap296 = 2 << 31;
+	p->sacroiliac_tilt = 1 << 31;
+	p->sacroiliac_torsion = 1 << 31;
+	p->sacroiliac_roll = 1 << 31;
+	p->l_hip_flexion = 1 << 31;
+	p->r_hip_flexion = 1 << 31;
+	p->l_hip_abduct = 1 << 31;
+	p->r_hip_abduct = 1 << 31;
+	p->l_hip_twisting = 1 << 31;
+	p->r_hip_twisting = 1 << 31;
+	p->l_knee_flexion = 1 << 31;
+	p->r_knee_flexion = 1 << 31;
+	p->l_knee_twisting = 1 << 31;
+	p->r_knee_twisting = 1 << 31;
+	p->l_ankle_flexion = 1 << 31;
+	p->r_ankle_flexion = 1 << 31;
+	p->l_ankle_twisting = 1 << 31;
+	p->r_ankle_twisting = 1 << 31;
+	p->l_subtalar_flexion = 1 << 31;
+	p->r_subtalar_flexion = 1 << 31;
+	p->l_midtarsal_flexion = 1 << 31;
+	p->r_midtarsal_flexion = 1 << 31;
+	p->l_metatarsal_flexion = 1 << 31;
+	p->r_metatarsal_flexion = 1 << 31;
+	p->l_sternoclavicular_abduct = 1 << 31;
+	p->r_sternoclavicular_abduct = 1 << 31;
+	p->l_sternoclavicular_rotate = 1 << 31;
+	p->r_sternoclavicular_rotate = 1 << 31;
+	p->l_acromioclavicular_abduct = 1 << 31;
+	p->r_acromioclavicular_abduct = 1 << 31;
+	p->l_acromioclavicular_rotate = 1 << 31;
+	p->r_acromioclavicular_rotate = 1 << 31;
+	p->l_shoulder_flexion = 1 << 31;
+	p->r_shoulder_flexion = 1 << 31;
+	p->l_shoulder_abduct = 1 << 31;
+	p->r_shoulder_abduct = 1 << 31;
+	p->l_shoulder_twisting = 1 << 31;
+	p->r_shoulder_twisting = 1 << 31;
+	p->l_elbow_flexion = 1 << 31;
+	p->r_elbow_flexion = 1 << 31;
+	p->l_elbow_twisting = 1 << 31;
+	p->r_elbow_twisting = 1 << 31;
+	p->l_wrist_flexion = 1 << 31;
+	p->r_wrist_flexion = 1 << 31;
+	p->l_wrist_pivot = 1 << 31;
+	p->r_wrist_pivot = 1 << 31;
+	p->l_wrist_twisting = 1 << 31;
+	p->r_wrist_twisting = 1 << 31;
+	p->skullbase_roll = 1 << 31;
+	p->skullbase_torsion = 1 << 31;
+	p->skullbase_tilt = 1 << 31;
+	p->vc1roll = 1 << 31;
+	p->vc1torsion = 1 << 31;
+	p->vc1tilt = 1 << 31;
+	p->vc2roll = 1 << 31;
+	p->vc2torsion = 1 << 31;
+	p->vc2tilt = 1 << 31;
+	p->vc3roll = 1 << 31;
+	p->vc3torsion = 1 << 31;
+	p->vc3tilt = 1 << 31;
+	p->vc4roll = 1 << 31;
+	p->vc4torsion = 1 << 31;
+	p->vc4tilt = 1 << 31;
+	p->vc5roll = 1 << 31;
+	p->vc5torsion = 1 << 31;
+	p->vc5tilt = 1 << 31;
+	p->vc6roll = 1 << 31;
+	p->vc6torsion = 1 << 31;
+	p->vc6tilt = 1 << 31;
+	p->vc7roll = 1 << 31;
+	p->vc7torsion = 1 << 31;
+	p->vc7tilt = 1 << 31;
+	p->vt1roll = 1 << 31;
+	p->vt1torsion = 1 << 31;
+	p->vt1tilt = 1 << 31;
+	p->vt2roll = 1 << 31;
+	p->vt2torsion = 1 << 31;
+	p->vt2tilt = 1 << 31;
+	p->vt3roll = 1 << 31;
+	p->vt3torsion = 1 << 31;
+	p->vt3tilt = 1 << 31;
+	p->vt4roll = 1 << 31;
+	p->vt4torsion = 1 << 31;
+	p->vt4tilt = 1 << 31;
+	p->vt5roll = 1 << 31;
+	p->vt5torsion = 1 << 31;
+	p->vt5tilt = 1 << 31;
+	p->vt6roll = 1 << 31;
+	p->vt6torsion = 1 << 31;
+	p->vt6tilt = 1 << 31;
+	p->vt7roll = 1 << 31;
+	p->vt7torsion = 1 << 31;
+	p->vt7tilt = 1 << 31;
+	p->vt8roll = 1 << 31;
+	p->vt8torsion = 1 << 31;
+	p->vt8tilt = 1 << 31;
+	p->vt9roll = 1 << 31;
+	p->vt9torsion = 1 << 31;
+	p->vt9tilt = 1 << 31;
+	p->vt10roll = 1 << 31;
+	p->vt10torsion = 1 << 31;
+	p->vt10tilt = 1 << 31;
+	p->vt11roll = 1 << 31;
+	p->vt11torsion = 1 << 31;
+	p->vt11tilt = 1 << 31;
+	p->vt12roll = 1 << 31;
+	p->vt12torsion = 1 << 31;
+	p->vt12tilt = 1 << 31;
+	p->vl1roll = 1 << 31;
+	p->vl1torsion = 1 << 31;
+	p->vl1tilt = 1 << 31;
+	p->vl2roll = 1 << 31;
+	p->vl2torsion = 1 << 31;
+	p->vl2tilt = 1 << 31;
+	p->vl3roll = 1 << 31;
+	p->vl3torsion = 1 << 31;
+	p->vl3tilt = 1 << 31;
+	p->vl4roll = 1 << 31;
+	p->vl4torsion = 1 << 31;
+	p->vl4tilt = 1 << 31;
+	p->vl5roll = 1 << 31;
+	p->vl5torsion = 1 << 31;
+	p->vl5tilt = 1 << 31;
+	p->l_pinky0_flexion = 1 << 31;
+	p->r_pinky0_flexion = 1 << 31;
+	p->l_pinky1_flexion = 1 << 31;
+	p->r_pinky1_flexion = 1 << 31;
+	p->l_pinky1_pivot = 1 << 31;
+	p->r_pinky1_pivot = 1 << 31;
+	p->l_pinky1_twisting = 1 << 31;
+	p->r_pinky1_twisting = 1 << 31;
+	p->l_pinky2_flexion = 1 << 31;
+	p->r_pinky2_flexion = 1 << 31;
+	p->l_pinky3_flexion = 1 << 31;
+	p->r_pinky3_flexion = 1 << 31;
+	p->l_ring0_flexion = 1 << 31;
+	p->r_ring0_flexion = 1 << 31;
+	p->l_ring1_flexion = 1 << 31;
+	p->r_ring1_flexion = 1 << 31;
+	p->l_ring1_pivot = 1 << 31;
+	p->r_ring1_pivot = 1 << 31;
+	p->l_ring1_twisting = 1 << 31;
+	p->r_ring1_twisting = 1 << 31;
+	p->l_ring2_flexion = 1 << 31;
+	p->r_ring2_flexion = 1 << 31;
+	p->l_ring3_flexion = 1 << 31;
+	p->r_ring3_flexion = 1 << 31;
+	p->l_middle0_flexion = 1 << 31;
+	p->r_middle0_flexion = 1 << 31;
+	p->l_middle1_flexion = 1 << 31;
+	p->r_middle1_flexion = 1 << 31;
+	p->l_middle1_pivot = 1 << 31;
+	p->r_middle1_pivot = 1 << 31;
+	p->l_middle1_twisting = 1 << 31;
+	p->r_middle1_twisting = 1 << 31;
+	p->l_middle2_flexion = 1 << 31;
+	p->r_middle2_flexion = 1 << 31;
+	p->l_middle3_flexion = 1 << 31;
+	p->r_middle3_flexion = 1 << 31;
+	p->l_index0_flexion = 1 << 31;
+	p->r_index0_flexion = 1 << 31;
+	p->l_index1_flexion = 1 << 31;
+	p->r_index1_flexion = 1 << 31;
+	p->l_index1_pivot = 1 << 31;
+	p->r_index1_pivot = 1 << 31;
+	p->l_index1_twisting = 1 << 31;
+	p->r_index1_twisting = 1 << 31;
+	p->l_index2_flexion = 1 << 31;
+	p->r_index2_flexion = 1 << 31;
+	p->l_index3_flexion = 1 << 31;
+	p->r_index3_flexion = 1 << 31;
+	p->l_thumb1_flexion = 1 << 31;
+	p->r_thumb1_flexion = 1 << 31;
+	p->l_thumb1_pivot = 1 << 31;
+	p->r_thumb1_pivot = 1 << 31;
+	p->l_thumb1_twisting = 1 << 31;
+	p->r_thumb1_twisting = 1 << 31;
+	p->l_thumb2_flexion = 1 << 31;
+	p->r_thumb2_flexion = 1 << 31;
+	p->l_thumb3_flexion = 1 << 31;
+	p->r_thumb3_flexion = 1 << 31;
+	p->HumanoidRoot_tr_vertical = 1 << 31;
+	p->HumanoidRoot_tr_lateral = 1 << 31;
+	p->HumanoidRoot_tr_frontal = 1 << 31;
+	p->HumanoidRoot_rt_body_turn = 1 << 31;
+	p->HumanoidRoot_rt_body_roll = 1 << 31;
+	p->HumanoidRoot_rt_body_tilt = 1 << 31;
+	p->extensionBap187 = 1 << 31;
+	p->extensionBap188 = 1 << 31;
+	p->extensionBap189 = 1 << 31;
+	p->extensionBap190 = 1 << 31;
+	p->extensionBap191 = 1 << 31;
+	p->extensionBap192 = 1 << 31;
+	p->extensionBap193 = 1 << 31;
+	p->extensionBap194 = 1 << 31;
+	p->extensionBap195 = 1 << 31;
+	p->extensionBap196 = 1 << 31;
+	p->extensionBap197 = 1 << 31;
+	p->extensionBap198 = 1 << 31;
+	p->extensionBap199 = 1 << 31;
+	p->extensionBap200 = 1 << 31;
+	p->extensionBap201 = 1 << 31;
+	p->extensionBap202 = 1 << 31;
+	p->extensionBap203 = 1 << 31;
+	p->extensionBap204 = 1 << 31;
+	p->extensionBap205 = 1 << 31;
+	p->extensionBap206 = 1 << 31;
+	p->extensionBap207 = 1 << 31;
+	p->extensionBap208 = 1 << 31;
+	p->extensionBap209 = 1 << 31;
+	p->extensionBap210 = 1 << 31;
+	p->extensionBap211 = 1 << 31;
+	p->extensionBap212 = 1 << 31;
+	p->extensionBap213 = 1 << 31;
+	p->extensionBap214 = 1 << 31;
+	p->extensionBap215 = 1 << 31;
+	p->extensionBap216 = 1 << 31;
+	p->extensionBap217 = 1 << 31;
+	p->extensionBap218 = 1 << 31;
+	p->extensionBap219 = 1 << 31;
+	p->extensionBap220 = 1 << 31;
+	p->extensionBap221 = 1 << 31;
+	p->extensionBap222 = 1 << 31;
+	p->extensionBap223 = 1 << 31;
+	p->extensionBap224 = 1 << 31;
+	p->extensionBap225 = 1 << 31;
+	p->extensionBap226 = 1 << 31;
+	p->extensionBap227 = 1 << 31;
+	p->extensionBap228 = 1 << 31;
+	p->extensionBap229 = 1 << 31;
+	p->extensionBap230 = 1 << 31;
+	p->extensionBap231 = 1 << 31;
+	p->extensionBap232 = 1 << 31;
+	p->extensionBap233 = 1 << 31;
+	p->extensionBap234 = 1 << 31;
+	p->extensionBap235 = 1 << 31;
+	p->extensionBap236 = 1 << 31;
+	p->extensionBap237 = 1 << 31;
+	p->extensionBap238 = 1 << 31;
+	p->extensionBap239 = 1 << 31;
+	p->extensionBap240 = 1 << 31;
+	p->extensionBap241 = 1 << 31;
+	p->extensionBap242 = 1 << 31;
+	p->extensionBap243 = 1 << 31;
+	p->extensionBap244 = 1 << 31;
+	p->extensionBap245 = 1 << 31;
+	p->extensionBap246 = 1 << 31;
+	p->extensionBap247 = 1 << 31;
+	p->extensionBap248 = 1 << 31;
+	p->extensionBap249 = 1 << 31;
+	p->extensionBap250 = 1 << 31;
+	p->extensionBap251 = 1 << 31;
+	p->extensionBap252 = 1 << 31;
+	p->extensionBap253 = 1 << 31;
+	p->extensionBap254 = 1 << 31;
+	p->extensionBap255 = 1 << 31;
+	p->extensionBap256 = 1 << 31;
+	p->extensionBap257 = 1 << 31;
+	p->extensionBap258 = 1 << 31;
+	p->extensionBap259 = 1 << 31;
+	p->extensionBap260 = 1 << 31;
+	p->extensionBap261 = 1 << 31;
+	p->extensionBap262 = 1 << 31;
+	p->extensionBap263 = 1 << 31;
+	p->extensionBap264 = 1 << 31;
+	p->extensionBap265 = 1 << 31;
+	p->extensionBap266 = 1 << 31;
+	p->extensionBap267 = 1 << 31;
+	p->extensionBap268 = 1 << 31;
+	p->extensionBap269 = 1 << 31;
+	p->extensionBap270 = 1 << 31;
+	p->extensionBap271 = 1 << 31;
+	p->extensionBap272 = 1 << 31;
+	p->extensionBap273 = 1 << 31;
+	p->extensionBap274 = 1 << 31;
+	p->extensionBap275 = 1 << 31;
+	p->extensionBap276 = 1 << 31;
+	p->extensionBap277 = 1 << 31;
+	p->extensionBap278 = 1 << 31;
+	p->extensionBap279 = 1 << 31;
+	p->extensionBap280 = 1 << 31;
+	p->extensionBap281 = 1 << 31;
+	p->extensionBap282 = 1 << 31;
+	p->extensionBap283 = 1 << 31;
+	p->extensionBap284 = 1 << 31;
+	p->extensionBap285 = 1 << 31;
+	p->extensionBap286 = 1 << 31;
+	p->extensionBap287 = 1 << 31;
+	p->extensionBap288 = 1 << 31;
+	p->extensionBap289 = 1 << 31;
+	p->extensionBap290 = 1 << 31;
+	p->extensionBap291 = 1 << 31;
+	p->extensionBap292 = 1 << 31;
+	p->extensionBap293 = 1 << 31;
+	p->extensionBap294 = 1 << 31;
+	p->extensionBap295 = 1 << 31;
+	p->extensionBap296 = 1 << 31;
 	return (GF_Node *)p;
 }

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/smil_timing.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/smil_timing.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/svg_attributes.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/svg_attributes.c Changed

@@ -34,7 +34,7 @@
 #define DUMP_COORDINATES 1
 
 
-static const struct dom_event_def {u32 event;  const char *name; u32 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 },
@@ -121,19 +121,6 @@
 	{ GF_EVENT_BATTERY, "battery", GF_DOM_EVENT_LASER },
 	{ GF_EVENT_CPU, "cpu", GF_DOM_EVENT_LASER },
 
-	/*MediaAccess events*/
-#if 0
-	{ GF_EVENT_MEDIA_BEGIN_SESSION_SETUP, "BeginSessionSetup", GF_DOM_EVENT_MEDIA_ACCESS },
-	{ GF_EVENT_MEDIA_END_SESSION_SETUP, "EndSessionSetup", GF_DOM_EVENT_MEDIA_ACCESS },
-	{ GF_EVENT_MEDIA_DATA_REQUEST, "DataRequest", GF_DOM_EVENT_MEDIA_ACCESS },
-	{ GF_EVENT_MEDIA_PLAYABLE, "Playable", GF_DOM_EVENT_MEDIA_ACCESS },
-	{ GF_EVENT_MEDIA_NOT_PLAYABLE, "NotPlayable", GF_DOM_EVENT_MEDIA_ACCESS },
-	{ GF_EVENT_MEDIA_DATA_PROGRESS, "DataReceptionProgress", GF_DOM_EVENT_MEDIA_ACCESS },
-	{ GF_EVENT_MEDIA_END_OF_DATA, "EndOfDataReception", GF_DOM_EVENT_MEDIA_ACCESS },
-	{ GF_EVENT_MEDIA_STOP, "Stop", GF_DOM_EVENT_MEDIA_ACCESS },
-	{ GF_EVENT_MEDIA_ERROR, "Error", GF_DOM_EVENT_MEDIA_ACCESS },
-#endif
-
 	{ GF_EVENT_MEDIA_SETUP_BEGIN, "setupbegin", GF_DOM_EVENT_MEDIA},
 	{ GF_EVENT_MEDIA_SETUP_DONE, "setupdone", GF_DOM_EVENT_MEDIA},
 
@@ -165,10 +152,11 @@
 	{ GF_EVENT_HTML_MSE_SOURCE_OPEN, "sourceopen", GF_DOM_EVENT_MEDIASOURCE },
 	{ GF_EVENT_HTML_MSE_SOURCE_ENDED, "sourceended", GF_DOM_EVENT_MEDIASOURCE },
 	{ GF_EVENT_HTML_MSE_SOURCE_CLOSE, "sourceclose", GF_DOM_EVENT_MEDIASOURCE },
-	{ GF_EVENT_HTML_MSE_APPEND_START, "appendstart", GF_DOM_EVENT_MEDIASOURCE },
-	{ GF_EVENT_HTML_MSE_APPEND_END, "appendend", GF_DOM_EVENT_MEDIASOURCE },
-	{ GF_EVENT_HTML_MSE_APPEND_ERROR, "error", GF_DOM_EVENT_MEDIASOURCE },
-	{ GF_EVENT_HTML_MSE_APPEND_ABORT, "abort", GF_DOM_EVENT_MEDIASOURCE },
+	{ GF_EVENT_HTML_MSE_UPDATE_START, "updatestart", GF_DOM_EVENT_MEDIASOURCE },
+	{ GF_EVENT_HTML_MSE_UPDATE, "update", GF_DOM_EVENT_MEDIASOURCE },
+	{ GF_EVENT_HTML_MSE_UPDATE_END, "updateend", GF_DOM_EVENT_MEDIASOURCE },
+	{ GF_EVENT_HTML_MSE_UPDATE_ERROR, "error", GF_DOM_EVENT_MEDIASOURCE },
+	{ GF_EVENT_HTML_MSE_UPDATE_ABORT, "abort", GF_DOM_EVENT_MEDIASOURCE },
 	{ GF_EVENT_HTML_MSE_ADD_SOURCE_BUFFER, "addsourcebuffer", GF_DOM_EVENT_MEDIASOURCE },
 	{ GF_EVENT_HTML_MSE_REMOVE_SOURCE_BUFFER, "removesourcebuffer", GF_DOM_EVENT_MEDIASOURCE },
 
@@ -178,7 +166,7 @@
 };
 
 GF_EXPORT
-u32 gf_dom_event_type_by_name(const char *name)
+GF_EventType gf_dom_event_type_by_name(const char *name)
 {
 	u32 i, count;
 	count = sizeof(defined_dom_events) / sizeof(struct dom_event_def);
@@ -191,7 +179,7 @@
 	return GF_EVENT_UNKNOWN;
 }
 
-const char *gf_dom_event_get_name(u32 type)
+const char *gf_dom_event_get_name(GF_EventType type)
 {
 	u32 i, count;
 	count = sizeof(defined_dom_events) / sizeof(struct dom_event_def);
@@ -202,7 +190,7 @@
 	return "unknown";
 }
 
-u32 gf_dom_event_get_category(u32 type)
+GF_DOMEventCategory gf_dom_event_get_category(GF_EventType type)
 {
 	u32 i, count;
 	count = sizeof(defined_dom_events) / sizeof(struct dom_event_def);
@@ -210,11 +198,11 @@
 		if (defined_dom_events[i].event == type)
 			return defined_dom_events[i].category;
 	}
-	return 0;
+	return GF_DOM_EVENT_UNKNOWN_CATEGORY;
 }
 
 
-static const struct predef_keyid {u32 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" },
@@ -431,7 +419,7 @@
 }
 
 
-u32 gf_dom_get_key_type(char *key_name)
+GF_KeyCode gf_dom_get_key_type(char *key_name)
 {
 	if (strlen(key_name) == 1) {
 		char c[2];
@@ -444,7 +432,7 @@
 		if (c[0] >= '0' && c[0] <= '9')
 			return ( GF_KEY_0 + (c[0] - '0') );
 
-		switch (c[0]) {
+		switch ((u8) c[0]) {
 		case '@': return GF_KEY_AT;
 		case '*': return GF_KEY_STAR;
 		case '#': return GF_KEY_NUMBER;
@@ -476,7 +464,7 @@
 		case '{': return GF_KEY_LEFTCURLYBRACKET;
 		case '|': return GF_KEY_PIPE;
 		case '}': return GF_KEY_RIGHTCURLYBRACKET;
-		case '¡': return GF_KEY_INVERTEXCLAMATION;
+		case 0xA1: return GF_KEY_INVERTEXCLAMATION;
 		default: return GF_KEY_UNIDENTIFIED;
 		}
 	} else {
@@ -1352,7 +1340,7 @@
 }
 
 /* Parses an SVG transform attribute and collapses all in the given matrix */
-static Bool svg_parse_transform(SVG_Transform *t, char *attribute_content)
+static GF_Err svg_parse_transform(SVG_Transform *t, char *attribute_content)
 {
 	char *str;
 	u32 i;
@@ -1403,11 +1391,11 @@
 			return GF_BAD_PARAM;
 		}
 	} else {
-		read_chars = gf_svg_parse_transformlist(&t->mat, attribute_content);
-        if (!read_chars) {
-            GF_LOG(GF_LOG_ERROR, GF_LOG_PARSER, ("[SVG Parsing] Error parsing transform list: %s\n", attribute_content));
-            return GF_BAD_PARAM;
-        }
+		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;
+	        }
 	}
 	return GF_OK;
 }

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/svg_smjs.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/svg_smjs.c Changed

@@ -97,6 +97,8 @@
 	GF_JSClass pointClass;
 	GF_JSClass pathClass;
 	GF_JSClass matrixClass;
+
+	GF_JSClass consoleClass;
 } GF_SVGuDOM;
 static GF_SVGuDOM *svg_rt = NULL;
 
@@ -179,7 +181,7 @@
 
 static void svg_script_error(JSContext *c, const char *msg, JSErrorReport *jserr)
 {
-	GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] Error: %s - line %d (%s)", msg, jserr->lineno, jserr->linebuf));
+	GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("[JavaScript] %s in file %s:%d (%s)\n", msg, jserr->filename, jserr->lineno+1, jserr->linebuf));
 }
 
 static JSBool SMJS_FUNCTION(svg_echo)
@@ -187,11 +189,11 @@
 	GF_SceneGraph *sg;
 	SMJS_OBJ
 	SMJS_ARGS
-	if ((argc!=1) || !GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL)) return JS_TRUE;
+	if ((argc!=1) || (!GF_JS_InstanceOf(c, obj, &svg_rt->globalClass, NULL) && !GF_JS_InstanceOf(c, obj, &svg_rt->consoleClass, NULL))) return JS_TRUE;
 	sg = (GF_SceneGraph *)SMJS_GET_PRIVATE(c, obj);
 	if (!sg) return JS_TRUE;
 
-	if (JSVAL_IS_STRING(argv[0])) {
+	{
 		char *str = SMJS_CHARS_FROM_STRING(c, JS_ValueToString(c, argv[0]) );
 		_ScriptMessage(sg, str);
 		SMJS_FREE(c, str);
@@ -1530,8 +1532,8 @@
 	/*eventTarget interface*/
 	{"addEventListenerNS", dom_event_add_listener, 4, 0, 0},
 	{"removeEventListenerNS", dom_event_remove_listener, 4, 0, 0},
-	{"addEventListenerNS", dom_event_add_listener, 3, 0, 0},
-	{"removeEventListenerNS", dom_event_remove_listener, 3, 0, 0},
+	{"addEventListener", dom_event_add_listener, 3, 0, 0},
+	{"removeEventListener", dom_event_remove_listener, 3, 0, 0},
 	/*connection interface*/
 	{"setEncoding", svg_connection_set_encoding, 1, 0, 0},
 	{"connect", svg_connection_connect, 1, 0, 0},
@@ -2141,6 +2143,21 @@
 	return NULL;
 }
 
+Bool is_svg_document_class(JSContext *c, JSObject *obj)
+{
+	if (!obj) return GF_FALSE;
+	if (GF_JS_InstanceOf(c, obj, &svg_rt->svgDocument, NULL))
+		return GF_TRUE;
+	return GF_FALSE;
+}
+
+Bool is_svg_element_class(JSContext *c, JSObject *obj)
+{
+	if (!obj) return GF_FALSE;
+	if (GF_JS_InstanceOf(c, obj, &svg_rt->svgElement, NULL))
+		return GF_TRUE;
+	return GF_FALSE;
+}
 
 static void svg_init_js_api(GF_SceneGraph *scene)
 {
@@ -2181,6 +2198,20 @@
 
 	svg_define_udom_exception(scene->svg_js->js_ctx, scene->svg_js->global);
 
+	/*Console class*/
+	{
+
+		JSPropertySpec consoleProps[] = {
+			SMJS_PROPERTY_SPEC(0, 0, 0, 0, 0)
+		};
+		JSFunctionSpec consoleFuncs[] = {
+			/*trait access interface*/
+			SMJS_FUNCTION_SPEC("log", svg_echo, 1),
+			SMJS_FUNCTION_SPEC(0, 0, 0)
+		};
+		GF_JS_InitClass(scene->svg_js->js_ctx, scene->svg_js->global, 0, &svg_rt->consoleClass, 0, 0, consoleProps, 0, 0, consoleFuncs);
+	}
+
 	/*SVGDocument class*/
 	{
 
@@ -2375,7 +2406,7 @@
 
 	gf_sg_lock_javascript(sg->svg_js->js_ctx, GF_TRUE);
 
-	prev_event = SMJS_GET_PRIVATE(sg->svg_js->js_ctx, sg->svg_js->event);
+	prev_event = (GF_DOM_Event *)SMJS_GET_PRIVATE(sg->svg_js->js_ctx, sg->svg_js->event);
 	SMJS_SET_PRIVATE(sg->svg_js->js_ctx, sg->svg_js->event, event);
 	ret = JS_EvaluateScript(sg->svg_js->js_ctx, sg->svg_js->global, utf8_script, (u32) strlen(utf8_script), 0, 0, &rval);
 	SMJS_SET_PRIVATE(sg->svg_js->js_ctx, sg->svg_js->event, prev_event);
@@ -2398,6 +2429,27 @@
 	return (ret==JS_FALSE) ? GF_FALSE : GF_TRUE;
 }
 
+void html_media_js_api_del();
+
+void gf_svg_script_context_del(GF_SVGJS *svg_js, GF_SceneGraph *scenegraph)
+{
+	dom_js_pre_destroy(svg_js->js_ctx, scenegraph, NULL);
+	/*user-defined extensions*/
+	gf_sg_load_script_extensions(scenegraph, svg_js->js_ctx, svg_js->global, GF_TRUE);
+	gf_sg_ecmascript_del(svg_js->js_ctx);
+	dom_js_unload();
+	gf_free(svg_js);
+	scenegraph->svg_js = NULL;
+	assert(svg_rt);
+	svg_rt->nb_inst--;
+	if (!svg_rt->nb_inst) {
+		/* HTML */
+		html_media_js_api_del();
+		gf_free(svg_rt);
+		svg_rt = NULL;
+	}
+}
+
 static void svg_script_predestroy(GF_Node *n, void *eff, Bool is_destroy)
 {
 	if (is_destroy) {
@@ -2412,29 +2464,22 @@
 			dom_js_pre_destroy(svg_js->js_ctx, n->sgprivate->scenegraph, n);
 
 			if (!svg_js->nb_scripts) {
-				dom_js_pre_destroy(svg_js->js_ctx, n->sgprivate->scenegraph, NULL);
-				/*user-defined extensions*/
-				gf_sg_load_script_extensions(n->sgprivate->scenegraph, svg_js->js_ctx, svg_js->global, GF_TRUE);
-				gf_sg_ecmascript_del(svg_js->js_ctx);
-				dom_js_unload(svg_js->js_ctx, svg_js->global);
-				gf_free(svg_js);
-				n->sgprivate->scenegraph->svg_js = NULL;
-				assert(svg_rt);
-				svg_rt->nb_inst--;
-				if (!svg_rt->nb_inst) {
-					gf_free(svg_rt);
-					svg_rt = NULL;
-				}
+				gf_svg_script_context_del(svg_js, n->sgprivate->scenegraph);
 			}
 		}
 	}
 }
 
-static GF_Err JSScript_CreateSVGContext(GF_SceneGraph *sg)
+GF_Err JSScript_CreateSVGContext(GF_SceneGraph *sg)
 {
 	GF_SVGJS *svg_js;
-	GF_SAFEALLOC(svg_js, GF_SVGJS);
 
+	if (sg->svg_js) {
+		/* the JS/SVG context is already created, no need to do anything  */
+		return GF_OK;
+	}
+
+	GF_SAFEALLOC(svg_js, GF_SVGJS);
 	/*create new ecmascript context*/
 	svg_js->js_ctx = gf_sg_ecmascript_new(sg);
 	if (!svg_js->js_ctx) {
@@ -2454,6 +2499,7 @@
 		JS_SETUP_CLASS(svg_rt->pointClass, "SVGPoint", JSCLASS_HAS_PRIVATE, point_getProperty, point_setProperty, baseCI_finalize);
 		JS_SETUP_CLASS(svg_rt->matrixClass, "SVGMatrix", JSCLASS_HAS_PRIVATE, matrix_getProperty, matrix_setProperty, baseCI_finalize);
 		JS_SETUP_CLASS(svg_rt->pathClass, "SVGPath", JSCLASS_HAS_PRIVATE, path_getProperty, JS_PropertyStub_forSetter, pathCI_finalize);
+		JS_SETUP_CLASS(svg_rt->consoleClass, "console", JSCLASS_HAS_PRIVATE, JS_PropertyStub, JS_PropertyStub_forSetter, JS_PropertyStub);
 	}
 	svg_rt->nb_inst++;
 
@@ -2532,7 +2578,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, 0, 0, &rval);
+	ret = JS_EvaluateScript(svg_js->js_ctx, svg_js->global, jsscript, sizeof(char)*fsize, file, 0, &rval);
 
 	if (svg_js->force_gc) {
 		gf_sg_js_call_gc(svg_js->js_ctx);
@@ -2638,6 +2684,15 @@
 }
 #endif
 
+/* Executes JavaScript code in response to an event being triggered
+  The code to be executed (stored in a GF_DOMHandler struct) is either:
+  - text content not yet passed to the JS engine
+     - text contained in a node's text content not yet parsed (node)
+	 - text, outside of a node, obtained by some external means (XHR, ...) - utf8_script
+  - already in the JS engine, in the form of:
+     - an anonymous function (js_fun_val)
+	 - a named function (js_fun) 
+*/
 static Bool svg_script_execute_handler(GF_Node *node, GF_DOM_Event *event, GF_Node *observer, char *utf8_script)
 {
 	GF_DOMText *txt = NULL;
@@ -2658,7 +2713,7 @@
 			if (!txt) return GF_FALSE;
 		}
 		/*not sure about this (cf test struct-use-205-t.svg)*/
-		if (!node->sgprivate->parents) return GF_FALSE;
+		//if (!node->sgprivate->parents) return GF_FALSE;
 	}
 
 	svg_js = node->sgprivate->scenegraph->svg_js;
@@ -2766,7 +2821,7 @@
 #endif
 
 	if (ret==JS_FALSE) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("SVG: Invalid handler textContent\n" ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_SCRIPT, ("SVG: Invalid event handler script\n" ));
 		return GF_FALSE;
 	}
 	return GF_TRUE;

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/svg_types.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/svg_types.c Changed

@@ -77,16 +77,7 @@
 	}
 	if (p->sgprivate->tag==TAG_SVG_listener) {
 		/*remove from target's listener list*/
-		GF_DOMEventTarget *evt = node->sgprivate->UserPrivate;
-		node->sgprivate->UserPrivate = NULL;
-		if (evt) 
-			gf_list_del_item(evt->evt_list, p);
-#if 0
-		if (evt && (gf_node_get_attribute_by_tag(p, TAG_XMLEV_ATT_event, 0, 0, &info) == GF_OK)) {
-			u32 type = ((XMLEV_Event *)info.far_ptr)->type;
-			gf_sg_unregister_event_type(p->sgprivate->scenegraph, gf_dom_event_get_category(type));
-		}
-#endif
+		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 
 	(eg handler with ev:event=""). Destroy the associated listener*/
@@ -110,7 +101,7 @@
 		u32 i, count;
 		count = gf_dom_listener_count(node);
 		for (i=0; i<count; i++) {
-			GF_Node *listener = gf_list_get(node->sgprivate->interact->dom_evt->evt_list, i);
+			GF_Node *listener = (GF_Node *)gf_list_get(node->sgprivate->interact->dom_evt->listeners, i);
 			listener->sgprivate->UserPrivate = NULL;
 		}
 	}

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/vrml_route.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/vrml_route.c Changed

@@ -285,17 +285,19 @@
 		}
 	}
 #ifndef GPAC_DISABLE_LOG
-	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 {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[VRML Event] executing ROUTE %s.%s TO %s.%s", gf_node_get_name(r->FromNode), r->FromField.name, gf_node_get_name(r->ToNode), r->ToField.name));
-	}
-	if (r->FromField.fieldType==GF_SG_VRML_SFBOOL) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("\tBOOL VAL: %d\n", *((SFBool*)r->FromField.far_ptr)));
-	} else if (r->FromField.fieldType==GF_SG_VRML_SFINT32) {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("\tINT VAL: %d\n", *((SFInt32*)r->FromField.far_ptr)));
-	} else {
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("\n"));
+	if (gf_log_tool_level_on(GF_LOG_DEBUG, GF_LOG_INTERACT)) {
+		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 {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("[VRML Event] executing ROUTE %s.%s TO %s.%s", gf_node_get_name(r->FromNode), r->FromField.name, gf_node_get_name(r->ToNode), r->ToField.name));
+		}
+		if (r->FromField.fieldType==GF_SG_VRML_SFBOOL) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("\tBOOL VAL: %d\n", *((SFBool*)r->FromField.far_ptr)));
+		} else if (r->FromField.fieldType==GF_SG_VRML_SFINT32) {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("\tINT VAL: %d\n", *((SFInt32*)r->FromField.far_ptr)));
+		} else {
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_INTERACT, ("\n"));
+		}
 	}
 #endif

gpac-0.5.0.svn4668.tar.bz2/src/scenegraph/vrml_smjs.c -> gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/vrml_smjs.c Changed

@@ -229,7 +229,7 @@
 		if (!cx) JS_RemoveValueRootRT(js_rt->js_runtime, rp);
 		else 
 #endif
-			JS_RemoveValueRoot(cx, rp);
+			JS_RemoveValueRoot(cx, (jsval *) rp);
 		break;
 	default:
 		if (cx) JS_RemoveGCThingRoot(cx, rp);
@@ -2887,8 +2887,10 @@
 	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;
-	len = JSVAL_TO_INT(*vp);
+#endif
+    len = JSVAL_TO_INT(*vp);
 
 
 	if (!len) {
@@ -2968,8 +2970,9 @@
 	jsuint len;
 	GF_JSField *ptr = (GF_JSField *) SMJS_GET_PRIVATE(c, obj);
 	/*avoids gcc warning*/
+#ifndef GPAC_CONFIG_DARWIN
 	if (!id) id=0;
-
+#endif
 	if (ptr->field.fieldType==GF_SG_VRML_MFNODE) {
 		len = gf_node_list_get_count(*(GF_ChildNodeItem **)ptr->field.far_ptr);
 		ret = JS_TRUE;
@@ -4947,4 +4950,28 @@
 	}
 	return 0;
 }
+
 #endif /* GPAC_HAS_SPIDERMONKEY */
+
+GF_Err gf_scene_execute_script(GF_SceneGraph *sg, const char *com) 
+{
+#ifdef GPAC_HAS_SPIDERMONKEY
+	u32 tag;
+	GF_Err e;
+	GF_Node *root = gf_sg_get_root_node(sg);
+	if (root) {
+		tag = gf_node_get_tag(root);
+		if (tag >= GF_NODE_RANGE_FIRST_SVG) {
+			GF_SVGJS *svg_js = sg->svg_js;
+			Bool ret = svg_js->script_execute(sg, (char *)com, NULL);
+			return (ret == GF_TRUE ? GF_OK : GF_BAD_PARAM);
+		} else {
+			e = GF_NOT_SUPPORTED;
+			return e;
+		}
+	}
+	return GF_BAD_PARAM;
+#else
+	return GF_NOT_SUPPORTED;
+#endif
+}

gpac-0.5.0.svn5178.tar.bz2/src/scenegraph/webvtt_smjs.c Added

@@ -0,0 +1,127 @@
+/*
+ *          GPAC - Multimedia Framework C SDK
+ *
+ *          Authors: Cyril Concolato
+ *          Copyright (c) Telecom ParisTech 2007-2012
+ *          All rights reserved
+ *
+ *  This file is part of GPAC / Scene Graph sub-project
+ *
+ *  GPAC is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU Lesser General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  GPAC is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+
+#include <gpac/setup.h>
+#include <gpac/internal/scenegraph_dev.h>
+#include <gpac/webvtt.h>
+
+#ifdef GPAC_HAS_SPIDERMONKEY
+
+#include <gpac/internal/smjs_api.h>
+
+GF_EXPORT 
+GF_Err gf_webvtt_js_addCue(GF_Node *node, const char *id, 
+										  const char *start, const char *end,
+										  const char *settings, 
+										  const char *payload)
+{
+	GF_Err e;
+	JSBool found;
+	JSContext *c = node->sgprivate->scenegraph->svg_js->js_ctx;
+	JSObject *global = node->sgprivate->scenegraph->svg_js->global;
+	jsval fun_val;
+	
+	gf_sg_lock_javascript(c, GF_TRUE);
+	found = JS_LookupProperty(c, global, "addCue", &fun_val);
+	if (!found || JSVAL_IS_VOID(fun_val) || !JSVAL_IS_OBJECT(fun_val) ) {
+		e = GF_BAD_PARAM;
+	} else {
+		JSBool ret;
+		uintN attr;
+		ret = JS_GetPropertyAttributes(c, global, "addCue", &attr, &found);
+		if (ret == JS_TRUE && found == JS_TRUE) {
+			jsval rval;
+			jsval argv[5];
+			argv[0] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (id ? id : "")) );
+			argv[1] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (start ? start : "")) );
+			argv[2] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (end ? end : "")) );
+			argv[3] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (settings ? settings : "")) );
+			argv[4] = STRING_TO_JSVAL( JS_NewStringCopyZ(c, (payload ? payload : "")) );
+
+			ret = JS_CallFunctionValue(c, global, fun_val, 5, argv, &rval);
+			//ret = JS_CallFunctionName(c, global, "addCue", 5, argv, &rval);
+			if (ret == JS_TRUE) {
+				e = GF_OK;
+			} else {
+				e = GF_BAD_PARAM;
+			}
+		} else {
+			e = GF_BAD_PARAM;
+		}
+	}
+	gf_sg_lock_javascript(c, GF_FALSE);
+	return e;
+}
+
+GF_EXPORT 
+GF_Err gf_webvtt_js_removeCues(GF_Node *node)
+{
+	GF_Err e;
+	JSBool found;
+	JSContext *c = node->sgprivate->scenegraph->svg_js->js_ctx;
+	JSObject *global = node->sgprivate->scenegraph->svg_js->global;
+	jsval fun_val;
+	
+	gf_sg_lock_javascript(c, GF_TRUE);
+	found = JS_LookupProperty(c, global, "removeCues", &fun_val);
+	if (!found || JSVAL_IS_VOID(fun_val) || !JSVAL_IS_OBJECT(fun_val) ) {
+		e = GF_BAD_PARAM;
+	} else {
+		JSBool ret;
+		uintN attr;
+		ret = JS_GetPropertyAttributes(c, global, "removeCues", &attr, &found);
+		if (ret == JS_TRUE && found == JS_TRUE) {
+			jsval rval;
+			ret = JS_CallFunctionValue(c, global, fun_val, 0, NULL, &rval);
+			if (ret == JS_TRUE) {
+				e = GF_OK;
+			} else {
+				e = GF_BAD_PARAM;
+			}
+		} else {
+			e = GF_BAD_PARAM;
+		}
+	}
+	gf_sg_lock_javascript(c, GF_FALSE);
+	return e;
+}
+
+#else
+GF_EXPORT 
+GF_Err gf_webvtt_js_addCue(GF_Node *node, const char *id, 
+										  const char *start, const char *end,
+										  const char *settings, 
+										  const char *payload)
+{
+	return GF_BAD_PARAM;
+}
+
+GF_EXPORT 
+GF_Err gf_webvtt_js_removeCues()
+{
+	return GF_BAD_PARAM;
+}
+#endif  /*GPAC_HAS_SPIDERMONKEY*/

gpac-0.5.0.svn4668.tar.bz2/src/terminal/channel.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/channel.c Changed

@@ -32,7 +32,7 @@
 #include "media_memory.h"
 #include "media_control.h"
 
-static void ch_buffer_off(GF_Channel *ch)
+void gf_es_buffer_off(GF_Channel *ch)
 {
 	/*just in case*/
 	if (ch->BufferOn) {
@@ -43,7 +43,7 @@
 }
 
 
-static void ch_buffer_on(GF_Channel *ch)
+void gf_es_buffer_on(GF_Channel *ch)
 {
 	/*don't buffer on an already running clock*/
 	if (ch->clock->no_time_ctrl && ch->clock->clock_init && (ch->esd->ESID!=ch->clock->clockID) ) return;
@@ -79,7 +79,7 @@
 	ch->seed_ts = 0;
 	ch->min_ts_inc = 0;
 	ch->min_computed_cts = 0;
-	ch_buffer_off(ch);
+	gf_es_buffer_off(ch);
 
 	if (ch->buffer) gf_free(ch->buffer);
 	ch->buffer = NULL;
@@ -226,9 +226,8 @@
 	/*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) {
-		/*don't trigger rebuffer*/
-		//if (ch->MinBuffer || (ch->clock->clock_init && ch->clock->Paused))
-			ch_buffer_on(ch);
+		if (! ch->is_pulling)
+			gf_es_buffer_on(ch);
 	}
 	ch->last_au_time = gf_term_get_time(ch->odm->term);
 	ch->es_state = GF_ESM_ES_RUNNING;
@@ -253,7 +252,7 @@
 		break;
 	}
 
-	ch_buffer_off(ch);
+	gf_es_buffer_off(ch);
 
 	ch->es_state = GF_ESM_ES_CONNECTED;
 	Channel_Reset(ch, 0);
@@ -286,11 +285,29 @@
 	ch->AU_buffer_first = ch->AU_buffer_last = NULL;
 	ch->AU_Count = 0;
 
+	ch->BufferTime = 0;
+	gf_mx_v(ch->mx);
+
 	if (ch->odm->codec && ch->odm->codec->CB) 
 		gf_cm_reset(ch->odm->codec->CB);
 
-	ch->BufferTime = 0;
+}
+
+void gf_es_reset_timing(GF_Channel *ch)
+{
+	struct _decoding_buffer *au = ch->AU_buffer_first;
+	gf_mx_p(ch->mx);
 
+	if (ch->buffer) gf_free(ch->buffer);
+	ch->buffer = NULL;
+	ch->len = ch->allocSize = 0;
+
+	while (au) {
+		au->CTS = au->DTS = 0;
+		au = au->next;
+	}
+	ch->BufferTime = 0;
+	ch->IsClockInit = 0;
 	gf_mx_v(ch->mx);
 }
 
@@ -333,11 +350,14 @@
 	if (ch->BufferTime < (s32) ch->MaxBuffer) {
 		/*check last AU time*/
 		u32 now = gf_term_get_time(ch->odm->term);
-		/*if more than half sec since last AU don't buffer and prevent rebuffering on short streams
-		this will also work for channels ignoring timing*/
-		if (now>ch->last_au_time + MAX(ch->BufferTime, 500) ) {
+		/*if more than MaxBuffer sec since last AU don't buffer and prevent rebuffering on short streams
+		this will also work for channels ignoring timing
+		we use MaxBuffer as some transport protocols (HTTP streaming, DVB-H) will work in burst modes of MaxBuffer 
+		*/
+		if (now > ch->last_au_time + 2*ch->MaxBuffer ) {
 			/*this can be safely seen as a stream with very few updates (likely only one)*/
-			if (!ch->AU_buffer_first && ch->first_au_fetched) ch->MinBuffer = 0;
+			if (!ch->AU_buffer_first && ch->first_au_fetched) 
+				ch->MinBuffer = 0;
 			return 0;
 		}
 		return 1;
@@ -350,9 +370,10 @@
 	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)) {
-		ch_buffer_off(ch);
+		gf_es_buffer_off(ch);
 		if (ch->MaxBuffer && update_info) gf_scene_buffering_info(ch->odm->parentscene ? ch->odm->parentscene : ch->odm->subscene);
 
 		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PLAYING);
@@ -598,7 +619,7 @@
 	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 - size %d time %d Buffer %d Nb AUs %d - First AU relative timing %d\n", ch->esd->ESID, au->DTS, au->CTS, 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 - 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 ));
 
 	/*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 
@@ -607,7 +628,7 @@
 		u32 retry = 100;
 		u32 current_frame;
 		GF_Terminal *term = ch->odm->term;
-		ch_buffer_off(ch);
+		gf_es_buffer_off(ch);
 
 		gf_es_lock(ch, 0);
 		if (gf_mx_try_lock(term->mm_mx)) {
@@ -874,6 +895,7 @@
 				}
 				OCR_TS += ch->ts_offset;
 				ch->clock->clock_init = 0;
+				ch->prev_pcr_diff = 0;
 
 				gf_clock_set_time(ch->clock, OCR_TS);
 				/*many TS streams deployed with HLS have broken PCRs - we will check their consistency
@@ -883,42 +905,43 @@
 				if (ch->clock->clock_init) ch->IsClockInit = 1;
 
 			}
-		}
-#if 0
-		/*adjust clock if M2TS PCR discontinuity*/
-		else if (hdr.m2ts_pcr==2) {
-			u32 ck;
-			u32 OCR_TS = (u32) ( hdr.objectClockReference / 27000);
-			ck = gf_clock_time(ch->clock);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u - OCR Discontinuity OCR: adjusting to %d (original TS "LLD") - original clock %d\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, ck));
-//			gf_clock_set_time(ch->clock, (u32) OCR_TS);
-		}
-		/*compute clock drift*/
-		else {
+		} else 	if (hdr.OCRflag==2) {
+			GF_LOG(GF_LOG_WARNING, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u clock disctontinuity was signaled\n", ch->esd->ESID, gf_clock_real_time(ch->clock) ));
+			gf_clock_discontinuity(ch->clock, ch->odm->parentscene, (hdr.m2ts_pcr==2) ? GF_TRUE : GF_FALSE);
+
+			//and re-init timing
+			gf_es_receive_sl_packet(serv, ch, payload, payload_size, header, reception_status);
+			return;
+		} else {
 			u32 ck;
 			u32 OCR_TS;
+			s32 pcr_diff, pcr_pcrprev_diff;
 			if (hdr.m2ts_pcr) {
 				OCR_TS = (u32) ( hdr.objectClockReference / 27000);
 			} else {
 				OCR_TS = (u32) ( (s64) (hdr.objectClockReference) * ch->ocr_scale);
 			}
 			ck = gf_clock_time(ch->clock);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] ES%d: At OTB %u adjusting OCR to %d (original TS "LLD") - diff %d\n", ch->esd->ESID, gf_clock_real_time(ch->clock), OCR_TS, hdr.objectClockReference, (s32) OCR_TS - (s32) ck));
-//			gf_clock_set_time(ch->clock, (u32) OCR_TS);
-		}
-#else
-		{
-			u32 ck;
-			u32 OCR_TS;
-			if (hdr.m2ts_pcr) {
-				OCR_TS = (u32) ( hdr.objectClockReference / 27000);
+
+			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" : "" ));
+
+			//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) {
+				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;
+				return;
 			} else {
-				OCR_TS = (u32) ( (s64) (hdr.objectClockReference) * ch->ocr_scale);
+				ch->prev_pcr_diff = pcr_diff;
 			}
-			ck = gf_clock_time(ch->clock);
-			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, (s32) OCR_TS - (s32) ck, (hdr.m2ts_pcr==2) ? " - PCR Discontinuity flag" : "" ));
 		}
-#endif
 		if (!payload_size) return;
 	}
 
@@ -1245,8 +1268,14 @@
 		evt.channel = ch;
 		evt.data = payload;
 		evt.data_size = payload_size;
-		evt.is_encrypted = hdr.isma_encrypted;
-		evt.isma_BSO = hdr.isma_BSO;
+		evt.is_encrypted = (hdr.isma_encrypted || hdr.cenc_encrypted) ? 1 : 0;
+		if (hdr.isma_encrypted) {
+			evt.isma_BSO = hdr.isma_BSO;
+		} else if (hdr.cenc_encrypted) {
+			evt.sai = hdr.sai;
+			evt.saiz = hdr.saiz;
+			evt.IV_size = hdr.IV_size;
+		}
 		e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
 
 		/*we discard undecrypted AU*/
@@ -1300,7 +1329,7 @@
 	ch->IsEndOfStream = 1;
 	
 	/*flush buffer*/
-	ch_buffer_off(ch);
+	gf_es_buffer_off(ch);
 	if (ch->len)
 		Channel_DispatchAU(ch, 0);
 
@@ -1318,9 +1347,21 @@
 	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;
+			com.command_type = GF_NET_SERVICE_FLUSH_DATA;
+			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) Channel_UpdateBuffering(ch, 0);
+		if (ch->BufferOn && ch->AU_buffer_first) Channel_UpdateBuffering(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;
@@ -1328,8 +1369,14 @@
 		return ch->AU_buffer_first;
 	}
 
-	/*pull from stream - resume clock if needed*/
-	if (!ch->MinBuffer) ch_buffer_off(ch);
+	//pull channel is buffering: fetch first frame for systems, or fetch until CB is full
+	if (ch->BufferOn) {
+		if (ch->odm->codec && ch->odm->codec->CB) {
+			if (ch->odm->codec->CB->UnitCount) return NULL;
+		} else {
+			if (ch->first_au_fetched) return NULL;
+		}
+	}
 
 	memset(&slh, 0, sizeof(GF_SLHeader));
 
@@ -1344,10 +1391,12 @@
 			//if we have a composition buffer, only trigger buffering when no more data is available in the CB
 			if (ch->odm->codec && ch->odm->codec->CB && ch->odm->codec->CB->UnitCount<=1) {
 				gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
-				ch_buffer_on(ch);
+				gf_es_buffer_on(ch);
+				ch->pull_forced_buffer = 1;
 			} else if (!ch->odm->codec || !ch->odm->codec->CB) {
 				gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PROGRESS);
-				ch_buffer_on(ch);
+				gf_es_buffer_on(ch);
+				ch->pull_forced_buffer = 1;
 			}
 		}
 		return NULL;
@@ -1362,8 +1411,9 @@
         }
 	}
 	assert(!comp);
-	/*update timing if new stream data but send no data*/
+	/*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->ipmp_tool) {
@@ -1372,8 +1422,14 @@
 			evt.event_type=GF_IPMP_TOOL_PROCESS_DATA;
 			evt.data = ch->AU_buffer_pull->data;
 			evt.data_size = ch->AU_buffer_pull->dataLength;
-			evt.is_encrypted = slh.isma_encrypted;
-			evt.isma_BSO = slh.isma_BSO;
+			evt.is_encrypted = (slh.isma_encrypted || slh.cenc_encrypted) ? 1 : 0;
+			if (slh.isma_encrypted) {
+				evt.isma_BSO = slh.isma_BSO;
+			} else if (slh.cenc_encrypted) {
+				evt.sai = slh.sai;
+				evt.saiz = slh.saiz;
+				evt.IV_size = slh.IV_size;
+			}
 			evt.channel = ch;
 			e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
 
@@ -1405,12 +1461,18 @@
 	ch->AU_buffer_pull->CTS = (u32) ch->CTS;
 	ch->AU_buffer_pull->DTS = (u32) ch->DTS;
 	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->BufferOn) {
-		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_PLAYING);
-		ch_buffer_off(ch);
+	if (ch->pull_forced_buffer) {
+		assert(ch->BufferOn);
+		ch->pull_forced_buffer=0;
+		gf_es_buffer_off(ch);
+		Channel_UpdateBuffering(ch, 1);
+	} else if (is_new_data && !ch->first_au_fetched) {
+		Channel_UpdateBuffering(ch, 1);
 	}
+
 	return ch->AU_buffer_pull;
 }
 
@@ -1420,7 +1482,7 @@
 	Bool comp, is_new_data;
 	GF_Err e, state;
 	/*pull from stream - resume clock if needed*/
-	ch_buffer_off(ch);
+	gf_es_buffer_off(ch);
 
 	ch->ts_res = 1000;
 	if (ch->is_pulling) {
@@ -1481,7 +1543,7 @@
 
 	/*if we get under our limit, rebuffer EXCEPT WHEN EOS is signaled*/
 	if (!ch->IsEndOfStream && Channel_NeedsBuffering(ch, 1)) {
-		ch_buffer_on(ch);
+		gf_es_buffer_on(ch);
 		gf_term_service_media_event(ch->odm, GF_EVENT_MEDIA_WAITING);
 	}
 
@@ -1513,7 +1575,7 @@
 	while ((ch = (GF_Channel*)gf_list_enum(in_scene->root_od->channels, &i)) ) {
 		if (ch->clock->no_time_ctrl) {
 			in_scene->root_od->flags |= GF_ODM_NO_TIME_CTRL;
-			//if (ch->clock->use_ocr && ch->BufferOn) ch_buffer_off(ch);
+			//if (ch->clock->use_ocr && ch->BufferOn) gf_es_buffer_off(ch);
 		}
 	}
 
@@ -1523,7 +1585,7 @@
 		while ((ch = (GF_Channel*)gf_list_enum(test_od->channels, &j)) ) {
 			if (ch->clock->no_time_ctrl) {
 				test_od->flags |= GF_ODM_NO_TIME_CTRL;
-				//if (ch->clock->use_ocr && ch->BufferOn) ch_buffer_off(ch);
+				//if (ch->clock->use_ocr && ch->BufferOn) gf_es_buffer_off(ch);
 			}
 		}
 	}
@@ -1584,22 +1646,25 @@
 	}
 	/*buffer setup*/
 	ch->MinBuffer = ch->MaxBuffer = 0;
-	/*set default values*/
-	com.buffer.max = com.buffer.min = 0;
-	if (can_buffer) {
-		com.buffer.max = 1000;
-		sOpt = gf_cfg_get_key(ch->odm->term->user->config, "Network", "BufferLength");
-		if (sOpt) com.buffer.max = atoi(sOpt);
-		com.buffer.min = 0;
-		sOpt = gf_cfg_get_key(ch->odm->term->user->config, "Network", "RebufferLength");
-		if (sOpt) com.buffer.min = atoi(sOpt);
-	}
 
+	/*set default values*/
+	com.buffer.max = 1000;
+	com.buffer.min = 0;
+	sOpt = gf_cfg_get_key(ch->odm->term->user->config, "Network", "BufferLength");
+	if (sOpt) com.buffer.max = atoi(sOpt);
+	com.buffer.min = 0;
+	sOpt = gf_cfg_get_key(ch->odm->term->user->config, "Network", "RebufferLength");
+	if (sOpt) com.buffer.min = atoi(sOpt);
+
+	//set the buffer command even though the channel is pulling, in order to indicate to the service the prefered values
 	com.command_type = GF_NET_CHAN_BUFFER;
 	com.base.on_channel = ch;
 	if (gf_term_service_command(ch->service, &com) == GF_OK) {
-		ch->MinBuffer = com.buffer.min;
-		ch->MaxBuffer = com.buffer.max;
+		//only set the values if we can buffer
+		if (can_buffer) {
+			ch->MinBuffer = com.buffer.min;
+			ch->MaxBuffer = com.buffer.max;
+		}
 	}
 
 	if (ch->esd->decoderConfig->streamType == GF_STREAM_PRIVATE_SCENE &&
@@ -1634,9 +1699,10 @@
 	GF_IPMPEvent evt;
 	GF_OMADRM2Config cfg;
 	GF_OMADRM2Config isma_cfg;
+	GF_CENCConfig cenc_cfg;
 
 	/*always buffer when fetching keys*/
-	ch_buffer_on(ch);
+	gf_es_buffer_on(ch);
 	ch->is_protected = 1;
 
 	memset(&evt, 0, sizeof(GF_IPMPEvent));
@@ -1644,35 +1710,47 @@
 	evt.channel = ch;
 
 	/*push all cfg data*/
-	if (drm_cfg->contentID) {
-		evt.config_data_code = GF_4CC('o','d','r','m');
-		memset(&cfg, 0, sizeof(cfg));
-		cfg.scheme_version = drm_cfg->scheme_version;
-		cfg.scheme_type = drm_cfg->scheme_type;
-		cfg.scheme_uri = drm_cfg->scheme_uri;
-		cfg.kms_uri = drm_cfg->kms_uri;
-		memcpy(cfg.hash, drm_cfg->hash, sizeof(char)*20);
-		cfg.contentID = drm_cfg->contentID;
-		cfg.oma_drm_crypt_type = drm_cfg->oma_drm_crypt_type;
-		cfg.oma_drm_use_pad = drm_cfg->oma_drm_use_pad;
-		cfg.oma_drm_use_hdr = drm_cfg->oma_drm_use_hdr;
-		cfg.oma_drm_textual_headers = drm_cfg->oma_drm_textual_headers;
-		cfg.oma_drm_textual_headers_len = drm_cfg->oma_drm_textual_headers_len;
-		evt.config_data = &cfg;
+	/*CommonEncryption*/
+	if ((drm_cfg->scheme_type == GF_4CC('c', 'e', 'n', 'c')) || (drm_cfg->scheme_type == GF_4CC('c','b','c','1'))) {
+		evt.config_data_code = drm_cfg->scheme_type;
+		memset(&cenc_cfg, 0, sizeof(cenc_cfg));
+		cenc_cfg.scheme_version = drm_cfg->scheme_version;
+		cenc_cfg.scheme_type = drm_cfg->scheme_type;
+		cenc_cfg.PSSH_count = drm_cfg->PSSH_count;
+		cenc_cfg.PSSHs = drm_cfg->PSSHs;
+		evt.config_data = &cenc_cfg;	
 	} else {
-		evt.config_data_code = GF_4CC('i','s','m','a');
-		memset(&isma_cfg, 0, sizeof(isma_cfg));
-		isma_cfg.scheme_version = drm_cfg->scheme_version;
-		isma_cfg.scheme_type = drm_cfg->scheme_type;
-		isma_cfg.scheme_uri = drm_cfg->scheme_uri;
-		isma_cfg.kms_uri = drm_cfg->kms_uri;
-		evt.config_data = &isma_cfg;		
+	/*ISMA and OMA*/
+		if (drm_cfg->contentID) {
+			evt.config_data_code = GF_4CC('o','d','r','m');
+			memset(&cfg, 0, sizeof(cfg));
+			cfg.scheme_version = drm_cfg->scheme_version;
+			cfg.scheme_type = drm_cfg->scheme_type;
+			cfg.scheme_uri = drm_cfg->scheme_uri;
+			cfg.kms_uri = drm_cfg->kms_uri;
+			memcpy(cfg.hash, drm_cfg->hash, sizeof(char)*20);
+			cfg.contentID = drm_cfg->contentID;
+			cfg.oma_drm_crypt_type = drm_cfg->oma_drm_crypt_type;
+			cfg.oma_drm_use_pad = drm_cfg->oma_drm_use_pad;
+			cfg.oma_drm_use_hdr = drm_cfg->oma_drm_use_hdr;
+			cfg.oma_drm_textual_headers = drm_cfg->oma_drm_textual_headers;
+			cfg.oma_drm_textual_headers_len = drm_cfg->oma_drm_textual_headers_len;
+			evt.config_data = &cfg;
+		} else {
+			evt.config_data_code = GF_4CC('i','s','m','a');
+			memset(&isma_cfg, 0, sizeof(isma_cfg));
+			isma_cfg.scheme_version = drm_cfg->scheme_version;
+			isma_cfg.scheme_type = drm_cfg->scheme_type;
+			isma_cfg.scheme_uri = drm_cfg->scheme_uri;
+			isma_cfg.kms_uri = drm_cfg->kms_uri;
+			evt.config_data = &isma_cfg;		
+		}
 	}
 
 	if (ch->ipmp_tool) {
 		e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
 		if (e) gf_term_message(ch->odm->term, ch->service->url, "Error setting up DRM tool", e);
-		ch_buffer_off(ch);
+		gf_es_buffer_off(ch);
 		return;
 	}
 
@@ -1685,13 +1763,13 @@
 		e = ch->ipmp_tool->process(ch->ipmp_tool, &evt);
 		if (e==GF_OK) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[IPMP] Associating IPMP tool %s to channel %d\n", ch->ipmp_tool->module_name, ch->esd->ESID));
-			ch_buffer_off(ch);
+			gf_es_buffer_off(ch);
 			return;
 		}
 		gf_modules_close_interface((GF_BaseInterface *) ch->ipmp_tool);
 		ch->ipmp_tool = NULL;
 	}
 	GF_LOG(GF_LOG_ERROR, GF_LOG_MEDIA, ("[IPMP] No IPMP tool suitable to handle channel protection scheme %s (KMS URI %s)\n", drm_cfg->scheme_uri, drm_cfg->kms_uri)); 
-	ch_buffer_off(ch);
+	gf_es_buffer_off(ch);
 }

gpac-0.5.0.svn4668.tar.bz2/src/terminal/clock.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/clock.c Changed

@@ -160,7 +160,6 @@
 	ck->init_time = 0;
 	ck->StartTime = 0;
 	ck->has_seen_eos = 0;
-	if (ck->no_time_ctrl==2) ck->no_time_ctrl = 1;
 }
 
 void gf_clock_stop(GF_Clock *ck)
@@ -195,7 +194,8 @@
 void gf_clock_pause(GF_Clock *ck)
 {
 	gf_mx_p(ck->mx);
-	if (!ck->Paused) ck->PauseTime = gf_term_get_time(ck->term);
+	if (!ck->Paused)
+		ck->PauseTime = gf_term_get_time(ck->term);
 	ck->Paused += 1;
 	gf_mx_v(ck->mx);
 }
@@ -204,6 +204,9 @@
 {
 	gf_mx_p(ck->mx);
 	assert(ck->Paused);
+	if (!ck->Paused) {
+		assert(!ck->Buffering);
+	}
 	ck->Paused -= 1;
 	if (!ck->Paused) 
 		ck->StartTime += gf_term_get_time(ck->term) - ck->PauseTime;
@@ -281,3 +284,50 @@
 {
 	if (ck) ck->drift = ms_drift;
 }
+
+
+/*handle clock discontinuity - for now we only reset timing of all received data and reinit the clock*/
+void gf_clock_discontinuity(GF_Clock *ck, GF_Scene *scene, Bool is_pcr_discontinuity)
+{
+	u32 i, j;
+	GF_Channel *ch;
+	GF_ObjectManager *odm;
+
+	/*check all channels and reset timing */
+	i=0;
+	while ((ch = (GF_Channel*)gf_list_enum(scene->root_od->channels, &i))) {
+		if (ch->clock == ck) {
+			gf_es_reset_timing(ch);
+		}
+	}
+	j=0;
+	while ((odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &j))) {
+		i=0;
+		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &i))) {
+			if (ch->clock == 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));
+				}
+
+				if (ch->odm->codec && ch->odm->codec->CB)
+					gf_cm_reset_timing(ch->odm->codec->CB);
+
+			}
+		}
+	}
+	gf_clock_reset(ck);
+}

gpac-0.5.0.svn4668.tar.bz2/src/terminal/decoder.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/decoder.c Changed

@@ -50,7 +50,7 @@
 	*e = Codec_Load(tmp, base_layer, PL);
 
 	if (*e) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[Codec] Cannot find decoder for stream type %s\n", gf_esd_get_textual_description(base_layer) ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CODEC, ("[Codec] ODM%d ES%d: Cannot find decoder for stream type %s\n", odm->OD->objectDescriptorID, base_layer->ESID, gf_esd_get_textual_description(base_layer) ));
 		gf_free(tmp);
 		return NULL;
 	}
@@ -60,7 +60,13 @@
 	tmp->Status = GF_ESM_CODEC_STOP;
 
 	if (tmp->type==GF_STREAM_PRIVATE_MEDIA) tmp->type = GF_STREAM_VISUAL;
-
+	
+	if (tmp->type==GF_STREAM_VISUAL) {
+		GF_CodecCapability cap;
+		cap.CapCode = GF_CODEC_DISPLAY_BPP;
+		cap.cap.valueInt = odm->term->compositor->video_out->max_screen_bpp;
+		gf_codec_set_capability(tmp, cap);
+	}
 	tmp->Priority = base_layer->streamPriority ? base_layer->streamPriority : 1;
 
 	GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[Codec] Found decoder %s for stream type %s\n", tmp->decio ? tmp->decio->module_name : "RAW", gf_esd_get_textual_description(base_layer) ));
@@ -92,6 +98,7 @@
 	u32 min, max;
 
 
+
 	/*only for valid codecs (eg not OCR)*/
 	if (codec->decio) {
 		com.get_dsi.dsi = NULL;
@@ -109,10 +116,14 @@
 		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[Codec] Attaching stream %d to codec %s\n", ch->esd->ESID, codec->decio->module_name));
 
-		/*lock the channel before setup in case we are using direct_decode */
-		gf_mx_p(ch->mx);
-		e = codec->decio->AttachStream(codec->decio, ch->esd);
-		gf_mx_v(ch->mx);
+		if (codec->odm->term->bench_mode==2) {
+			e = GF_OK;
+		} else {
+			/*lock the channel before setup in case we are using direct_decode */
+			gf_mx_p(ch->mx);
+			e = codec->decio->AttachStream(codec->decio, ch->esd);
+			gf_mx_v(ch->mx);
+		}
 
 		if (ch->esd->decoderConfig && ch->esd->decoderConfig->rvc_config) {
 			gf_odf_desc_del((GF_Descriptor *)ch->esd->decoderConfig->rvc_config);
@@ -136,6 +147,17 @@
 		/*get desired amount of units and minimal fullness (used for scheduling)*/
 		switch(codec->type) {
 		case GF_STREAM_VISUAL:
+			//this works but we need at least double buffering of textures on the GPU which we don't have now
+			if ( gf_sc_use_raw_texture(codec->odm->term->compositor)) {
+				cap.CapCode = GF_CODEC_DIRECT_OUTPUT;
+				gf_codec_get_capability(codec, &cap);
+				if (cap.cap.valueBool) {
+					cap.CapCode = GF_CODEC_DIRECT_OUTPUT;
+					if ((gf_codec_set_capability(codec, cap)==GF_OK) && (((GF_MediaDecoder*)codec->decio)->GetOutputBuffer != NULL))
+						codec->direct_vout = GF_TRUE;
+				}
+			}
+
 		case GF_STREAM_AUDIO:
 			cap.CapCode = GF_CODEC_BUFFER_MIN;
 			cap.cap.valueInt = 1;
@@ -158,15 +180,25 @@
 
 		/*setup CB*/
 		if (!codec->CB && max) {
+			Bool no_alloc = GF_FALSE;
 			if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
 				max = 1;
 				/*create a semaphore in non-notified stage*/
 				codec->odm->raw_frame_sema = gf_sema_new(1, 0);
+				no_alloc = 1;
+			}
+			else if (codec->direct_vout) {
+				max = 1;
+				no_alloc = 1;
+			}
+			//very low latency 
+			else if (ch->MaxBuffer<=300) {
+//				max /= MAX(max/2, 2);
 			}
 
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[ODM] Creating composition buffer for codec %s - %d units %d bytes each\n", codec->decio->module_name, max, CUsize));
 
-			codec->CB = gf_cm_new(CUsize, max, (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) ? 1 : 0);
+			codec->CB = gf_cm_new(CUsize, max, no_alloc);
 			codec->CB->Min = min;
 			codec->CB->odm = codec->odm;
 		}
@@ -240,7 +272,6 @@
 		}
 	}
 
-
 	/*assign the first base layer as the codec clock by default, or current channel clock if no clock set
 	Also assign codec priority here*/
 	if (!ch->esd->dependsOnESID || !codec->ck) {
@@ -265,6 +296,14 @@
 	}
 }
 
+Bool gf_codec_is_scene_or_image(GF_Codec *codec)
+{
+	if (!codec) return GF_TRUE;
+	if (!codec->CB) return GF_TRUE;
+	if (codec->CB->Capacity>1 || codec->CB->no_allocation) return GF_FALSE;
+	return GF_TRUE;
+}
+
 Bool gf_codec_remove_channel(GF_Codec *codec, struct _es_channel *ch)
 {
   	s32 i;
@@ -273,7 +312,11 @@
 	assert(ch);
 	i = gf_list_find(codec->inChannels, ch);
 	if (i>=0) {
-		if (codec->decio) codec->decio->DetachStream(codec->decio, ch->esd->ESID);
+		if (codec->decio) {
+			if (codec->odm->term->bench_mode!=2) {
+				codec->decio->DetachStream(codec->decio, ch->esd->ESID);
+			}
+		}
 		gf_list_rem(codec->inChannels, (u32) i);
 		return 1;
 	}
@@ -281,25 +324,32 @@
 }
 
 
-static void codec_update_stats(GF_Codec *codec, u32 dataLength, u32 dec_time)
+static void codec_update_stats(GF_Codec *codec, u32 dataLength, u64 dec_time, u32 DTS)
 {
 	codec->total_dec_time += dec_time;
+	codec->last_frame_time = gf_sys_clock();
+	if (!codec->nb_dec_frames)
+		codec->first_frame_time = codec->last_frame_time;
+
 	codec->nb_dec_frames++;
 	if (dec_time>codec->max_dec_time) codec->max_dec_time = dec_time;
 
 	if (dataLength) {
-		u32 now = gf_clock_time(codec->ck);
-		if (codec->last_stat_start + 1000 <= now) {
+		if (codec->last_stat_start + 2000 <= DTS) {
 			if (!codec->cur_bit_size) {
-				codec->last_stat_start = now;
+				codec->last_stat_start = DTS;
 			} else {
-				codec->avg_bit_rate = codec->cur_bit_size;
+				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 = now;
+				codec->last_stat_start = DTS;
 				codec->cur_bit_size = 0;
 			}
 		}
 		codec->cur_bit_size += 8*dataLength;
+		if (!codec->tot_bit_size) {
+			codec->stat_start = DTS;
+		}
+		codec->tot_bit_size += 8*dataLength;
 	}
 }
 
@@ -307,14 +357,14 @@
 {
 	GF_Channel *ch;
 	GF_DBUnit *AU;
-	u32 count, minDTS, i;
+	u32 count, curCTS, i;
 	count = gf_list_count(codec->inChannels);
 	*nextAU = NULL;
 	*activeChannel = NULL;
 
 	if (!count) return;
 
-	minDTS = 0;
+	curCTS = 0;
 	
 	/*browse from base to top layer*/
 	for (i=0;i<count;i++) {
@@ -328,7 +378,7 @@
 			}
 			return;
 		}
-
+refetch_AU:
 		AU = gf_es_get_au(ch);
 		if (!AU) {
 			if (! (*activeChannel)) *activeChannel = ch;
@@ -338,14 +388,14 @@
 		/*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);
+				//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\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 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));
 			*nextAU = AU;
 			*activeChannel = ch;
-			minDTS = AU->DTS;
-		} else if (AU->DTS == minDTS) {
+			curCTS = AU->CTS;
+		} else if (AU->CTS == curCTS) {
 			GF_DBUnit *baseAU = *nextAU;
 			assert(baseAU);
 
@@ -355,11 +405,57 @@
 			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_es_drop_au(ch);
 			ch->first_au_fetched = 1;
-		} else {
-			break;
+		}
+		//not the same TS for base and enhancement - either temporal scalability is used or we had a frame loss
+		else {		
+			//we cannot rely on DTS - to check if this is temporal scalability, check next CTS
+			if (ch->recompute_dts) {
+				Bool au_match_base_ts = GF_FALSE;
+				GF_DBUnit *next_unit = AU->next;
+				while (next_unit) {
+					//SNR/spatial scalable found later: we need to start from the enhancement layer
+					if (next_unit->CTS==curCTS) {
+						au_match_base_ts = GF_TRUE;
+						break;
+					}
+					next_unit = next_unit->next;
+				}
+				//no AU found with the same CTS as the current base, we likely had a drop in the enhancement - aggregate from base
+				if (!au_match_base_ts) {
+				} 
+				// AU found with the same CTS as the current base, we either had a drop on the base or some temporal scalability - aggregate from current channel.
+				else {
+					//we cannot tell whether this is a loss or temporal scalable, don't attempt to discard the AU
+					GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d 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));
+					*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));
+					gf_es_drop_au(ch);
+					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));
+					*nextAU = AU;
+					*activeChannel = ch;
+					(*activeChannel)->prev_aggregated_dts = (*nextAU)->DTS;
+					curCTS = AU->CTS;
+				}
+			}
 		}
 	}
 
+	if (*nextAU)
+		(*activeChannel)->prev_aggregated_dts = (*nextAU)->DTS;
+
 	if (codec->is_reordering && *nextAU && codec->first_frame_dispatched) {
 		if ((*activeChannel)->esd->slConfig->no_dts_signaling) {
 			u32 CTS = (*nextAU)->CTS;
@@ -431,7 +527,8 @@
 {
 	GF_DBUnit *AU;
 	GF_Channel *ch;
-	u32 now, obj_time, mm_level, au_time, cts;
+	u32 obj_time, mm_level, au_time, cts;
+	u64 now;
 	GF_Scene *scene_locked;
 	Bool check_next_unit;
 	GF_SceneDecoder *sdec = (GF_SceneDecoder *)codec->decio;
@@ -464,6 +561,7 @@
 			sdec->GetCapabilities(codec->decio, &cap);
 			if (!cap.cap.valueInt) {
 				gf_term_stop_codec(codec, 0);
+				gf_odm_signal_eos(ch->odm);
 				if ((codec->type==GF_STREAM_OD) && (codec->nb_dec_frames==1)) {
 					/*this is just by safety, since seeking is only allowed when a single clock is present
 					in the scene*/
@@ -487,7 +585,11 @@
 //	if (ch->first_au_fetched && !gf_clock_is_started(ch->clock)) goto exit;
 
 	/*check timing based on the input channel and main FPS*/
-	if (AU->DTS > obj_time /*+ codec->odm->term->half_frame_duration*/) goto exit;
+	if (AU->DTS > obj_time) {
+		gf_sc_set_system_pending_frame(ch->odm->term->compositor, 1);
+		goto exit;
+	}
+	gf_sc_set_system_pending_frame(ch->odm->term->compositor, 0);
 
 	cts = AU->CTS;
 	/*in cases where no CTS was set for the BIFS (which may be interpreted as "now", although not compliant), use the object clock*/
@@ -529,13 +631,17 @@
 	updates in time*/
 	codec->odm->current_time = gf_clock_time(codec->ck);
 
-	now = gf_term_get_time(codec->odm->term);
-	e = sdec->ProcessData(sdec, AU->data, AU->dataLength, ch->esd->ESID, au_time, mm_level);
-	now = gf_term_get_time(codec->odm->term) - now;
+	now = gf_sys_clock_high_res();
+	if (codec->odm->term->bench_mode==2) {
+		e = GF_OK;
+	} else {
+		e = sdec->ProcessData(sdec, AU->data, AU->dataLength, ch->esd->ESID, au_time, mm_level);
+	}
+	now = gf_sys_clock_high_res() - now;
 
-	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d#CH%d at %d decoded AU TS %d in %d ms\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, codec->odm->current_time, AU->CTS, now));
 
-	codec_update_stats(codec, AU->dataLength, now);
+	codec_update_stats(codec, AU->dataLength, now, AU->DTS);
 	codec->prev_au_size = AU->dataLength;
 
 	/*destroy this AU*/
@@ -579,7 +685,7 @@
 /*special handling of decoders not using ESM*/
 static GF_Err PrivateScene_Process(GF_Codec *codec, u32 TimeAvailable)
 {
-	u32 now;
+	u64 now;
 	GF_Channel *ch;
 	GF_Scene *scene_locked;
 	GF_SceneDecoder *sdec = (GF_SceneDecoder *)codec->decio;
@@ -604,8 +710,9 @@
 		/*signal seek*/
 		if (!gf_mx_try_lock(scene_locked->root_od->term->compositor->mx)) return GF_OK;
 		gf_es_init_dummy(ch);
-
-		sdec->ProcessData(sdec, NULL, 0, ch->esd->ESID, -1, GF_CODEC_LEVEL_NORMAL);
+		if (codec->odm->term->bench_mode != 2) {
+			sdec->ProcessData(sdec, NULL, 0, ch->esd->ESID, -1, GF_CODEC_LEVEL_NORMAL);
+		}
 		gf_mx_v(scene_locked->root_od->term->compositor->mx);
 		started = gf_clock_is_started(ch->clock);
 		/*let's be nice to the scene loader (that usually involves quite some parsing), pause clock while
@@ -621,9 +728,14 @@
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[PrivateDec] Codec %s Processing at %d\n", sdec->module_name , codec->odm->current_time));
 
 	if (!gf_mx_try_lock(scene_locked->root_od->term->compositor->mx)) return GF_OK;
-	now = gf_term_get_time(codec->odm->term);
-	e = sdec->ProcessData(sdec, NULL, 0, ch->esd->ESID, codec->odm->current_time, GF_CODEC_LEVEL_NORMAL);
-	now = gf_term_get_time(codec->odm->term) - now;
+
+    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);
+	}
+    now = gf_sys_clock_high_res() - now;
 	codec->last_unit_dts ++;
 	/*resume on error*/
 	if (e && (codec->last_unit_dts<2) ) {
@@ -635,7 +747,7 @@
 		gf_clock_resume(ch->clock);
 	}
 
-	codec_update_stats(codec, 0, now);
+	codec_update_stats(codec, 0, now, codec->odm->current_time);
 
 	gf_mx_v(scene_locked->root_od->term->compositor->mx);
 
@@ -668,9 +780,7 @@
 		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) {
 		/*first dispatch from decoder, store CTS*/
 		if (!dec->first_frame_dispatched) {
@@ -741,8 +851,9 @@
 	GF_DBUnit *AU;
 	GF_Channel *ch, *prev_ch;
 	Bool drop_late_frames = 0;
+	u64 now, entryTime;
 	u32 mmlevel, cts;
-	u32 first, entryTime, now, obj_time, unit_size;
+	u32 first, obj_time, unit_size;
 	GF_MediaDecoder *mdec = (GF_MediaDecoder*)codec->decio;
 	GF_Err e = GF_OK;
 	CU = NULL;
@@ -751,17 +862,22 @@
 	if audio codec muted we dispatch to keep sync in place*/
 	if (codec->Muted && (codec->type==GF_STREAM_VISUAL) ) return GF_OK;
 
-	entryTime = gf_term_get_time(codec->odm->term);
-	if (codec->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) 
+	//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;
+	}
+
+	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)) 
 		drop_late_frames = 1;
 
+
 	/*fetch next AU in DTS order for this codec*/
 	MediaDecoder_GetNextAU(codec, &ch, &AU);
 
-	//cannot output frame, do nothing (we force a channel query before for pull mode)
-	if ( (codec->CB->UnitCount > 1) && (codec->CB->Capacity == codec->CB->UnitCount) )
-		return GF_OK;
-
 	/*no active channel return*/
 	if (!AU || !ch) {
 		/*if the codec is in EOS state, assume we're done*/
@@ -772,25 +888,30 @@
 					return GF_OK;
 				assert( CU );
 				unit_size = 0;
-				e = mdec->ProcessData(mdec, NULL, 0, 0, CU->data, &unit_size, 0, 0);
-				if (e==GF_OK) {
-					e = UnlockCompositionUnit(codec, CU, unit_size);
-					if (unit_size) return GF_OK;
+				if (codec->odm->term->bench_mode != 2) {
+					e = mdec->ProcessData(mdec, NULL, 0, 0, CU->data, &unit_size, 0, 0);
+					if (e==GF_OK) {
+						e = UnlockCompositionUnit(codec, CU, unit_size);
+						if (unit_size) return GF_OK;
+					}
 				}
 			}
 			gf_term_stop_codec(codec, 0);
-			if (codec->CB) gf_cm_set_eos(codec->CB);
+			if (codec->CB) {
+				gf_cm_set_eos(codec->CB);
+			}
 		}
 		/*if no data, and channel not buffering, ABORT CB buffer (data timeout or EOS not detectable)*/
-		else if (ch && !ch->BufferOn)
+		else if (ch && !ch->is_pulling && !ch->BufferOn && !ch->last_au_was_seek)
 			gf_cm_abort_buffering(codec->CB);
 
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d: No data in decoding buffer\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID));
+		//GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d: No data in decoding buffer\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID));
 		return GF_OK;
 	}
 
 	/*get the object time*/
 	obj_time = gf_clock_time(codec->ck);
+
 	/*Media Time for media codecs is updated in the CB*/
 
 	if (!codec->CB) {
@@ -804,7 +925,7 @@
 	}
 
 	/*image codecs*/
-	if (codec->CB->Capacity == 1) {
+	if (!codec->CB->no_allocation && (codec->CB->Capacity == 1)) {
 		/*a SHA signature is computed for each AU. This avoids decoding/recompositing when identical (for instance streaming a carousel)*/
 		u8 new_unit_signature[20];
 		gf_sha1_csum((u8*)AU->data, AU->dataLength, new_unit_signature);
@@ -835,10 +956,12 @@
 	first = 1;
 	while (codec->CB->Capacity > codec->CB->UnitCount) {
 	/*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*/
 		if (!ch->skip_sl && codec->last_unit_cts && (codec->last_unit_cts == AU->CTS) && !ch->esd->dependsOnESID) {
 			mmlevel = GF_CODEC_LEVEL_SEEK;
+			ch->last_au_was_seek = 1;
 			/*object clock is paused by media control or terminal is paused: exact frame seek*/
 			if (
 #ifndef GPAC_DISABLE_VRML
@@ -897,14 +1020,19 @@
 
 scalable_retry:
 
-		now = gf_term_get_time(codec->odm->term);
+		now = gf_sys_clock_high_res();
 
 		assert( CU );
-		if (!CU->data && unit_size)
+		if (!CU->data && unit_size && !codec->CB->no_allocation) {
 			e = GF_OUT_OF_MEM;
-		else
+		} else if (codec->odm->term->bench_mode==2) {
+			unit_size = 0;
+			gf_cm_abort_buffering(codec->CB);
+		} 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);
-		now = gf_term_get_time(codec->odm->term) - now;
+		}
+		now = gf_sys_clock_high_res() - now;
 		if (codec->Status == GF_ESM_CODEC_STOP) {
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Exit decode loop because codec has been stopped\n", codec->decio->module_name));
 			return GF_OK;
@@ -927,16 +1055,17 @@
 
 		/*this happens a lot when using non-MPEG-4 streams (ex: ffmpeg demuxer)*/
 		case GF_PACKED_FRAMES:
-			/*in seek don't dispatch any output*/
-			if (mmlevel >= GF_CODEC_LEVEL_DROP) {
-				if (drop_late_frames)
+			/*in seek do dispatch output otherwise we will only see the I-frame preceding the seek point*/
+			if (mmlevel == GF_CODEC_LEVEL_DROP) {
+				if (drop_late_frames) {
 					unit_size = 0;
-				else 
+					codec->nb_droped++;
+				} 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 %d ms\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->CTS, now));
+			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));
 			if (ch->skip_sl) {
 				if (codec->bytes_per_sec) {
 					codec->cur_audio_bytes += unit_size;
@@ -954,23 +1083,32 @@
 				}
 				AU->CTS += deltaTS;
 			}
-			codec_update_stats(codec, 0, now);
+			codec_update_stats(codec, 0, now, 0);
 			continue;
 
 		/*for all cases below, don't release the composition buffer until we are sure we are not
 		processing a scalable stream*/
 		case GF_OK:
 			if (unit_size) {
-				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d ES%d at %d decoded frame TS %d in %d ms (DTS %d - size %d) - %d in CB\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->CTS, now, AU->DTS, AU->dataLength, codec->CB->UnitCount + 1));
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] ODM%d ES%d at %d decoded frame TS %d in "LLU" us (DTS %d - size %d) - %d in CB\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->CTS, now, AU->DTS, AU->dataLength, codec->CB->UnitCount + 1));
+
+				if (codec->direct_vout) {
+					e = mdec->GetOutputBuffer(mdec, ch->esd->ESID, &codec->CB->pY, &codec->CB->pU, &codec->CB->pV);
+					if (e==GF_OK) {
+						gf_sc_set_video_pending_frame(codec->odm->term->compositor);
+					}
+				}
 			}
-			/*if no size the decoder is not using the composition memory - if the object is in intitial buffering resume it!!*/
-			else if (codec->CB->Status == CB_BUFFER) {
+#if 0
+			/*if no size and the decoder is not using the composition memory - if the object is in intitial buffering resume it!!*/
+			else if ( (!codec->CB->UnitSize && !codec->CB->Capacity) && (codec->CB->Status == CB_BUFFER)) {
 				codec->nb_dispatch_skipped++;
 				if (codec->nb_dispatch_skipped==codec->CB->UnitCount)
 					gf_cm_abort_buffering(codec->CB);
 			}
+#endif
 
-			codec_update_stats(codec, AU->dataLength, now);
+			codec_update_stats(codec, AU->dataLength, now, AU->DTS);
 			if (ch->skip_sl) {
 				if (codec->bytes_per_sec) {
 					codec->cur_audio_bytes += unit_size;
@@ -992,7 +1130,7 @@
 			unit_size = 0;
 			/*error - if the object is in intitial buffering resume it!!*/
 			gf_cm_abort_buffering(codec->CB);
-			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d At %d (frame TS %d - %d ms ): decoded error %s\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->CTS, now, gf_error_to_string(e) ));
+			GF_LOG(GF_LOG_INFO, GF_LOG_CODEC, ("[%s] ODM%d ES%d At %d (frame TS %d - "LLU" us ): decoded error %s\n", codec->decio->module_name, codec->odm->OD->objectDescriptorID, ch->esd->ESID, gf_clock_real_time(ch->clock), AU->CTS, now, gf_error_to_string(e) ));
 			e = GF_OK;
 			break;
 		}
@@ -1004,6 +1142,16 @@
 			codec->first_frame_processed = 1;
 		}
 
+#ifndef GPAC_DISABLE_LOG
+		if (unit_size) {
+			if (ch->is_pulling) {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] at %d decoded frame CTS %d in "LLU" us\n", codec->decio->module_name, gf_clock_real_time(ch->clock), AU->CTS, now));
+			} else {
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[%s] at %d decoded frame CTS %d in "LLU" us - %d AU in channel\n", codec->decio->module_name, gf_clock_real_time(ch->clock), AU->CTS, now, ch->AU_Count));
+			}
+		}
+#endif
+
 		/*store current CTS*/
 		cts = AU->CTS;
 		prev_ch = ch;
@@ -1026,9 +1174,10 @@
 
 		/*in seek don't dispatch any output*/
 		if (mmlevel >= GF_CODEC_LEVEL_DROP) {
-			if (drop_late_frames || (mmlevel == GF_CODEC_LEVEL_SEEK) )
+			if (drop_late_frames || (mmlevel == GF_CODEC_LEVEL_SEEK) ) {
 				unit_size = 0;
-			else 
+				if (drop_late_frames) codec->nb_droped++;
+			} else 
 				ch->clock->last_TS_rendered = codec->CB->LastRenderedTS;
 		} 
 
@@ -1037,7 +1186,7 @@
 			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;
 		}
-		now = gf_term_get_time(codec->odm->term) - entryTime;
+		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) {
@@ -1047,9 +1196,9 @@
 		} 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));
 			return GF_OK;
+		} else if (codec->odm->term->bench_mode) {
+			return GF_OK;
 		}
-		MediaDecoder_GetNextAU(codec, &ch, &AU);
-		if (!ch || !AU) return GF_OK;
 	}
 	return GF_OK;
 }
@@ -1141,8 +1290,9 @@
 GF_Err gf_codec_get_capability(GF_Codec *codec, GF_CodecCapability *cap)
 {
 	cap->cap.valueInt = 0;
-	if (codec->decio) 
+	if (codec->decio) {
 		return codec->decio->GetCapabilities(codec->decio, cap);
+	}
 
 	if (codec->flags & GF_ESM_CODEC_IS_RAW_MEDIA) {
 		GF_BitStream *bs;
@@ -1230,7 +1380,8 @@
 		codec->prev_au_size = 0;
 		codec->Status = Status;
 		codec->last_stat_start = codec->cur_bit_size = codec->max_bit_rate = codec->avg_bit_rate = 0;
-		codec->nb_dec_frames = codec->total_dec_time = codec->max_dec_time = 0;
+		codec->nb_dec_frames = 0;
+		codec->total_dec_time = codec->max_dec_time = 0;
 		codec->cur_audio_bytes = codec->cur_video_frames = 0;
 		codec->nb_droped = 0;
 		codec->nb_repeted_frames = 0;
@@ -1345,6 +1496,17 @@
 	/*prefered codec module per streamType/objectType from config*/
 	sprintf(szPrefDec, "codec_%02X_%02X", esd->decoderConfig->streamType, esd->decoderConfig->objectTypeIndication);
 	sOpt = gf_cfg_get_key(term->user->config, "Systems", szPrefDec);
+
+	//little hack - FFMPEG has some weird issues with MPEG1/2 audio on some systems, try to default to MAD if present
+	if (!sOpt && (esd->decoderConfig->streamType==GF_STREAM_AUDIO)) {
+		switch (esd->decoderConfig->objectTypeIndication) {
+		case GPAC_OTI_AUDIO_MPEG2_PART3:
+		case GPAC_OTI_AUDIO_MPEG1:
+			sOpt = "MAD Decoder";
+			gf_cfg_set_key(term->user->config, "Systems", szPrefDec, sOpt);
+		}
+	}
+
 	if (sOpt) {
 		ifce = (GF_BaseDecoder *) gf_modules_load_interface_by_name(term->user->modules, sOpt, ifce_type);
 		if (ifce) {

gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_control.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_control.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_control.h -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_control.h Changed

gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_manager.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_manager.c Changed

@@ -270,7 +270,7 @@
 	return 0;
 }
 
-static u32 MM_SimulationStep_Decoder(GF_Terminal *term)
+static u32 MM_SimulationStep_Decoder(GF_Terminal *term, u32 *nb_active_decs)
 {
 	CodecEntry *ce;
 	GF_Err e;
@@ -295,10 +295,10 @@
 
 	count = gf_list_count(term->codecs);
 	time_left = term->frame_duration;
+	*nb_active_decs = 0;
 
 	if (term->last_codec >= count) term->last_codec = 0;
 	remain = count;
-	time_taken = 0;
 	/*this is ultra basic a nice scheduling system would be much better*/
 	while (remain) {
 		ce = (CodecEntry*)gf_list_get(term->codecs, term->last_codec);
@@ -313,7 +313,7 @@
 		time_slice = ce->dec->Priority * time_left / term->cumulated_priority;
 		if (ce->dec->PriorityBoost) time_slice *= 2;
 		time_taken = gf_sys_clock();
-
+		(*nb_active_decs) ++;
 		e = gf_codec_process(ce->dec, time_slice);
 		time_taken = gf_sys_clock() - time_taken;
 		/*avoid signaling errors too often...*/
@@ -321,7 +321,7 @@
 		if (e) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_CODEC, ("[ODM%d] Decoding Error %s\n", ce->dec->odm->OD->objectDescriptorID, gf_error_to_string(e) ));
 		} else {
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Decode time slice %d ms out of %d ms\n", ce->dec->decio ? ce->dec->decio->module_name : "RAW", time_taken, time_left ));
+			//GF_LOG(GF_LOG_DEBUG, GF_LOG_CODEC, ("[%s] Decode time slice %d ms out of %d ms\n", ce->dec->decio ? ce->dec->decio->module_name : "RAW", time_taken, time_left ));
 		}
 #endif
 		if (ce->flags & GF_MM_CE_DISCARDED) {
@@ -364,23 +364,32 @@
 //	GF_LOG(GF_LOG_DEBUG, GF_LOG_RTI, ("(RTI] Terminal Cycle Log\tServices\tDecoders\tCompositor\tSleep\n"));
 
 	while (term->flags & GF_TERM_RUNNING) {
+		u32 nb_decs = 0;
 		u32 left = 0;
-		if (do_codec) left = MM_SimulationStep_Decoder(term);
-//		else left = term->frame_duration;
+		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();
-			gf_sc_draw_frame(term->compositor);
+			gf_sc_draw_frame(term->compositor, &ms_until_next);
 			time_taken = gf_sys_clock() - time_taken;
-			if (left>time_taken) 
+			if (ms_until_next<term->frame_duration/2) {
+				left = 0;
+			} else if (left>time_taken) 
 				left -= time_taken;
 			else
 				left = 0;
 		}
-
 		if (do_regulate) {
-			if (left==term->frame_duration) {
-				gf_sleep(term->frame_duration);
+			if (term->bench_mode) {
+				gf_sleep(0);
+			} else {
+				if (left==term->frame_duration) {
+					//if nothing was done during this pass but we have active decoder, just yield. We don't want to sleep since 
+					//composition memory could be released at any time. We should have a signal here, rather than a wait
+					gf_sleep(nb_decs ? 0 : term->frame_duration/2);
+				}
 			}
 		}
 	}
@@ -391,20 +400,20 @@
 u32 RunSingleDec(void *ptr)
 {
 	GF_Err e;
-	u32 time_left;
+	u64 time_taken;
 	CodecEntry *ce = (CodecEntry *) ptr;
 
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[MediaDecoder %d] Entering thread ID %d\n", ce->dec->odm->OD->objectDescriptorID, gf_th_id() ));
 
 	while (ce->flags & GF_MM_CE_RUNNING) {
-		time_left = gf_sys_clock();
+		time_taken = gf_sys_clock_high_res();
 		if (!ce->dec->force_cb_resize) {
 			gf_mx_p(ce->mx);
 			e = gf_codec_process(ce->dec, ce->dec->odm->term->frame_duration);
 			if (e) gf_term_message(ce->dec->odm->term, ce->dec->odm->net_service->url, "Decoding Error", e);
 			gf_mx_v(ce->mx);
 		}
-		time_left = gf_sys_clock() - time_left;
+		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 
@@ -415,11 +424,8 @@
 		/*while on don't sleep*/
 		if (ce->dec->PriorityBoost) continue;
 
-		if (time_left) {
-			while (time_left > ce->dec->odm->term->frame_duration) time_left -= ce->dec->odm->term->frame_duration;
-			gf_sleep(time_left);
-		} else {
-			gf_sleep(ce->dec->odm->term->frame_duration);
+		if (time_taken<20) {
+			gf_sleep(1);
 		}
 	}
 	ce->flags |= GF_MM_CE_DEAD;
@@ -434,6 +440,7 @@
 	GF_CodecCapability cap;
 	CodecEntry *ce;
 	GF_Terminal *term = codec->odm->term;
+	if (!gf_list_count(codec->odm->channels)) return;
 	ce = mm_get_codec(term->codecs, codec);
 	if (!ce) return;
 
@@ -466,6 +473,7 @@
 		}
 	}
 
+
 	/*unlock dec*/
 	if (ce->mx)
 		gf_mx_v(ce->mx);
@@ -595,7 +603,7 @@
 	gf_mx_v(term->mm_mx);
 }
 
-Bool gf_term_lock_codec(GF_Codec *codec, Bool lock)
+Bool gf_term_lock_codec(GF_Codec *codec, Bool lock, Bool trylock)
 {
 	Bool res = 1;
 	CodecEntry *ce;
@@ -605,11 +613,23 @@
 	if (!ce) return 0;
 
 	if (ce->mx) {
-		if (lock) res = gf_mx_try_lock(ce->mx);
+		if (lock) {
+			if (trylock) {
+				res = gf_mx_try_lock(ce->mx);
+			} else {
+				res = gf_mx_p(ce->mx);
+			}
+		}
 		else gf_mx_v(ce->mx);
 	}
 	else {
-		if (lock) res = gf_mx_try_lock(term->mm_mx);
+		if (lock) {
+			if (trylock) {
+				res = gf_mx_try_lock(term->mm_mx);
+			} else {
+				res = gf_mx_p(term->mm_mx);
+			}
+		}
 		else gf_mx_v(term->mm_mx);
 	}
 	return res;
@@ -635,14 +655,20 @@
 GF_EXPORT
 u32 gf_term_process_step(GF_Terminal *term)
 {
+	u32 nb_decs=0;
 	u32 time_taken = gf_sys_clock();
 
 	if (term->flags & GF_TERM_NO_DECODER_THREAD) {
-		MM_SimulationStep_Decoder(term);
+		MM_SimulationStep_Decoder(term, &nb_decs);
 	} 
 
 	if (term->flags & GF_TERM_NO_COMPOSITOR_THREAD) {
-		gf_sc_draw_frame(term->compositor);
+		u32 ms_until_next;
+		gf_sc_draw_frame(term->compositor, &ms_until_next);
+		if (ms_until_next<term->compositor->frame_duration/2) {
+			time_taken=0;
+		}
+
 	}
 	time_taken = gf_sys_clock() - time_taken;
 	if (time_taken > term->compositor->frame_duration) {
@@ -650,9 +676,11 @@
 	} else {
 		time_taken = term->compositor->frame_duration - time_taken;
 	}
-	if (term->user->init_flags & GF_TERM_NO_REGULATION) return time_taken;
+	if (term->bench_mode || (term->user->init_flags & GF_TERM_NO_REGULATION)) return time_taken;
 
-	gf_sleep(time_taken);
+	if (2*time_taken >= term->compositor->frame_duration) {
+		gf_sleep(nb_decs ? 1 : time_taken);
+	}
 	return time_taken;
 }
 
@@ -676,7 +704,7 @@
 			gf_mx_v(term->mm_mx);
 		}
 
-		if (!gf_sc_draw_frame(term->compositor))
+		if (!gf_sc_draw_frame(term->compositor, NULL))
 			break;
 
 		if (! (term->user->init_flags & GF_TERM_NO_REGULATION))

gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_memory.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_memory.c Changed

@@ -148,10 +148,10 @@
 void gf_cm_del(GF_CompositionMemory *cb)
 {
 	gf_odm_lock(cb->odm, 1);
-	/*may happen when CB is destroyed right after creation in case*/
+	/*may happen when CB is destroyed right after creation */
 	if (cb->Status == CB_BUFFER) {
 		gf_clock_buffer_off(cb->odm->codec->ck);
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] 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));
+		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*/
@@ -324,6 +324,14 @@
 #endif
 }
 
+static void cb_set_buffer_off(GF_CompositionMemory *cb)
+{
+	gf_clock_buffer_off(cb->odm->codec->ck);
+	GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB Buffering done ODM%d: buffering off at %d (nb buffering on clock: %d)\n", cb->odm->OD->objectDescriptorID, gf_term_get_time(cb->odm->term), cb->odm->codec->ck->Buffering));
+
+	gf_term_service_media_event(cb->odm->parentscene->root_od, GF_EVENT_MEDIA_CANPLAY);
+}
+
 void gf_cm_unlock_input(GF_CompositionMemory *cb, GF_CMUnit *cu, u32 cu_size, Bool codec_reordering)
 {
 	/*nothing dispatched, ignore*/
@@ -347,22 +355,21 @@
 		cu->dataLength = cu_size;
 		cu->RenderedLength = 0;
 
-		/*turn off buffering - 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) ) {
+		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;
-			gf_clock_buffer_off(cb->odm->codec->ck);
-//			cb->odm->codec->ck->data_timeout = 0;
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] 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));
-
-			gf_term_service_media_event(cb->odm->parentscene->root_od, GF_EVENT_MEDIA_CANPLAY);
+			cb_set_buffer_off(cb);
 		} 
 
+		//new FPS regulation doesn't need this signaling
+#if 0
 		/*since a new CU is here notify the compositor*/
 		if ((cb->odm->codec->type==GF_STREAM_VISUAL) && cb->odm->mo && cb->odm->mo->num_open) {
 			gf_term_invalidate_compositor(cb->odm->term);
 		}
+#endif
 	}
 	gf_odm_lock(cb->odm, 0);
 }
@@ -375,7 +382,6 @@
 	GF_CMUnit *cu;
 
 	gf_odm_lock(cb->odm, 1);
-
 	cu = cb->input;
 	cu->RenderedLength = 0;
 	if (cu->dataLength && cb->odm->raw_frame_sema)  {
@@ -392,11 +398,27 @@
 		cu->dataLength = 0;
 		cu = cu->next;
 	}
-	cb->output = cb->input;
 	cb->UnitCount = 0;
 	cb->HasSeenEOS = 0;
 
 	if (cb->odm->mo) cb->odm->mo->timestamp = 0;
+
+	cb->output = cb->input;
+	gf_odm_lock(cb->odm, 0);
+}
+
+void gf_cm_reset_timing(GF_CompositionMemory *cb)
+{
+	GF_CMUnit *cu = cb->input;
+
+	gf_odm_lock(cb->odm, 1);
+	cu->TS = 0;
+	cu = cu->next;
+	while (cu != cb->input) {
+		cu->TS = 0;
+		cu = cu->next;
+	}
+	if (cb->odm->mo) cb->odm->mo->timestamp = 0;
 	gf_odm_lock(cb->odm, 0);
 }
 
@@ -490,16 +512,13 @@
 this is a blocking call since input may change the output (temporal scalability)*/
 GF_CMUnit *gf_cm_get_output(GF_CompositionMemory *cb)
 {
-	GF_CMUnit *out = NULL;
-
 	/*if paused or stop or buffering, do nothing*/
 	switch (cb->Status) {
 	case CB_BUFFER:
-		return NULL;
 	case CB_STOP:
 	case CB_PAUSE:
 		/*only visual buffers deliver data when paused*/
-		if (cb->odm->codec->type != GF_STREAM_VISUAL) goto exit;
+		if (cb->odm->codec->type != GF_STREAM_VISUAL) return NULL;
 		break;
 	case CB_BUFFER_DONE:
 		cb->Status = CB_PLAY;
@@ -517,8 +536,9 @@
 			/*force update of media time*/
 			mediasensor_update_timing(cb->odm, 1);
 #endif
+			gf_odm_signal_eos(cb->odm);
 		}
-		goto exit;
+		return NULL;
 	}
 
 	/*update the timing*/
@@ -537,35 +557,52 @@
 			gf_odm_signal_eos(cb->odm);
 		}
 	}
-	out = cb->output;
-
-	//assert(out->TS >= cb->LastRenderedTS);
-
-exit:
-	return out;
+	return cb->output;
 }
 
 
-
 /*drop the output CU*/
-void gf_cm_drop_output(GF_CompositionMemory *cb)
+void gf_cm_output_kept(GF_CompositionMemory *cb)
 {
 	assert(cb->UnitCount);
 	/*this allows reuse of the CU*/
 	cb->output->RenderedLength = 0;
 	cb->LastRenderedTS = cb->output->TS;
 
+	if (cb->Status==CB_BUFFER) {
+		cb_set_buffer_off(cb);
+		cb->Status=CB_PLAY;
+	}
+}
+
+/*drop the output CU*/
+void gf_cm_drop_output(GF_CompositionMemory *cb)
+{
+	gf_cm_output_kept(cb);
+	if (cb->Status!=CB_PLAY) {
+		return;
+	}
+
 	/*WARNING: in RAW mode, we (for the moment) only have one unit - setting output->dataLength to 0 means the input is available 
 	for the raw channel - we have to make sure the output is completely reseted before releasing the sema*/
 
 	/*on visual streams (except raw oness), always keep the last AU*/
-	if (!cb->no_allocation && cb->output->dataLength && (cb->odm->codec->type == GF_STREAM_VISUAL) ) {
+	if (cb->output->dataLength && (cb->odm->codec->type == GF_STREAM_VISUAL) ) {
 		if ( !cb->output->next->dataLength || (cb->Capacity == 1) )  {
-			if (cb->odm->raw_frame_sema) {
-				cb->output->dataLength = 0;
-				gf_sema_notify(cb->odm->raw_frame_sema, 1);
+			Bool no_drop = 1;
+			if (cb->no_allocation ) {
+				if (cb->odm->term->bench_mode)
+					no_drop = 0;
+				else if (gf_clock_time(cb->odm->codec->ck) > cb->output->TS)
+					no_drop = 0;
+			}
+			if (no_drop) {
+				if (cb->odm->raw_frame_sema) {
+					cb->output->dataLength = 0;
+					gf_sema_notify(cb->odm->raw_frame_sema, 1);
+				}
+				return;
 			}
-			return;
 		}
 	}
 	
@@ -586,6 +623,9 @@
 
 void gf_cm_set_status(GF_CompositionMemory *cb, u32 Status)
 {
+	if (cb->Status == Status) 
+		return;
+
 	gf_odm_lock(cb->odm, 1);
 	/*if we're asked for play, trigger on buffering*/
 	if (Status == CB_PLAY) {
@@ -609,13 +649,16 @@
 		cb->LastRenderedTS = 0;
 		if (cb->Status == CB_BUFFER) {
 			gf_clock_buffer_off(cb->odm->codec->ck);
-			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] 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));
+			GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB status changed - 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 (Status == CB_STOP) {
 			gf_cm_reset(cb);
 			cb->LastRenderedTS = 0;
 		}
 		cb->Status = Status;
+		if (Status==CB_BUFFER) {
+			gf_clock_buffer_on(cb->odm->codec->ck);
+		}
 	}
 
 	gf_odm_lock(cb->odm, 0);
@@ -631,10 +674,16 @@
 	if (cb->Status == CB_BUFFER) {
 		cb->Status = CB_BUFFER_DONE;
 		gf_clock_buffer_off(cb->odm->codec->ck);
-//		cb->odm->codec->ck->data_timeout = 0;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] 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));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] CB EOS - 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));
 	}
 	cb->HasSeenEOS = 1;
+
+	//in bench mode eos cannot be signaled through flush of composition memory since it is always empty - do it here
+	if (cb->odm->term->bench_mode==2) {
+		cb->Status = CB_STOP;
+		gf_odm_signal_eos(cb->odm);
+	}
+
 	gf_term_invalidate_compositor(cb->odm->term);
 	gf_odm_lock(cb->odm, 0);
 }
@@ -646,7 +695,6 @@
 		return !cb->odm->codec->ck->Paused;
 
 	if ((cb->Status == CB_BUFFER_DONE) && (gf_clock_is_started(cb->odm->codec->ck) || cb->odm->term->play_state) ) {
-		cb->Status = CB_PLAY;
 		return 1;
 	}
 
@@ -660,15 +708,15 @@
 
 Bool gf_cm_is_eos(GF_CompositionMemory *cb)
 {
-	return ( (cb->Status == CB_STOP) && cb->HasSeenEOS);
+	if (cb->HasSeenEOS)
+		return ( (cb->Status == CB_STOP) || (cb->UnitCount==0)) ? 1 : 0;
+	return 0;
 }
 
 void gf_cm_abort_buffering(GF_CompositionMemory *cb)
 {
 	if (cb->Status == CB_BUFFER) {
 		cb->Status = CB_BUFFER_DONE;
-		gf_clock_buffer_off(cb->odm->codec->ck);
-//		cb->odm->codec->ck->data_timeout = 0;
-		GF_LOG(GF_LOG_DEBUG, GF_LOG_SYNC, ("[SyncLayer] 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));
+		cb_set_buffer_off(cb);
 	}
 }

gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_memory.h -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_memory.h Changed

gpac-0.5.0.svn4668.tar.bz2/src/terminal/media_object.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/media_object.c Changed

@@ -310,6 +310,13 @@
 	GF_CodecCapability cap;
 	if (!mo->odm || !mo->odm->codec || (mo->type != GF_MEDIA_OBJECT_AUDIO)) return GF_FALSE;
 
+	if (mo->odm->term->bench_mode==2) {
+		if (sample_rate) *sample_rate = 44100;
+		if (bits_per_sample) *bits_per_sample = 16;
+		if (num_channels) *num_channels = 2;
+		if (channel_config) *channel_config = 0;
+		return GF_TRUE;
+	}
 	if (sample_rate) {
 		cap.CapCode = GF_CODEC_SAMPLERATE;
 		gf_codec_get_capability(mo->odm->codec, &cap);
@@ -352,16 +359,25 @@
 	}
 }
 
+
 GF_EXPORT
-char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size)
+char *gf_mo_fetch_data(GF_MediaObject *mo, Bool resync, Bool *eos, u32 *timestamp, u32 *size, s32 *ms_until_pres, s32 *ms_until_next)
 {
 	GF_Codec *codec;
 	Bool force_decode = GF_FALSE;
 	u32 obj_time;
 	GF_CMUnit *CU;
+	s32 diff;
+	Bool bench_mode;
+
 	*eos = GF_FALSE;
+	*timestamp = mo->timestamp;
+	*size = mo->framesize;
+	if (ms_until_pres) *ms_until_pres = mo->ms_until_pres;
+	if (ms_until_next) *ms_until_next = mo->ms_until_next;
 
-	if (!gf_odm_lock_mo(mo)) return NULL;
+	if (!gf_odm_lock_mo(mo)) 
+		return NULL;
 
 	if (!mo->odm->codec || !mo->odm->codec->CB) {
 		gf_odm_lock(mo->odm, 0);
@@ -371,9 +387,6 @@
 
 	/*if frame locked return it*/
 	if (mo->nb_fetch) {
-		*eos = GF_FALSE;
-		*timestamp = mo->timestamp;
-		*size = mo->framesize;
 		mo->nb_fetch ++;
 		gf_odm_lock(mo->odm, 0);
 		return mo->frame;
@@ -389,6 +402,8 @@
 		return NULL;
 	}
 
+	bench_mode = mo->odm->term->bench_mode;
+
 	/*resize requested - if last frame destroy CB and force a decode*/
 	if (codec->force_cb_resize && (codec->CB->UnitCount<=1)) {
 		CU = gf_cm_get_output(codec->CB);
@@ -400,25 +415,28 @@
 		}
 	}
 
-	/*fast forward, force decode if no data is available*/
-	if (! *eos && (codec->ck->speed > FIX_ONE))
+	/*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;
 		gf_odm_lock(mo->odm, 0);
 		while (retry) {
-			if (gf_term_lock_codec(codec, GF_TRUE)) {
+			if (gf_term_lock_codec(codec, GF_TRUE, GF_TRUE)) {
 				gf_codec_process(codec, 1);
-				gf_term_lock_codec(codec, GF_FALSE);
+				gf_term_lock_codec(codec, GF_FALSE, GF_TRUE);
 				break;
 			}
 			retry--;
+			gf_sleep(0);
 		}
-		if (!retry) {
+		if (!retry && codec->force_cb_resize) {
 			GF_LOG(GF_LOG_WARNING, GF_LOG_MEDIA, ("[ODM%d] At %d could not resize and decode next frame in one pass - blank frame after TS %d\n", mo->odm->OD->objectDescriptorID, gf_clock_time(codec->ck), mo->timestamp));
 		}
-		if (!gf_odm_lock_mo(mo)) return NULL;
+		if (!gf_odm_lock_mo(mo))
+			return NULL;
 	}
 
 	/*new frame to fetch, lock*/
@@ -432,20 +450,42 @@
 	/*note this assert is NOT true when recomputing DTS from CTS on the fly (MPEG1/2 RTP and H264/AVC RTP)*/
 	//assert(CU->TS >= codec->CB->LastRenderedTS);
 
-	if (codec->CB->UnitCount==1) resync = GF_FALSE;
+	if (codec->CB->UnitCount<=1) resync = GF_FALSE;
+
+	if (bench_mode && resync) {
+		resync = GF_FALSE;
+		if (mo->timestamp == CU->TS) {
+			if (CU->next->dataLength) {
+				gf_cm_drop_output(codec->CB);
+				CU = gf_cm_get_output(codec->CB);
+			}
+		}
+	}
+
 
 	/*resync*/
+	obj_time = gf_clock_time(codec->ck);
+
+	//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)) {
+		resync=GF_FALSE;
+		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 (resync) {
 		u32 nb_droped = 0;
-		obj_time = gf_clock_time(codec->ck);
 		while (CU->TS < obj_time) {
+			u32 diff;
 			if (!CU->next->dataLength) {
 				if (force_decode) {
 					obj_time = gf_clock_time(codec->ck);
 					gf_odm_lock(mo->odm, 0);
-					if (gf_term_lock_codec(codec, GF_TRUE)) {
+					if (gf_term_lock_codec(codec, GF_TRUE, GF_TRUE)) {
 						gf_codec_process(codec, 1);
-						gf_term_lock_codec(codec, GF_FALSE);
+						gf_term_lock_codec(codec, GF_FALSE, GF_TRUE);
 					}
 					gf_odm_lock(mo->odm, 1);
 					if (!CU->next->dataLength) 
@@ -454,6 +494,11 @@
 					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) {
 				*eos = GF_FALSE;
@@ -476,6 +521,16 @@
 
 	mo->framesize = CU->dataLength - CU->RenderedLength;
 	mo->frame = CU->data + CU->RenderedLength;
+
+	if (CU->next->dataLength) {
+		diff = (s32) (CU->next->TS) - (s32) obj_time;
+		mo->ms_until_next = FIX2INT(diff * mo->speed);
+	} else  {
+		mo->ms_until_next = 1;
+	}
+	diff = (s32) (CU->TS) - (s32) obj_time;
+	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);
@@ -484,25 +539,47 @@
 		if (mo->odm->parentscene->is_dynamic_scene)
 			mo->odm->parentscene->root_od->current_time = mo->odm->current_time;
 
-		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\n", mo->odm->OD->objectDescriptorID, gf_clock_time(codec->ck), CU->TS, mo->framesize, mo->timestamp, codec->CB->UnitCount, gf_net_get_utc() ));
 		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 ));
 	}
 
 	/*also adjust CU time based on consummed bytes in input, since some codecs output very large audio chunks*/
 	if (codec->bytes_per_sec) mo->timestamp += CU->RenderedLength * 1000 / codec->bytes_per_sec;
 
+	if (bench_mode) {
+//		mo->timestamp = gf_clock_time(codec->ck);
+		mo->ms_until_pres = -1;
+		mo->ms_until_next = 1;
+	} 
+
+
 	mo->nb_fetch ++;
 	*timestamp = mo->timestamp;
 	*size = mo->framesize;
-
+	if (ms_until_pres) *ms_until_pres = mo->ms_until_pres;
+	if (ms_until_next) *ms_until_next = mo->ms_until_next;
+	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;
 }
 
 GF_EXPORT
-void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 forceDrop)
+GF_Err gf_mo_get_raw_image_planes(GF_MediaObject *mo, u8 **pY_or_RGB, u8 **pU, u8 **pV)
+{
+	if (!mo || !mo->odm || !mo->odm->codec) return GF_BAD_PARAM;
+	*pY_or_RGB = mo->odm->codec->CB->pY;
+	*pU = mo->odm->codec->CB->pU;
+	*pV = mo->odm->codec->CB->pV;
+	return GF_OK;
+}
+
+GF_EXPORT
+void gf_mo_release_data(GF_MediaObject *mo, u32 nb_bytes, s32 drop_mode)
 {
 #if 0
 	u32 obj_time;
@@ -518,8 +595,14 @@
 		gf_odm_lock(mo->odm, 0);
 		return;
 	}
+
+/*	if ((drop_mode==0) && !(mo->odm->term->flags & GF_TERM_DROP_LATE_FRAMES) && (mo->type==GF_MEDIA_OBJECT_VIDEO))
+		drop_mode=1;
+	else 
+*/
 	if (mo->odm->codec->CB->no_allocation)
-		forceDrop = 1;
+		drop_mode = 1;
+	
 
 	/*perform a sanity check on TS since the CB may have changed status - this may happen in 
 	temporal scalability only*/
@@ -531,10 +614,10 @@
 			mo->odm->codec->CB->output->RenderedLength += nb_bytes;
 		}
 
-		if (forceDrop<0) {
+		if (drop_mode<0) {
 			/*only allow for explicit last frame keeping if only one node is using the resource
 			otherwise this would block the composition memory*/
-			if (mo->num_open>1) forceDrop=0;
+			if (mo->num_open>1) drop_mode=0;
 			else {
 				gf_odm_lock(mo->odm, 0);
 				return;
@@ -543,26 +626,14 @@
 
 		/*discard frame*/
 		if (mo->odm->codec->CB->output->RenderedLength == mo->odm->codec->CB->output->dataLength) {
-			if (forceDrop) {
+			if (drop_mode) {
 				gf_cm_drop_output(mo->odm->codec->CB);
-				forceDrop--;
-//				if (forceDrop) mo->odm->codec->nb_droped++;
+				GF_LOG(GF_LOG_DEBUG, GF_LOG_MEDIA, ("[ODM%d] At OTB %u drop frame TS %u\n", mo->odm->OD->objectDescriptorID, gf_clock_time(mo->odm->codec->ck), mo->timestamp));
 			} else {
 				/*we cannot drop since we don't know the speed of the playback (which can even be frame by frame)*/
-#if 0
-				obj_time = gf_clock_time(mo->odm->codec->ck);
-				if (mo->odm->codec->CB->output->next->dataLength) { 
-					if (2*obj_time < mo->timestamp + mo->odm->codec->CB->output->next->TS ) {
-						mo->odm->codec->CB->output->RenderedLength = 0;
-					} else {
-						gf_cm_drop_output(mo->odm->codec->CB);
-					}
-				} else {
-					gf_cm_drop_output(mo->odm->codec->CB);
-				}
-#else
-				mo->odm->codec->CB->output->RenderedLength = 0;
-#endif
+
+				//notif CB we kept the output
+				gf_cm_output_kept(mo->odm->codec->CB);
 			}
 		}
 	}
@@ -1101,6 +1172,13 @@
 }
 
 GF_EXPORT
+Bool gf_mo_is_raw_memory(GF_MediaObject *mo)
+{
+	if (!mo->odm || !mo->odm->codec) return GF_FALSE;
+	return mo->odm->codec->direct_vout;
+}
+
+GF_EXPORT
 u32 gf_mo_has_audio(GF_MediaObject *mo)
 {
 	char *sub_url, *ext;
@@ -1143,29 +1221,19 @@
 	return mo->odm->subscene->graph;
 }
 
-static GF_DOMEventTarget *gf_mo_event_target_add(GF_MediaObject *mo, GF_DOMEventTargetType type, void *obj)
-{
-    GF_DOMEventTarget *target;
-    GF_SAFEALLOC(target, GF_DOMEventTarget);
-    target->ptr_type = type;
-    target->evt_list = gf_list_new();
-    target->ptr = obj;
-    gf_list_add(mo->evt_targets, target);
-    return target;
-}
 
 GF_EXPORT
 GF_DOMEventTarget *gf_mo_event_target_add_node(GF_MediaObject *mo, GF_Node *n)
 {
+#ifndef GPAC_DISABLE_SVG
+    GF_DOMEventTarget *target = NULL;
     if (!mo ||!n) return NULL;
-    return gf_mo_event_target_add(mo, GF_DOM_EVENT_NODE, n);
-}
-
-GF_EXPORT
-GF_DOMEventTarget *gf_mo_event_target_add_object(GF_MediaObject *mo, void *obj)
-{
-    if (!mo || !obj) return NULL;
-    return gf_mo_event_target_add(mo, GF_DOM_EVENT_JS, obj);
+	target = gf_dom_event_get_target_from_node(n);
+	gf_list_add(mo->evt_targets, target);
+	return target;
+#else
+	return NULL;
+#endif
 }
 
 GF_Err gf_mo_event_target_remove(GF_MediaObject *mo, GF_DOMEventTarget *target)
@@ -1188,6 +1256,7 @@
     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;
 }
 
@@ -1213,7 +1282,9 @@
         GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(mo->evt_targets, i);
         if (target->ptr == node) {
             gf_list_del_item(mo->evt_targets, target);
-            return GF_OK;
+            i--;
+			count--;
+			//return GF_OK;
         }
     }
     return GF_BAD_PARAM;
@@ -1222,7 +1293,7 @@
 GF_EXPORT
 GF_Node *gf_event_target_get_node(GF_DOMEventTarget *target)
 {
-    if (target && (target->ptr_type == GF_DOM_EVENT_NODE)) {
+    if (target && (target->ptr_type == GF_DOM_EVENT_TARGET_NODE)) {
         return (GF_Node *)target->ptr;
     }
     return NULL;
@@ -1248,6 +1319,7 @@
 
 void gf_mo_del(GF_MediaObject *mo)
 {
+	assert(gf_list_count(mo->evt_targets) == 0);
     gf_list_del(mo->evt_targets);
     gf_free(mo);
 }

gpac-0.5.0.svn4668.tar.bz2/src/terminal/mpeg4_inline.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/mpeg4_inline.c Changed

@@ -95,7 +95,7 @@
 			if (mo->num_open) {
 				if (!changed) return;
 
-				gf_scene_notify_event(scene, GF_EVENT_UNLOAD, node, NULL, GF_OK);
+				gf_scene_notify_event(scene, GF_EVENT_UNLOAD, node, NULL, GF_OK, GF_TRUE);
 				gf_node_dirty_parents(node);
 				gf_mo_event_target_remove_by_node(mo, node);
 
@@ -148,7 +148,6 @@
 
 		In such a case we would end up in a deadlock - this needs urgent fixing ...
 	*/
-
 	if (ODID) {
 		/*if no parent we must process the url change as we may not be traversed later on (not in the scene tree)*/
 		if (gf_node_get_parent(node, 0)==NULL) {
@@ -238,7 +237,7 @@
 		if (!scene) return;
 		mo = scene->root_od ? scene->root_od->mo : NULL;
 
-		gf_scene_notify_event(scene, GF_EVENT_UNLOAD, n, NULL, GF_OK);
+		gf_scene_notify_event(scene, GF_EVENT_UNLOAD, n, NULL, GF_OK, GF_TRUE);
 		if (!mo) return;
 		gf_mo_event_target_remove_by_node(mo, n);
 
@@ -290,6 +289,21 @@
 		}
 	}
 
+	/*if not attached return (attaching the graph cannot be done in render since render is not called while unattached :) */
+	if (!scene->graph_attached) {
+		/*just like protos, we must invalidate parent graph until attached*/
+		gf_node_dirty_set(n, 0, GF_TRUE);
+		return;
+	}
+	/*clear dirty flags for any sub-inlines, bitmaps or protos*/
+	gf_node_dirty_clear(n, 0);
+
+	current_url = scene->current_url;
+	scene->current_url = & ((M_Inline*)n)->url;
+	gf_sc_traverse_subscene(scene->root_od->term->compositor, n, scene->graph, rs);
+	scene->current_url = current_url;
+
+	//do we have to restart for next frame ? If so let's do it
 	gf_inline_check_restart(scene);
 
 	/*if we need to restart, shutdown graph and do it*/
@@ -311,19 +325,6 @@
 		return;
 	} 
 	
-	/*if not attached return (attaching the graph cannot be done in render since render is not called while unattached :) */
-	if (!scene->graph_attached) {
-		/*just like protos, we must invalidate parent graph until attached*/
-		gf_node_dirty_set(n, 0, GF_TRUE);
-		return;
-	}
-	/*clear dirty flags for any sub-inlines, bitmaps or protos*/
-	gf_node_dirty_clear(n, 0);
-
-	current_url = scene->current_url;
-	scene->current_url = & ((M_Inline*)n)->url;
-	gf_sc_traverse_subscene(scene->root_od->term->compositor, n, scene->graph, rs);
-	scene->current_url = current_url;
 }

gpac-0.5.0.svn4668.tar.bz2/src/terminal/network_service.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/network_service.c Changed

@@ -24,6 +24,7 @@
  */
 
 #include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
 #include <gpac/network.h>
 #include <gpac/cache.h>
 #include "media_memory.h"
@@ -51,9 +52,9 @@
 		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_OK);
+			gf_term_message(term, service->url, szMsg, GF_IP_NETWORK_FAILURE);
 
-			/*reload scene*/
+			/*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);
@@ -82,7 +83,7 @@
 		gf_term_service_media_event(service->owner, GF_EVENT_MEDIA_SETUP_DONE);
 		if (err) {
 			char msg[5000];
-			snprintf(msg, sizeof(msg)-1, "Cannot open %s", service->url);
+			snprintf(msg, sizeof(msg), "Cannot open %s", service->url);
 			gf_term_message(term, service->url, msg, err);
 
 			gf_term_service_media_event(service->owner, GF_EVENT_ERROR);
@@ -99,7 +100,6 @@
 					/*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;
@@ -107,7 +107,7 @@
 					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);
+					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,6 +115,7 @@
 					gf_scene_remove_object(root->parentscene, root, 0);
 					gf_odm_disconnect(root, 1);
 				}
+				gf_term_lock_media_queue(term, 0);
 				return;
 			}
 		}
@@ -453,7 +454,7 @@
 
 	if (com->command_type==GF_NET_BUFFER_QUERY) {
 		GF_List *od_list;
-		u32 i;
+		u32 i, max_buffer_time;
 		GF_ObjectManager *odm;
 		com->buffer.max = 0;
 		com->buffer.min = com->buffer.occupancy = (u32) -1;
@@ -476,6 +477,7 @@
 		/*get exclusive access to media scheduler, to make sure ODs are not being
 		manipulated*/
 		gf_mx_p(term->mm_mx);
+		max_buffer_time=0;
 		if (!gf_list_count(od_list))
 			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;
@@ -487,25 +489,36 @@
 				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 && (u32) ch->BufferTime  < com->buffer.occupancy) {
+				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 (odm->codec->CB->UnitCount + ch->AU_Count <= odm->codec->CB->Capacity) {
-//						com->buffer.occupancy = 0;
-						com->buffer.occupancy = ch->BufferTime;
-					} else {
+					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;
 				}
 			}
 		}
 		gf_mx_v(term->mm_mx);
-//		fprintf(stderr, "Buffer occupancy %d\n", com->buffer.occupancy);
 		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;
+			com->buffer.max = 1;
+			com->buffer.min = 0;
+		}
 		return;
 	}
 	if (com->command_type==GF_NET_SERVICE_INFO) {
@@ -514,11 +527,13 @@
 		gf_term_send_event(term, &evt);
 		return;
 	}
-
+	if (com->command_type==GF_NET_SERVICE_MEDIA_CAP_QUERY) {
+		gf_sc_get_av_caps(term->compositor, &com->mcaps.width, &com->mcaps.height, &com->mcaps.display_bit_depth, &com->mcaps.audio_bpp, &com->mcaps.channels, &com->mcaps.sample_rate);
+		return;
+	}
 
 	if (!com->base.on_channel) return;
 
-
 	ch = gf_term_get_channel(service, com->base.on_channel);
 	if (!ch) return;
 
@@ -599,6 +614,16 @@
 	case GF_NET_CHAN_RESET:
 		gf_es_reset_buffers(ch);
 		break;
+	case GF_NET_CHAN_PAUSE:
+		gf_es_buffer_on(ch);
+		break;
+	case GF_NET_CHAN_RESUME:
+		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);
+		break;
 	default:
 		return;
 	}
@@ -625,8 +650,8 @@
 	(*ret_code) = GF_OK;
 	if (strnicmp(url, "http", 4)) return NULL;
 
-	/*don't use any NetIO and don't issue a HEAD command, always go for GET and store the session */
-	sess = gf_dm_sess_new(term->downloader, (char *) url, GF_NETIO_SESSION_NOT_THREADED | GF_NETIO_SESSION_NOT_CACHED, NULL, NULL, ret_code);
+	/*don't use any NetIO and don't issue a HEAD command, always go for GET, use cache and store the session*/
+	sess = gf_dm_sess_new(term->downloader, (char *) url, GF_NETIO_SESSION_NOT_THREADED , NULL, NULL, ret_code);
 	if (!sess) {
 		if (strstr(url, "rtsp://") || strstr(url, "rtp://") || strstr(url, "udp://") || strstr(url, "tcp://") ) (*ret_code) = GF_OK;
 		return NULL;
@@ -880,7 +905,6 @@
 {
 	GF_DownloadSession *download_session = NULL;
 	char *sURL;
-	const char *opt;
 	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;
@@ -894,19 +918,6 @@
 	serv->dnloads = gf_list_new();
 	serv->pending_service_session = download_session;
 
-	opt = gf_cfg_get_key(term->user->config, "Network", "HTTPRebuffer");
-	if (!opt) {
-		opt = "5000";
-		gf_cfg_set_key(term->user->config, "Network", "HTTPRebuffer", "5000");
-	}
-	serv->download_rebuffer = atoi(opt);
-	opt = gf_cfg_get_key(term->user->config, "Network", "HTTPAutoRebuffer");
-	if (!opt) {
-		opt = "no";
-		gf_cfg_set_key(term->user->config, "Network", "HTTPAutoRebuffer", "no");
-	}
-	serv->auto_rebuffer = !strcmp(opt, "yes") ? 1 : 0;
-
 	gf_list_add(term->net_services, serv);
 
 	return serv;
@@ -1112,7 +1123,8 @@
 {
 	GF_ClientService *serv;
 	const char *szURI;
-	u32 total_size, bytes_done, net_status, bytes_per_sec;
+	u32 total_size, bytes_done, bytes_per_sec;
+	GF_NetIOStatus net_status;
 
 	if (!sess) return;
 
@@ -1145,57 +1157,6 @@
 		}
 		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] %s received %d / %d\n", szURI, bytes_done, total_size));
 		gf_term_service_media_event_with_download(serv->owner, GF_EVENT_MEDIA_PROGRESS, bytes_done, total_size, bytes_per_sec);
-
-		/*JLF fix this*/
-		if (0&& (serv->download_rebuffer || serv->auto_rebuffer) && serv->owner && !(serv->owner->flags & GF_ODM_DESTROYED) && serv->owner->duration) {
-			GF_Clock *ck = gf_odm_get_media_clock(serv->owner);
-			Double download_percent, playback_percent, adj_percent;
-			download_percent = 100 * bytes_done; 
-			download_percent /= total_size;
-
-			playback_percent = 100 * serv->owner->current_time; 
-			playback_percent /= serv->owner->duration;
-			if (serv->auto_rebuffer)
-				adj_percent = 0.0;
-			else
-				adj_percent = 100.0 * serv->download_rebuffer / serv->owner->duration;
-
-			if (playback_percent >= download_percent) {
-				if (gf_clock_is_started(ck)) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP Resource] Played %d %% but downloaded %d %% - Pausing\n", (u32) playback_percent, (u32) download_percent));
-					if (!serv->is_paused) {
-						serv->is_paused = 1;
-						mediacontrol_pause(serv->owner);
-					}
-					gf_term_service_media_event(serv->owner, GF_EVENT_MEDIA_WAITING);
-					gf_term_on_message(serv, GF_OK, "HTTP Buffering ...");
-				}
-			} else if (playback_percent + adj_percent <= download_percent) {
-				Double time_to_play = 0;
-				Double time_to_download = 0;
-				/*automatic rebuffer: make sure we can finish playback before resuming*/
-				if (serv->auto_rebuffer) {
-					if (bytes_per_sec) {
-						time_to_download = 1000.0*(total_size - bytes_done);
-						time_to_download /= bytes_per_sec;
-					}
-					time_to_play = (Double) serv->owner->duration;
-					time_to_play -= serv->owner->current_time;
-				}
-				if ((time_to_download<=time_to_play) && !gf_clock_is_started(ck)) {
-					GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP Resource] Played %d %% and downloaded %d %% - Resuming\n", (u32) playback_percent, (u32) download_percent));
-					if (serv->auto_rebuffer) {
-						GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP Resource] Auto-rebuffer done: should be done downloading in %d ms and remains %d ms to play\n", (u32) time_to_download, (u32) (serv->owner->duration - serv->owner->current_time) ));
-					}
-					gf_term_service_media_event(serv->owner, GF_EVENT_MEDIA_PLAYING);
-					if (serv->is_paused) {
-						serv->is_paused = 0;
-						mediacontrol_resume(serv->owner);
-					}
-					gf_term_on_message(serv, GF_OK, "HTTP Resuming playback");
-				}
-			}
-		}
 		break;
 	case GF_NETIO_DATA_TRANSFERED:
 		gf_term_service_media_event(serv->owner, GF_EVENT_MEDIA_LOAD_DONE);
@@ -1210,6 +1171,8 @@
 			}
 		}
 		break;
+	default:
+		break;
 	}
 }

gpac-0.5.0.svn4668.tar.bz2/src/terminal/object_browser.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/object_browser.c Changed

@@ -103,6 +103,7 @@
 }
 
 /*select given object when stream selection is available*/
+GF_EXPORT
 void gf_term_select_object(GF_Terminal *term, GF_ObjectManager *odm)
 {
 	if (!term || !odm) return;
@@ -130,11 +131,15 @@
 
 static void get_codec_stats(GF_Codec *dec, GF_MediaInfo *info)
 {
-	info->avg_bitrate = dec->avg_bit_rate;
+	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->max_bitrate = dec->max_bit_rate;
 	info->nb_dec_frames = dec->nb_dec_frames;
 	info->max_dec_time = dec->max_dec_time;
 	info->total_dec_time = dec->total_dec_time;
+	info->first_frame_time = dec->first_frame_time;
+	info->last_frame_time = dec->last_frame_time;
+	info->raw_media = dec->flags & GF_ESM_CODEC_IS_RAW_MEDIA;
 }
 
 GF_EXPORT
@@ -150,9 +155,17 @@
 
 	info->duration = (Double) (s64)odm->duration;
 	info->duration /= 1000;
+
 	if (odm->codec) {
 		/*since we don't remove ODs that failed setup, check for clock*/
-		if (odm->codec->ck) info->current_time = odm->codec->CB ? odm->current_time : gf_clock_time(odm->codec->ck);
+		if (odm->codec->ck) {
+			if (odm->codec->CB) {
+				info->current_time = odm->current_time ? odm->current_time : odm->codec->last_unit_cts;
+			} else {
+				info->current_time = gf_clock_time(odm->codec->ck);
+			}
+			info->current_time -= odm->codec->ck->init_time;
+		}
 		info->current_time /= 1000;
 		info->nb_droped = odm->codec->nb_droped;
 	} else if (odm->subscene) {
@@ -164,11 +177,16 @@
 			info->duration = (Double) (s64)odm->subscene->duration;
 			info->duration /= 1000;
 			info->nb_droped = odm->subscene->scene_codec->nb_droped;
-		} else if (odm->subscene->is_dynamic_scene && odm->subscene->dyn_ck) {
-			info->current_time = gf_clock_time(odm->subscene->dyn_ck);
-			info->current_time /= 1000;
+		} 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 /= 1000;
+			}
+			info->generated_scene = 1;
 		}
 	}
+	if (info->current_time>info->duration)
+		info->current_time = info->duration;
 
 	info->buffer = -2;
 	info->db_unit_count = 0;
@@ -237,6 +255,9 @@
 		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->direct_video_memory = 1;
+			}
 		}
 	} 
 	
@@ -367,7 +388,9 @@
 	GF_SceneGraph *sg;
 	GF_ObjectManager *odm;
 	GF_SceneDumper *dumper;
+	GF_List *extra_graphs;
 	u32 mode;
+	u32 i;
 	char szExt[20], *ext;
 	GF_Err e;
 
@@ -384,9 +407,11 @@
 	if (odm->subscene) {
 		if (!odm->subscene->graph) return GF_IO_ERR;
 		sg = odm->subscene->graph;
+		extra_graphs = odm->subscene->extra_scenes;
 	} else {
 		if (!odm->parentscene->graph) return GF_IO_ERR;
 		sg = odm->parentscene->graph;
+		extra_graphs = odm->parentscene->extra_scenes;
 	}
 
 	mode = xml_dump ? GF_SM_DUMP_AUTO_XML : GF_SM_DUMP_AUTO_TXT;
@@ -404,6 +429,12 @@
 
 	if (!dumper) return GF_IO_ERR;
 	e = gf_sm_dump_graph(dumper, skip_protos, 0);
+	for (i = 0; i < gf_list_count(extra_graphs); i++) {
+		GF_SceneGraph *extra = (GF_SceneGraph *)gf_list_get(extra_graphs, i);
+		gf_sm_dumper_set_extra_graph(dumper, extra);
+		e = gf_sm_dump_graph(dumper, skip_protos, 0);
+	}
+
 	if (filename) *filename = gf_strdup(gf_sm_dump_get_name(dumper));
 	gf_sm_dumper_del(dumper);
 	return e;
@@ -412,3 +443,4 @@
 #endif
 }
 
+

gpac-0.5.0.svn4668.tar.bz2/src/terminal/object_manager.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/object_manager.c Changed

@@ -25,6 +25,7 @@
 
 
 #include <gpac/internal/terminal_dev.h>
+#include <gpac/internal/compositor_dev.h>
 #include <gpac/constants.h>
 #include "media_memory.h"
 #include "media_control.h"
@@ -127,7 +128,7 @@
 }
 
 GF_EXPORT
-void gf_odm_disconnect(GF_ObjectManager *odm, Bool do_remove)
+void gf_odm_disconnect(GF_ObjectManager *odm, u32 do_remove)
 {
 	GF_Terminal *term;
 	GF_Channel *ch;
@@ -478,7 +479,7 @@
 GF_Err ODM_ValidateOD(GF_ObjectManager *odm, Bool *hasInline)
 {
 	u32 i;
-	u16 es_id;
+	u16 es_id, ck_id;
 	GF_ESD *esd, *base_scene;
 	const char *sOpt;
 	u32 nb_od, nb_ocr, nb_scene, nb_mp7, nb_ipmp, nb_oci, nb_mpj, nb_other, prev_st;
@@ -489,12 +490,21 @@
 	*hasInline = 0;
 
 	/*step 1: validate OD*/
+	ck_id = 0;
 	i=0;
 	while ((esd = (GF_ESD *)gf_list_enum(odm->OD->ESDescriptors, &i))) {
 		assert(esd->decoderConfig);
+		//force single clock ID in one object
+		if (!ck_id) ck_id = esd->OCRESID;
+		else esd->OCRESID = ck_id;
+
 		switch (esd->decoderConfig->streamType) {
-		case GF_STREAM_OD: nb_od++; break;
-		case GF_STREAM_OCR: nb_ocr++; break;
+		case GF_STREAM_OD:
+			nb_od++;
+			break;
+		case GF_STREAM_OCR: 
+			nb_ocr++; 
+			break;
 		case GF_STREAM_SCENE: 
 			switch (esd->decoderConfig->objectTypeIndication) {
 			case GPAC_OTI_SCENE_AFX:
@@ -587,6 +597,24 @@
 	return GF_OK;
 }
 
+static Bool gf_odm_should_auto_select(GF_ObjectManager *odm)
+{
+	u32 i, count;
+	if (gf_codec_is_scene_or_image(odm->codec)) return GF_TRUE;
+
+	if (odm->parentscene && !odm->parentscene->is_dynamic_scene) return GF_TRUE;
+
+	count = gf_list_count(odm->parentscene->resources);
+	for (i=0; i<count; i++) {
+		GF_ObjectManager *an_odm = gf_list_get(odm->parentscene->resources, i);
+		if (an_odm==odm) continue;
+		if (!an_odm->codec) continue;
+		if (an_odm->codec->type != odm->codec->type) continue;
+		//same type - if the first one has been autumatically activated, do not activate this one
+		if (an_odm->state == GF_ODM_STATE_PLAY) return GF_FALSE;
+	}
+	return GF_TRUE;
+}
 
 
 /*connection of OD and setup of streams. The streams are not requested if the OD
@@ -766,7 +794,7 @@
 	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)) && (odm->parentscene->selected_service_id == odm->OD->ServiceID)) {
+	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;
 		if (odm->state==GF_ODM_STATE_STOP) {
 			odm->flags |= GF_ODM_PREFETCH;
@@ -776,6 +804,7 @@
 		else if ((odm->state==GF_ODM_STATE_PLAY) && (gf_list_del_item(odm->term->media_queue, odm)>=0) ) {
 			force_play = GF_TRUE;
 		}
+
 		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));
@@ -1201,10 +1230,7 @@
 	}
 
 	/*in case a channel is inserted in a running OD, open and play if not in queue*/
-	if ( (ch->odm->state==GF_ODM_STATE_PLAY) 
-		/*HACK: special case when OD resources are statically described in the ESD itself (ISMA streaming)*/
-//		|| 	(dec && (dec->flags & GF_ESM_CODEC_IS_STATIC_OD)) 
-	) {
+	if (ch->odm->state==GF_ODM_STATE_PLAY) {
 
 		gf_term_lock_media_queue(ch->odm->term, 1);
 		gf_list_del_item(ch->odm->term->media_queue, ch->odm);
@@ -1355,6 +1381,11 @@
 			}
 			skip_register = 0;
 		}
+		//wait for end of setup 
+		else if (odm->state==GF_ODM_STATE_IN_SETUP) {
+			media_queue_state=0;
+			skip_register = 0;
+		}
 		/*object is already started - only reinsert in media queue if this function was called on an object already in the queue*/
 		else {
 			skip_register = media_queue_state ? 0 : 1;
@@ -1450,6 +1481,10 @@
 			ck_time = (Double) (s64) odm->media_start_time;
 			ck_time /= 1000;
 		}
+		else if (odm->parentscene && odm->parentscene->root_od->media_start_time && !ch->clock->clock_init) {
+			ck_time = (Double) (s64) odm->parentscene->root_od->media_start_time;
+			ck_time /= 1000;
+		}
 		/*play from current time*/
 		else {
 			ck_time = gf_clock_time(ch->clock);
@@ -1537,6 +1572,7 @@
 	}
 
 	gf_term_service_media_event(odm, GF_EVENT_MEDIA_LOAD_START);
+	gf_term_service_media_event(odm, GF_EVENT_MEDIA_TIME_UPDATE);
 
 
 	/*start codecs last (otherwise we end up pulling data from channels not yet connected->pbs when seeking)*/
@@ -1608,7 +1644,10 @@
 
 	/*little opt for image codecs: don't actually stop the OD*/
 	if (!force_close && odm->codec && odm->codec->CB && !odm->codec->CB->no_allocation) {
-		if (odm->codec->CB->Capacity==1) return;
+		if (odm->codec->CB->Capacity==1) {
+			gf_cm_abort_buffering(odm->codec->CB);
+			return;
+		}
 	}
 
 	/*if raw media, stop all channels before sending stop command to network, to avoid new media frames to be set
@@ -1694,11 +1733,9 @@
 
 #ifndef GPAC_DISABLE_VRML
 	/*reset media sensor(s)*/
-	if (force_close!=2) {
-		i = 0;
-		while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i))){
-			MS_Stop(media_sens);
-		}
+	i = 0;
+	while ((media_sens = (MediaSensorStack *)gf_list_enum(odm->ms_stack, &i))){
+		MS_Stop(media_sens);
 	}
 	/*reset media control state*/
 	ctrl = gf_odm_get_mediacontrol(odm);
@@ -1709,18 +1746,23 @@
 
 void gf_odm_on_eos(GF_ObjectManager *odm, GF_Channel *on_channel)
 {
-	u32 i, count, nb_eos, nb_share_clock;
+	u32 i, count, nb_eos, nb_share_clock, nb_ck_running;
 #ifndef GPAC_DISABLE_VRML
 	if (gf_odm_check_segment_switch(odm)) return;
 #endif
 
 	nb_share_clock=0;
 	nb_eos = 0;
+	nb_ck_running = 0;
 	count = gf_list_count(odm->channels);
 	for (i=0; i<count; i++) {
 		GF_Channel *ch = gf_list_get(odm->channels, i);
 		if (on_channel) {
-			if (ch->clock != on_channel->clock) continue;
+			if (ch->clock != on_channel->clock) {
+				if (! ch->clock->has_seen_eos)
+					nb_ck_running++;
+				continue;
+			}
 			nb_share_clock++;
 		}
 		if (ch->IsEndOfStream) nb_eos++;
@@ -1728,8 +1770,10 @@
 	if (on_channel) {
 		if (nb_eos==nb_share_clock) {
 			on_channel->clock->has_seen_eos = 1;
+		} else {
+			nb_ck_running++;
 		}
-		if (nb_eos != count) return;
+		if (nb_ck_running) return;
 	} else {
 		if (nb_eos != count) return;
 	}
@@ -1751,14 +1795,12 @@
 	}
 	if (!odm->subscene) return;
 
-	if (odm->subscene->scene_codec && (gf_list_find(odm->subscene->scene_codec->inChannels, on_channel)>=0) ) {
+	if (odm->subscene->scene_codec) {
 		gf_codec_set_status(odm->subscene->scene_codec, GF_ESM_CODEC_EOS);
-		return;
 	}
 
-	if (on_channel->esd->decoderConfig->streamType==GF_STREAM_OD) {
+	if (odm->subscene->od_codec) {
 		gf_codec_set_status(odm->subscene->od_codec, GF_ESM_CODEC_EOS);
-		return;
 	}
 }
 
@@ -1766,15 +1808,16 @@
 {
 	if (odm->codec) {
 		if (ch->esd->decoderConfig->streamType == odm->codec->type)
-			if (odm->duration < stream_duration)
+			if (odm->duration/1000 != stream_duration/1000)
 				odm->duration = stream_duration;
 	} else if (odm->ocr_codec) {
 		if (ch->esd->decoderConfig->streamType == odm->ocr_codec->type)
-			if (odm->duration < stream_duration)
+			if (odm->duration/1000 != stream_duration/1000)
 				odm->duration = stream_duration;
 	} else if (odm->subscene && odm->subscene->scene_codec) {
 		//if (gf_list_find(odm->subscene->scene_codec->inChannels, ch) >= 0) {
-			if (odm->duration < stream_duration) odm->duration = stream_duration;
+			if (odm->duration/1000 != stream_duration/1000)
+				odm->duration = stream_duration;
 		//}
 	}
 
@@ -2014,11 +2057,25 @@
 
 void gf_odm_signal_eos(GF_ObjectManager *odm)
 {
-	if (odm->parentscene != odm->term->root_scene) return;
-	if (gf_term_check_end_of_scene(odm->term, 0)) {
-		GF_Event evt;
-		evt.type = GF_EVENT_EOS;
-		gf_term_send_event(odm->term, &evt);
+	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;
+		else
+			is_over = gf_sc_is_over(odm->term->compositor, root->subscene->graph);
+
+		if (is_over) {
+			gf_term_service_media_event(root, GF_EVENT_MEDIA_ENDED);
+		}
+	} else {
+		if (gf_term_check_end_of_scene(odm->term, 0)) {
+			GF_Event evt;
+			evt.type = GF_EVENT_EOS;
+			gf_term_send_event(odm->term, &evt);
+		}
 	}
 }

gpac-0.5.0.svn4668.tar.bz2/src/terminal/scene.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/scene.c Changed

@@ -41,15 +41,16 @@
 #endif
 
 #include "input_sensor.h"
+#include "media_memory.h"
 
 GF_EXPORT
 Double gf_scene_get_time(void *_is)
 {
 	GF_Scene *scene = (GF_Scene *)_is;
-#if 0
+#if 1
 	u32 ret;
 	GF_Clock *ck;
-	assert(is);
+	assert(scene);
 	ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
 	if (!ck) return 0.0;
 	ret = gf_clock_time(ck);
@@ -64,20 +65,6 @@
 void gf_storage_save(M_Storage *storage);
 #endif
 
-void gf_scene_sample_time(GF_Scene *scene)
-{
-	u32 ret;
-	GF_Clock *ck;
-	ck = scene->scene_codec ? scene->scene_codec->ck : scene->dyn_ck;
-	if (!ck) 
-		scene->simulation_time = 0;
-	else {
-		ret = gf_clock_time(ck);
-		if (scene->root_od->media_stop_time && (scene->root_od->media_stop_time<ret)) ret = (u32) scene->root_od->media_stop_time;
-		scene->simulation_time = ((Double) ret) / 1000.0;
-	}
-}
-
 static void inline_on_media_event(GF_Scene *scene, u32 type)
 {
 	gf_term_service_media_event(scene->scene_codec->odm, type); 
@@ -232,14 +219,16 @@
 				obj = odm->mo;
 				while (gf_mo_event_target_count(obj)) {
 					GF_Node *n = (GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(obj, 0));
-					switch (gf_node_get_tag(n)) {
-						case TAG_MPEG4_InputSensor:
-							{
-								M_InputSensor* is = (M_InputSensor*)n;
-								is->enabled = 0;
-								InputSensorModified(n);
-								break;
-							}
+					if (n) {
+						switch (gf_node_get_tag(n)) {
+							case TAG_MPEG4_InputSensor:
+								{
+									M_InputSensor* is = (M_InputSensor*)n;
+									is->enabled = 0;
+									InputSensorModified(n);
+									break;
+								}
+						}
 					}
 					gf_mo_event_target_remove_by_index(obj, 0);
 				}	
@@ -268,10 +257,9 @@
 
 	/*release the scene - at this stage, we no longer have any node stack refering to our media objects */
 	if (dec && dec->ReleaseScene) dec->ReleaseScene(dec);
+	gf_sc_node_destroy(scene->root_od->term->compositor, NULL, scene->graph);
 	gf_sg_reset(scene->graph);
 	scene->graph_attached = 0;
-	scene->simulation_time = 0;
-	
 
 	/*reset statc ressource flag since we destroyed scene objects*/
 	scene->static_media_ressources = GF_FALSE;
@@ -404,7 +392,7 @@
 }
 
 
-void gf_scene_remove_object(GF_Scene *scene, GF_ObjectManager *odm, Bool for_shutdown)
+void gf_scene_remove_object(GF_Scene *scene, GF_ObjectManager *odm, u32 for_shutdown)
 {
 	u32 i;
 	GF_MediaObject *obj;
@@ -522,9 +510,10 @@
 		while ((ch = (GF_Channel*)gf_list_enum(odm->channels, &j))) {
 			/*count only re-buffering channels*/
 			if (!ch->BufferOn) continue;
-
-			max_buffer += ch->MaxBuffer;
-			cur_buffer += (ch->BufferTime>0) ? ch->BufferTime : 1;
+			if (ch->MaxBuffer) {
+				max_buffer += ch->MaxBuffer;
+				cur_buffer += (ch->BufferTime>0) ? ch->BufferTime : 0;
+			}
 		}
 	}
 
@@ -542,27 +531,28 @@
 
 
 
-void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *_event, GF_Err code)
+void gf_scene_notify_event(GF_Scene *scene, u32 event_type, GF_Node *n, void *_event, GF_Err code, Bool no_queueing)
 {
 	/*fire resize event*/
 #ifndef GPAC_DISABLE_SVG
 	GF_Node *root;
 	u32 i, count;
 	u32 w, h;
-	GF_DOM_Event evt, *event;
-	event = (GF_DOM_Event *)_event;
+	GF_DOM_Event evt, *dom_event;
+	dom_event = (GF_DOM_Event *)_event;
 
 	if (!scene) return;
 	root = gf_sg_get_root_node(scene->graph);
 
-	if (!event) {
+	if (!dom_event) {
 		memset(&evt, 0, sizeof(GF_DOM_Event));
-		event = &evt;
+		dom_event = &evt;
 		w = h = 0;
 		gf_sg_get_scene_size_info(scene->graph, &w, &h);
 		evt.type = event_type;
 		evt.screen_rect.width = INT2FIX(w);
 		evt.screen_rect.height = INT2FIX(h);
+		evt.key_flags = scene->is_dynamic_scene;
 		if (root) {
 #ifndef GPAC_DISABLE_VRML
 			switch (gf_node_get_tag(root)) {
@@ -582,13 +572,28 @@
 		evt.error_state = code;
 	}
 	if (n) {
-		gf_dom_event_fire(n, event);
+		if (no_queueing) {
+			gf_dom_event_fire(n, dom_event);
+		} else {
+			gf_sc_queue_dom_event(scene->root_od->term->compositor, n, dom_event);
+		}
 	} else {
-		if (root) gf_dom_event_fire(root, event);
+		if (root) {
+			if (no_queueing) {
+				gf_dom_event_fire(root, dom_event);
+			} else {
+				gf_sc_queue_dom_event(scene->root_od->term->compositor, root, dom_event);
+			}
+		}
 	
 		count=scene->root_od->mo ? gf_mo_event_target_count(scene->root_od->mo) : 0;
 		for (i=0;i<count; i++) {
-			gf_dom_event_fire(gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, i)), event);
+			GF_Node *an = gf_event_target_get_node(gf_mo_event_target_get(scene->root_od->mo, i));
+			if (no_queueing) {
+				gf_dom_event_fire(an, dom_event);
+			} else {
+				gf_sc_queue_dom_event(scene->root_od->term->compositor, an, dom_event);
+			}
 		}
 	}
 #endif
@@ -635,7 +640,7 @@
 			gf_sc_set_size(scene->root_od->term->compositor, w, h);
 		}
 		/*trigger a scene attach event*/
-		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK);
+		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
 	}
 }
 
@@ -1188,7 +1193,7 @@
 		IS_UpdateVideoPos(scene);
 	} else {
 		scene->graph_attached = 1;
-		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK);
+		gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
 		gf_term_invalidate_compositor(scene->root_od->term);
 	}
 }
@@ -1325,7 +1330,6 @@
 
 	/*reset clock*/
 	gf_clock_reset(ck);
-	scene->simulation_time = from_time/1000.0;
 	if (!scene->is_dynamic_scene) gf_clock_set_time(ck, 0);
 
 	/*restart objects*/
@@ -1365,8 +1369,6 @@
 	/*for now only allowed when no scene info*/
 	if (!scene->is_dynamic_scene) return;
 	
-	gf_sc_lock(scene->root_od->term->compositor, 1);
-
 	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) {
@@ -1406,9 +1408,7 @@
 	IS_UpdateVideoPos(scene);
 #endif
 
-	gf_sc_lock(scene->root_od->term->compositor, 0);
-
-	gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK);
+	gf_scene_notify_event(scene, GF_EVENT_SCENE_ATTACHED, NULL, NULL, GF_OK, GF_FALSE);
 }
 
 
@@ -1522,8 +1522,10 @@
 		}
 		i=0;
 		while ( (odm = (GF_ObjectManager*)gf_list_enum(scene->resources, &i)) ) {
-			if (odm->net_service != ns) {
+			if (odm->net_service && (odm->net_service != ns)) {
 				if (!gf_scene_check_clocks(odm->net_service, NULL)) return 0;
+			} else if (odm->codec && odm->codec->CB && !gf_cm_is_eos(odm->codec->CB) ) {
+				return 0;
 			}
 		}
 	}
@@ -1531,6 +1533,10 @@
 	while ( (ck = (GF_Clock *)gf_list_enum(ns->Clocks, &i) ) ) {
 		if (!ck->has_seen_eos) return 0;
 	}
+	if (scene) {
+		if (scene->scene_codec && (scene->scene_codec->Status != GF_ESM_CODEC_STOP)) return 0;
+		if (scene->od_codec && (scene->od_codec->Status != GF_ESM_CODEC_STOP)) return 0;
+	}
 	return 1;
 }
 
@@ -1565,6 +1571,13 @@
 	return gf_list_enum(scene->extra_scenes, i);
 }
 
+Bool gf_scene_is_dynamic_scene(GF_SceneGraph *sg)
+{
+	GF_Scene *scene = gf_sg_get_private(sg);
+	if (!scene) return 0;
+	return scene->is_dynamic_scene ? 1 : 0;
+}
+
 #define USE_TEXTURES	0
 
 void gf_scene_generate_views(GF_Scene *scene, char *url, char *parent_path)
@@ -1579,6 +1592,7 @@
 	M_Inline *inl;
 #endif
 	GF_Event evt;
+	gf_sc_node_destroy(scene->root_od->term->compositor, NULL, scene->graph);
 	gf_sg_reset(scene->graph);
 	
 	scene->force_single_timeline = 1;

gpac-0.5.0.svn4668.tar.bz2/src/terminal/term_node_init.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/term_node_init.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/terminal/terminal.c -> gpac-0.5.0.svn5178.tar.bz2/src/terminal/terminal.c Changed

@@ -308,10 +308,10 @@
 	/*reload term part*/
 
 	sOpt = gf_cfg_get_key(term->user->config, "Systems", "DrawLateFrames");
-	if (sOpt && !stricmp(sOpt, "yes"))
-		term->flags &= ~GF_TERM_DROP_LATE_FRAMES;
-	else
+	if (sOpt && !stricmp(sOpt, "no"))
 		term->flags |= GF_TERM_DROP_LATE_FRAMES;
+	else
+		term->flags &= ~GF_TERM_DROP_LATE_FRAMES;
 
 	sOpt = gf_cfg_get_key(term->user->config, "Systems", "ForceSingleClock");
 	if (sOpt && !stricmp(sOpt, "yes")) 
@@ -346,6 +346,8 @@
 			else if (!stricmp(sOpt, "Multi")) mode = GF_TERM_THREAD_MULTI;
 			gf_term_set_threading(term, mode);
 		}
+	} else {
+		gf_term_set_threading(term, GF_TERM_THREAD_SINGLE);
 	}
 
 	/*default data timeout is 20 sec*/
@@ -645,29 +647,31 @@
 			gf_list_add(tmp->unthreaded_extensions, ifce);
 	}
 
+	gf_term_lock_media_queue(tmp, 1);
 	if (!gf_list_count(tmp->unthreaded_extensions)) {
 		gf_list_del(tmp->unthreaded_extensions);
 		tmp->unthreaded_extensions = NULL;
 	}
+	gf_term_lock_media_queue(tmp, 0);
+
 	if (0 == gf_cfg_get_key_count(user->config, "MimeTypes")){
-          GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Terminal] Initializing Mime Types..."));
-          /* No mime-types detected, probably the first launch */
-          for (i=0; i< gf_modules_get_count(user->modules); i++) {
-                GF_BaseInterface *ifce = gf_modules_load_interface(user->modules, i, GF_NET_CLIENT_INTERFACE);
-                if (ifce) {
-		  GF_InputService * service = (GF_InputService*) ifce;
-		  GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Asking mime types supported for new module %s...\n", ifce->module_name));
-		  if (service->RegisterMimeTypes){
-		    u32 num = service->RegisterMimeTypes(service);
-		    GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] module %s has registered %u new mime-types.\n", ifce->module_name, num));
-		  } else {
-		    GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Core] Module %s has not declared any RegisterMimeTypes method, cannot guess its supported mime-types.\n", ifce->module_name));
-		  }
-		  gf_modules_close_interface(ifce);
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Terminal] Initializing Mime Types..."));
+		/* No mime-types detected, probably the first launch */
+		for (i=0; i< gf_modules_get_count(user->modules); i++) {
+			GF_BaseInterface *ifce = gf_modules_load_interface(user->modules, i, GF_NET_CLIENT_INTERFACE);
+			if (ifce) {
+				GF_InputService * service = (GF_InputService*) ifce;
+				GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] Asking mime types supported for new module %s...\n", ifce->module_name));
+				if (service->RegisterMimeTypes){
+					u32 num = service->RegisterMimeTypes(service);
+					GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[Core] module %s has registered %u new mime-types.\n", ifce->module_name, num));
+				} else {
+					GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[Core] Module %s has not declared any RegisterMimeTypes method, cannot guess its supported mime-types.\n", ifce->module_name));
+				}
+				gf_modules_close_interface(ifce);
+			}
 		}
-	  }
-          GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Terminal] Finished Initializing Mime Types."));
-	  
+		GF_LOG(GF_LOG_INFO, GF_LOG_MEDIA, ("[Terminal] Finished Initializing Mime Types."));
 	}
 
 	tmp->uri_relocators = gf_list_new();
@@ -792,6 +796,7 @@
 {
 	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;
@@ -925,7 +930,9 @@
 	case GF_OPT_HTTP_MAX_RATE:
 		gf_dm_set_data_rate(term->downloader, value);
 		return GF_OK;
-
+	case GF_OPT_VIDEO_BENCH:
+		term->bench_mode = value;
+		//fallthrough
 	default:
 		return gf_sc_set_option(term->compositor, type, value);
 	}
@@ -941,9 +948,11 @@
 }
 
 GF_EXPORT
-Double gf_term_get_simulation_frame_rate(GF_Terminal *term)
+Double gf_term_get_simulation_frame_rate(GF_Terminal *term, u32 *nb_frames_drawn)
 {
-	return term ? term->compositor->frame_rate : 0.0;
+	if (!term) return 0.0;
+	if (nb_frames_drawn) *nb_frames_drawn = term->compositor->frame_number;
+	return term->compositor->frame_rate;
 }
 
 
@@ -993,6 +1002,8 @@
 		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;
+
 	default: return gf_sc_get_option(term->compositor, type);
 	}
 }
@@ -1137,6 +1148,7 @@
 	}
 
 	/*extensions*/
+	gf_term_lock_media_queue(term, 1);
 	if (!term->reload_state && term->unthreaded_extensions) {
 		u32 i, count;
 		count = gf_list_count(term->unthreaded_extensions);
@@ -1145,6 +1157,7 @@
 			ifce->process(ifce, GF_TERM_EXT_PROCESS, NULL);
 		}
 	}
+	gf_term_lock_media_queue(term, 0);
 
 	
 	/*need to reload*/
@@ -1293,11 +1306,10 @@
 }
 #endif
 
-void gf_term_service_media_event_with_download(GF_ObjectManager *odm, u32 event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec)
+void gf_term_service_media_event_with_download(GF_ObjectManager *odm, GF_EventType event_type, u64 loaded_size, u64 total_size, u32 bytes_per_sec)
 {
 #ifndef GPAC_DISABLE_SVG
 	u32 i, count, min_buffer, min_time;
-	Bool locked;
 	GF_DOMMediaEvent media_event;
 	GF_DOM_Event evt;
 	GF_ObjectManager *an_od;
@@ -1306,8 +1318,20 @@
 	if (!odm || !odm->net_service) return;
 	if (odm->mo) {
 		count = gf_mo_event_target_count(odm->mo);
+
+		//for dynamic scenes, check if we have listeners on the root object of the scene containing this media
+		if (!count
+			&& odm->parentscene 
+			&& odm->parentscene->is_dynamic_scene 
+			&& odm->parentscene->root_od->mo 
+			&& (odm->parentscene->root_od->net_service==odm->net_service)
+		) {
+			odm = odm->parentscene->root_od;
+			count = gf_mo_event_target_count(odm->mo);
+		}
 		if (!count) return;
-		if (!(gf_node_get_dom_event_filter((GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(odm->mo, 0))) & GF_DOM_EVENT_MEDIA))
+
+		if (0 && !(gf_node_get_dom_event_filter((GF_Node *)gf_event_target_get_node(gf_mo_event_target_get(odm->mo, 0))) & GF_DOM_EVENT_MEDIA))
 			return;
 	} else {
 		count = 0;
@@ -1340,25 +1364,22 @@
 	evt.type = event_type;
 	evt.bubbles = 0;	/*the spec says yes but we force it to NO*/
 
-	/*lock scene to prevent concurrent access of scene data*/
-	locked = gf_mx_try_lock(odm->term->compositor->mx);
-	if (!locked) return;
-
+	//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_Node *node = (GF_Node *)gf_list_get(odm->mo->nodes, i);
-		//gf_dom_event_fire(node, &evt);
 		GF_DOMEventTarget *target = (GF_DOMEventTarget *)gf_list_get(odm->mo->evt_targets, i);
-		sg_fire_dom_event(target, &evt, scene->graph, NULL);
+		if (target) 
+			gf_sc_queue_dom_event_on_target(scene->root_od->term->compositor, &evt, target, scene->graph);
 	}
 	if (!count) {
 		GF_Node *root = gf_sg_get_root_node(scene->graph);
-		if (root) gf_dom_event_fire(root, &evt);
+		if (root) gf_sc_queue_dom_event(scene->root_od->term->compositor, root, &evt);
 	}
-	gf_sc_lock(odm->term->compositor, GF_FALSE);
 #endif
 }
 
-void gf_term_service_media_event(GF_ObjectManager *odm, u32 event_type)
+void gf_term_service_media_event(GF_ObjectManager *odm, GF_EventType event_type)
 {
 	gf_term_service_media_event_with_download(odm, event_type, 0, 0, 0);
 }
@@ -1704,6 +1725,7 @@
 }
 
 
+GF_EXPORT
 void gf_term_attach_service(GF_Terminal *term, GF_InputService *service_hdl)
 {
 	Bool net_check_interface(GF_InputService *ifce);
@@ -1757,6 +1779,10 @@
 	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);
+	}
 
 	memset(&load, 0, sizeof(GF_SceneLoader));
 	load.localPath = gf_cfg_get_key(term->user->config, "General", "CacheDirectory");
@@ -1880,33 +1906,7 @@
 	return gf_sc_release_screen_buffer(term->compositor, framebuffer);
 }
 
-
-static void gf_term_sample_scenetime(GF_Scene *scene)
-{
-	u32 i, count;
-	Bool locked = gf_mx_try_lock(scene->root_od->term->net_mx);
-	/*we cannot grab the network mutex, therefore we are not sure if some resources are not being destroyed.
-	TODO: add a dedicated mutex for this condition instead of using the global net mutex*/
-	if (!locked) return;
-
-	gf_scene_sample_time(scene);
-	count = gf_list_count(scene->resources);
-	for (i=0; i<count; i++) {
-		GF_ObjectManager *odm = gf_list_get(scene->resources, i);
-		if (odm->subscene) gf_term_sample_scenetime(odm->subscene);
-	}
-	gf_mx_v(scene->root_od->term->net_mx);
-}
-
-u32 gf_term_sample_clocks(GF_Terminal *term)
-{
-	if (term->root_scene) {
-		gf_term_sample_scenetime(term->root_scene);
-		return (u32) (1000*term->root_scene->simulation_time);
-	}
-	return 0;
-}
-
+GF_EXPORT
 const char *gf_term_get_text_selection(GF_Terminal *term, Bool probe_only)
 {
 	Bool has_text;
@@ -1918,6 +1918,7 @@
 }
 
 
+GF_EXPORT
 GF_Err gf_term_paste_text(GF_Terminal *term, const char *txt, Bool probe_only)
 {
 	if (!term) return GF_BAD_PARAM;
@@ -1925,6 +1926,7 @@
 	return gf_sc_paste_text(term->compositor, txt);
 }
 
+GF_EXPORT
 Bool gf_term_forward_event(GF_Terminal *term, GF_Event *evt, Bool consumed, Bool forward_only)
 {
 	if (!term) return 0;
@@ -2106,6 +2108,7 @@
 				gf_term_set_option(term, GF_OPT_PLAY_STATE, GF_STATE_STEP_PAUSE);
 				break;
 			case GF_ACTION_EXIT:
+				memset(&evt, 0, sizeof(GF_Event));
 				evt.type = GF_EVENT_QUIT;
 				gf_term_send_event(term, &evt);
 				break;
@@ -2290,7 +2293,7 @@
 	}
 	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) )
 			odm->net_service->ifce->ServiceCommand(odm->net_service->ifce, &net_cmd);
@@ -2305,3 +2308,11 @@
 	gf_scene_switch_quality(term->root_scene, up);
 }
 
+GF_EXPORT
+GF_Err gf_term_get_visual_output_size(GF_Terminal *term, u32 *width, u32 *height)
+{
+	if (!term) return GF_BAD_PARAM;
+	if (width) *width = term->compositor->vp_width;
+	if (height) *height = term->compositor->vp_height;
+	return GF_OK;
+}
\ No newline at end of file

gpac-0.5.0.svn4668.tar.bz2/src/utils/alloc.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/alloc.c Changed

@@ -542,7 +542,7 @@
 	/*lock*/
 	gf_mx_p(gpac_allocations_lock);
 
-	gf_memory_add(&memory_add, ptr, size, filename, line);
+	gf_memory_add(&memory_add, ptr, (int) size, filename, line);
 	gf_memory_del_item(&memory_rem, ptr); /*the same block can be reallocated, so remove it from the deallocation list*/
 
 	/*update stats*/
@@ -692,8 +692,13 @@
 			memory_element *curr_element = memory_add, *next_element;
 #endif
 			while (curr_element) {
+				char szVal[51];
+				u32 size;
 				next_element = curr_element->next;
-				gf_memory_log(GF_MEMORY_INFO, "[MemTracker] Memory Block %p (size %d) allocated\n             in file %s at line %d\n", curr_element->ptr, curr_element->size, curr_element->filename, curr_element->line);
+				size = curr_element->size>=50 ? 49 : curr_element->size;
+				memcpy(szVal, curr_element->ptr, sizeof(char)*size);
+				szVal[size+1] = 0;
+				gf_memory_log(GF_MEMORY_INFO, "[MemTracker] Memory Block %p (size %d) allocated\n\tin file %s at line %d\n\tstring dump: %s\n", curr_element->ptr, curr_element->size, curr_element->filename, curr_element->line, szVal);
 				curr_element = next_element;
 			}
 		}

gpac-0.5.0.svn4668.tar.bz2/src/utils/bitstream.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/bitstream.c Changed

@@ -444,7 +444,10 @@
 		bs->position++;
 		return;
 	}
-	if (bs->buffer_io && (bs->buffer_written<bs->buffer_io_size)) {
+	if (bs->buffer_io) {
+		if (bs->buffer_written == bs->buffer_io_size) {
+			bs_flush_cache(bs);
+		}
 		bs->buffer_io[bs->buffer_written] = val;
 		bs->buffer_written++;
 		if (bs->buffer_written == bs->buffer_io_size) {
@@ -836,11 +839,14 @@
 	/*if mem, do it */
 	if ((bs->bsmode == GF_BITSTREAM_READ) || (bs->bsmode == GF_BITSTREAM_WRITE) || (bs->bsmode == GF_BITSTREAM_WRITE_DYN)) {
 		if (offset > 0xFFFFFFFF) return GF_IO_ERR;
+		if (!bs->original) return GF_BAD_PARAM;
 		/*0 for write, read will be done automatically*/
 		if (offset >= bs->size) {
 			if ( (bs->bsmode == GF_BITSTREAM_READ) || (bs->bsmode == GF_BITSTREAM_WRITE) ) return GF_BAD_PARAM;
 			/*in DYN, gf_realloc ...*/
 			bs->original = (char*)gf_realloc(bs->original, (u32) (offset + 1));
+			if (!bs->original)
+				return GF_OUT_OF_MEM;
 			for (i = 0; i < (u32) (offset + 1 - bs->size); i++) {
 				bs->original[bs->size + i] = 0;
 			}
@@ -1020,6 +1026,7 @@
 	if (bs->stream) return;
 }
 
+
 GF_EXPORT
 GF_Err gf_bs_transfer(GF_BitStream *dst, GF_BitStream *src)
 {
@@ -1041,4 +1048,29 @@
 	gf_free(data);
 	if (written<data_len) return GF_IO_ERR;
 	return GF_OK;
-}
\ No newline at end of file
+}
+
+GF_EXPORT
+void gf_bs_flush(GF_BitStream *bs)
+{
+	if (bs->buffer_io)
+		bs_flush_cache(bs);
+
+	if (!bs->stream) return;
+
+	if (bs->bsmode != GF_BITSTREAM_FILE_WRITE) return;
+	fflush(bs->stream);
+}
+
+void gf_bs_reassign(GF_BitStream *bs, FILE *stream)
+{
+	if (!bs) return;
+	switch (bs->bsmode) {
+	case GF_BITSTREAM_FILE_WRITE:
+	case GF_BITSTREAM_FILE_READ:
+		bs->stream = stream;
+		if (gf_f64_tell(stream) != bs->position)
+			gf_bs_seek(bs, bs->position);
+		break;
+	}
+}

gpac-0.5.0.svn4668.tar.bz2/src/utils/cache.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/cache.c Changed

@@ -441,9 +441,9 @@
 #ifdef ENABLE_WRITE_MX
 	{
 		char name[1024];
-		snprintf(name, sizeof(name)-1, "CachedEntryWriteMx=%p, url=%s", (void*) entry, url);
+		snprintf(name, sizeof(name), "CachedEntryWriteMx=%p, url=%s", (void*) entry, url);
 		entry->write_mutex = gf_mx_new(name);
-		assert( entry->write_mutex);
+		assert(entry->write_mutex);
 	}
 #endif
 
@@ -602,7 +602,7 @@
 
 	if (entry->memory_stored) {
 		GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[CACHE] Opening cache file %s for write (%s)...\n", entry->cache_filename, entry->url));
-		if (entry->mem_allocated <= entry->contentLength) {
+		if (!entry->mem_allocated || (entry->mem_allocated < entry->contentLength)) {
 			if (entry->contentLength) entry->mem_allocated = entry->contentLength;
 			else if (!entry->mem_allocated) entry->mem_allocated = 81920;
 			entry->mem_storage = gf_realloc(entry->mem_storage, sizeof(char)* (entry->mem_allocated + 2) );
@@ -643,10 +643,9 @@
 		
 	if (entry->memory_stored) {
 		if (entry->written_in_cache + size > entry->mem_allocated) {
-			u32 new_size = entry->mem_allocated*2;
-			if (new_size < size) new_size = size;
+			u32 new_size = MAX(entry->mem_allocated*2, entry->written_in_cache + size);
 			entry->mem_storage = gf_realloc(entry->mem_storage, (new_size+2));
-			entry->mem_allocated = new_size + 2;
+			entry->mem_allocated = new_size;
 			sprintf(entry->cache_filename, "gmem://%d@%p", entry->contentLength, entry->mem_storage);
 			GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[CACHE] Reallocating memory cache to %d bytes\n", new_size));
 		}
@@ -790,6 +789,10 @@
 		gf_free ( entry->mimeType );
 		entry->mimeType = NULL;
 	}
+	if (entry->mem_storage) { 
+		gf_free(entry->mem_storage);
+	}
+
 	if ( entry->cache_filename )
 	{
 		gf_free ( entry->cache_filename );
@@ -817,8 +820,6 @@
 		entry->sessions = NULL;
 	}
 
-	if (entry->mem_storage) 
-		gf_free(entry->mem_storage);
 	gf_free (entry);
 	return GF_OK;
 }

gpac-0.5.0.svn4668.tar.bz2/src/utils/color.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/color.c Changed

@@ -109,6 +109,62 @@
 	}
 }
 
+static void gf_yuv_10_load_lines_planar(unsigned char *dst, s32 dststride, unsigned char *_y_src, unsigned char *_u_src, unsigned char *_v_src, s32 y_stride, s32 uv_stride, s32 width)
+{
+	u32 hw, x;
+	unsigned char *dst2 = (unsigned char *) dst + dststride;
+	unsigned short *y_src2 = (unsigned short *) (_y_src + y_stride);
+	unsigned short *y_src = (unsigned short *)_y_src;
+	unsigned short *u_src = (unsigned short *)_u_src;
+	unsigned short *v_src = (unsigned short *)_v_src;
+
+
+	hw = width / 2;
+	for (x = 0; x < hw; x++) {
+		s32 u, v;
+		s32 b_u, g_uv, r_v, rgb_y;
+
+		u = u_src[x] >> 2;
+		v = v_src[x] >> 2;
+
+		b_u = B_U[u];
+		g_uv = G_U[u] + G_V[v];
+		r_v = R_V[v];
+
+		rgb_y = RGB_Y[*y_src >> 2];
+		dst[0] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
+		dst[1] = col_clip( (rgb_y - g_uv) >> SCALEBITS_OUT);
+		dst[2] = col_clip( (rgb_y + b_u) >> SCALEBITS_OUT);
+		dst[3] = 0xFF;
+		y_src++;
+
+		rgb_y = RGB_Y[*y_src >> 2];
+		dst[4] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
+		dst[5] = col_clip( (rgb_y - g_uv) >> SCALEBITS_OUT);
+		dst[6] = col_clip( (rgb_y + b_u) >> SCALEBITS_OUT);
+		dst[7] = 0xFF;
+		y_src++;
+
+		rgb_y = RGB_Y[*y_src2 >> 2];
+		dst2[0] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
+		dst2[1] = col_clip( (rgb_y - g_uv) >> SCALEBITS_OUT);
+		dst2[2] = col_clip( (rgb_y + b_u) >> SCALEBITS_OUT);
+		dst2[3] = 0xFF;
+		y_src2++;
+
+		rgb_y = RGB_Y[*y_src2 >> 2];
+		dst2[4] = col_clip( (rgb_y + r_v) >> SCALEBITS_OUT);
+		dst2[5] = col_clip( (rgb_y - g_uv) >> SCALEBITS_OUT);
+		dst2[6] = col_clip( (rgb_y + b_u) >> SCALEBITS_OUT);
+		dst2[7] = 0xFF;
+		y_src2++;
+
+		dst += 8;
+		dst2 += 8;
+	}
+}
+
+
 static void gf_yuv_load_lines_packed(unsigned char *dst, s32 dststride, unsigned char *y_src, unsigned char *u_src, unsigned char * v_src, s32 width)
 {
 	u32 hw, x;
@@ -755,25 +811,45 @@
 	}
 }
 
-static void load_line_yv12(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_yv12(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV)
 {
-	u8 *pY, *pU, *pV;
+	u8 *pY;
 	pY = (u8 *)src_bits;
-	pU = (u8 *)src_bits + y_pitch*height;
-	pV = (u8 *)src_bits + 5*y_pitch*height/4;
+	if (!pU) {
+		pU = (u8 *)src_bits + y_pitch*height;
+		pV = (u8 *)src_bits + 5*y_pitch*height/4;
+	}
+
 	pY += x_offset + y_offset*y_pitch;
 	pU += x_offset/2 + y_offset*y_pitch/4;
 	pV += x_offset/2 + y_offset*y_pitch/4;
 	gf_yuv_load_lines_planar((unsigned char*)dst_bits, 4*width, pY, pU, pV, y_pitch, y_pitch/2, width);
 }
 
-static void load_line_yuva(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits)
+static void load_line_yv12_10(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV)
+{
+	u8 *pY;
+	pY = (u8 *)src_bits;
+	if (!pU) {
+		pU = (u8 *)src_bits + y_pitch*height;
+		pV = (u8 *)src_bits + 5*y_pitch*height/4;
+	}
+
+	pY += x_offset + y_offset*y_pitch;
+	pU += x_offset/2 + y_offset*y_pitch/4;
+	pV += x_offset/2 + y_offset*y_pitch/4;
+	gf_yuv_10_load_lines_planar((unsigned char*)dst_bits, 4*width, pY, pU, pV, y_pitch, y_pitch/2, width);
+}
+
+static void load_line_yuva(char *src_bits, u32 x_offset, u32 y_offset, u32 y_pitch, u32 width, u32 height, u8 *dst_bits, u8 *pU, u8 *pV, u8 *pA)
 {
-	u8 *pY, *pU, *pV, *pA;
+	u8 *pY;
 	pY = (u8*)src_bits;
-	pU = (u8*)src_bits + y_pitch*height;
-	pV = (u8*)src_bits + 5*y_pitch*height/4;
-	pA = (u8*)src_bits + 3*y_pitch*height/2;
+	if (!pU) {
+		pU = (u8*)src_bits + y_pitch*height;
+		pV = (u8*)src_bits + 5*y_pitch*height/4;
+		pA = (u8*)src_bits + 3*y_pitch*height/2;
+	}
 
 	pY += x_offset + y_offset*y_pitch;
 	pU += x_offset/2 + y_offset*y_pitch/4;
@@ -912,6 +988,10 @@
 		yuv2rgb_init();
 		yuv_planar_type = 1;
 		break;
+	case GF_PIXEL_YV12_10:
+		yuv2rgb_init();
+		yuv_planar_type = 3;
+		break;
 	case GF_PIXEL_NV21:
 		load_line = load_line_YUV420SP;
 		break;
@@ -1036,16 +1116,18 @@
 						the_row --;
 						if (flip) the_row = src->height-2 - the_row;
 						if (yuv_planar_type==1) {
-							load_line_yv12(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp);
+							load_line_yv12(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *) src->u_ptr, (u8 *) src->v_ptr);
+						} else if (yuv_planar_type==3) {
+							load_line_yv12_10((char *) src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp,(u8 *) src->u_ptr, (u8 *) src->v_ptr);
 						} else {
-							load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp);
+							load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *) src->u_ptr, (u8 *) src->v_ptr, (u8 *) src->a_ptr);
 						}
 						the_row = src_row - 1;
 
 						if (cmat) {
 							for (i=0; i<2*src_w; i++) {
 								u32 idx = 4*i;
-								gf_cmx_apply_argb(cmat, &tmp[idx+3], &tmp[idx], &tmp[idx+1], &tmp[idx+2]);
+								gf_cmx_apply_argb(cmat, (u8 *) &tmp[idx+3], (u8 *) &tmp[idx], (u8 *) &tmp[idx+1], (u8 *) &tmp[idx+2]);
 							}
 						}
 						if (key) {
@@ -1070,9 +1152,11 @@
 				} else {
 					if (flip) the_row = src->height-2 - the_row;
 					if (yuv_planar_type==1) {
-						load_line_yv12(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp);
+						load_line_yv12(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *) src->u_ptr, (u8 *) src->v_ptr);
+					} else if (yuv_planar_type==3) {
+						load_line_yv12_10(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *) src->u_ptr, (u8 *) src->v_ptr);
 					} else {
-						load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp);
+						load_line_yuva(src->video_buffer, x_off, the_row, src->pitch_y, src_w, src->height, tmp, (u8 *) src->u_ptr,(u8 *)  src->v_ptr, (u8 *) src->a_ptr);
 					}
 					yuv_init = 1;
 					rows = flip ? tmp + src_w * 4 : tmp;
@@ -1308,3 +1392,175 @@
 	*g = INT2FIX(GF_COL_G(col)) / 255;
 	*b = INT2FIX(GF_COL_B(col)) / 255;
 }
+
+
+
+#ifdef WIN32
+# include <intrin.h>
+# define GPAC_HAS_SSE2
+#else
+# ifdef __SSE2__
+#  include <emmintrin.h>
+#  define GPAC_HAS_SSE2
+# endif
+#endif
+
+#ifdef GPAC_HAS_SSE2
+
+static GF_Err gf_color_write_yv12_10_to_yuv_intrin(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd)
+{
+	u32 i, j, w, h;
+	if (!pU) {
+		pU = pY + src_stride * src_height;
+		pV = pY + 5*src_stride * src_height/4;
+	}
+
+	if (_src_wnd) {
+		pY = pY + src_stride * _src_wnd->y + _src_wnd->x;
+		/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
+		therefore force an even Y offset for U and V planes.*/
+		pU = pU + (src_stride * (_src_wnd->y / 2) + _src_wnd->x) / 2;
+		pV = pV + (src_stride * (_src_wnd->y / 2) + _src_wnd->x) / 2;
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+	} else {
+		w = src_width;
+		h = src_height;
+	}
+
+	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);				
+				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;
+			dst = (__m128i *)(vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + 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);				
+				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 *) (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);				
+				val2 = _mm_load_si128(src2);
+				val2 = _mm_srli_epi16(val2, 2);
+				val_dst = _mm_packus_epi16(val1, val2);
+				_mm_store_si128(dst, val_dst);
+			}
+		}
+		return GF_OK;
+	}
+	return GF_NOT_SUPPORTED;
+}
+#endif
+
+
+GF_EXPORT
+GF_Err gf_color_write_yv12_10_to_yuv(GF_VideoSurface *vs_dst,  unsigned char *pY, unsigned char *pU, unsigned char*pV, u32 src_stride, u32 src_width, u32 src_height, const GF_Window *_src_wnd)
+{
+	u32 i, j, w, h;
+
+	if (_src_wnd) {
+		w = _src_wnd->w;
+		h = _src_wnd->h;
+	} else {
+		w = src_width;
+		h = src_height;
+	}
+
+
+#ifdef GPAC_HAS_SSE2
+
+#ifdef GPAC_64_BITS
+#define GFINTCAST  (u64)
+#else
+#define GFINTCAST  (u32)
+#endif
+
+	if ( (w%32 == 0)
+		&& (GFINTCAST (vs_dst->video_buffer + vs_dst->pitch_y)%8 == 0)
+		&& (GFINTCAST (vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + vs_dst->pitch_y/2)%8 == 0)
+		&& (GFINTCAST (pU + 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);
+	}
+#endif
+
+	if (!pU) {
+		pU = pY + src_stride * src_height;
+		pV = pY + 5*src_stride * src_height/4;
+	}
+
+	if (_src_wnd) {
+		pY = pY + src_stride * _src_wnd->y + _src_wnd->x;
+		/*because of U and V downsampling by 2x2, working with odd Y offset will lead to a half-line shift between Y and UV components. We
+		therefore force an even Y offset for U and V planes.*/
+		pU = pU + (src_stride * (_src_wnd->y / 2) + _src_wnd->x) / 2;
+		pV = pV + (src_stride * (_src_wnd->y / 2) + _src_wnd->x) / 2;
+	}
+
+	if (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++) {
+				*dst = (*src) >> 2;
+				dst++;
+				src++;
+			}
+		}
+
+		for (i=0; i<h/2; i++) {
+			u16 *src = (u16 *) (pU + i*src_stride/2);
+			u8 *dst = (u8 *) vs_dst->video_buffer + vs_dst->pitch_y * vs_dst->height + i*vs_dst->pitch_y/2;
+
+			for (j=0; j<w/2;j++) {
+				*dst = (*src) >> 2;
+				dst++;
+				src++;
+			}
+		}
+
+		for (i=0; i<h/2; i++) {
+			u16 *src = (u16 *) (pV + i*src_stride/2);
+			u8 *dst = (u8 *) vs_dst->video_buffer + 5*vs_dst->pitch_y * vs_dst->height/4  + i*vs_dst->pitch_y/2;
+
+			for (j=0; j<w/2;j++) {
+				*dst = (*src) >> 2;
+				dst++;
+				src++;
+			}
+		}
+		return GF_OK;
+	}
+	return GF_NOT_SUPPORTED;
+}
+

gpac-0.5.0.svn4668.tar.bz2/src/utils/configfile.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/configfile.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/utils/downloader.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/downloader.c Changed

@@ -84,6 +84,14 @@
     OTHER = 2
 };
 
+/*!the structure used to store an HTTP header*/
+typedef struct
+{
+	char *name;
+	char *value;
+} GF_HTTPHeader;
+
+
 /**
  * This structure handles partial downloads
  */
@@ -117,14 +125,19 @@
     DownloadedCacheEntry cache_entry;
 	Bool reused_cache_entry;
 
+	//mime type, only used when the session is not cached.
+	char *mime_type;
+    GF_List *headers;
+
     GF_Socket *sock;
-    u32 num_retry, status;
+    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;
-
+	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;
@@ -161,6 +174,7 @@
 	Bool chunked;
 	u32 nb_left_in_chunk;
 
+	u32 request_time;
     /*private extension*/
     void *ext;
 };
@@ -174,7 +188,7 @@
     Bool (*GetUserPassword)(void *usr_cbk, const char *site_url, char *usr_name, char *password);
     void *usr_cbk;
 
-	u32 head_timeout;
+	u32 head_timeout, request_timeout;
     GF_Config *cfg;
     GF_List *sessions;
 	Bool disable_cache;
@@ -225,6 +239,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 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
@@ -235,6 +250,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 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
  */
@@ -244,6 +260,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 
  * \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 );
@@ -493,8 +510,12 @@
 
 /**
  * Creates a new cache entry
+ * \param dm The download manager to create this entry
  * \param cache_directory The path to the directory containing cache files
  * \param url The full URL
+ * \param start_range the start of the byte range request
+ * \param end_range the end of the byte range request
+ * \param mem_storage Boolean indicating if the cache data should be stored in memory
  * \return The DownloadedCacheEntry
  */
 DownloadedCacheEntry gf_cache_create_entry( GF_DownloadManager * dm, const char * cache_directory, const char * url, u64 start_range, u64 end_range, Bool mem_storage);
@@ -552,19 +573,24 @@
     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);
-    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);
-        gf_mx_p( sess->dm->cache_mx );
-        gf_list_add(sess->dm->cache_entries, entry);
-        gf_mx_v( sess->dm->cache_mx );
-		sess->is_range_continuation = 0;
-    }
-    assert( entry );
-    sess->cache_entry = entry;
-	sess->reused_cache_entry = 	gf_cache_is_in_progress(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)));
+	if (sess->flags & GF_NETIO_SESSION_NOT_CACHED) {
+		sess->cache_entry = NULL;
+	} else {
+		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);
+			gf_mx_p( sess->dm->cache_mx );
+			gf_list_add(sess->dm->cache_entries, entry);
+			gf_mx_v( sess->dm->cache_mx );
+			sess->is_range_continuation = 0;
+		}
+		assert( entry );
+		sess->cache_entry = entry;
+		sess->reused_cache_entry = 	gf_cache_is_in_progress(entry);
+		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)));
+	}
 }
 
 void gf_dm_delete_cached_file_entry(const GF_DownloadManager * dm,  const char * url)
@@ -622,9 +648,28 @@
 }
 
 
+static void gf_dm_clear_headers(GF_DownloadSession *sess)
+{
+	while (gf_list_count(sess->headers)) {
+		GF_HTTPHeader *hdr = gf_list_last(sess->headers);
+		gf_list_rem_last(sess->headers);
+		gf_free(hdr->name);
+		gf_free(hdr->value);
+		gf_free(hdr);
+	}
+	if (sess->mime_type) {
+		gf_free(sess->mime_type);
+		sess->mime_type = NULL;
+	}
+}
+
+
 static void gf_dm_disconnect(GF_DownloadSession *sess, Bool force_close)
 {
     assert( sess );
+	if (sess->connection_close) force_close=1;
+	sess->connection_close = 0;
+
     if (sess->status >= GF_NETIO_DISCONNECTED)
 		return;
     GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Downloader] gf_dm_disconnect(%p)\n", sess ));
@@ -643,7 +688,6 @@
 			GF_Socket * sx = sess->sock;
 			sess->sock = NULL;
 			gf_sk_del(sx);
-			//sess->sock = NULL;
 		}
 	}
     sess->status = GF_NETIO_DISCONNECTED;
@@ -664,6 +708,7 @@
         return;
     }
     gf_dm_disconnect(sess, 1);
+	gf_dm_clear_headers(sess);
 
     /*if threaded wait for thread exit*/
     if (sess->th) {
@@ -693,13 +738,14 @@
     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 ));
 }
 
 void http_do_requests(GF_DownloadSession *sess);
 
-static void gf_dm_sess_notify_state(GF_DownloadSession *sess, u32 dnload_status, GF_Err error)
+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;
@@ -707,6 +753,7 @@
         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;
     }
@@ -716,6 +763,7 @@
 {
     if (sess->user_proc) {
         sess->in_callback = 1;
+		par->sess = sess;
         sess->user_proc(sess->usr_cbk, par);
         sess->in_callback = 0;
     }
@@ -904,18 +952,20 @@
 GF_Err gf_dm_sess_setup_from_url(GF_DownloadSession *sess, const char *url)
 {
 	Bool socket_changed = 0;
-    GF_Err e;
     GF_URL_Info info;
 
 	if (!url) return GF_BAD_PARAM;
 
+	gf_dm_clear_headers(sess);
+
     gf_dm_url_info_init(&info);
-    
+
 	if (!sess->sock) socket_changed = 1;
-	else if (sess->status>GF_NETIO_DISCONNECTED) socket_changed = 1;
+	else if (sess->status>GF_NETIO_DISCONNECTED) 
+		socket_changed = 1;
 
-    e = gf_dm_get_url_info(url, &info, sess->remote_path);
-	if (e) return e;
+	sess->last_error = gf_dm_get_url_info(url, &info, sess->remote_path);
+	if (sess->last_error) return sess->last_error;
 
 	if (sess->port != info.port) {
 		socket_changed = 1;
@@ -977,7 +1027,7 @@
 		sess->sock = NULL;
 		sess->status = GF_NETIO_SETUP;
 	}
-    return e;
+    return sess->last_error;
 }
 
 
@@ -1024,6 +1074,7 @@
 	 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;
 	if (dm && !dm->head_timeout) sess->server_only_understand_get = 1;
     sess->user_proc = user_io;
@@ -1089,6 +1140,17 @@
 	    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;
+	}
+#endif
+
     if (!sess->sock)
         return GF_NETIO_DISCONNECTED;
     e = gf_sk_receive(sess->sock, data, data_size, 0, out_read);
@@ -1340,6 +1402,8 @@
         case GF_NETIO_STATE_ERROR:
             go = 0;
             break;
+	default:
+	    break;
         }
     }
     sess->flags = flags;
@@ -1357,8 +1421,8 @@
             return oldMimeIfAny;
     }
     entry = gf_dm_refresh_cache_entry (sess);
-    if (!entry)
-	return NULL;
+    if (!entry) 
+		return sess->mime_type;
     assert( entry == sess->cache_entry && entry);
     return gf_cache_get_mime_type( sess->cache_entry );
 }
@@ -1436,6 +1500,8 @@
         case GF_NETIO_STATE_ERROR:
             go = 0;
             break;
+	default:
+            break;
         }
     }
     return sess->last_error;
@@ -1465,6 +1531,8 @@
         case GF_NETIO_STATE_ERROR:
             go = 0;
             break;
+	default:
+            break;
         }
     }
     return sess->last_error;
@@ -1546,6 +1614,14 @@
 			dm->head_timeout = atoi(opt);
 		}
 	}
+	dm->request_timeout = 20000;
+	if (cfg) {
+        opt = gf_cfg_get_key(cfg, "Downloader", "HTTPRequestTimeout");
+		if (opt) {
+			dm->request_timeout = atoi(opt);
+		}
+	}
+
     gf_mx_v( dm->cache_mx );
     if (default_cache_dir)
         gf_free(default_cache_dir);
@@ -1676,8 +1752,8 @@
                     par.msg_type = GF_NETIO_PARSE_HEADER;
                     par.name = "icy-meta";
                     par.value = szData;
-                    GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK,
-                           ("[ICY] Found metainfo in stream=%s, (every %d bytes)\n", szData, icy_metaint));
+					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;
@@ -1698,7 +1774,6 @@
             }
 
             par.msg_type = GF_NETIO_DATA_EXCHANGE;
-            par.error = GF_OK;
             par.data = data;
             par.size = left;
             gf_dm_sess_user_io(sess, &par);
@@ -1709,7 +1784,7 @@
 }
 
 
-static u8 *gf_dm_get_chunk_data(GF_DownloadSession *sess, u8 *body_start, u32 *payload_size, u32 *header_size)
+static char *gf_dm_get_chunk_data(GF_DownloadSession *sess, char *body_start, u32 *payload_size, u32 *header_size)
 {
 	u32 size;
 	char *te_header, *sep;
@@ -1728,7 +1803,7 @@
 	}
 	
 
-	te_header = strstr(body_start, "\r\n");
+	te_header = strstr((char *) body_start, "\r\n");
 	if (!te_header) return NULL;
 
 	te_header[0] = 0;
@@ -1758,7 +1833,7 @@
 	hdr_size = 0;
 	remaining = 0;
 	if (sess->chunked) {
-		data = gf_dm_get_chunk_data(sess, payload, &nbBytes, &hdr_size);
+		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; 
@@ -1788,15 +1863,21 @@
 	if (nbBytes) {
 		rcv = nbBytes;
 		sess->bytes_done += nbBytes;
+		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 ));
+			sess->bytes_done = sess->total_size;
+		}
+
 		if (sess->icy_metaint > 0)
-			gf_icy_skip_data(sess, sess->icy_metaint, data, nbBytes);
+			gf_icy_skip_data(sess, sess->icy_metaint, (char *) data, nbBytes);
 		else {
 			if (sess->use_cache_file)
-				gf_cache_write_to_cache( sess->cache_entry, sess, data, nbBytes);
+				gf_cache_write_to_cache( sess->cache_entry, sess, (char *) data, nbBytes);
 
 			par.msg_type = GF_NETIO_DATA_EXCHANGE;
 			par.error = GF_OK;
-			par.data = data;
+			par.data = (char *) data;
 			par.size = nbBytes;
 			par.reply = flush_chunk;
 			gf_dm_sess_user_io(sess, &par);
@@ -1808,7 +1889,8 @@
 			if (!runtime) {
 				sess->bytes_per_sec = 0;
 			} else {
-				sess->bytes_per_sec = (1000 * sess->bytes_done) / runtime;
+				u64 nb_bytes = sess->bytes_done;
+				sess->bytes_per_sec = (u32) (1000*nb_bytes / runtime);
 			}
 		}
 	}
@@ -1885,12 +1967,12 @@
     if (e) return e;
     size = *read_size;
     *read_size = 0;
-    gf_dm_data_received(sess, buffer, size, 0, read_size);
+    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, u32 *net_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)
 {
     if (!sess) return GF_BAD_PARAM;
     if (server) *server = sess->server_name;
@@ -1908,6 +1990,13 @@
 }
 
 GF_EXPORT
+u64 gf_dm_sess_get_utc_start(GF_DownloadSession * sess)
+{
+    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;
@@ -1965,7 +2054,7 @@
 /*!
  * Sends the HTTP headers
  * \param sess The GF_DownloadSession
- * \param the buffer containing the request
+ * \param sHTTP buffer containing the request
  * \return GF_OK if everything went fine, the error otherwise
  */
 static GF_Err http_send_headers(GF_DownloadSession *sess, char * sHTTP) {
@@ -1980,6 +2069,7 @@
     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);
 
 	if (sess->needs_cache_reconfig) {
 		gf_dm_configure_cache(sess);
@@ -2197,8 +2287,15 @@
 #endif
             e = gf_sk_send(sess->sock, sHTTP, (u32) strlen(sHTTP));
 
-        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Sending request %s\n ; Error Code=%d\n", sHTTP, e));
-    }
+#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));
+		 }
+#endif
+	}
+	sess->request_time = gf_sys_clock();
 
     if (e) {
         sess->status = GF_NETIO_STATE_ERROR;
@@ -2226,24 +2323,24 @@
         if (sess->status>=GF_NETIO_DISCONNECTED)
             return GF_REMOTE_SERVICE_ERROR;
 
-#if 1
-        if (sess->dm && sess->dm->limit_data_rate && sess->bytes_per_sec) {
+		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;
-				sess->bytes_per_sec = (1000 * sess->bytes_done) / runtime;
+				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;
             }
         }
-#endif
-        e = gf_dm_read_data(sess, sHTTP, GF_DOWNLOAD_BUFFER_SIZE, &size);
+
+		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);
 				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)));
-                sess->status = GF_NETIO_DISCONNECTED;
+		        gf_dm_disconnect(sess, (e == GF_IP_CONNECTION_CLOSED) ? 1 : 0);
             }
             return GF_OK;
         }
@@ -2252,7 +2349,7 @@
 			if (e == GF_IP_CONNECTION_CLOSED){
 				u32 len = gf_cache_get_content_length(sess->cache_entry);
 				if (size > 0)
-					gf_dm_data_received(sess, sHTTP, size, 0, NULL);
+					gf_dm_data_received(sess, (u8 *) sHTTP, size, 0, NULL);
 				if ( ( (len == 0) && sess->use_cache_file) 
 					/*ivica patch*/
 					|| (size==0)
@@ -2262,7 +2359,6 @@
 					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)));
-					sess->status = GF_NETIO_DISCONNECTED;
 					if (sess->use_cache_file) 
 						gf_cache_set_content_length(sess->cache_entry, sess->bytes_done);
 					e = GF_OK;
@@ -2273,7 +2369,7 @@
 			gf_dm_sess_notify_state(sess, sess->status, e);
 			return e;
 		}
-		gf_dm_data_received(sess, sHTTP, size, 0, NULL);
+		gf_dm_data_received(sess, (u8 *) sHTTP, size, 0, NULL);
 
         /*socket empty*/
         if (size < GF_DOWNLOAD_BUFFER_SIZE) {
@@ -2283,7 +2379,24 @@
     }
 }
 
+static void notify_headers(GF_DownloadSession *sess, char * sHTTP, s32 bytesRead, s32 BodyStart)
+{
+    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);
+    }
+}
 
 /*!
  * Waits for the response HEADERS, parse the information... and so on
@@ -2294,9 +2407,10 @@
 {
     GF_NETIO_Parameter par;
     s32 bytesRead, BodyStart;
-    u32 res;
+    u32 res, i;
     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;
@@ -2304,12 +2418,26 @@
     assert( sess->status == GF_NETIO_WAIT_FOR_REPLY );
     bytesRead = res = 0;
     new_location = NULL;
-    sess->use_cache_file = 1;
+	if (!(sess->flags & GF_NETIO_SESSION_NOT_CACHED)) {
+	    sess->use_cache_file = 1;
+	}
+
+	//always set start time to the time at last attempt reply parsing
+    sess->start_time = gf_sys_clock();
+	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) return GF_OK;
+            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;
+					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:
@@ -2379,8 +2507,9 @@
     Pos = gf_token_get(buf, Pos, " \r\n", comp, 400);
 
     no_range = range = ContentLength = first_byte = last_byte = total_size = 0;
-    /* parse header */
+    /* 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);
@@ -2398,20 +2527,29 @@
             if (hdr_sep) hdr_sep[0] = 0;
         }
 
- //       GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[HTTP] Processing header %s: %s\n", hdr, hdr_val));
+		GF_SAFEALLOC(hdrp, GF_HTTPHeader);
+		hdrp->name = gf_strdup(hdr);
+		hdrp->value = gf_strdup(hdr_val);
+		gf_list_add(sess->headers, hdrp);
+
+		if (sep) sep[0]=':';
+        if (hdr_sep) hdr_sep[0] = '\r';
+	}
 
-        if (!stricmp(hdr, "Content-Length") ) {
-            ContentLength = (u32) atoi(hdr_val);
+	//default pre-processing of headers - needs cleanup, not all of these have to be parsed before checking reply code
+	for (i=0; i<gf_list_count(sess->headers); i++) {
+		char *val;
+		GF_HTTPHeader *hdrp = gf_list_get(sess->headers, i);
+
+		if (!stricmp(hdrp->name, "Content-Length") ) {
+			ContentLength = (u32) atoi(hdrp->value);
             
 			if (rsp_code<300)
 				gf_cache_set_content_length(sess->cache_entry, ContentLength);
 			
-			/*Ivica patch*/
-			if (ContentLength==0)
-				sess->use_cache_file = 0;
         }
-        else if (!stricmp(hdr, "Content-Type")) {
-            char * mime_type = gf_strdup(hdr_val);
+        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;
@@ -2421,64 +2559,69 @@
                     break;
                 }
             }
-            hdr = strchr(mime_type, ';');
-            if (hdr) hdr[0] = 0;
+            val = strchr(mime_type, ';');
+            if (val) val[0] = 0;
 
 			strlwr(mime_type);
-			if (rsp_code<300)
-	            gf_cache_set_mime_type(sess->cache_entry, mime_type);
-            gf_free(mime_type);
+			if (rsp_code<300) {
+	            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(hdr, "Content-Range")) {
+        else if (!stricmp(hdrp->name, "Content-Range")) {
             range = 1;
-            if (!strncmp(hdr_val, "bytes", 5)) {
-                hdr_val += 5;
-                if (hdr_val[0] == ':') hdr_val += 1;
-                hdr_val += http_skip_space(hdr_val);
-                if (hdr_val[0] == '*') {
-                    sscanf(hdr_val, "*/%u", &total_size);
+            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(hdr_val, "%u-%u/%u", &first_byte, &last_byte, &total_size);
+                    sscanf(val, "%u-%u/%u", &first_byte, &last_byte, &total_size);
                 }
             }
         }
-        else if (!stricmp(hdr, "Accept-Ranges")) {
-            if (strstr(hdr_val, "none")) no_range = 1;
+        else if (!stricmp(hdrp->name, "Accept-Ranges")) {
+			if (strstr(hdrp->value, "none")) no_range = 1;
         }
-        else if (!stricmp(hdr, "Location"))
-            new_location = gf_strdup(hdr_val);
-        else if (!strnicmp(hdr, "ice", 3) || !strnicmp(hdr, "icy", 3) ) {
+        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(hdr, "icy-metaint")) {
-                sess->icy_metaint = atoi(hdr_val);
+            if (!stricmp(hdrp->name, "icy-metaint")) {
+                sess->icy_metaint = atoi(hdrp->value);
             }
         }
-        else if (!stricmp(hdr, "Cache-Control")) {
+        else if (!stricmp(hdrp->name, "Cache-Control")) {
         }
-        else if (!stricmp(hdr, "ETag")) {
+        else if (!stricmp(hdrp->name, "ETag")) {
 			if (rsp_code<300)
-	            gf_cache_set_etag_on_server(sess->cache_entry, hdr_val);
+	            gf_cache_set_etag_on_server(sess->cache_entry, hdrp->value);
         }
-        else if (!stricmp(hdr, "Last-Modified")) {
+        else if (!stricmp(hdrp->name, "Last-Modified")) {
 			if (rsp_code<300)
-	            gf_cache_set_last_modified_on_server(sess->cache_entry, hdr_val);
+	            gf_cache_set_last_modified_on_server(sess->cache_entry, hdrp->value);
         }
-        else if (!stricmp(hdr, "Transfer-Encoding")) {
-			if (!stricmp(hdr_val, "chunked"))
+        else if (!stricmp(hdrp->name, "Transfer-Encoding")) {
+			if (!stricmp(hdrp->value, "chunked"))
 				sess->chunked = GF_TRUE;
 		}		
-        else if (!stricmp(hdr, "X-UserProfileID") ) {
+        else if (!stricmp(hdrp->name, "X-UserProfileID") ) {
             if (sess->dm && sess->dm->cfg)
-                gf_cfg_set_key(sess->dm->cfg, "Downloader", "UserProfileID", hdr_val);
+                gf_cfg_set_key(sess->dm->cfg, "Downloader", "UserProfileID", hdrp->value);
         }
-        /*			else if (!stricmp(hdr, "Connection") )
-        				if (strstr(hdr_val, "close")) sess->http_read_type = 1; */
-
-        if (sep) sep[0]=':';
-        if (hdr_sep) hdr_sep[0] = '\r';
+        else if (!stricmp(hdrp->name, "Connection") ) {
+			if (strstr(hdrp->value, "close")) 
+				connection_closed = 1; 
+		}
 
         if (sess->status==GF_NETIO_DISCONNECTED) return GF_OK;
     }
@@ -2493,6 +2636,41 @@
      */
     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);
+			switch (e) {
+			case GF_IP_NETWORK_EMPTY:
+				gf_sleep(1);
+				continue;
+			case GF_OK:
+		        bytesRead += res;
+				break;
+			default:
+				start=0;
+				break;
+			}
+			if (gf_sys_clock()-start>100)
+				break;
+
+			//does not fit in our buffer, too bad we'll kill the connection
+			if (bytesRead == GF_DOWNLOAD_BUFFER_SIZE)
+				break;
+		}
+
+		if (BodyStart + ContentLength > (u32) bytesRead) {
+			ContentLength = 0;
+			//cannot flush, discard socket
+			sess->connection_close = 1;
+		}
+	}
+	//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:
@@ -2574,10 +2752,11 @@
                     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_OK;
-                        par.reply = 200;
+                        par.error = GF_EOS;
+                        par.reply = 2;
                         par.data = file_cache_buff;
                         gf_dm_sess_user_io(sess, &par);
                     }
@@ -2589,7 +2768,7 @@
         /* Cache file is the most recent */
         sess->status = GF_NETIO_DATA_TRANSFERED;
         gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-        sess->status = GF_NETIO_DISCONNECTED;
+        gf_dm_disconnect(sess, 0);
         par.msg_type = GF_NETIO_DATA_TRANSFERED;
         par.error = GF_OK;
         gf_dm_sess_user_io(sess, &par);
@@ -2627,13 +2806,16 @@
 			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);
-        e = GF_SERVICE_ERROR;
+
+		notify_headers(sess, sHTTP, bytesRead, BodyStart);
+		e = GF_SERVICE_ERROR;
         goto exit;
         break;
     case 400:
@@ -2657,6 +2839,7 @@
         }
 
         gf_dm_sess_user_io(sess, &par);
+		notify_headers(sess, sHTTP, bytesRead, BodyStart);
         e = GF_REMOTE_SERVICE_ERROR;
         goto exit;
 
@@ -2670,39 +2853,12 @@
         }
     default:
         gf_dm_sess_user_io(sess, &par);
+		notify_headers(sess, sHTTP, bytesRead, BodyStart);
         e = GF_REMOTE_SERVICE_ERROR;
         goto exit;
     }
 
-
-    /* FIXME UGLY CODE DUPLICATION to fix later on: we only send the headers to the user if no problem in response (eg no relocation, ...)*/
-    while (1) {
-        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;
-        }
-
-        par.error = 0;
-        par.msg_type = GF_NETIO_PARSE_HEADER;
-        par.name = hdr;
-        par.value = hdr_val;
-        gf_dm_sess_user_io(sess, &par);
-        if (sep) sep[0]=':';
-        if (hdr_sep) hdr_sep[0] = '\r';
-    }
-
+	notify_headers(sess, sHTTP, bytesRead, BodyStart);
 
     if (sess->http_read_type != GET)
         sess->use_cache_file = 0;
@@ -2710,7 +2866,6 @@
     if (sess->http_read_type==HEAD) {
         gf_dm_disconnect(sess, 0);
         gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-        sess->status = GF_NETIO_DISCONNECTED;
         sess->http_read_type = 0;
         return GF_OK;
     }
@@ -2722,7 +2877,13 @@
             sess->use_cache_file = 0;
         }
 
-        GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s - error %s\n", sess->server_name, gf_error_to_string(e) ));
+#ifndef GPAC_DISABLE_LOGS
+		if (e) {
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[HTTP] Error connecting to %s: %s\n", sess->server_name, gf_error_to_string(e) ) );
+		} else {
+			GF_LOG(GF_LOG_INFO, GF_LOG_NETWORK, ("[HTTP] Connected to %s\n", sess->server_name ) );
+		}
+#endif
 
         /*some servers may reply without content length, but we MUST have it*/
         if (e) goto exit;
@@ -2742,10 +2903,8 @@
                 sess->status = GF_NETIO_DATA_EXCHANGE;
                 sess->bytes_done = 0;
             } else {
-                /*we don't expect anything*/
-                gf_dm_disconnect(sess, 0);
                 gf_dm_sess_notify_state(sess, GF_NETIO_DATA_TRANSFERED, GF_OK);
-                sess->status = GF_NETIO_DISCONNECTED;
+                gf_dm_disconnect(sess, 0);
                 return GF_OK;
             }
         } else {
@@ -2762,27 +2921,27 @@
         }
     }
 
-    sess->start_time = gf_sys_clock();
-
     /* 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, sHTTP + BodyStart, bytesRead - BodyStart, 1, 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 ));
-        gf_dm_disconnect(sess, 1);
+		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;
     }
 	/*DO NOT call parse_body yet, as the final user may not be connected to our session*/
-    //return http_parse_remaining_body(sess, sHTTP);
 	return GF_OK;
 }
 
@@ -2796,7 +2955,7 @@
 
 	if (sess->reused_cache_entry) {
 		if (!gf_cache_is_in_progress(sess->cache_entry)) {
-			sess->status = GF_NETIO_DISCONNECTED;
+			gf_dm_disconnect(sess, 0);
 			sess->reused_cache_entry = 0;
 		}
 		return;
@@ -2827,6 +2986,8 @@
 		}
         http_parse_remaining_body(sess, sHTTP);
         break;
+    default:
+        break;
     }
 }
 
@@ -2982,6 +3143,7 @@
     sess->last_error = GF_OK;
     sess->total_size = 0;
     sess->start_time = 0;
+	sess->start_time_utc = 0;
     return GF_OK;
 }
 
@@ -3158,3 +3320,17 @@
 {
 	return dm->limit_data_rate*8;
 }
+
+
+GF_EXPORT
+const char *gf_dm_sess_get_header(GF_DownloadSession *sess, const char *name)
+{
+	u32 i, count;
+	if( !sess || !name) return NULL;
+	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; 
+	}
+	return NULL;
+}

gpac-0.5.0.svn4668.tar.bz2/src/utils/list.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/list.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/utils/map.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/map.c Changed

@@ -31,50 +31,19 @@
 	GF_List** pairs;
 };
 
-struct _it_map
-{
-	/* The current map*/
-	GF_Map* map;
-
-	/* The current pair */
-	GF_Pair* pair;
-
-	/* The current list */
-	u32 ilist;
-
-	/* The current index in the hasmap*/
-	u32 hash;
-};
-
 GF_EXPORT
-GF_Err gf_map_iter_new(GF_Map* map, GF_It_Map** it){
-	GF_It_Map* new_it;
-
+GF_Err gf_map_iter_set(GF_Map* map, GF_It_Map* it){
 	/* Iterator must be associated to a map */
-	if (!it) return GF_BAD_PARAM;
-	*it = NULL;
-	if(!map) return GF_BAD_PARAM;
-
-	/* Allocate space for a new iterator */
-	GF_SAFEALLOC(new_it, GF_It_Map);
-	if (!new_it) return GF_OUT_OF_MEM;
+	if (!map || !it) return GF_BAD_PARAM;
 
 	/* Associate iterator to the beginning of the map */
-	new_it->map = map;
-	new_it->ilist = 0;
-	new_it->hash = 0;
-	*it = new_it;
-
+	it->map = map;
+	it->ilist = 0;
+	it->hash = 0;
 	return GF_OK;
 }
 
 GF_EXPORT
-void gf_map_iter_del(GF_It_Map* it){
-	if (!it) return;
-	gf_free(it);
-}
-
-GF_EXPORT
 void* gf_map_iter_has_next(GF_It_Map* it){
 	GF_Pair* next_pair = NULL;
 
@@ -98,10 +67,8 @@
 GF_EXPORT
 GF_Err gf_map_iter_reset(GF_It_Map* it){
 	if (!it) return GF_BAD_PARAM;
-
 	it->hash = 0;
 	it->ilist = 0;
-
 	return GF_OK;
 }

gpac-0.5.0.svn4668.tar.bz2/src/utils/math.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/math.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/utils/module.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/module.c Changed

@@ -44,8 +44,12 @@
 #ifdef GPAC_STATIC_MODULES
 	GF_InterfaceRegister *pr;
 
+#ifdef GPAC_HAS_FAAD
 	LOAD_PLUGIN(aac_in);
+#endif
+#ifdef GPAC_HAS_AC3
     LOAD_PLUGIN(ac3);
+#endif
 #ifdef GPAC_HAS_ALSA
     LOAD_PLUGIN(alsa);
 #endif
@@ -82,7 +86,9 @@
 #ifndef GPAC_DISABLE_SVG
 	LOAD_PLUGIN(laser);
 #endif	
+#ifdef GPAC_HAS_MAD
 	LOAD_PLUGIN(mp3_in);
+#endif
     LOAD_PLUGIN(mpd_in);
 #ifndef GPAC_DISABLE_MEDIA_IMPORT
 	LOAD_PLUGIN(mpegts_in);
@@ -127,6 +133,9 @@
 #ifdef GPAC_HAS_WAVEOUT
 	LOAD_PLUGIN(wave_out);
 #endif
+#ifndef GPAC_DISABLE_TTXT
+	LOAD_PLUGIN(vtt_in);
+#endif
 #ifndef GPAC_DISABLE_SVG
 	LOAD_PLUGIN(widgetman);
 #endif
@@ -136,10 +145,7 @@
 #ifdef GPAC_HAS_XVID
     LOAD_PLUGIN(xvid);
 #endif
-	
-
-
-				
+					
 	//todo fix project for iOS
 #ifdef GPAC_IPHONE
 //    LOAD_PLUGIN(ios_cam);
@@ -168,8 +174,8 @@
 	GF_SAFEALLOC(tmp, GF_ModuleManager);
 	if (!tmp) return NULL;
 	tmp->cfg = config;
+	tmp->mutex = gf_mx_new("Module Manager");
 	gf_modules_get_module_directories(tmp, &num_dirs);
-	if (!num_dirs) return NULL;
 
 	/* Initialize module list */
 	tmp->plug_list = gf_list_new();
@@ -217,6 +223,9 @@
 	}
 
 	gf_list_del(pm->plug_list);
+
+	if (pm->plugin_registry) gf_list_del(pm->plugin_registry);
+	gf_mx_del(pm->mutex);
 	gf_free(pm);
 }
 
@@ -287,15 +296,18 @@
 		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){
 		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){
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] No pm->cfg has been set !!!\n"));
+		gf_mx_v(pm->mutex);
 		return NULL;
 	}
 	opt = gf_cfg_get_key(pm->cfg, "PluginsCache", inst->name);
@@ -303,12 +315,14 @@
 		const char * ifce_str = gf_4cc_to_str(InterfaceFamily);
 		snprintf(szKey, 32, "%s:yes", ifce_str ? ifce_str : "(null)");
 		if (!strstr(opt, szKey)){
+			gf_mx_v(pm->mutex);
 			return NULL;
 		}
 	}
 	if (!gf_modules_load_library(inst)) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot load library %s\n", inst->name));
 		gf_cfg_set_key(pm->cfg, "PluginsCache", inst->name, "Invalid Plugin");
+		gf_mx_v(pm->mutex);
 		return NULL;
 	}
 	if (!inst->query_func) {
@@ -357,12 +371,14 @@
 	/*keep track of parent*/
 	ifce->HPLUG = inst;
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Load interface %s DONE.\n", inst->name));
+	gf_mx_v(pm->mutex);
 	return ifce;
 
 err_exit:
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Load interface %s exit label, freing library...\n", inst->name));
 	gf_modules_unload_library(inst);
 	GF_LOG(GF_LOG_DEBUG, GF_LOG_CORE, ("[Core] Load interface %s EXIT.\n", inst->name));
+	gf_mx_v(pm->mutex);
 	return NULL;
 }

gpac-0.5.0.svn4668.tar.bz2/src/utils/module_wrap.h -> gpac-0.5.0.svn5178.tar.bz2/src/utils/module_wrap.h Changed

gpac-0.5.0.svn4668.tar.bz2/src/utils/os_config_init.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/os_config_init.c Changed

@@ -1,567 +1,567 @@
-/*
- *			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. 
- *
- */
-
-#include <gpac/config_file.h>
-
-
-#if defined(WIN32) || defined(_WIN32_WCE)
-#include <windows.h> /*for GetModuleFileName*/
-
-#ifndef _WIN32_WCE
-#include <direct.h>  /*for _mkdir*/
-#include <shlobj.h>  /*for getting user-dir*/
-
-#ifndef SHGFP_TYPE_CURRENT
-#define SHGFP_TYPE_CURRENT 0 /*needed for MinGW*/
-#endif
-
-#endif
-
-#define CFG_FILE_NAME	"GPAC.cfg"
-#define TEST_MODULE		"gm_dummy_in.dll"
-
-#elif (defined(__DARWIN__) || defined(__APPLE__) )
-#include <mach-o/dyld.h> /*for _NSGetExecutablePath */
-
-#ifdef GPAC_IPHONE
-#define TEST_MODULE     "osmo4ios"
-#else
-#define TEST_MODULE		"gm_dummy_in.dylib"
-#endif
-#define CFG_FILE_NAME	".gpacrc"
-
-#else
-#ifdef GPAC_CONFIG_LINUX
-#include <unistd.h>
-#endif
-#define CFG_FILE_NAME	".gpacrc"
-#define TEST_MODULE		"gm_dummy_in.so"
-#endif
-
-
-#ifdef GPAC_STATIC_MODULES
-static Bool enum_mod_dir(void *cbck, char *item_name, char *item_path)
-{
-	if (!strnicmp(item_name, "gm_", 3)) {
-printf("Found %s\n", item_name);
-		*(Bool *) cbck = GF_TRUE;
-	}
-	return GF_FALSE;
-}
-#endif
-
-static Bool check_file_exists(char *name, char *path, char *outPath)
-{
-	char szPath[GF_MAX_PATH];
-	FILE *f;
-
-#ifdef GPAC_STATIC_MODULES
-	if (!strcmp(name, TEST_MODULE)) {
-		Bool found = GF_FALSE;
-		gf_enum_directory(path, GF_FALSE, enum_mod_dir, &found, NULL);
-		if (!found) return 0;
-		if (outPath != path) strcpy(outPath, path);
-		return 1;
-	}
-#endif
-	sprintf(szPath, "%s%c%s", path, GF_PATH_SEPARATOR, name);
-	f = fopen(szPath, "rb");
-	if (!f) return 0;
-	fclose(f);
-	if (outPath != path) strcpy(outPath, path);
-	return 1;
-}
-
-enum
-{
-	GF_PATH_APP,
-	GF_PATH_CFG,
-	GF_PATH_GUI,
-	GF_PATH_MODULES,
-};
-
-#if defined(WIN32) || defined(_WIN32_WCE)
-static Bool get_default_install_path(char *file_path, u32 path_type)
-{
-	FILE *f;
-	char *sep;
-	char szPath[GF_MAX_PATH];
-	
-	
-#ifdef _WIN32_WCE
-	TCHAR w_szPath[GF_MAX_PATH];
-	GetModuleFileName(NULL, w_szPath, GF_MAX_PATH);
-	CE_WideToChar((u16 *) w_szPath, file_path);
-#else
-	GetModuleFileNameA(NULL, file_path, GF_MAX_PATH);
-#endif
-	
-	/*remove exe name*/
-	if (strstr(file_path, ".exe")) {
-		sep = strrchr(file_path, '\\');
-		if (sep) sep[0] = 0;
-	}
-
-	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 
-	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;
-		u16 w_path[1024];
-		RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\GPAC"), 0, KEY_READ, &hKey);
-#ifdef _DEBUG
-		if (RegQueryValueEx(hKey, TEXT("DebugDir"), 0, &dwType, (LPBYTE) w_path, &dwSize) != ERROR_SUCCESS)
-#endif
-			RegQueryValueEx(hKey, TEXT("InstallDir"), 0, &dwType, (LPBYTE) w_path, &dwSize);
-		CE_WideToChar(w_path, (char *)file_path);
-		RegCloseKey(hKey);
-#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
-		if (RegQueryValueEx(hKey, "DebugDir", NULL, NULL,(unsigned char*) file_path, &dwSize) != ERROR_SUCCESS)
-#endif
-			RegQueryValueEx(hKey, "InstallDir", NULL, NULL,(unsigned char*) file_path, &dwSize);
-
-		RegCloseKey(hKey);
-#endif
-	}
-
-
-	if (path_type==GF_PATH_APP) return 1;
-	
-	if (path_type==GF_PATH_GUI) {
-		char *sep;
-		strcat(file_path, "\\gui");
-		if (check_file_exists("gui.bt", file_path, file_path)) return 1;
-		sep = strstr(file_path, "\\bin\\");
-		if (sep) {
-			sep[0] = 0;
-			strcat(file_path, "\\gui");
-			if (check_file_exists("gui.bt", file_path, file_path)) return 1;
-		}
-		return 0;
-	}
-	/*modules are stored in the GPAC directory (should be changed to GPAC/modules)*/
-	if (path_type==GF_PATH_MODULES) return 1;
-
-	/*we are looking for the config file path - make sure it is writable*/
-	assert(path_type == GF_PATH_CFG);
-
-	strcpy(szPath, file_path);
-	strcat(szPath, "\\gpaccfgtest.txt");
-	f = gf_f64_open(szPath, "wb");
-	if (f != NULL) {
-		fclose(f);
-		gf_delete_file(szPath);
-		return 1;
-	}
-#ifdef _WIN32_WCE
-	return 0;
-#else
-	/*no write access, get user home directory*/
-	SHGetFolderPath(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, file_path);
-	if (file_path[strlen(file_path)-1] != '\\') strcat(file_path, "\\");
-	strcat(file_path, "GPAC");
-	/*create GPAC dir*/
-	_mkdir(file_path);
-	strcpy(szPath, file_path);
-	strcat(szPath, "\\gpaccfgtest.txt");
-	f = gf_f64_open(szPath, "wb");
-	/*COMPLETE FAILURE*/
-	if (!f) return 0;
-	
-	fclose(f);
-	gf_delete_file(szPath);
-	return 1;
-#endif
-}
-
-/*FIXME - android initialization is a mess right now*/
-#elif defined(GPAC_ANDROID)
-
-static Bool get_default_install_path(char *file_path, u32 path_type)
-{
-	if (path_type==GF_PATH_APP) strcpy(file_path, "");
-	else if (path_type==GF_PATH_CFG) strcpy(file_path, "");
-	else if (path_type==GF_PATH_GUI) strcpy(file_path, "");
-	else if (path_type==GF_PATH_MODULES) strcpy(file_path, "");
-	return 1;
-}
-
-	
-#elif defined(__SYMBIAN__)
-
-#if defined(__SERIES60_3X__)
-#define SYMBIAN_GPAC_CFG_DIR	"\\private\\F01F9075"
-#define SYMBIAN_GPAC_GUI_DIR	"\\private\\F01F9075\\gui"
-#define SYMBIAN_GPAC_MODULES_DIR	"\\sys\\bin"
-#else
-#define SYMBIAN_GPAC_CFG_DIR	"\\system\\apps\\Osmo4"
-#define SYMBIAN_GPAC_GUI_DIR	"\\system\\apps\\Osmo4\\gui"
-#define SYMBIAN_GPAC_MODULES_DIR	GPAC_CFG_DIR
-#endif
-
-static Bool get_default_install_path(char *file_path, u32 path_type)
-{
-	if (path_type==GF_PATH_APP) strcpy(file_path, SYMBIAN_GPAC_MODULES_DIR);
-	else if (path_type==GF_PATH_CFG) strcpy(file_path, SYMBIAN_GPAC_CFG_DIR);
-	else if (path_type==GF_PATH_GUI) strcpy(file_path, SYMBIAN_GPAC_GUI_DIR);
-	else if (path_type==GF_PATH_MODULES) strcpy(file_path, SYMBIAN_GPAC_MODULES_DIR);
-	return 1;
-}
-
-/*Linux, OSX, iOS*/
-#else
-
-static Bool get_default_install_path(char *file_path, u32 path_type)
-{
-	char app_path[GF_MAX_PATH];
-	char *sep;
-	u32 size = GF_MAX_PATH;
-
-	/*on OSX, Linux & co, user home is where we store the cfg file*/
-	if (path_type==GF_PATH_CFG) {
-		char *user_home = getenv("HOME");
-#ifdef GPAC_IPHONE
-        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
-#endif
-        strcpy(file_path, user_home);
-		if (file_path[strlen(file_path)-1] == '/') file_path[strlen(file_path)-1] = 0;
-        return 1;
-	}
-
-	if (path_type==GF_PATH_APP) {
-#if (defined(__DARWIN__) || defined(__APPLE__) )
-		if (_NSGetExecutablePath(app_path, &size) ==0) {
-			realpath(app_path, file_path);
-			char *sep = strrchr(file_path, '/');
-			if (sep) sep[0] = 0;
-			return 1;
-		}
-
-#elif defined(GPAC_CONFIG_LINUX)
-		size = readlink("/proc/self/exe", file_path, GF_MAX_PATH);
-		if (size>0) {				
-			char *sep = strrchr(file_path, '/');
-			if (sep) sep[0] = 0;
-			return 1;
-		}
-#endif
-		return 0;
-	}
-
-	
-	/*locate the app*/
-	if (!get_default_install_path(app_path, GF_PATH_APP)) return 0;
-
-	/*installed or symlink on system, user user home directory*/
-	if (!strnicmp(app_path, "/usr/", 5) || !strnicmp(app_path, "/opt/", 5)) {
-		if (path_type==GF_PATH_GUI) {
-			/*look in possible install dirs ...*/
-			if (check_file_exists("gui.bt", "/usr/share/gpac/gui", file_path)) return 1;
-			if (check_file_exists("gui.bt", "/usr/local/share/gpac/gui", file_path)) return 1;
-			if (check_file_exists("gui.bt", "/opt/share/gpac/gui", file_path)) return 1;
-			if (check_file_exists("gui.bt", "/opt/local/share/gpac/gui", file_path)) return 1;
-		} else if (path_type==GF_PATH_MODULES) {
-			/*look in possible install dirs ...*/
-			if (check_file_exists(TEST_MODULE, "/usr/lib/gpac", file_path)) return 1;
-			if (check_file_exists(TEST_MODULE, "/usr/local/lib/gpac", file_path)) return 1;
-			if (check_file_exists(TEST_MODULE, "/opt/lib/gpac", file_path)) return 1;
-			if (check_file_exists(TEST_MODULE, "/opt/local/lib/gpac", file_path)) return 1;
-		}
-	}
-
-	if (path_type==GF_PATH_GUI) {
-		if (get_default_install_path(app_path, GF_PATH_CFG)) {
-			/*GUI not found, look in ~/.gpac/gui/ */
-			strcat(app_path, "/.gpac/gui");
-			if (check_file_exists("gui.bt", app_path, file_path)) return 1;
-		}
-
-		/*GUI not found, look in gpac distribution if any */
-		if (get_default_install_path(app_path, GF_PATH_APP)) {
-			char *sep = strstr(app_path, "/bin/gcc");
-			if (sep) {
-				sep[0] = 0;
-				strcat(app_path, "/gui");
-				if (check_file_exists("gui.bt", app_path, file_path)) return 1;
-			}
-		}
-		/*GUI not found, look in .app for OSX case*/
-	}
-
-	if (path_type==GF_PATH_MODULES) {
-		/*look in gpac compilation tree (modules are output in the same folder as apps) */
-		if (get_default_install_path(app_path, GF_PATH_APP)) {
-			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
-			/*on OSX check modules subdirectory */
-			strcat(app_path, "/modules");
-			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
-		}
-		/*modules not found, look in ~/.gpac/modules/ */
-		if (get_default_install_path(app_path, GF_PATH_CFG)) {
-			strcpy(app_path, file_path);
-			strcat(app_path, "/.gpac/modules");
-			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
-		}
-		/*modules not found, failure*/
-		return 0;
-	}
-
-	/*OSX way vs iPhone*/
-	sep = strstr(app_path, ".app/");
-	if (sep) sep[4] = 0;
-
-	/*we are looking for .app install path, or GUI */
-	if (path_type==GF_PATH_GUI) {
-#ifndef GPAC_IPHONE
-		strcat(app_path, "/Contents/MacOS/gui");
-		if (check_file_exists("gui.bt", app_path, file_path)) return 1;
-#else /*iOS: for now, everything is set flat within the package*/
-		/*iOS app is distributed with embedded GUI*/
-		get_default_install_path(app_path, GF_PATH_APP);
-		strcat(app_path, "/gui");
-		if (check_file_exists("gui_old.bt", app_path, file_path)) return 1;
-#endif		
-	}
-	else { // (path_type==GF_PATH_MODULES) 
-		strcat(app_path, "/Contents/MacOS/modules");
-		if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
-	}
-	/*not found ...*/
-	return 0;
-}
-
-#endif
-
-
-static GF_Config *create_default_config(char *file_path)
-{
-	FILE *f;
-	GF_Config *cfg;
-	char *cache_dir;
-	char szPath[GF_MAX_PATH];
-	char gui_path[GF_MAX_PATH];
-
-	if (! get_default_install_path(file_path, GF_PATH_CFG)) {
-		gf_delete_file(szPath);
-		return NULL;
-	}
-	/*Create the config file*/
-	sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
-    fprintf(stderr, "Trying to create config file: %s", szPath);
-	f = gf_f64_open(szPath, "wt");
-	if (!f) return NULL;
-	fclose(f);
-
-	if (! get_default_install_path(szPath, GF_PATH_MODULES)) {
-		gf_delete_file(szPath);
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] default modules not found\n"));
-		return NULL;
-	}
-
-	cfg = gf_cfg_new(file_path, CFG_FILE_NAME);
-	if (!cfg) return NULL;
-
-	gf_cfg_set_key(cfg, "General", "ModulesDirectory", szPath);
-
-	/*get default temporary directoy */
-	cache_dir = gf_get_default_cache_directory();
-	if (cache_dir) {
-		gf_cfg_set_key(cfg, "General", "CacheDirectory", cache_dir);
-		gf_free(cache_dir);
-	}
-	gf_cfg_set_key(cfg, "Compositor", "Raster2D", "GPAC 2D Raster");
-	gf_cfg_set_key(cfg, "Audio", "ForceConfig", "yes");
-	gf_cfg_set_key(cfg, "Audio", "NumBuffers", "2");
-	gf_cfg_set_key(cfg, "Audio", "TotalDuration", "120");
-	gf_cfg_set_key(cfg, "Audio", "DisableNotification", "no");
-
-	/*Setup font engine to FreeType by default, and locate TrueType font directory on the system*/
-	gf_cfg_set_key(cfg, "FontEngine", "FontReader", "FreeType Font Reader");
-	gf_cfg_set_key(cfg, "FontEngine", "RescanFonts", "yes");
-
-
-#if defined(_WIN32_WCE)
-	/*FIXME - is this true on all WinCE systems??*/
-	strcpy(szPath, "\\Windows");
-#elif defined(WIN32)
-	GetWindowsDirectory((char*)szPath, MAX_PATH);
-	if (szPath[strlen((char*)szPath)-1] != '\\') strcat((char*)szPath, "\\");
-	strcat((char *)szPath, "Fonts");
-#elif defined(__APPLE__)
-
-#ifdef GPAC_IPHONE
-	strcpy(szPath, "/System/Library/Fonts/Cache");
-#else
-	strcpy(szPath, "/Library/Fonts");
-#endif
-
-#else
-	strcpy(szPath, "/usr/share/fonts/truetype/");
-#endif
-	gf_cfg_set_key(cfg, "FontEngine", "FontDirectory", szPath);
-
-	gf_cfg_set_key(cfg, "Downloader", "CleanCache", "yes");
-	gf_cfg_set_key(cfg, "Compositor", "AntiAlias", "All");
-	gf_cfg_set_key(cfg, "Compositor", "FrameRate", "30.0");
-	/*use power-of-2 emulation in OpenGL if no rectangular texture extension*/
-	gf_cfg_set_key(cfg, "Compositor", "EmulatePOW2", "yes");
-	gf_cfg_set_key(cfg, "Compositor", "ScalableZoom", "yes");
-
-#if defined(_WIN32_WCE)
-	gf_cfg_set_key(cfg, "Video", "DriverName", "GAPI Video Output");
-#elif defined(WIN32)
-	gf_cfg_set_key(cfg, "Video", "DriverName", "DirectX Video Output");
-#elif defined(__DARWIN__) || defined(__APPLE__)
-	gf_cfg_set_key(cfg, "Video", "DriverName", "SDL Video Output");
-#else
-	gf_cfg_set_key(cfg, "Video", "DriverName", "X11 Video Output");
-	gf_cfg_set_key(cfg, "Audio", "DriverName", "SDL Audio Output");
-#endif
-#ifdef GPAC_IPHONE
-    gf_cfg_set_key(cfg, "Compositor", "DisableGLUScale", "yes");
-#endif
-
-	gf_cfg_set_key(cfg, "Video", "SwitchResolution", "no");
-	gf_cfg_set_key(cfg, "Video", "HardwareMemory", "Auto");
-	gf_cfg_set_key(cfg, "Network", "AutoReconfigUDP", "yes");
-	gf_cfg_set_key(cfg, "Network", "UDPTimeout", "10000");
-	gf_cfg_set_key(cfg, "Network", "BufferLength", "3000");
-
-
-	/*locate GUI*/
-	if ( get_default_install_path(szPath, GF_PATH_GUI) ) {
-		sprintf(gui_path, "%s%cgui.bt", szPath, GF_PATH_SEPARATOR);
-		f = fopen(gui_path, "rt");
-		if (f) {
-			fclose(f);
-			gf_cfg_set_key(cfg, "General", "StartupFile", gui_path);
-		}
-	}
-
-	/*store and reload*/
-	gf_cfg_del(cfg);
-	return gf_cfg_new(file_path, CFG_FILE_NAME);
-}
-
-/*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)
-{
-	char path[GF_MAX_PATH];
-	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);
-#endif
-	}
-
-	/*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
-			strcat(path, "/gui.bt");
-#endif
-			gf_cfg_set_key(cfg, "General", "StartupFile", path);
-		}
-	}
-}
-
-GF_EXPORT
-GF_Config *gf_cfg_init(const char *file, Bool *new_cfg)
-{
-	GF_Config *cfg;
-	char szPath[GF_MAX_PATH];
-
-	if (new_cfg) *new_cfg = 0;
-
-	if (file) {
-		cfg = gf_cfg_new(NULL, file);
-		/*force creation of a new config*/
-		if (!cfg) {
-			FILE *fcfg = fopen(file, "wt");
-			if (fcfg) {
-				fclose(fcfg);
-				cfg = gf_cfg_new(NULL, file);
-				if (new_cfg) *new_cfg = 1;
-			}
-		}
-		if (cfg) {
-			check_modules_dir(cfg);
-			return cfg;
-		}
-	}
-
-	if (!get_default_install_path(szPath, GF_PATH_CFG)) {
-		fprintf(stderr, "Fatal error: Cannot create a configuration file in application or user home directory - no write access\n");
-		return NULL;
-	}
-	cfg = gf_cfg_new(szPath, CFG_FILE_NAME);
-	if (!cfg) {
-		fprintf(stderr, "GPAC config file %s not found in %s - creating new file\n", CFG_FILE_NAME, szPath);
-		cfg = create_default_config(szPath);
-	}
-
-	if (!cfg) {
-		fprintf(stderr, "Cannot create config file %s in %s directory\n", CFG_FILE_NAME, szPath);
-		return NULL;
-	}
-
-	fprintf(stderr, "Using config file in %s directory\n", szPath);
-
-	check_modules_dir(cfg);
-
-	if (new_cfg) *new_cfg = 1;
-	return cfg;
-}
-
+/*
+ *			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. 
+ *
+ */
+
+#include <gpac/config_file.h>
+
+
+#if defined(WIN32) || defined(_WIN32_WCE)
+#include <windows.h> /*for GetModuleFileName*/
+
+#ifndef _WIN32_WCE
+#include <direct.h>  /*for _mkdir*/
+#include <shlobj.h>  /*for getting user-dir*/
+
+#ifndef SHGFP_TYPE_CURRENT
+#define SHGFP_TYPE_CURRENT 0 /*needed for MinGW*/
+#endif
+
+#endif
+
+#define CFG_FILE_NAME	"GPAC.cfg"
+#define TEST_MODULE		"gm_dummy_in.dll"
+
+#elif (defined(__DARWIN__) || defined(__APPLE__) )
+#include <mach-o/dyld.h> /*for _NSGetExecutablePath */
+
+#ifdef GPAC_IPHONE
+#define TEST_MODULE     "osmo4ios"
+#else
+#define TEST_MODULE		"gm_dummy_in.dylib"
+#endif
+#define CFG_FILE_NAME	".gpacrc"
+
+#else
+#ifdef GPAC_CONFIG_LINUX
+#include <unistd.h>
+#endif
+#define CFG_FILE_NAME	".gpacrc"
+#define TEST_MODULE		"gm_dummy_in.so"
+#endif
+
+
+#ifdef GPAC_STATIC_MODULES
+static Bool enum_mod_dir(void *cbck, char *item_name, char *item_path)
+{
+	if (!strnicmp(item_name, "gm_", 3)) {
+printf("Found %s\n", item_name);
+		*(Bool *) cbck = GF_TRUE;
+	}
+	return GF_FALSE;
+}
+#endif
+
+static Bool check_file_exists(char *name, char *path, char *outPath)
+{
+	char szPath[GF_MAX_PATH];
+	FILE *f;
+
+#ifdef GPAC_STATIC_MODULES
+	if (!strcmp(name, TEST_MODULE)) {
+		Bool found = GF_FALSE;
+		gf_enum_directory(path, GF_FALSE, enum_mod_dir, &found, NULL);
+		if (!found) return 0;
+		if (outPath != path) strcpy(outPath, path);
+		return 1;
+	}
+#endif
+	sprintf(szPath, "%s%c%s", path, GF_PATH_SEPARATOR, name);
+	f = fopen(szPath, "rb");
+	if (!f) return 0;
+	fclose(f);
+	if (outPath != path) strcpy(outPath, path);
+	return 1;
+}
+
+enum
+{
+	GF_PATH_APP,
+	GF_PATH_CFG,
+	GF_PATH_GUI,
+	GF_PATH_MODULES,
+};
+
+#if defined(WIN32) || defined(_WIN32_WCE)
+static Bool get_default_install_path(char *file_path, u32 path_type)
+{
+	FILE *f;
+	char *sep;
+	char szPath[GF_MAX_PATH];
+	
+	
+#ifdef _WIN32_WCE
+	TCHAR w_szPath[GF_MAX_PATH];
+	GetModuleFileName(NULL, w_szPath, GF_MAX_PATH);
+	CE_WideToChar((u16 *) w_szPath, file_path);
+#else
+	GetModuleFileNameA(NULL, file_path, GF_MAX_PATH);
+#endif
+	
+	/*remove exe name*/
+	if (strstr(file_path, ".exe")) {
+		sep = strrchr(file_path, '\\');
+		if (sep) sep[0] = 0;
+	}
+
+	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 
+	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;
+		u16 w_path[1024];
+		RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Software\\GPAC"), 0, KEY_READ, &hKey);
+#ifdef _DEBUG
+		if (RegQueryValueEx(hKey, TEXT("DebugDir"), 0, &dwType, (LPBYTE) w_path, &dwSize) != ERROR_SUCCESS)
+#endif
+			RegQueryValueEx(hKey, TEXT("InstallDir"), 0, &dwType, (LPBYTE) w_path, &dwSize);
+		CE_WideToChar(w_path, (char *)file_path);
+		RegCloseKey(hKey);
+#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
+		if (RegQueryValueEx(hKey, "DebugDir", NULL, NULL,(unsigned char*) file_path, &dwSize) != ERROR_SUCCESS)
+#endif
+			RegQueryValueEx(hKey, "InstallDir", NULL, NULL,(unsigned char*) file_path, &dwSize);
+
+		RegCloseKey(hKey);
+#endif
+	}
+
+
+	if (path_type==GF_PATH_APP) return 1;
+	
+	if (path_type==GF_PATH_GUI) {
+		char *sep;
+		strcat(file_path, "\\gui");
+		if (check_file_exists("gui.bt", file_path, file_path)) return 1;
+		sep = strstr(file_path, "\\bin\\");
+		if (sep) {
+			sep[0] = 0;
+			strcat(file_path, "\\gui");
+			if (check_file_exists("gui.bt", file_path, file_path)) return 1;
+		}
+		return 0;
+	}
+	/*modules are stored in the GPAC directory (should be changed to GPAC/modules)*/
+	if (path_type==GF_PATH_MODULES) return 1;
+
+	/*we are looking for the config file path - make sure it is writable*/
+	assert(path_type == GF_PATH_CFG);
+
+	strcpy(szPath, file_path);
+	strcat(szPath, "\\gpaccfgtest.txt");
+	f = gf_f64_open(szPath, "wb");
+	if (f != NULL) {
+		fclose(f);
+		gf_delete_file(szPath);
+		return 1;
+	}
+#ifdef _WIN32_WCE
+	return 0;
+#else
+	/*no write access, get user home directory*/
+	SHGetFolderPath(NULL, CSIDL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, file_path);
+	if (file_path[strlen(file_path)-1] != '\\') strcat(file_path, "\\");
+	strcat(file_path, "GPAC");
+	/*create GPAC dir*/
+	_mkdir(file_path);
+	strcpy(szPath, file_path);
+	strcat(szPath, "\\gpaccfgtest.txt");
+	f = gf_f64_open(szPath, "wb");
+	/*COMPLETE FAILURE*/
+	if (!f) return 0;
+	
+	fclose(f);
+	gf_delete_file(szPath);
+	return 1;
+#endif
+}
+
+/*FIXME - android initialization is a mess right now*/
+#elif defined(GPAC_ANDROID)
+
+static Bool get_default_install_path(char *file_path, u32 path_type)
+{
+	if (path_type==GF_PATH_APP) strcpy(file_path, "");
+	else if (path_type==GF_PATH_CFG) strcpy(file_path, "");
+	else if (path_type==GF_PATH_GUI) strcpy(file_path, "");
+	else if (path_type==GF_PATH_MODULES) strcpy(file_path, "");
+	return 1;
+}
+
+	
+#elif defined(__SYMBIAN__)
+
+#if defined(__SERIES60_3X__)
+#define SYMBIAN_GPAC_CFG_DIR	"\\private\\F01F9075"
+#define SYMBIAN_GPAC_GUI_DIR	"\\private\\F01F9075\\gui"
+#define SYMBIAN_GPAC_MODULES_DIR	"\\sys\\bin"
+#else
+#define SYMBIAN_GPAC_CFG_DIR	"\\system\\apps\\Osmo4"
+#define SYMBIAN_GPAC_GUI_DIR	"\\system\\apps\\Osmo4\\gui"
+#define SYMBIAN_GPAC_MODULES_DIR	GPAC_CFG_DIR
+#endif
+
+static Bool get_default_install_path(char *file_path, u32 path_type)
+{
+	if (path_type==GF_PATH_APP) strcpy(file_path, SYMBIAN_GPAC_MODULES_DIR);
+	else if (path_type==GF_PATH_CFG) strcpy(file_path, SYMBIAN_GPAC_CFG_DIR);
+	else if (path_type==GF_PATH_GUI) strcpy(file_path, SYMBIAN_GPAC_GUI_DIR);
+	else if (path_type==GF_PATH_MODULES) strcpy(file_path, SYMBIAN_GPAC_MODULES_DIR);
+	return 1;
+}
+
+/*Linux, OSX, iOS*/
+#else
+
+static Bool get_default_install_path(char *file_path, u32 path_type)
+{
+	char app_path[GF_MAX_PATH];
+	char *sep;
+	u32 size = GF_MAX_PATH;
+
+	/*on OSX, Linux & co, user home is where we store the cfg file*/
+	if (path_type==GF_PATH_CFG) {
+		char *user_home = getenv("HOME");
+#ifdef GPAC_IPHONE
+        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
+#endif
+        strcpy(file_path, user_home);
+		if (file_path[strlen(file_path)-1] == '/') file_path[strlen(file_path)-1] = 0;
+        return 1;
+	}
+
+	if (path_type==GF_PATH_APP) {
+#if (defined(__DARWIN__) || defined(__APPLE__) )
+		if (_NSGetExecutablePath(app_path, &size) ==0) {
+			realpath(app_path, file_path);
+			char *sep = strrchr(file_path, '/');
+			if (sep) sep[0] = 0;
+			return 1;
+		}
+
+#elif defined(GPAC_CONFIG_LINUX)
+		size = readlink("/proc/self/exe", file_path, GF_MAX_PATH);
+		if (size>0) {				
+			char *sep = strrchr(file_path, '/');
+			if (sep) sep[0] = 0;
+			return 1;
+		}
+#endif
+		return 0;
+	}
+
+	
+	/*locate the app*/
+	if (!get_default_install_path(app_path, GF_PATH_APP)) return 0;
+
+	/*installed or symlink on system, user user home directory*/
+	if (!strnicmp(app_path, "/usr/", 5) || !strnicmp(app_path, "/opt/", 5)) {
+		if (path_type==GF_PATH_GUI) {
+			/*look in possible install dirs ...*/
+			if (check_file_exists("gui.bt", "/usr/share/gpac/gui", file_path)) return 1;
+			if (check_file_exists("gui.bt", "/usr/local/share/gpac/gui", file_path)) return 1;
+			if (check_file_exists("gui.bt", "/opt/share/gpac/gui", file_path)) return 1;
+			if (check_file_exists("gui.bt", "/opt/local/share/gpac/gui", file_path)) return 1;
+		} else if (path_type==GF_PATH_MODULES) {
+			/*look in possible install dirs ...*/
+			if (check_file_exists(TEST_MODULE, "/usr/lib/gpac", file_path)) return 1;
+			if (check_file_exists(TEST_MODULE, "/usr/local/lib/gpac", file_path)) return 1;
+			if (check_file_exists(TEST_MODULE, "/opt/lib/gpac", file_path)) return 1;
+			if (check_file_exists(TEST_MODULE, "/opt/local/lib/gpac", file_path)) return 1;
+		}
+	}
+
+	if (path_type==GF_PATH_GUI) {
+		if (get_default_install_path(app_path, GF_PATH_CFG)) {
+			/*GUI not found, look in ~/.gpac/gui/ */
+			strcat(app_path, "/.gpac/gui");
+			if (check_file_exists("gui.bt", app_path, file_path)) return 1;
+		}
+
+		/*GUI not found, look in gpac distribution if any */
+		if (get_default_install_path(app_path, GF_PATH_APP)) {
+			char *sep = strstr(app_path, "/bin/gcc");
+			if (sep) {
+				sep[0] = 0;
+				strcat(app_path, "/gui");
+				if (check_file_exists("gui.bt", app_path, file_path)) return 1;
+			}
+		}
+		/*GUI not found, look in .app for OSX case*/
+	}
+
+	if (path_type==GF_PATH_MODULES) {
+		/*look in gpac compilation tree (modules are output in the same folder as apps) */
+		if (get_default_install_path(app_path, GF_PATH_APP)) {
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+			/*on OSX check modules subdirectory */
+			strcat(app_path, "/modules");
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+		}
+		/*modules not found, look in ~/.gpac/modules/ */
+		if (get_default_install_path(app_path, GF_PATH_CFG)) {
+			strcpy(app_path, file_path);
+			strcat(app_path, "/.gpac/modules");
+			if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+		}
+		/*modules not found, failure*/
+		return 0;
+	}
+
+	/*OSX way vs iPhone*/
+	sep = strstr(app_path, ".app/");
+	if (sep) sep[4] = 0;
+
+	/*we are looking for .app install path, or GUI */
+	if (path_type==GF_PATH_GUI) {
+#ifndef GPAC_IPHONE
+		strcat(app_path, "/Contents/MacOS/gui");
+		if (check_file_exists("gui.bt", app_path, file_path)) return 1;
+#else /*iOS: for now, everything is set flat within the package*/
+		/*iOS app is distributed with embedded GUI*/
+		get_default_install_path(app_path, GF_PATH_APP);
+		strcat(app_path, "/gui");
+		if (check_file_exists("gui_old.bt", app_path, file_path)) return 1;
+#endif		
+	}
+	else { // (path_type==GF_PATH_MODULES) 
+		strcat(app_path, "/Contents/MacOS/modules");
+		if (check_file_exists(TEST_MODULE, app_path, file_path)) return 1;
+	}
+	/*not found ...*/
+	return 0;
+}
+
+#endif
+
+
+static GF_Config *create_default_config(char *file_path)
+{
+	FILE *f;
+	GF_Config *cfg;
+	char *cache_dir;
+	char szPath[GF_MAX_PATH];
+	char gui_path[GF_MAX_PATH];
+
+	if (! get_default_install_path(file_path, GF_PATH_CFG)) {
+		gf_delete_file(szPath);
+		return NULL;
+	}
+	/*Create the config file*/
+	sprintf(szPath, "%s%c%s", file_path, GF_PATH_SEPARATOR, CFG_FILE_NAME);
+    fprintf(stderr, "Trying to create config file: %s", szPath);
+	f = gf_f64_open(szPath, "wt");
+	if (!f) return NULL;
+	fclose(f);
+
+	if (! get_default_install_path(szPath, GF_PATH_MODULES)) {
+		gf_delete_file(szPath);
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] default modules not found\n"));
+		return NULL;
+	}
+
+	cfg = gf_cfg_new(file_path, CFG_FILE_NAME);
+	if (!cfg) return NULL;
+
+	gf_cfg_set_key(cfg, "General", "ModulesDirectory", szPath);
+
+	/*get default temporary directoy */
+	cache_dir = gf_get_default_cache_directory();
+	if (cache_dir) {
+		gf_cfg_set_key(cfg, "General", "CacheDirectory", cache_dir);
+		gf_free(cache_dir);
+	}
+	gf_cfg_set_key(cfg, "Compositor", "Raster2D", "GPAC 2D Raster");
+	gf_cfg_set_key(cfg, "Audio", "ForceConfig", "yes");
+	gf_cfg_set_key(cfg, "Audio", "NumBuffers", "2");
+	gf_cfg_set_key(cfg, "Audio", "TotalDuration", "120");
+	gf_cfg_set_key(cfg, "Audio", "DisableNotification", "no");
+
+	/*Setup font engine to FreeType by default, and locate TrueType font directory on the system*/
+	gf_cfg_set_key(cfg, "FontEngine", "FontReader", "FreeType Font Reader");
+	gf_cfg_set_key(cfg, "FontEngine", "RescanFonts", "yes");
+
+
+#if defined(_WIN32_WCE)
+	/*FIXME - is this true on all WinCE systems??*/
+	strcpy(szPath, "\\Windows");
+#elif defined(WIN32)
+	GetWindowsDirectory((char*)szPath, MAX_PATH);
+	if (szPath[strlen((char*)szPath)-1] != '\\') strcat((char*)szPath, "\\");
+	strcat((char *)szPath, "Fonts");
+#elif defined(__APPLE__)
+
+#ifdef GPAC_IPHONE
+	strcpy(szPath, "/System/Library/Fonts/Cache");
+#else
+	strcpy(szPath, "/Library/Fonts");
+#endif
+
+#else
+	strcpy(szPath, "/usr/share/fonts/truetype/");
+#endif
+	gf_cfg_set_key(cfg, "FontEngine", "FontDirectory", szPath);
+
+	gf_cfg_set_key(cfg, "Downloader", "CleanCache", "yes");
+	gf_cfg_set_key(cfg, "Compositor", "AntiAlias", "All");
+	gf_cfg_set_key(cfg, "Compositor", "FrameRate", "30.0");
+	/*use power-of-2 emulation in OpenGL if no rectangular texture extension*/
+	gf_cfg_set_key(cfg, "Compositor", "EmulatePOW2", "yes");
+	gf_cfg_set_key(cfg, "Compositor", "ScalableZoom", "yes");
+
+#if defined(_WIN32_WCE)
+	gf_cfg_set_key(cfg, "Video", "DriverName", "GAPI Video Output");
+#elif defined(WIN32)
+	gf_cfg_set_key(cfg, "Video", "DriverName", "DirectX Video Output");
+#elif defined(__DARWIN__) || defined(__APPLE__)
+	gf_cfg_set_key(cfg, "Video", "DriverName", "SDL Video Output");
+#else
+	gf_cfg_set_key(cfg, "Video", "DriverName", "X11 Video Output");
+	gf_cfg_set_key(cfg, "Audio", "DriverName", "SDL Audio Output");
+#endif
+#ifdef GPAC_IPHONE
+    gf_cfg_set_key(cfg, "Compositor", "DisableGLUScale", "yes");
+#endif
+
+	gf_cfg_set_key(cfg, "Video", "SwitchResolution", "no");
+	gf_cfg_set_key(cfg, "Video", "HardwareMemory", "Auto");
+	gf_cfg_set_key(cfg, "Network", "AutoReconfigUDP", "yes");
+	gf_cfg_set_key(cfg, "Network", "UDPTimeout", "10000");
+	gf_cfg_set_key(cfg, "Network", "BufferLength", "3000");
+
+
+	/*locate GUI*/
+	if ( get_default_install_path(szPath, GF_PATH_GUI) ) {
+		sprintf(gui_path, "%s%cgui.bt", szPath, GF_PATH_SEPARATOR);
+		f = fopen(gui_path, "rt");
+		if (f) {
+			fclose(f);
+			gf_cfg_set_key(cfg, "General", "StartupFile", gui_path);
+		}
+	}
+
+	/*store and reload*/
+	gf_cfg_del(cfg);
+	return gf_cfg_new(file_path, CFG_FILE_NAME);
+}
+
+/*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)
+{
+	char path[GF_MAX_PATH];
+	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);
+#endif
+	}
+
+	/*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
+			strcat(path, "/gui.bt");
+#endif
+			gf_cfg_set_key(cfg, "General", "StartupFile", path);
+		}
+	}
+}
+
+GF_EXPORT
+GF_Config *gf_cfg_init(const char *file, Bool *new_cfg)
+{
+	GF_Config *cfg;
+	char szPath[GF_MAX_PATH];
+
+	if (new_cfg) *new_cfg = 0;
+
+	if (file) {
+		cfg = gf_cfg_new(NULL, file);
+		/*force creation of a new config*/
+		if (!cfg) {
+			FILE *fcfg = fopen(file, "wt");
+			if (fcfg) {
+				fclose(fcfg);
+				cfg = gf_cfg_new(NULL, file);
+				if (new_cfg) *new_cfg = 1;
+			}
+		}
+		if (cfg) {
+			check_modules_dir(cfg);
+			return cfg;
+		}
+	}
+
+	if (!get_default_install_path(szPath, GF_PATH_CFG)) {
+		fprintf(stderr, "Fatal error: Cannot create a configuration file in application or user home directory - no write access\n");
+		return NULL;
+	}
+	cfg = gf_cfg_new(szPath, CFG_FILE_NAME);
+	if (!cfg) {
+		fprintf(stderr, "GPAC config file %s not found in %s - creating new file\n", CFG_FILE_NAME, szPath);
+		cfg = create_default_config(szPath);
+	}
+
+	if (!cfg) {
+		fprintf(stderr, "Cannot create config file %s in %s directory\n", CFG_FILE_NAME, szPath);
+		return NULL;
+	}
+
+	fprintf(stderr, "Using config file in %s directory\n", szPath);
+
+	check_modules_dir(cfg);
+
+	if (new_cfg) *new_cfg = 1;
+	return cfg;
+}
+

gpac-0.5.0.svn4668.tar.bz2/src/utils/os_divers.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/os_divers.c Changed

@@ -68,6 +68,7 @@
 #define SLEEP_ABS_SELECT		1
 
 static u32 sys_start_time = 0;
+static u64 sys_start_time_hr = 0;
 #endif
 
 
@@ -85,6 +86,15 @@
 	gettimeofday(&now, NULL);
 	return ( (now.tv_sec)*1000 + (now.tv_usec) / 1000) - sys_start_time;
 }
+
+GF_EXPORT
+u64 gf_sys_clock_high_res()
+{
+	struct timeval now;
+	gettimeofday(&now, NULL);
+	return (now.tv_sec)*1000000 + (now.tv_usec) - sys_start_time_hr;
+}
+
 #endif
 
 
@@ -168,22 +178,22 @@
 	res = CreateDirectory(swzName, NULL);
 	if (! res) {
 		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create director %s: last error %d\n", DirPathName, err ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
 	}
 #elif defined (WIN32) 
 	int res = mkdir(DirPathName);
 	if (res==-1) {
 		int err = GetLastError();
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create director %s: last error %d\n", DirPathName, err ));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, err ));
 	}
 #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 director %s, it already exists: last error %d \n", DirPathName, errno ));
+			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{
-			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create director %s: last error %d\n", DirPathName, errno ));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("Cannot create directory %s: last error %d\n", DirPathName, errno ));
 			return GF_IO_ERR;
 		}
 	}
@@ -191,7 +201,7 @@
 	return GF_OK;
 }
 
-static Bool delete_carousel_data(void *cbck, char *item_name, char *item_path)
+static Bool delete_dir(void *cbck, char *item_name, char *item_path)
 {
 	Bool directory_clean_mode = *(Bool*)cbck;
 
@@ -201,7 +211,7 @@
 	}else{
 		gf_delete_file(item_path);		
 	}	
-	return GF_OK;
+	return 0;
 }
 
 GF_Err gf_cleanup_dir(char* DirPathName)
@@ -209,9 +219,9 @@
 	Bool directory_clean_mode;
 
 	directory_clean_mode = 1;
-	gf_enum_directory(DirPathName, 1, delete_carousel_data, &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_carousel_data, &directory_clean_mode, NULL);
+	gf_enum_directory(DirPathName, 0, delete_dir, &directory_clean_mode, NULL);
 
 	return GF_OK;
 }
@@ -317,7 +327,6 @@
 	time between jan 1, 1601 and jan 1, 1970 in units of 100 nanoseconds 
 	FILETIME in Win32 is from jan 1, 1601
 */
-#define TIMESPEC_TO_FILETIME_OFFSET (((LONGLONG)27111902 << 32) + (LONGLONG)3577643008)
 
 s32 __gettimeofday(struct timeval *tp, void *tz)
 {
@@ -412,11 +421,12 @@
 	char cmd[1024];
 	if (!fileName || !newFileName)
 		return GF_IO_ERR;
-	snprintf(cmd, sizeof(cmd)-1, "mv '%s' '%s' > /dev/null 2>&1", fileName, newFileName);
+	snprintf(cmd, sizeof(cmd), "mv '%s' '%s' > /dev/null 2>&1", fileName, newFileName);
 	return ( system(cmd) == 0) ? GF_OK : GF_IO_ERR;
 #endif
 }
 
+GF_EXPORT
 void gf_rand_init(Bool Reset)
 {
 	if (Reset) {
@@ -430,6 +440,7 @@
 	}
 }
 
+GF_EXPORT
 u32 gf_rand()
 {
 	return rand();
@@ -782,7 +793,11 @@
 #if defined(_WIN32_WCE)
 	return (u64) ftell(fp);
 #elif defined(GPAC_CONFIG_WIN32)	/* mingw or cygwin */
+#if (_FILE_OFFSET_BITS >= 64)
+	return (u64) ftello64(fp);
+#else
 	return (u64) ftell(fp);
+#endif
 #elif defined(WIN32)
 	return (u64) _ftelli64(fp);
 #elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
@@ -800,7 +815,11 @@
 #if defined(_WIN32_WCE)
 	return (u64) fseek(fp, (s32) offset, whence);
 #elif defined(GPAC_CONFIG_WIN32)	/* mingw or cygwin */
+#if (_FILE_OFFSET_BITS >= 64)
+	return (u64) fseeko64(fp, offset, whence);
+#else
 	return (u64) fseek(fp, (s32) offset, whence);
+#endif
 #elif defined(WIN32)
 	return (u64) _fseeki64(fp, offset, whence);
 #elif defined(GPAC_CONFIG_LINUX) && !defined(GPAC_ANDROID)
@@ -1060,6 +1079,13 @@
 {
 	return OS_GetSysClock();
 }
+
+
+static u64 (*OS_GetSysClockHR)();
+u64 gf_sys_clock_high_res()
+{
+	return OS_GetSysClockHR();
+}
 #endif
 
 
@@ -1073,6 +1099,14 @@
 	return (u32) ((now.QuadPart * 1000) / frequency.QuadPart);
 }
 
+static u64 OS_GetSysClockHIGHRES_FULL()
+{
+	LARGE_INTEGER now;
+	QueryPerformanceCounter(&now);
+	now.QuadPart -= init_counter.QuadPart;
+	return (u64) ((now.QuadPart * 1000000) / frequency.QuadPart);
+}
+
 static u32 OS_GetSysClockNORMAL() 
 { 
 #ifdef _WIN32_WCE
@@ -1082,6 +1116,12 @@
 #endif
 }
 
+static u64 OS_GetSysClockNORMAL_FULL() 
+{ 
+	u64 res = OS_GetSysClockNORMAL();
+	return res*1000;
+}
+
 #endif /* WIN32 */
 
 #if defined(__sh__) 
@@ -1138,8 +1178,12 @@
 void gf_sys_init(Bool enable_memory_tracker)
 {
 	if (!sys_init) {
+#if defined (WIN32)
 #if defined(_WIN32_WCE)
 		MEMORYSTATUS ms;
+#else
+		SYSTEM_INFO sysinfo;
+#endif
 #endif
 
 		if (enable_memory_tracker) {
@@ -1163,9 +1207,11 @@
 		if (QueryPerformanceFrequency(&frequency)) {
 			QueryPerformanceCounter(&init_counter);
 			OS_GetSysClock = OS_GetSysClockHIGHRES;
+			OS_GetSysClockHR = OS_GetSysClockHIGHRES_FULL;
 			GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[core] using WIN32 performance timer\n"));
 		} else {
 			OS_GetSysClock = OS_GetSysClockNORMAL;
+			OS_GetSysClockHR = OS_GetSysClockNORMAL_FULL;
 			GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[core] using WIN32 regular timer\n"));
 		}
 
@@ -1179,6 +1225,7 @@
 		last_update_time = 0;
 		memset(&the_rti, 0, sizeof(GF_SystemRTInfo));
 		the_rti.pid = GetCurrentProcessId();
+		the_rti.nb_cores = 1;
 		GlobalMemoryStatus(&ms);
 		mem_usage_at_startup = ms.dwAvailPhys;
 #else
@@ -1201,17 +1248,39 @@
 		last_update_time = 0;
 		memset(&the_rti, 0, sizeof(GF_SystemRTInfo));
 		the_rti.pid = GetCurrentProcessId();
+
+		GetSystemInfo( &sysinfo );
+		the_rti.nb_cores = sysinfo.dwNumberOfProcessors;
 #endif
 		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("\n"));
 
 #else
-		/*linux threads...*/
+		/*linux threads and OSX...*/
 		last_process_k_u_time = 0;
 		last_cpu_u_k_time = last_cpu_idle_time = 0;
 		last_update_time = 0;
 		memset(&the_rti, 0, sizeof(GF_SystemRTInfo));
 		the_rti.pid = getpid();
+
+#ifdef GPAC_CONFIG_FREEBSD
+		{
+			s32 flags[4];
+			size_t len = sizeof(u32); 
+			flags[0] = CTL_HW;
+			flags[1] = HW_AVAILCPU;
+			sysctl(flags, 2, &the_rti.nb_cores, &len, NULL, 0);
+			if( the_rti.nb_cores < 1 ) {
+				flags[1] = HW_NCPU;
+				sysctl(flags, 2, &the_rti.nb_cores, &len, NULL, 0);
+				if (the_rti.nb_cores<1) the_rti.nb_cores = 1;
+			}
+		}
+#else
+		the_rti.nb_cores = sysconf( _SC_NPROCESSORS_ONLN );
+#endif
+
 		sys_start_time = gf_sys_clock();
+		sys_start_time_hr = gf_sys_clock_high_res();
 #endif
 		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[core] process id %d\n", the_rti.pid));
 
@@ -1227,6 +1296,7 @@
 		GF_SystemRTInfo rti;
 		gf_sys_get_rti(500, &rti, GF_RTI_SYSTEM_MEMORY_ONLY);
 		memory_at_gpac_startup = rti.physical_memory_avail;
+		GF_LOG(GF_LOG_INFO, GF_LOG_CORE, ("[core] System init OK - process id %d - %d MB physical RAM - %d cores\n", rti.pid, (u32) (rti.physical_memory/1024/1024), rti.nb_cores));
 	}
 }
 
@@ -1538,7 +1608,7 @@
 	size_t length;
 	u32 entry_time, i, percent;
 	int mib[6];
-	int result;
+	u64 result;
 	int pagesize;
 	u64 process_u_k_time;
 	double utime, stime;
@@ -1574,12 +1644,13 @@
 
 	if (!total_physical_memory) {
 		mib[0] = CTL_HW;
-		mib[1] = HW_PHYSMEM;
-		length = sizeof(result);
+		mib[1] = HW_MEMSIZE;
+		length = sizeof(u64);
 		if (sysctl(mib, 2, &result, &length, NULL, 0) >= 0) {
 			total_physical_memory = result;
 		}
 	}
+	the_rti.physical_memory = total_physical_memory;
 	
 	error = task_for_pid(mach_task_self(), the_rti.pid, &task);
  	if (error) {
@@ -1647,7 +1718,7 @@
 	last_cpu_idle_time = 0;
 	last_update_time = entry_time;
 	memcpy(rti, &the_rti, sizeof(GF_SystemRTInfo));
-	return 1;
+    return 1;
 }
 
 //linux
@@ -1940,7 +2011,7 @@
 	{
 		int sz = 100;
 		char * buf = gf_malloc( sz );
-		sz = snprintf(buf, sz-1, "%ld\n", (long) getpid());
+		sz = snprintf(buf, sz, "%ld\n", (long) getpid());
 		if (write(fd, buf, sz) != sz){
 			gf_free(buf);
 			goto exit;
@@ -2064,58 +2135,184 @@
 
 #endif //GPAC_ANDROID
 
+/*
+		NTP tools
+*/
 GF_EXPORT
-u64 gf_net_get_utc()
+void gf_net_get_ntp(u32 *sec, u32 *frac)
 {
-	u64 current_time;
-	Double msec;
-	u32 sec, frac;
-
-#ifndef _WIN32_WCE
-	time_t gtime;
-	struct tm _t;
+	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) );
+	frac_part = now.tv_usec * 0xFFFFFFFFULL;
+	frac_part /= 1000000;
+	*frac = (u32) ( frac_part );
+}
 
-	gf_net_get_ntp(&sec, &frac);
-
-#ifndef _WIN32_WCE
-	gtime = sec - GF_NTP_SEC_1900_TO_1970;
-	_t = * gmtime(&gtime);
 
+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);
+		/*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;
-	current_time = mktime(&_t) - t_timezone;
+		t_timezone = (t_gmt.tm_hour - t_local.tm_hour) * 3600;
+		return t_timezone;
 	}
+#elif defined(_WIN32_WCE)
+	return 0;
 #else
 	{
 		s32 val = timezone;
-		current_time = mktime(&_t) - val;
+		return val;
 	}
 #endif
 
-#else
-	{
+}
+
+GF_EXPORT
+u64 gf_net_parse_date(const char *val)
+{
+	u64 current_time;
+	char szDay[50], szMonth[50];
+	u32 year, month, day, h, m, s, ms;
+	s32 oh, om;
+	Float secs;
+	Bool neg_time_zone = 0;
+
+#ifdef _WIN32_WCE
 	SYSTEMTIME syst;
 	FILETIME filet;
-	GetSystemTime(&syst);
-	SystemTimeToFileTime(&syst, &filet);
+#else
+	struct tm t;
+	memset(&t, 0, sizeof(struct tm));
+#endif
 
-#define TIMESPEC_TO_FILETIME_OFFSET (((LONGLONG)27111902 << 32) + (LONGLONG)3577643008)
+	szDay[0] = szMonth[0] = 0;
+	year = month = day = h = m = s = 0;
+	oh = om = 0;
+	secs = 0;
 
+	if (sscanf(val, "%d-%d-%dT%d:%d:%gZ", &year, &month, &day, &h, &m, &secs) == 6) {
+	}
+	else if (sscanf(val, "%d-%d-%dT%d:%d:%g-%d:%d", &year, &month, &day, &h, &m, &secs, &oh, &om) == 8) {
+		neg_time_zone = 1;
+	}
+	else if (sscanf(val, "%d-%d-%dT%d:%d:%g+%d:%d", &year, &month, &day, &h, &m, &secs, &oh, &om) == 8) {
+	}
+	else if (sscanf(val, "%3s, %d %3s %d %d:%d:%d", szDay, &day, szMonth, &year, &h, &m, &s)==7) {
+		secs  = (Float) s;
+	}
+	else if (sscanf(val, "%9s, %d-%3s-%d %02d:%02d:%02d GMT", szDay, &day, szMonth, &year, &h, &m, &s)==7) {
+		secs  = (Float) s;
+	}
+	else if (sscanf(val, "%3s %3s %d %02d:%02d:%02d %d", szDay, szMonth, &day, &year, &h, &m, &s)==7) {
+		secs  = (Float) s;
+	}
+	else {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_CORE, ("[Core] Cannot parse date string %s\n", val));
+		return 0;
+	}
+
+	if (month) {
+		month -= 1;
+	} else {
+		if (!strcmp(szMonth, "Jan")) month = 0;
+		else if (!strcmp(szMonth, "Feb")) month = 1;
+		else if (!strcmp(szMonth, "Mar")) month = 2;
+		else if (!strcmp(szMonth, "Apr")) month = 3;
+		else if (!strcmp(szMonth, "May")) month = 4;
+		else if (!strcmp(szMonth, "Jun")) month = 5;
+		else if (!strcmp(szMonth, "Jul")) month = 6;
+		else if (!strcmp(szMonth, "Aug")) month = 7;
+		else if (!strcmp(szMonth, "Sep")) month = 8;
+		else if (!strcmp(szMonth, "Oct")) month = 9;
+		else if (!strcmp(szMonth, "Nov")) month = 10;
+		else if (!strcmp(szMonth, "Dec")) month = 11;
+	}
+
+#ifdef _WIN32_WCE
+	memset(&syst, 0, sizeof(SYSTEMTIME));
+	syst.wYear = year;
+	syst.wMonth = month + 1;
+	syst.wDay = day;
+	syst.wHour = h;
+	syst.wMinute = m;
+	syst.wSecond = (u32) secs;
+	SystemTimeToFileTime(&syst, &filet);
 	current_time = (u64) ((*(LONGLONG *) &filet - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
 
-#undef TIMESPEC_TO_FILETIME_OFFSET 
+#else
+
+	t.tm_year = year>1000 ? year-1900 : year;
+	t.tm_mday = day;
+	t.tm_hour = h;
+	t.tm_min = m;
+	t.tm_sec = (u32) secs;
+	t.tm_mon = month;
+
+	if (strlen(szDay) ) {
+		if (!strcmp(szDay, "Mon") || !strcmp(szDay, "Monday")) t.tm_wday = 0;
+		else if (!strcmp(szDay, "Tue") || !strcmp(szDay, "Tuesday")) t.tm_wday = 1;
+		else if (!strcmp(szDay, "Wed") || !strcmp(szDay, "Wednesday")) t.tm_wday = 2;
+		else if (!strcmp(szDay, "Thu") || !strcmp(szDay, "Thursday")) t.tm_wday = 3;
+		else if (!strcmp(szDay, "Fri") || !strcmp(szDay, "Friday")) t.tm_wday = 4;
+		else if (!strcmp(szDay, "Sat") || !strcmp(szDay, "Saturday")) t.tm_wday = 5;
+		else if (!strcmp(szDay, "Sun") || !strcmp(szDay, "Sunday")) t.tm_wday = 6;
 	}
+	current_time = mktime(&t) - gf_net_get_timezone();
+
+#endif
+
+	if (om || oh) {
+		s32 diff = (60*oh + om)*60;
+		if (neg_time_zone) diff = -diff;
+		current_time = current_time + diff;
+	}
+	current_time *= 1000;
+	ms = (u32) ( (secs - (u32) secs) * 1000);
+	return current_time + ms;
+}
+
+
 
+GF_EXPORT
+u64 gf_net_get_utc()
+{
+	u64 current_time;
+	Double msec;
+	u32 sec, frac;
+
+#ifdef _WIN32_WCE
+	SYSTEMTIME syst;
+	FILETIME filet;
+#else
+	time_t gtime;
+	struct tm _t;
+#endif
+
+	gf_net_get_ntp(&sec, &frac);
+
+#ifndef _WIN32_WCE
+	gtime = sec - GF_NTP_SEC_1900_TO_1970;
+	_t = * gmtime(&gtime);
+	current_time = mktime(&_t) - gf_net_get_timezone();
+#else
+	GetSystemTime(&syst);
+	SystemTimeToFileTime(&syst, &filet);
+	current_time = (u64) ((*(LONGLONG *) &filet - TIMESPEC_TO_FILETIME_OFFSET) / 10000000);
 #endif
 
 	current_time *= 1000;
@@ -2126,3 +2323,33 @@
 }
 
 
+
+GF_EXPORT
+GF_Err gf_bin128_parse(char *string, bin128 value)
+{
+	u32 len;
+	u32	i=0;
+	if (!strnicmp(string, "0x", 2)) string += 2;
+	len = (u32) strlen(string);
+	if (len >= 32) {
+		u32 j;
+		for (j=0; j<len; j+=2) {
+			u32 v;
+			char szV[5];
+
+			while (string[j] && !isalnum(string[j]))
+				j++;
+			if (!string[j])
+				break;
+			sprintf(szV, "%c%c", string[j], string[j+1]);
+			sscanf(szV, "%x", &v);
+			value[i] = v;
+			i++;
+		}
+	}
+	if (i != 16) {
+		GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[CORE] 128bit blob is not 16-bytes long: %s\n", string));
+		return GF_BAD_PARAM;
+	}
+	return GF_OK;
+}

gpac-0.5.0.svn4668.tar.bz2/src/utils/os_module.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/os_module.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/utils/os_net.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/os_net.c Changed

@@ -205,21 +205,6 @@
 }
 
 
-/*
-		NTP tools
-*/
-GF_EXPORT
-void gf_net_get_ntp(u32 *sec, u32 *frac)
-{
-	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) );
-}
-
 u32 gf_net_has_ipv6()
 {
 #ifdef GPAC_HAS_IPV6
@@ -393,15 +378,15 @@
 		res = setsockopt(sock->socket, SOL_SOCKET, SO_RCVBUF, (char *) &NewSize, sizeof(u32) );
 	}
 	if (res<0) {
-		GF_LOG(GF_LOG_NETWORK, GF_LOG_ERROR, ("[Core] Couldn't set socket %s buffer size: %d\n", SendBuffer ? "send" : "receive", res));
+		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[Core] Couldn't set socket %s buffer size: %d\n", SendBuffer ? "send" : "receive", res));
 	} else {
-		GF_LOG(GF_LOG_NETWORK, GF_LOG_DEBUG, ("[Core] Set socket %s buffer size\n", SendBuffer ? "send" : "receive"));
+		GF_LOG(GF_LOG_DEBUG, GF_LOG_NETWORK, ("[Core] Set socket %s buffer size\n", SendBuffer ? "send" : "receive"));
 	}
 	return GF_OK;
 }
 
 GF_EXPORT
-GF_Err gf_sk_set_block_mode(GF_Socket *sock, u32 NonBlockingOn)
+GF_Err gf_sk_set_block_mode(GF_Socket *sock, Bool NonBlockingOn)
 {
 	s32 res;
 #ifdef WIN32
@@ -593,7 +578,7 @@
 		ret = connect(sock->socket, (struct sockaddr *) &sock->dest_addr, sizeof(struct sockaddr));
 		if (ret == SOCKET_ERROR) {
 			u32 res = LASTSOCKERROR;
-			GF_LOG(GF_LOG_NETWORK, GF_LOG_ERROR, ("[Core] Couldn't connect socket - last sock error %d\n", res));
+			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;
 #ifdef WIN32
@@ -794,7 +779,7 @@
 	}
 
 	/*bind the socket*/
-	ret = bind(sock->socket, (struct sockaddr *) &LocalAdd, addrlen);
+	ret = bind(sock->socket, (struct sockaddr *) &LocalAdd, (int) addrlen);
 	if (ret == SOCKET_ERROR) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] cannot bind socket - socket error %x\n", LASTSOCKERROR));
 		ret = GF_IP_CONNECTION_FAILURE;
@@ -924,10 +909,10 @@
 #ifdef GPAC_HAS_IPV6
 	struct sockaddr *addr;
 	struct addrinfo *res, *aip;
+	Bool is_ipv6 = 0;
 	u32 type;
-#else
-	unsigned long local_add_id;
 #endif
+	unsigned long local_add_id;
 
 	if (!sock || sock->socket) return GF_BAD_PARAM;
 
@@ -947,94 +932,102 @@
 
 
 #ifdef GPAC_HAS_IPV6
+	is_ipv6 = gf_net_is_ipv6(multi_IPAdd) || gf_net_is_ipv6(local_interface_ip) ? 1 : 0;
 	type = (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM;
-	res = gf_sk_get_ipv6_addr(local_interface_ip, MultiPortNumber, AF_UNSPEC, AI_PASSIVE, type);
-	if (!res) {
-		if (local_interface_ip) {
-			res = gf_sk_get_ipv6_addr(NULL, MultiPortNumber, AF_UNSPEC, AI_PASSIVE, type);
-			local_interface_ip = NULL;
-		}
-		if (!res) return GF_IP_CONNECTION_FAILURE;
-	}
 
-	/*for all interfaces*/
-	for (aip=res; aip!=NULL; aip=aip->ai_next) {
-		if (type != (u32) aip->ai_socktype) continue;
-		sock->socket = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
-		if (sock->socket == INVALID_SOCKET) {
-			sock->socket = NULL_SOCKET;
-			continue;
+	if (is_ipv6) {
+
+		res = gf_sk_get_ipv6_addr(local_interface_ip, MultiPortNumber, AF_UNSPEC, AI_PASSIVE, type);
+		if (!res) {
+			if (local_interface_ip) {
+				res = gf_sk_get_ipv6_addr(NULL, MultiPortNumber, AF_UNSPEC, AI_PASSIVE, type);
+				local_interface_ip = NULL;
+			}
+			if (!res) return GF_IP_CONNECTION_FAILURE;
 		}
 
-		if (aip->ai_next && (aip->ai_next->ai_family==PF_INET) && !gf_net_is_ipv6(multi_IPAdd)) continue;
+		/*for all interfaces*/
+		for (aip=res; aip!=NULL; aip=aip->ai_next) {
+			if (type != (u32) aip->ai_socktype) continue;
+			sock->socket = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
+			if (sock->socket == INVALID_SOCKET) {
+				sock->socket = NULL_SOCKET;
+				continue;
+			}
+
+			if ((aip->ai_family!=PF_INET) && aip->ai_next && (aip->ai_next->ai_family==PF_INET) && !gf_net_is_ipv6(multi_IPAdd)) continue;
 
-		/*enable address reuse*/
-		optval = 1;
-		setsockopt(sock->socket, SOL_SOCKET, SO_REUSEADDR, (const char *) &optval, sizeof(optval));
+			/*enable address reuse*/
+			optval = 1;
+			setsockopt(sock->socket, SOL_SOCKET, SO_REUSEADDR, (const char *) &optval, sizeof(optval));
 #ifdef SO_REUSEPORT
-		optval = 1;
-		setsockopt(sock->socket, SOL_SOCKET, SO_REUSEPORT, SSO_CAST &optval, sizeof(optval));
+			optval = 1;
+			setsockopt(sock->socket, SOL_SOCKET, SO_REUSEPORT, SSO_CAST &optval, sizeof(optval));
 #endif
 
-		/*TODO: copy over other properties (recption buffer size & co)*/
-		if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, 1);
+			/*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);
-		sock->dest_addr_len = (u32) aip->ai_addrlen;
+			memcpy(&sock->dest_addr, aip->ai_addr, aip->ai_addrlen);
+			sock->dest_addr_len = (u32) aip->ai_addrlen;
 
-		if (!NoBind) {
-			ret = bind(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
-			if (ret == SOCKET_ERROR) {
-				closesocket(sock->socket);
-				sock->socket = NULL_SOCKET;
-				continue;
+			if (!NoBind) {
+				ret = bind(sock->socket, aip->ai_addr, (int) aip->ai_addrlen);
+				if (ret == SOCKET_ERROR) {
+					closesocket(sock->socket);
+					sock->socket = NULL_SOCKET;
+					continue;
+				}
 			}
+			if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
+			else sock->flags &= ~GF_SOCK_IS_IPV6;
+			break;
 		}
-		if (aip->ai_family==PF_INET6) sock->flags |= GF_SOCK_IS_IPV6;
-		else sock->flags &= ~GF_SOCK_IS_IPV6;
-		break;
-	}
-	freeaddrinfo(res);
-	if (!sock->socket) return GF_IP_CONNECTION_FAILURE;
+		freeaddrinfo(res);
+		if (!sock->socket) return GF_IP_CONNECTION_FAILURE;
 
 
-	if (!gf_sk_ipv6_set_remote_address(sock, multi_IPAdd, MultiPortNumber))
-		return GF_IP_CONNECTION_FAILURE;
+		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;
-		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*/
-		ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &TTL, sizeof(TTL));
-		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
-		/*Disable loopback*/
-		flag = 1;
-		ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
-		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
-	}
-	if (addr->sa_family == AF_INET6) {
-		struct ipv6_mreq M_reqV6;
+		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;
+			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*/
+			ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_TTL, (char *) &TTL, sizeof(TTL));
+			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+			/*Disable loopback*/
+			flag = 1;
+			ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
+			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+		}
 
+		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;
+			memcpy(&M_reqV6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
+			M_reqV6.ipv6mr_interface = 0;
 
-		/*set TTL*/
-		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &TTL, sizeof(TTL));
-		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
-		/*Disable loopback*/
-		flag = 1;
-		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
-		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+			/*set TTL*/
+			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, (char *) &TTL, sizeof(TTL));
+			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+			/*Disable loopback*/
+			flag = 1;
+			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
+			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
 
-		ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &M_reqV6, sizeof(M_reqV6));
-		if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+			ret = setsockopt(sock->socket, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (char *) &M_reqV6, sizeof(M_reqV6));
+			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
+		}
+		sock->flags |= GF_SOCK_IS_MULTICAST | GF_SOCK_HAS_PEER;
+		return GF_OK;
 	}
-#else
+#endif
 
+	//IPv4 setup
 	sock->socket = socket(AF_INET, (sock->flags & GF_SOCK_IS_TCP) ? SOCK_STREAM : SOCK_DGRAM, 0);
 	if (sock->flags & GF_SOCK_NON_BLOCKING) gf_sk_set_block_mode(sock, 1);
 	sock->flags &= ~GF_SOCK_IS_IPV6;
@@ -1071,6 +1064,7 @@
 			if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
 		}
 	}
+
 	/*now join the multicast*/
 	M_req.imr_multiaddr.s_addr = inet_addr(multi_IPAdd);
 	M_req.imr_interface.s_addr = local_add_id;
@@ -1088,10 +1082,17 @@
 	ret = setsockopt(sock->socket, IPPROTO_IP, IP_MULTICAST_LOOP, (char *) &flag, sizeof(flag));
 //	if (ret == SOCKET_ERROR) return GF_IP_CONNECTION_FAILURE;
 
+#ifdef GPAC_HAS_IPV6
+	((struct sockaddr_in *) &sock->dest_addr)->sin_family = AF_INET;
+	((struct sockaddr_in *) &sock->dest_addr)->sin_addr.s_addr = M_req.imr_multiaddr.s_addr;
+	((struct sockaddr_in *) &sock->dest_addr)->sin_port = htons( MultiPortNumber);
+	sock->dest_addr_len = sizeof(struct sockaddr);
+#else
 	sock->dest_addr.sin_family = AF_INET;
 	sock->dest_addr.sin_addr.s_addr = M_req.imr_multiaddr.s_addr;
 	sock->dest_addr.sin_port = htons( MultiPortNumber);
 #endif
+
 	sock->flags |= GF_SOCK_IS_MULTICAST | GF_SOCK_HAS_PEER;
 	return GF_OK;
 }
@@ -1133,7 +1134,7 @@
 			return GF_IP_SOCK_WOULD_BLOCK;
 		case EINTR:
 			/* Interrupted system call, not really important... */
-			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] netowrk is lost\n"));
+			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] network is lost\n"));
 			return GF_IP_NETWORK_EMPTY;
 		default:
 			GF_LOG(GF_LOG_ERROR, GF_LOG_NETWORK, ("[socket] cannot select (error %d)\n", LASTSOCKERROR));
@@ -1149,9 +1150,6 @@
 		res = recvfrom(sock->socket, (char *) buffer + startFrom, length - startFrom, 0, (struct sockaddr *)&sock->dest_addr, &sock->dest_addr_len);
 	else {
 		res = recv(sock->socket, (char *) buffer + startFrom, length - startFrom, 0);
-		/* souchay : Added for Linux, if we cannot read, it means we have been disconnected, beahviour may be different
-		 * on some OSs... in such case, a #ifdef directive shoud be used
-		 */
 		if (res == 0)
 		  return GF_IP_CONNECTION_CLOSED;
 	}

gpac-0.5.0.svn4668.tar.bz2/src/utils/os_thread.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/os_thread.c Changed

@@ -232,6 +232,7 @@
 #ifdef WIN32
 	t->threadH = CreateThread(NULL,  t->stackSize, &(RunThread), (void *)t, 0, &id);
 	if (t->threadH != NULL) {
+#ifdef _MSC_VER
 		/*add thread name for the msvc debugger*/
 #pragma pack(push,8)
 		typedef struct {
@@ -250,6 +251,7 @@
 			RaiseException(0x406D1388, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info);
 		} __except (EXCEPTION_CONTINUE_EXECUTION) {
 		}
+#endif
 	} else {
 #else
 	if ( pthread_attr_init(&att) != 0 ) return GF_IO_ERR;
@@ -552,7 +554,7 @@
 		if (retCode == EINVAL)
 		  GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutex %p=%s] Not properly initialized.\n", mx, mx->log_name));
 		if (retCode == EDEADLK)
-		  GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("[Mutext %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;
@@ -636,11 +638,12 @@
 GF_Semaphore *gf_sema_new(u32 MaxCount, u32 InitCount)
 {
 	GF_Semaphore *tmp = gf_malloc(sizeof(GF_Semaphore));
-
-	if (!tmp) return NULL;
+	if (!tmp) {
+		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Couldn't allocate semaphore\n"));
+		return NULL;
+	}
 #if defined(WIN32)
 	tmp->hSemaphore = CreateSemaphore(NULL, InitCount, MaxCount, NULL);
-
 	if (!tmp->hSemaphore) {
 		GF_LOG(GF_LOG_ERROR, GF_LOG_MUTEX, ("Couldn't create semaphore\n"));
 		gf_free(tmp);
@@ -765,204 +768,3 @@
 	return 0;
 #endif
 }
-
-
-
-/*********************************************************************
-						OS-Specific Condition Object
-**********************************************************************/
-struct __tag_condition
-{
-#ifdef WIN32
-
-//	  /* Count of the number of waiters. */
-//	  int waiters_count_;
-//
-//	  /* Serialize access to <waiters_count_>. */
-//	  CRITICAL_SECTION waiters_count_lock_;
-//
-//	  /* Number of threads to release via a <pthread_cond_broadcast> or a
-//	   * <pthread_cond_signal>.
-//	   */
-//	  int release_count_;
-//
-//	  /* Keeps track of the current "generation" so that we don't allow
-//	   * one thread to steal all the "releases" from the broadcast.
-//	   */
-//	  int wait_generation_count_;
-//
-	  /* A manual-reset event that's used to block and release waiting
-	   * threads.
-	   */
-	  HANDLE event_;
-
-#else
-	pthread_cond_t hCond;
-#endif
-};
-
-GF_EXPORT
-GF_Condition * gf_cond_new() {
-
-	GF_Condition * tmp = gf_malloc(sizeof(GF_Condition));
-
-	if (!tmp) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("[Condition] cannot initialize.\n"));
-		return NULL;
-	}
-
-#ifdef WIN32
-
-//	  tmp->waiters_count_ = 0;
-//	  tmp->wait_generation_count_ = 0;
-//	  tmp->release_count_ = 0;
-//
-//	  /* Create a manual-reset event. */
-//	  tmp->event_ = CreateEvent (NULL, TRUE, FALSE, NULL);
-
-#else
-	pthread_cond_init(&tmp->hCond, NULL);
-#endif
-
-	return tmp;
-}
-
-GF_EXPORT
-void gf_cond_del(GF_Condition * cond) {
-
-	if (!cond) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("[Condition] cannot delete.\n"));
-		return;
-	}
-
-#ifdef WIN32
-//	CloseHandle(tmp->event_);
-
-#else
-	pthread_cond_destroy(&cond->hCond);
-#endif
-
-	gf_free(cond);
-}
-
-GF_EXPORT
-void gf_cond_wait(GF_Condition * cond, GF_Mutex * mx) {
-	u32 caller;
-
-	if (!cond) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("[Condition] condition is null; cannot wait for condition.\n"));
-	}
-
-	if (!mx) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("[Condition] mutex is null; cannot wait for condition.\n"));
-	}
-
-	caller = gf_th_id();
-	/*only if we own*/
-	assert(caller == mx->Holder);
-	mx->HolderCount = 0;
-
-#ifdef WIN32
-
-//	  /* Avoid race conditions. */
-//	  EnterCriticalSection (&cond->waiters_count_lock_);
-//
-//	  /* Increment count of waiters. */
-//	  cond->waiters_count_++;
-//
-//	  /* Store current generation in our activation record. */
-//	  int my_generation = cond->wait_generation_count_;
-//
-//	  LeaveCriticalSection (&cond->waiters_count_lock_);
-//	  LeaveCriticalSection (mx->hMutex);
-//
-//	  for (;;) {
-//	    /* Wait until the event is signaled. */
-//	    WaitForSingleObject (cond->event_, INFINITE);
-//
-//	    EnterCriticalSection (&cond->waiters_count_lock_);
-//	    /* Exit the loop when the <cond->event_> is signaled and
-//	     * there are still waiting threads from this <wait_generation>
-//	     * that haven't been released from this wait yet.
-//	     */
-//	    int wait_done = cond->release_count_ > 0
-//	                    && cond->wait_generation_count_ != my_generation;
-//	    LeaveCriticalSection (&cond->waiters_count_lock_);
-//
-//	    if (wait_done)
-//	      break;
-//	  }
-//
-//	  EnterCriticalSection (mx->hMutex);
-//	  EnterCriticalSection (&cond->waiters_count_lock_);
-//	  cond->waiters_count_--;
-//	  cond->release_count_--;
-//	  int last_waiter = cond->release_count_ == 0;
-//	  LeaveCriticalSection (&cond->waiters_count_lock_);
-//
-//	  if (last_waiter)
-//	    /* We're the last waiter to be notified, so reset the manual event. */
-//	    ResetEvent (cond->event_);
-
-
-#else
-	pthread_cond_wait(&cond->hCond, &mx->hMutex);
-#endif
-
-	caller = gf_th_id();
-	mx->HolderCount = 1;
-	mx->Holder = caller;
-}
-
-GF_EXPORT
-void gf_cond_signal(GF_Condition * cond) {
-
-	if (!cond) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("[Condition] condition is null; cannot signal.\n"));
-	}
-
-#ifdef WIN32
-
-//	  EnterCriticalSection (&cond->waiters_count_lock_);
-//	  if (cond->waiters_count_ > cond->release_count_) {
-//		  SetEvent (cond->event_);
-//		  cond->release_count_++;
-//		  cond->wait_generation_count++;
-//	  }
-//	  LeaveCriticalSection (&cond->waiters_count_lock_);
-
-#else
-	pthread_cond_signal(&cond->hCond);
-#endif
-
-}
-
-GF_EXPORT
-void gf_cond_broadcast(GF_Condition * cond) {
-
-	if (!cond) {
-		GF_LOG(GF_LOG_ERROR, GF_LOG_CONDITION, ("[Condition] condition is null; cannot broadcast.\n"));
-	}
-
-#ifdef WIN32
-
-//	  EnterCriticalSection (&cond->waiters_count_lock_);
-//	  if (cond->waiters_count_ > 0) {
-//	    SetEvent (cond->event_);
-//	    /* Release all the threads in this generation. */
-//	    cond->release_count_ = cond->waiters_count_;
-//
-//	    /* Start a new generation. */
-//	    cond->wait_generation_count_++;
-//	  }
-//	  LeaveCriticalSection (&cond->waiters_count_lock_);
-
-#else
-	pthread_cond_broadcast(&cond->hCond);
-#endif
-
-}
-
-
-
-

gpac-0.5.0.svn4668.tar.bz2/src/utils/ringbuffer.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/ringbuffer.c Changed

gpac-0.5.0.svn4668.tar.bz2/src/utils/xml_parser.c -> gpac-0.5.0.svn5178.tar.bz2/src/utils/xml_parser.c Changed

@@ -1,4 +1,4 @@
-/*
+/*
  *			GPAC - Multimedia Framework C SDK
  *
  *			Authors: Jean Le Feuvre
@@ -712,7 +712,8 @@
 static GF_Err xml_sax_parse(GF_SAXParser *parser, Bool force_parse)
 {
 	u32 i = 0;
-	Bool is_text, is_end;
+	Bool is_text;
+	u32 is_end;
 	u8 c;
 	char *elt, sep;
 	u32 cdata_sep;
@@ -1907,3 +1908,149 @@
 	}
 	return node;
 }
+
+
+#include <gpac/bitstream.h>
+#include <gpac/base_coding.h>
+
+#define XML_SCAN_INT(_fmt, _value)	\
+	{\
+	if (strstr(att->value, "0x")) { u32 __i; sscanf(att->value+2, "%x", &__i); _value = __i; }\
+	else if (strstr(att->value, "0X")) { u32 __i; sscanf(att->value+2, "%X", &__i); _value = __i; }\
+	else sscanf(att->value, _fmt, &_value); \
+	}\
+
+
+GF_EXPORT
+GF_Err gf_xml_parse_bit_sequence(GF_XMLNode *bsroot, char **specInfo, u32 *specInfoSize)
+{
+	u32 i, j;
+	GF_XMLNode *node;
+	GF_XMLAttribute *att;
+	GF_BitStream *bs = gf_bs_new(NULL, 0, GF_BITSTREAM_WRITE);
+	if (!bs) return GF_OUT_OF_MEM;
+
+	i=0;
+	while ((node = (GF_XMLNode *) gf_list_enum(bsroot->content, &i))) {
+		u32 nb_bits = 0;
+		u32 size = 0;
+		u64 offset = 0;
+		s64 value = 0;
+		bin128 word128;
+		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 *szBase64 = NULL;
+		const char *szData = NULL;
+		if (node->type) continue;
+		if (stricmp(node->name, "BS") ) continue;
+
+		j=0;
+		while ( (att = (GF_XMLAttribute *)gf_list_enum(node->attributes, &j))) {
+			if (!stricmp(att->name, "bits")) {
+				XML_SCAN_INT("%d", nb_bits);
+			} else if (!stricmp(att->name, "value")) {
+				XML_SCAN_INT(LLD, value);
+			} else if (!stricmp(att->name, "mediaOffset") || !stricmp(att->name, "dataOffset")) {
+				XML_SCAN_INT(LLU, offset);
+			} else if (!stricmp(att->name, "dataLength")) {
+				XML_SCAN_INT("%u", size);
+			} else if (!stricmp(att->name, "mediaFile") || !stricmp(att->name, "dataFile")) {
+				szFile = att->value;
+			} else if (!stricmp(att->name, "text") || !stricmp(att->name, "string")) {
+				szString = att->value;
+			} else if (!stricmp(att->name, "fcc")) {
+				value = GF_4CC(att->value[0], att->value[1], att->value[2], att->value[3]);
+				nb_bits = 32;
+			} else if (!stricmp(att->name, "ID128")) {
+				gf_bin128_parse(att->value, word128);
+                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")) {
+				szBase64 = att->value;
+			} else if (!stricmp(att->name, "data")) {
+				szData = att->value;
+				if (!strnicmp(szData, "0x", 2)) szData += 2;
+			} else if (!stricmp(att->name, "endian")) {
+				if (!stricmp(att->value, "little")) {
+					big_endian = GF_FALSE;
+				}
+			}
+		}
+		if (szString) {
+			u32 len = (u32) strlen(szString);
+			if (nb_bits)
+				gf_bs_write_int(bs, len, nb_bits);
+
+			gf_bs_write_data(bs, szString, len);
+		} 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); 
+			if ((s32) ret >=0) {
+				gf_bs_write_int(bs, ret, nb_bits);
+				gf_bs_write_data(bs, data, ret);
+			} else {
+				GF_LOG(GF_LOG_WARNING, GF_LOG_CORE, ("[XML/NHML] Error decoding base64 %s\n", att->value));
+			}
+			gf_free(data);
+		} else if (szData) {
+			u32 j, len = (u32) strlen(szData);
+			char *data = (char *) gf_malloc(sizeof(char)*len/2);
+			for (j=0; j<len; j+=2) {
+				u32 v;
+				char szV[5];
+				sprintf(szV, "%c%c", szData[j], szData[j+1]);
+				sscanf(szV, "%x", &v);
+				data[j/2] = v;
+			}
+			gf_bs_write_int(bs, len/2, nb_bits);
+			gf_bs_write_data(bs, data, len/2);
+			gf_free(data);
+		} else if (nb_bits) {
+			if (!big_endian) {
+				if (nb_bits == 16)
+					gf_bs_write_u16_le(bs, (u32)value);
+				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"));
+			}
+			else {
+				if (nb_bits<33) gf_bs_write_int(bs, (s32) value, nb_bits);
+				else gf_bs_write_long_int(bs, value, nb_bits);
+			}
+		} else if (szFile) {
+			char block[1024];
+			FILE *_tmp = gf_f64_open(szFile, use_text ? "rt" : "rb");
+			if (_tmp) {
+				u32 read, remain;
+				if (!size) {
+					gf_f64_seek(_tmp, 0, SEEK_END);
+					size = (u32) gf_f64_tell(_tmp);
+					//if offset only copy from offset until end
+					if ((u64) size > offset)
+						size -= (u32) offset;
+				}
+				remain = size;
+				gf_f64_seek(_tmp, offset, SEEK_SET);
+				while (remain) {
+					read = (u32) fread(block, 1, (remain>1024) ? 1024 : remain, _tmp);
+					gf_bs_write_data(bs, block, read);
+					remain -= size;
+				}
+				fclose(_tmp);
+			}
+		} else if (use_word128) {
+			gf_bs_write_data(bs, (char *)word128, 16);
+		}
+	}
+	gf_bs_align(bs);
+	gf_bs_get_content(bs, specInfo, specInfoSize);
+	gf_bs_del(bs);
+	return GF_OK;
+
+}

Build Results
RPM Lint

Refresh

Comments for request 944 0

Request History

marguerite created request over 10 years ago

update version 5178

marguerite accepted request over 10 years ago

thanks